Skip to content

Commit 9543718

Browse files
WillStrohlWillStrohl
authored
Merge pull request #383 from HotcakesCommerce/development
Release 03.06.00
2 parents 4b7bf82 + 09e6bd8 commit 9543718

File tree

63 files changed

+1175
-1379
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1175
-1379
lines changed

‎Build.proj‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
3+
<PropertyGroup>
4+
<LangVersion>C# 7.0</LangVersion>
5+
</PropertyGroup>
6+
37
<PropertyGroup>
48
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\.build</MSBuildCommunityTasksPath>
59
</PropertyGroup>
@@ -8,14 +12,14 @@
812

913
<!-- Version Number -->
1014
<PropertyGroup Condition=" '$(BUILD_NUMBER)' == '' ">
11-
<Version>03.05.00</Version>
15+
<Version>03.06.00</Version>
1216
<FileVersion>01.00.00</FileVersion>
1317
<InformationalVersion>01.00.00</InformationalVersion>
1418
</PropertyGroup>
1519

1620
<PropertyGroup Condition=" '$(BUILD_NUMBER)' != '' ">
1721
<!-- Build Server Number -->
18-
<Version>03.05.00</Version>
22+
<Version>03.06.00</Version>
1923
<FileVersion>$(BUILD_NUMBER)</FileVersion>
2024
<InformationalVersion>$(BUILD_NUMBER)</InformationalVersion>
2125
</PropertyGroup>

‎CommonAssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[assembly: CLSCompliant(false)]
1212
[assembly: ComVisible(false)]
1313

14-
[assembly: AssemblyVersion("3.05.00")]
14+
[assembly: AssemblyVersion("3.06.00")]
1515
[assembly: AssemblyDelaySign(false)]
1616
[assembly: AssemblyKeyFile("")]
1717
[assembly: AssemblyKeyName("")]

‎DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyBootstrap4/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,7 @@
201201
<data name="AffiliateIdHelp.Text" xml:space="preserve">
202202
<value>Letters and numbers only, please</value>
203203
</data>
204+
<data name="ValMessage_ConfirmTerms.Text" xml:space="preserve">
205+
<value>Please agree to the Terms and Conditions</value>
206+
</data>
204207
</root>

‎DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyBootstrap4/Views/AffiliateRegistration/Index.cshtml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,10 @@
184184
</label>
185185
<div class="col-sm-6 offset-sm-0">
186186
<div class="form-check dnnFormRequired">
187-
@Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms", @class="form-check-input" })
187+
@Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms", @class = "form-check-input" })
188188
<label class="form-check-label" for="ConfirmTerms">@Localization.GetString("lblIAgreeTo")</label>
189+
@Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "alert alert-danger" })
190+
@Html.HiddenFor(model => model.IsTrue)
189191
</div>
190192
<a href="#hcAffiliateTermsPopup" data-min-width="600" data-min-height="350" title="@Localization.GetString("TermsTitle")" class="btn btn-outline-info btn-sm hc-popup">
191193
<i class="fas fa-book"></i>@Localization.GetString("lblAffiliateTerms")
@@ -218,7 +220,9 @@
218220
</div>
219221
}
220222
else{
221-
Html.Raw(Model.AgreementText);
223+
<text>
224+
@Html.Raw(Model.AgreementText)
225+
</text>
222226
}
223227
</div>
224228
<p class="text-right mt-3">

‎DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyLegacy/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,4 +189,7 @@
189189
<data name="lblLastName.Text" xml:space="preserve">
190190
<value>Last Name:</value>
191191
</data>
192+
<data name="ValMessage_ConfirmTerms.Text" xml:space="preserve">
193+
<value>Please agree to the Terms and Conditions</value>
194+
</data>
192195
</root>

‎DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyLegacy/Views/AffiliateRegistration/Index.cshtml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,9 @@
9494
</label>
9595
<label>
9696
@Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms" })
97-
@Localization.GetString("lblIAgreeTo")
97+
@Localization.GetString("lblIAgreeTo")
98+
@Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "dnnFormMessage hcFormError" })
99+
@Html.HiddenFor(model => model.IsTrue)
98100
</label>
99101
<a href="#hcAffiliateTermsPopup" data-min-width="600" data-min-height="350" title="@Localization.GetString("TermsTitle")" class="hc-popup">@Localization.GetString("lblAffiliateTerms") </a>
100102
</div>
@@ -164,7 +166,16 @@
164166
@* Affiliate Terms Popup *@
165167
<div id="hcAffiliateTermsPopup" style="display: none;">
166168
<div class="hc-affiliate-terms">
167-
@Html.Raw(@Model.AgreementText)
169+
@if (Model.AgreementText == ""){
170+
<div class="alert alert-warning">
171+
@Localization.GetString("NoAgreement")
172+
</div>
173+
}
174+
else{
175+
<text>
176+
@Html.Raw(Model.AgreementText)
177+
</text>
178+
}
168179
</div>
169180
<ul class="dnnActions dnnRight">
170181
<li>

‎DevSamples/MyViewSet/Portals/_default/HotcakesViews/MyViewSet/Views/AffiliateRegistration/Index.cshtml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,9 @@
184184
<div class="checkbox dnnFormRequired">
185185
<label>
186186
@Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms" })
187-
@Localization.GetString("lblIAgreeTo")
187+
@Localization.GetString("lblIAgreeTo")
188+
@Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "alert alert-danger" })
189+
@Html.HiddenFor(model => model.IsTrue)
188190
</label>
189191
</div>
190192
<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 @@
214216
</div>
215217
}
216218
else{
217-
Html.Raw(Model.AgreementText);
219+
<text>
220+
@Html.Raw(Model.AgreementText)
221+
</text>
218222
}
219223
</div>
220224
<p class="text-right margin-top-md">

‎DevSamples/MyViewSet/Portals/_default/HotcakesViews/Porto5/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,4 +201,7 @@
201201
<data name="AffiliateIdHelp.Text" xml:space="preserve">
202202
<value>Letters and numbers only, please</value>
203203
</data>
204+
<data name="ValMessage_ConfirmTerms.Text" xml:space="preserve">
205+
<value>Please agree to the Terms and Conditions</value>
206+
</data>
204207
</root>

‎DevSamples/MyViewSet/Portals/_default/HotcakesViews/Porto5/Views/AffiliateRegistration/Index.cshtml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,8 @@
186186
<div class="form-check dnnFormRequired">
187187
@Html.CheckBoxFor(model => model.ConfirmTerms, new { data_bind = "checked: model.confirmterms", @class="form-check-input" })
188188
<label class="form-check-label" for="ConfirmTerms">@Localization.GetString("lblIAgreeTo")</label>
189+
@Html.ValidationMessageFor(model => model.ConfirmTerms, Localization.GetString("ValMessage_ConfirmTerms"), new { @class = "alert alert-danger" })
190+
@Html.HiddenFor(model => model.IsTrue)
189191
</div>
190192
<a href="#hcAffiliateTermsPopup" data-min-width="600" data-min-height="350" title="@Localization.GetString("TermsTitle")" class="btn btn-outline-info btn-sm hc-popup">
191193
<i class="fas fa-book"></i>@Localization.GetString("lblAffiliateTerms")

‎DevSamples/MyViewSet/Portals/_default/HotcakesViews/SocialSpokes/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,4 +189,7 @@
189189
<data name="lblLastName.Text" xml:space="preserve">
190190
<value>Last Name:</value>
191191
</data>
192+
<data name="ValMessage_ConfirmTerms.Text" xml:space="preserve">
193+
<value>Please agree to the Terms and Conditions</value>
194+
</data>
192195
</root>

0 commit comments

Comments
 (0)