Merge pull request #359 from erw13n/development

Fix #292 - Affiliate & Category (drilldown) views don't work
HotcakesCommerce · Dec 1, 2021 · 569512a · 569512a
2 parents 983bbdf + 9223019
commit 569512a
Show file tree

Hide file tree

Showing 21 changed files with 121 additions and 21 deletions.
diff --git a/...tcakesViews/MyBootstrap4/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx b/...tcakesViews/MyBootstrap4/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
@@ -201,4 +201,7 @@
   <data name="AffiliateIdHelp.Text" xml:space="preserve">
     <value>Letters and numbers only, please</value>
   </data>
+  <data name="ValMessage_ConfirmTerms.Text" xml:space="preserve">
+    <value>Please agree to the Terms and Conditions</value>
+  </data>
 </root>
diff --git a/...wSet/Portals/_default/HotcakesViews/MyBootstrap4/Views/AffiliateRegistration/Index.cshtml b/...wSet/Portals/_default/HotcakesViews/MyBootstrap4/Views/AffiliateRegistration/Index.cshtml
@@ -184,8 +184,10 @@
                                     </label>
                                     <div class="col-sm-6 offset-sm-0">
                                         <div class="form-check dnnFormRequired">
-                                            @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms", @class="form-check-input" })
+                                            @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms", @class = "form-check-input" })
                                             <label class="form-check-label" for="ConfirmTerms">@Localization.GetString("lblIAgreeTo")</label>
+                                            @Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "alert alert-danger" })
+                                            @Html.HiddenFor(model => model.IsTrue)
                                         </div>
                                         <a href="#hcAffiliateTermsPopup" data-min-width="600" data-min-height="350" title="@Localization.GetString("TermsTitle")" class="btn btn-outline-info btn-sm hc-popup">
                                             <i class="fas fa-book"></i>@Localization.GetString("lblAffiliateTerms") 
@@ -218,7 +220,9 @@
                         </div>
                     }
                     else{
-                        Html.Raw(Model.AgreementText);
+                        <text>
+                        @Html.Raw(Model.AgreementText)
+                        </text>
                     }
                 </div>
                 <p class="text-right mt-3">

diff --git a/...t/HotcakesViews/MyLegacy/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx b/...t/HotcakesViews/MyLegacy/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
@@ -189,4 +189,7 @@
   <data name="lblLastName.Text" xml:space="preserve">
     <value>Last Name:</value>
   </data>
+  <data name="ValMessage_ConfirmTerms.Text" xml:space="preserve">
+    <value>Please agree to the Terms and Conditions</value>
+  </data>
 </root>
diff --git a/...yViewSet/Portals/_default/HotcakesViews/MyLegacy/Views/AffiliateRegistration/Index.cshtml b/...yViewSet/Portals/_default/HotcakesViews/MyLegacy/Views/AffiliateRegistration/Index.cshtml
@@ -94,7 +94,9 @@
                 </label>
                 <label>
                     @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms" })
-                    @Localization.GetString("lblIAgreeTo") 
+                    @Localization.GetString("lblIAgreeTo")
+                    @Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "dnnFormMessage hcFormError" })
+                    @Html.HiddenFor(model => model.IsTrue)
                 </label>
                 <a href="#hcAffiliateTermsPopup" data-min-width="600" data-min-height="350" title="@Localization.GetString("TermsTitle")" class="hc-popup">@Localization.GetString("lblAffiliateTerms") </a>
             </div>
@@ -164,7 +166,16 @@
 @* Affiliate Terms Popup *@
 <div id="hcAffiliateTermsPopup" style="display: none;">
     <div class="hc-affiliate-terms">
-        @Html.Raw(@Model.AgreementText)
+        @if (Model.AgreementText == ""){
+            <div class="alert alert-warning">
+                @Localization.GetString("NoAgreement")
+            </div>
+        }
+        else{
+            <text>
+            @Html.Raw(Model.AgreementText)
+            </text>
+        }
     </div>
     <ul class="dnnActions dnnRight">
         <li>

diff --git a/...ViewSet/Portals/_default/HotcakesViews/MyViewSet/Views/AffiliateRegistration/Index.cshtml b/...ViewSet/Portals/_default/HotcakesViews/MyViewSet/Views/AffiliateRegistration/Index.cshtml
@@ -184,7 +184,9 @@
                             <div class="checkbox dnnFormRequired">
                                 <label>
                                     @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms" })
-                                    @Localization.GetString("lblIAgreeTo") 
+                                    @Localization.GetString("lblIAgreeTo")
+                                    @Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "alert alert-danger" })
+                                    @Html.HiddenFor(model => model.IsTrue)
                                 </label>
                             </div>
                             <a href="#hcAffiliateTermsPopup" data-min-width="600" data-min-height="350" title="@Localization.GetString("TermsTitle")" class="btn btn-default btn-sm hc-popup">
@@ -214,7 +216,9 @@
                     </div>
                 }
                 else{
-                    Html.Raw(Model.AgreementText);
+                    <text>
+                    @Html.Raw(Model.AgreementText)
+                    </text>
                 }
             </div>
             <p class="text-right margin-top-md">

diff --git a/...ult/HotcakesViews/Porto5/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx b/...ult/HotcakesViews/Porto5/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
@@ -201,4 +201,7 @@
   <data name="AffiliateIdHelp.Text" xml:space="preserve">
     <value>Letters and numbers only, please</value>
   </data>
+  <data name="ValMessage_ConfirmTerms.Text" xml:space="preserve">
+    <value>Please agree to the Terms and Conditions</value>
+  </data>
 </root>
diff --git a/.../MyViewSet/Portals/_default/HotcakesViews/Porto5/Views/AffiliateRegistration/Index.cshtml b/.../MyViewSet/Portals/_default/HotcakesViews/Porto5/Views/AffiliateRegistration/Index.cshtml
@@ -186,6 +186,8 @@
                                         <div class="form-check dnnFormRequired">
                                             @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms", @class="form-check-input" })
                                             <label class="form-check-label" for="ConfirmTerms">@Localization.GetString("lblIAgreeTo")</label>
+                                            @Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "alert alert-danger" })
+                                            @Html.HiddenFor(model => model.IsTrue)
                                         </div>
                                         <a href="#hcAffiliateTermsPopup" data-min-width="600" data-min-height="350" title="@Localization.GetString("TermsTitle")" class="btn btn-outline-info btn-sm hc-popup">
                                             <i class="fas fa-book"></i>@Localization.GetString("lblAffiliateTerms") 

diff --git a/...tcakesViews/SocialSpokes/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx b/...tcakesViews/SocialSpokes/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
@@ -189,4 +189,7 @@
   <data name="lblLastName.Text" xml:space="preserve">
     <value>Last Name:</value>
   </data>
+  <data name="ValMessage_ConfirmTerms.Text" xml:space="preserve">
+    <value>Please agree to the Terms and Conditions</value>
+  </data>
 </root>
diff --git a/...wSet/Portals/_default/HotcakesViews/SocialSpokes/Views/AffiliateRegistration/Index.cshtml b/...wSet/Portals/_default/HotcakesViews/SocialSpokes/Views/AffiliateRegistration/Index.cshtml
@@ -94,7 +94,9 @@
                 </label>
                 <label>
                     @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms" })
-                    @Localization.GetString("lblIAgreeTo") 
+                    @Localization.GetString("lblIAgreeTo")
+                    @Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "dnnFormMessage hcFormError" })
+                    @Html.HiddenFor(model => model.IsTrue)
                 </label>
                 <a href="#hcAffiliateTermsPopup" data-min-width="600" data-min-height="350" title="@Localization.GetString("TermsTitle")" class="hc-popup">@Localization.GetString("lblAffiliateTerms") </a>
             </div>
@@ -164,7 +166,16 @@
 @* Affiliate Terms Popup *@
 <div id="hcAffiliateTermsPopup" style="display: none;">
     <div class="hc-affiliate-terms">
-        @Html.Raw(@Model.AgreementText)
+        @if (Model.AgreementText == ""){
+            <div class="alert alert-warning">
+                @Localization.GetString("NoAgreement")
+            </div>
+        }
+        else{
+            <text>
+            @Html.Raw(Model.AgreementText)
+            </text>
+        }
     </div>
     <ul class="dnnActions dnnRight">
         <li>

diff --git a/Libraries/Hotcakes.Shipping/USPSAddressProvider.cs b/Libraries/Hotcakes.Shipping/USPSAddressProvider.cs
@@ -34,7 +34,7 @@ namespace Hotcakes.Shipping
 {
     public class USPSAddressProvider : IAddressProvider
     {
-        private const string _url = "http://production.shippingapis.com/ShippingAPITest.dll?API=Verify&XML=";
+        private const string _url = "https://production.shippingapis.com/ShippingAPITest.dll?API=Verify&XML=";
         private readonly string _userID;
 
         public USPSAddressProvider(string userID)

diff --git a/Website/DesktopModules/Hotcakes/Core/Models/AffiliateViewModel.cs b/Website/DesktopModules/Hotcakes/Core/Models/AffiliateViewModel.cs
@@ -166,9 +166,12 @@ public string ToJson()
         [RegularExpression(@"[-\w]*", ErrorMessage = "Only alpha-numeric and '-', '_' characters are allowed")]
         public string ReferralAffiliateId { get; set; }
 
+        public bool IsTrue { get { return true; } }
+
         /// <summary>
         ///     Checkbox to confirm the terms
         /// </summary>
+        [Compare(nameof(IsTrue), ErrorMessage = "Please agree to Terms and Conditions")]
         public bool ConfirmTerms { get; set; }
 
         /// <summary>

diff --git a/...HotcakesViews/Bootstrap4/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx b/...HotcakesViews/Bootstrap4/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
@@ -201,4 +201,7 @@
   <data name="AffiliateIdHelp.Text" xml:space="preserve">
     <value>Letters and numbers only, please</value>
   </data>
+  <data name="ValMessage_ConfirmTerms.Text" xml:space="preserve">
+    <value>Please agree to the Terms and Conditions</value>
+  </data>
 </root>
diff --git a/Website/Portals/_default/HotcakesViews/Bootstrap4/Views/AffiliateRegistration/Index.cshtml b/Website/Portals/_default/HotcakesViews/Bootstrap4/Views/AffiliateRegistration/Index.cshtml
@@ -184,8 +184,10 @@
                                     </label>
                                     <div class="col-sm-6 offset-sm-0">
                                         <div class="form-check dnnFormRequired">
-                                            @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms", @class="form-check-input" })
+                                            @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms", @class = "form-check-input" })
                                             <label class="form-check-label" for="ConfirmTerms">@Localization.GetString("lblIAgreeTo")</label>
+                                            @Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "alert alert-danger" })
+                                            @Html.HiddenFor(model => model.IsTrue)
                                         </div>
                                         <a href="#hcAffiliateTermsPopup" data-min-width="600" data-min-height="350" title="@Localization.GetString("TermsTitle")" class="btn btn-outline-info btn-sm hc-popup">
                                             <i class="fas fa-book"></i>@Localization.GetString("lblAffiliateTerms") 
@@ -218,7 +220,9 @@
                         </div>
                     }
                     else{
-                        Html.Raw(Model.AgreementText);
+                        <text>
+                        @Html.Raw(Model.AgreementText)
+                        </text>
                     }
                 </div>
                 <p class="text-right mt-3">

diff --git a/...ult/HotcakesViews/Porto5/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx b/...ult/HotcakesViews/Porto5/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
@@ -201,4 +201,7 @@
   <data name="AffiliateIdHelp.Text" xml:space="preserve">
     <value>Letters and numbers only, please</value>
   </data>
+  <data name="ValMessage_ConfirmTerms.Text" xml:space="preserve">
+    <value>Please agree to the Terms and Conditions</value>
+  </data>
 </root>
diff --git a/Website/Portals/_default/HotcakesViews/Porto5/Views/AffiliateRegistration/Index.cshtml b/Website/Portals/_default/HotcakesViews/Porto5/Views/AffiliateRegistration/Index.cshtml
@@ -184,8 +184,10 @@
                                     </label>
                                     <div class="col-sm-6 offset-sm-0">
                                         <div class="form-check dnnFormRequired">
-                                            @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms", @class="form-check-input" })
+                                            @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms", @class = "form-check-input" })
                                             <label class="form-check-label" for="ConfirmTerms">@Localization.GetString("lblIAgreeTo")</label>
+                                            @Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "alert alert-danger" })
+                                            @Html.HiddenFor(model => model.IsTrue)
                                         </div>
                                         <a href="#hcAffiliateTermsPopup" data-min-width="600" data-min-height="350" title="@Localization.GetString("TermsTitle")" class="btn btn-outline-info btn-sm hc-popup">
                                             <i class="fas fa-book"></i>@Localization.GetString("lblAffiliateTerms") 
@@ -218,7 +220,9 @@
                         </div>
                     }
                     else{
-                        Html.Raw(Model.AgreementText);
+                        <text>
+                        @Html.Raw(Model.AgreementText)
+                        </text>
                     }
                 </div>
                 <p class="text-right mt-3">

diff --git a/...tcakesViews/SocialSpokes/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx b/...tcakesViews/SocialSpokes/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
@@ -189,4 +189,7 @@
   <data name="lblLastName.Text" xml:space="preserve">
     <value>Last Name:</value>
   </data>
+  <data name="ValMessage_ConfirmTerms.Text" xml:space="preserve">
+    <value>Please agree to the Terms and Conditions</value>
+  </data>
 </root>
diff --git a/Website/Portals/_default/HotcakesViews/SocialSpokes/Views/AffiliateRegistration/Index.cshtml b/Website/Portals/_default/HotcakesViews/SocialSpokes/Views/AffiliateRegistration/Index.cshtml
@@ -94,7 +94,9 @@
                 </label>
                 <label>
                     @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms" })
-                    @Localization.GetString("lblIAgreeTo") 
+                    @Localization.GetString("lblIAgreeTo")
+                    @Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "dnnFormMessage hcFormError" })
+                    @Html.HiddenFor(model => model.IsTrue)
                 </label>
                 <a href="#hcAffiliateTermsPopup" data-min-width="600" data-min-height="350" title="@Localization.GetString("TermsTitle")" class="hc-popup">@Localization.GetString("lblAffiliateTerms") </a>
             </div>
@@ -164,7 +166,18 @@
 @* Affiliate Terms Popup *@
 <div id="hcAffiliateTermsPopup" style="display: none;">
     <div class="hc-affiliate-terms">
-        @Html.Raw(@Model.AgreementText)
+        @if (Model.AgreementText == "")
+        {
+            <div class="alert alert-warning">
+                @Localization.GetString("NoAgreement")
+            </div>
+        }
+        else
+        {
+            <text>
+            @Html.Raw(Model.AgreementText)
+            </text>
+        }
     </div>
     <ul class="dnnActions dnnRight">
         <li>

diff --git a/...kesViews/_default-Legacy/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx b/...kesViews/_default-Legacy/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
@@ -189,4 +189,7 @@
   <data name="lblLastName.Text" xml:space="preserve">
     <value>Last Name:</value>
   </data>
+  <data name="ValMessage_ConfirmTerms.Text" xml:space="preserve">
+    <value>Please agree to the Terms and Conditions</value>
+  </data>
 </root>
diff --git a/...e/Portals/_default/HotcakesViews/_default-Legacy/Views/AffiliateRegistration/Index.cshtml b/...e/Portals/_default/HotcakesViews/_default-Legacy/Views/AffiliateRegistration/Index.cshtml
@@ -94,7 +94,9 @@
                 </label>
                 <label>
                     @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms" })
-                    @Localization.GetString("lblIAgreeTo") 
+                    @Localization.GetString("lblIAgreeTo")
+                    @Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "dnnFormMessage hcFormError" })
+                    @Html.HiddenFor(model => model.IsTrue)
                 </label>
                 <a href="#hcAffiliateTermsPopup" data-min-width="600" data-min-height="350" title="@Localization.GetString("TermsTitle")" class="hc-popup">@Localization.GetString("lblAffiliateTerms") </a>
             </div>
@@ -164,7 +166,18 @@
 @* Affiliate Terms Popup *@
 <div id="hcAffiliateTermsPopup" style="display: none;">
     <div class="hc-affiliate-terms">
-        @Html.Raw(@Model.AgreementText)
+        @if (Model.AgreementText == "")
+        {
+            <div class="alert alert-warning">
+                @Localization.GetString("NoAgreement")
+            </div>
+        }
+        else
+        {
+            <text>
+                @Html.Raw(Model.AgreementText)
+            </text>
+        }
     </div>
     <ul class="dnnActions dnnRight">
         <li>

diff --git a/...t/HotcakesViews/_default/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx b/...t/HotcakesViews/_default/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
@@ -201,4 +201,7 @@
   <data name="AffiliateIdHelp.Text" xml:space="preserve">
     <value>Letters and numbers only, please</value>
   </data>
-</root>
+  <data name="ValMessage_ConfirmTerms.Text" xml:space="preserve">
+    <value>Please agree to the Terms and Conditions</value>
+  </data>
+</root>
diff --git a/Website/Portals/_default/HotcakesViews/_default/Views/AffiliateRegistration/Index.cshtml b/Website/Portals/_default/HotcakesViews/_default/Views/AffiliateRegistration/Index.cshtml
@@ -183,8 +183,10 @@
                         <div class="col-offset-0 col-xs-6">
                             <div class="checkbox dnnFormRequired">
                                 <label>
-                                    @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms" })
-                                    @Localization.GetString("lblIAgreeTo") 
+                                    @Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms", ID = "chkConfirmTerms" })
+                                    @Localization.GetString("lblIAgreeTo")
+                                    @Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "alert alert-danger" })
+                                    @Html.HiddenFor(model => model.IsTrue)
                                 </label>
                             </div>
                             <a href="#hcAffiliateTermsPopup" data-min-width="600" data-min-height="350" title="@Localization.GetString("TermsTitle")" class="btn btn-default btn-sm hc-popup">
@@ -214,7 +216,9 @@
                     </div>
                 }
                 else{
-                    Html.Raw(Model.AgreementText);
+                    <text>
+                    @Html.Raw(Model.AgreementText)
+                    </text>
                 }
             </div>
             <p class="text-right margin-top-md">