Merge pull request #383 from HotcakesCommerce/development

Release 03.06.00
HotcakesCommerce · Dec 7, 2021 · 9543718 · 9543718
2 parents 4b7bf82 + 09e6bd8
commit 9543718
Show file tree

Hide file tree

Showing 63 changed files with 1,175 additions and 1,379 deletions.
diff --git a/Build.proj b/Build.proj
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
+	<PropertyGroup>
+		<LangVersion>C# 7.0</LangVersion>
+	</PropertyGroup>
+
 	<PropertyGroup>
 		<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\.build</MSBuildCommunityTasksPath>
 	</PropertyGroup>
@@ -8,14 +12,14 @@
 
 	<!-- Version Number -->
 	<PropertyGroup Condition=" '$(BUILD_NUMBER)' == '' ">
-		<Version>03.05.00</Version>
+		<Version>03.06.00</Version>
 		<FileVersion>01.00.00</FileVersion>
 		<InformationalVersion>01.00.00</InformationalVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(BUILD_NUMBER)' != '' ">
 		<!-- Build Server Number -->
-		<Version>03.05.00</Version>
+		<Version>03.06.00</Version>
 		<FileVersion>$(BUILD_NUMBER)</FileVersion>
 		<InformationalVersion>$(BUILD_NUMBER)</InformationalVersion>
 	</PropertyGroup>

diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -11,7 +11,7 @@
 [assembly: CLSCompliant(false)]
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("3.05.00")]
+[assembly: AssemblyVersion("3.06.00")]
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]

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/DevSamples/References/Hotcakes.Commerce.Dnn.dll b/DevSamples/References/Hotcakes.Commerce.Dnn.dll
diff --git a/DevSamples/References/Hotcakes.Commerce.dll b/DevSamples/References/Hotcakes.Commerce.dll
diff --git a/DevSamples/References/Hotcakes.CommerceDTO.dll b/DevSamples/References/Hotcakes.CommerceDTO.dll
diff --git a/DevSamples/References/Hotcakes.Modules.dll b/DevSamples/References/Hotcakes.Modules.dll
diff --git a/DevSamples/References/Hotcakes.Payment.dll b/DevSamples/References/Hotcakes.Payment.dll
diff --git a/DevSamples/References/Hotcakes.Web.dll b/DevSamples/References/Hotcakes.Web.dll
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+ <PropertyGroup>
+   <LangVersion>latestMajor</LangVersion>
+ </PropertyGroup>
+</Project>
diff --git a/GlobalAssemblyInfo.cs b/GlobalAssemblyInfo.cs
@@ -8,25 +8,25 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyCopyright("Copyright © 2020. All rights reserved.")]
+[assembly: System.Reflection.AssemblyInformationalVersion("01.00.00")]
 [assembly: System.Reflection.AssemblyConfiguration("Release")]
-[assembly: System.Reflection.AssemblyVersion("03.05.00")]
+[assembly: System.Reflection.AssemblyCopyright("Copyright © 2021. All rights reserved.")]
 [assembly: System.Reflection.AssemblyFileVersion("01.00.00")]
-[assembly: System.Reflection.AssemblyInformationalVersion("01.00.00")]
+[assembly: System.Reflection.AssemblyVersion("03.06.00")]
 
 
 
 internal sealed partial class ThisAssembly {
 
-    internal const string AssemblyCopyright = "Copyright © 2020. All rights reserved.";
+    internal const string AssemblyInformationalVersion = "01.00.00";
 
     internal const string AssemblyConfiguration = "Release";
 
-    internal const string AssemblyVersion = "03.05.00";
+    internal const string AssemblyCopyright = "Copyright © 2021. All rights reserved.";
 
     internal const string AssemblyFileVersion = "01.00.00";
 
-    internal const string AssemblyInformationalVersion = "01.00.00";
+    internal const string AssemblyVersion = "03.06.00";
 
     private ThisAssembly() {
     }

diff --git a/Libraries/Hotcakes.Commerce/BusinessRules/OrderTasks/ReceiveCreditCards.cs b/Libraries/Hotcakes.Commerce/BusinessRules/OrderTasks/ReceiveCreditCards.cs
@@ -108,11 +108,12 @@ private bool ProcessTransaction(OrderTaskContext context, OrderTransaction p)
 			try
 			{
 				var payManager = new OrderPaymentManager(context.Order, context.HccApp);
+                var orderNumber = !string.IsNullOrEmpty(p.OrderNumber) ? p.OrderNumber : context.Order.OrderNumber;
 				Transaction t = payManager.CreateEmptyTransaction();
 				t.Card = p.CreditCard;
 				t.Card.SecurityCode = context.Inputs.GetProperty("hcc", "CardSecurityCode");
 				t.Amount = p.Amount;
-                t.Items = GetLineItemsForTransaction(context, p.OrderNumber);
+                t.Items = GetLineItemsForTransaction(context, orderNumber);
 
 				if (context.HccApp.CurrentStore.Settings.PaymentCreditCardAuthorizeOnly)
 				{

diff --git a/Libraries/Hotcakes.Commerce/Data/EF/HccDbContext.Context.cs b/Libraries/Hotcakes.Commerce/Data/EF/HccDbContext.Context.cs
@@ -355,5 +355,10 @@ public virtual int DeleteStoreOrders(Nullable<long> storeId)
 
             return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("DeleteStoreOrders", storeIdParameter);
         }
+
+        public virtual int hcc_RefreshStoreSettings()
+        {
+            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction("hcc_RefreshStoreSettings");
+        }
     }
 }
diff --git a/Libraries/Hotcakes.Commerce/Data/EF/HccDbContext.Designer.cs b/Libraries/Hotcakes.Commerce/Data/EF/HccDbContext.Designer.cs