Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #292 - Affiliate & Category (drilldown) views don't work #359

Merged
merged 10 commits into from
Dec 1, 2021
Merged

Fix #292 - Affiliate & Category (drilldown) views don't work #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a4b49cf
Affiliate Form, Javascript validation issue - missing validation for …
erw13n Apr 27, 2021
9c84b47
Affiliate Terms not showing
erw13n Apr 27, 2021
35205b1
Affiliate Term error message
erw13n Apr 27, 2021
86e7fe8
Cleanup unused method
erw13n Apr 27, 2021
d5a509f
#353 Changed Endpoint URL to https
erw13n Apr 28, 2021
7e920e8
Update Index.cshtml.resx
Apr 29, 2021
3387da7
Update the other Viewset
erw13n Apr 29, 2021
0303e03
Merge branch 'development' of https://github.com/erw13n/hotcakes-comm…
erw13n Apr 29, 2021
c545c6a
Fix blank Agreement Term
erw13n Apr 29, 2021
9223019
Update Localization
erw13n Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ...tcakesViews/MyBootstrap4/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
8 changes: 6 additions & 2 deletions ...wSet/Portals/_default/HotcakesViews/MyBootstrap4/Views/AffiliateRegistration/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -218,7 +220,9 @@
</div>
}
else{
Html.Raw(Model.AgreementText);
<text>
@Html.Raw(Model.AgreementText)
</text>
}
</div>
<p class="text-right mt-3">
Expand Down
3 changes: 3 additions & 0 deletions ...t/HotcakesViews/MyLegacy/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
15 changes: 13 additions & 2 deletions ...yViewSet/Portals/_default/HotcakesViews/MyLegacy/Views/AffiliateRegistration/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
8 changes: 6 additions & 2 deletions ...ViewSet/Portals/_default/HotcakesViews/MyViewSet/Views/AffiliateRegistration/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -214,7 +216,9 @@
</div>
}
else{
Html.Raw(Model.AgreementText);
<text>
@Html.Raw(Model.AgreementText)
</text>
}
</div>
<p class="text-right margin-top-md">
Expand Down
3 changes: 3 additions & 0 deletions ...ult/HotcakesViews/Porto5/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 2 additions & 0 deletions .../MyViewSet/Portals/_default/HotcakesViews/Porto5/Views/AffiliateRegistration/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
3 changes: 3 additions & 0 deletions ...tcakesViews/SocialSpokes/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
15 changes: 13 additions & 2 deletions ...wSet/Portals/_default/HotcakesViews/SocialSpokes/Views/AffiliateRegistration/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Hotcakes.Shipping/USPSAddressProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions Website/DesktopModules/Hotcakes/Core/Models/AffiliateViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; } }
Copy link
Contributor Author

@erw13n erw13n Dec 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@WillStrohl It's been update in here.


/// <summary>
/// Checkbox to confirm the terms
/// </summary>
[Compare(nameof(IsTrue), ErrorMessage = "Please agree to Terms and Conditions")]
public bool ConfirmTerms { get; set; }

/// <summary>
Expand Down
3 changes: 3 additions & 0 deletions ...HotcakesViews/Bootstrap4/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
8 changes: 6 additions & 2 deletions Website/Portals/_default/HotcakesViews/Bootstrap4/Views/AffiliateRegistration/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -218,7 +220,9 @@
</div>
}
else{
Html.Raw(Model.AgreementText);
<text>
@Html.Raw(Model.AgreementText)
</text>
}
</div>
<p class="text-right mt-3">
Expand Down
3 changes: 3 additions & 0 deletions ...ult/HotcakesViews/Porto5/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
8 changes: 6 additions & 2 deletions Website/Portals/_default/HotcakesViews/Porto5/Views/AffiliateRegistration/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -218,7 +220,9 @@
</div>
}
else{
Html.Raw(Model.AgreementText);
<text>
@Html.Raw(Model.AgreementText)
</text>
}
</div>
<p class="text-right mt-3">
Expand Down
3 changes: 3 additions & 0 deletions ...tcakesViews/SocialSpokes/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
17 changes: 15 additions & 2 deletions Website/Portals/_default/HotcakesViews/SocialSpokes/Views/AffiliateRegistration/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
3 changes: 3 additions & 0 deletions ...kesViews/_default-Legacy/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
17 changes: 15 additions & 2 deletions ...e/Portals/_default/HotcakesViews/_default-Legacy/Views/AffiliateRegistration/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
5 changes: 4 additions & 1 deletion ...t/HotcakesViews/_default/Views/AffiliateRegistration/App_LocalResources/Index.cshtml.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
10 changes: 7 additions & 3 deletions Website/Portals/_default/HotcakesViews/_default/Views/AffiliateRegistration/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -214,7 +216,9 @@
</div>
}
else{
Html.Raw(Model.AgreementText);
<text>
@Html.Raw(Model.AgreementText)
</text>
}
</div>
<p class="text-right margin-top-md">
Expand Down