Skip to content

Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.

customer attributes - vee validate added

DanielŻuławski0547458509b8
diff --git a/src/Web/Grand.Web/Views/Account/Info.cshtml b/src/Web/Grand.Web/Views/Account/Info.cshtml
index effb53eab..0abca2e3f 100644
--- a/src/Web/Grand.Web/Views/Account/Info.cshtml
+++ b/src/Web/Grand.Web/Views/Account/Info.cshtml
@@ -31,7 +31,7 @@
elChild.innerHTML = id.name;
ddlStates.appendChild(elChild);
});
- customerinfo.StateProvinceId = response.data[0].id;
+ customer.StateProvinceId = response.data[0].id;
}).then(function () {
ddlStates.classList.remove('is-valid');
ddlStates.classList.add('is-invalid');
@@ -114,7 +114,7 @@
<validation-provider tag="div" rules="required" name="FirstName" v-slot="{ errors, classes }">
<label asp-for="FirstName" class="col-form-label">@Loc["Account.Fields.FirstName"]:</label>
<span class="required">*</span>
- <input asp-for="FirstName" v-model="customerinfo.FirstName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="FirstName" v-model="customer.FirstName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="FirstName"></span>
</validation-provider>
@@ -132,7 +132,7 @@
<validation-provider tag="div" rules="required" name="LastName" v-slot="{ errors, classes }">
<label asp-for="LastName" class="col-form-label">@Loc["Account.Fields.LastName"]:</label>
<span class="required">*</span>
- <input asp-for="LastName" v-model="customerinfo.LastName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="LastName" v-model="customer.LastName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="LastName"></span>
</validation-provider>
@@ -178,7 +178,7 @@
<validation-provider tag="div" rules="required|email" name="Email" v-slot="{ errors, classes }">
<label asp-for="Email" class="col-form-label">@Loc["Account.Fields.Email"]:</label>
<span class="required">*</span>
- <input asp-for="Email" v-model="customerinfo.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" asp-readonly=@(!Model.AllowUsersToChangeEmail) />
+ <input asp-for="Email" v-model="customer.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" asp-readonly=@(!Model.AllowUsersToChangeEmail) />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="Email"></span>
</validation-provider>
@@ -194,7 +194,7 @@
<validation-provider tag="div" rules="required" name="Username" v-slot="{ errors, classes }">
<label asp-for="Username" class="col-form-label">@Loc["Account.Fields.Username"]:</label>
<span class="required">*</span>
- <input asp-for="Username" v-model="customerinfo.Username" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="Username" v-model="customer.Username" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="Username"></span>
</validation-provider>
@@ -232,7 +232,7 @@
<validation-provider tag="div" rules="required" name="Company" v-slot="{ errors, classes }">
<label asp-for="Company" class="col-form-label">@Loc["Account.Fields.Company"]:</label>
<span class="required">*</span>
- <input asp-for="Company" v-model="customerinfo.Company" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="Company" v-model="customer.Company" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="Company"></span>
</validation-provider>
@@ -280,7 +280,7 @@
<validation-provider tag="div" rules="required" name="StreetAddress" v-slot="{ errors, classes }">
<label asp-for="StreetAddress" class="col-form-label">@Loc["Account.Fields.StreetAddress"]:</label>
<span class="required">*</span>
- <input asp-for="StreetAddress" v-model="customerinfo.StreetAddress" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="StreetAddress" v-model="customer.StreetAddress" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="StreetAddress"></span>
</validation-provider>
@@ -302,7 +302,7 @@
<validation-provider tag="div" rules="required" name="StreetAddress2" v-slot="{ errors, classes }">
<label asp-for="StreetAddress2" class="col-form-label">@Loc["Account.Fields.StreetAddress2"]:</label>
<span class="required">*</span>
- <input asp-for="StreetAddress2" v-model="customerinfo.StreetAddress2" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="StreetAddress2" v-model="customer.StreetAddress2" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="StreetAddress2"></span>
</validation-provider>
@@ -324,7 +324,7 @@
<validation-provider tag="div" rules="required" name="ZipPostalCode" v-slot="{ errors, classes }">
<label asp-for="ZipPostalCode" class="col-form-label">@Loc["Account.Fields.ZipPostalCode"]:</label>
<span class="required">*</span>
- <input asp-for="ZipPostalCode" v-model="customerinfo.ZipPostalCode" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="ZipPostalCode" v-model="customer.ZipPostalCode" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="ZipPostalCode"></span>
</validation-provider>
@@ -346,7 +346,7 @@
<validation-provider tag="div" rules="required" name="City" v-slot="{ errors, classes }">
<label asp-for="City" class="col-form-label">@Loc["Account.Fields.City"]:</label>
<span class="required">*</span>
- <input asp-for="City" v-model="customerinfo.City" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="City" v-model="customer.City" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="City"></span>
</validation-provider>
@@ -369,7 +369,7 @@
<label asp-for="CountryId" class="col-form-label">@Loc["Account.Fields.Country"]:</label>
<span class="required">*</span>
<select asp-for="CountryId" asp-items="Model.AvailableCountries"
- onchange="@Html.IdFor(model => model.CountryId)_select_element(this)" v-bind:class="[classes , 'form-control custom-select']" v-model="customerinfo.CountryId"></select>
+ onchange="@Html.IdFor(model => model.CountryId)_select_element(this)" v-bind:class="[classes , 'form-control custom-select']" v-model="customer.CountryId"></select>
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="CountryId"></span>
</validation-provider>
@@ -393,7 +393,7 @@
<span class="required">*</span>
}
<select asp-for="StateProvinceId" data-val-required="@Loc["Address.Fields.StateProvince.Required"]" class="custom-select form-control"
- onchange="@Html.IdFor(model => model.StateProvinceId)_select_element(this)" asp-items="Model.AvailableStates" v-model="customerinfo.StateProvinceId"></select>
+ onchange="@Html.IdFor(model => model.StateProvinceId)_select_element(this)" asp-items="Model.AvailableStates" v-model="customer.StateProvinceId"></select>
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="StateProvinceId"></span>
<span id="states-loading-progress" style="display: none;" class="please-wait">@Loc["Common.Wait..."]</span>
@@ -420,7 +420,7 @@
<validation-provider tag="div" rules="required" name="Phone" v-slot="{ errors, classes }">
<label asp-for="Phone" class="col-form-label">@Loc["Account.Fields.Phone"]:</label>
<span class="required">*</span>
- <input asp-for="Phone" v-bind:class="[classes , 'form-control']" v-model="customerinfo.Phone" />
+ <input asp-for="Phone" v-bind:class="[classes , 'form-control']" v-model="customer.Phone" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="Phone"></span>
</validation-provider>
@@ -443,7 +443,7 @@
<validation-provider tag="div" rules="required" name="Fax" v-slot="{ errors, classes }">
<label asp-for="Fax" class="col-form-label">@Loc["Account.Fields.Fax"]:</label>
<span class="required">*</span>
- <input asp-for="Fax" v-bind:class="[classes , 'form-control']" v-model="customerinfo.Fax" />
+ <input asp-for="Fax" v-bind:class="[classes , 'form-control']" v-model="customer.Fax" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="Fax"></span>
</validation-provider>
@@ -575,7 +575,7 @@
</validation-observer>
</div>
<script asp-location="Footer" asp-order="300">
- var customerinfo = new Vue({
+ var customer = new Vue({
data: () => ({
@{
<text>
@@ -592,6 +592,10 @@
Fax: '@Html.Raw(Model.Fax)',
Username: '@Html.Raw(Model.Username)',
Email: '@Html.Raw(Model.Email)',
+ @foreach (var item in Model.CustomerAttributes)
+ {
+ <text>customer_attribute_</text> @item.Id <text>: '',</text>
+ }
</text>
}
})
diff --git a/src/Web/Grand.Web/Views/Account/Register.cshtml b/src/Web/Grand.Web/Views/Account/Register.cshtml
index a83d0dc9b..afa79a2ef 100644
--- a/src/Web/Grand.Web/Views/Account/Register.cshtml
+++ b/src/Web/Grand.Web/Views/Account/Register.cshtml
@@ -23,7 +23,7 @@
elChild.innerHTML = id.name;
ddlStates.appendChild(elChild);
});
- register.StateProvinceId = response.data[0].id;
+ customer.StateProvinceId = response.data[0].id;
}).then(function () {
ddlStates.classList.remove('is-valid');
ddlStates.classList.add('is-invalid');
@@ -104,7 +104,7 @@
<validation-provider tag="div" rules="required" name="FirstName" v-slot="{ errors, classes }">
<label asp-for="FirstName" class="col-form-label">@Loc["Account.Fields.FirstName"]:</label>
<span class="required">*</span>
- <input asp-for="FirstName" v-model="register.FirstName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="FirstName" v-model="customer.FirstName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="FirstName"></span>
</validation-provider>
@@ -122,7 +122,7 @@
<validation-provider tag="div" rules="required" name="LastName" v-slot="{ errors, classes }">
<label asp-for="LastName" class="col-form-label">@Loc["Account.Fields.LastName"]:</label>
<span class="required">*</span>
- <input asp-for="LastName" v-model="register.LastName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="LastName" v-model="customer.LastName" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="LastName"></span>
</validation-provider>
@@ -163,7 +163,7 @@
<validation-provider tag="div" rules="required" name="Email" v-slot="{ errors, classes }">
<label asp-for="Email" class="col-form-label">@Loc["Account.Fields.Email"]:</label>
<span class="required">*</span>
- <input asp-for="Email" v-model="register.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="Email" v-model="customer.Email" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="Email"></span>
</validation-provider>
@@ -178,7 +178,7 @@
</div>
<div class="col-12">
<validation-provider tag="div" rules="required" name="Username" v-slot="{ errors, classes }">
- <input asp-for="Username" v-model="register.Username" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="Username" v-model="customer.Username" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="Username"></span>
</validation-provider>
@@ -205,7 +205,7 @@
<validation-provider tag="div" rules="required" name="Company" v-slot="{ errors, classes }">
<label asp-for="Company" class="col-form-label">@Loc["Account.Fields.Company"]:</label>
<span class="required">*</span>
- <input asp-for="Company" v-model="register.Company" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="Company" v-model="customer.Company" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="Company"></span>
</validation-provider>
@@ -256,7 +256,7 @@
<validation-provider tag="div" rules="required" name="StreetAddress" v-slot="{ errors, classes }">
<label asp-for="StreetAddress" class="col-form-label">@Loc["Account.Fields.StreetAddress"]:</label>
<span class="required">*</span>
- <input asp-for="StreetAddress" v-model="register.StreetAddress" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="StreetAddress" v-model="customer.StreetAddress" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="StreetAddress"></span>
</validation-provider>
@@ -278,7 +278,7 @@
<validation-provider tag="div" rules="required" name="StreetAddress2" v-slot="{ errors, classes }">
<label asp-for="StreetAddress2" class="col-form-label">@Loc["Account.Fields.StreetAddress2"]:</label>
<span class="required">*</span>
- <input asp-for="StreetAddress2" v-model="register.StreetAddress2" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="StreetAddress2" v-model="customer.StreetAddress2" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="StreetAddress2"></span>
</validation-provider>
@@ -300,7 +300,7 @@
<validation-provider tag="div" rules="required" name="ZipPostalCode" v-slot="{ errors, classes }">
<label asp-for="ZipPostalCode" class="col-form-label">@Loc["Account.Fields.ZipPostalCode"]:</label>
<span class="required">*</span>
- <input asp-for="ZipPostalCode" v-model="register.ZipPostalCode" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="ZipPostalCode" v-model="customer.ZipPostalCode" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="ZipPostalCode"></span>
</validation-provider>
@@ -322,7 +322,7 @@
<validation-provider tag="div" rules="required" name="City" v-slot="{ errors, classes }">
<label asp-for="City" class="col-form-label">@Loc["Account.Fields.City"]:</label>
<span class="required">*</span>
- <input asp-for="City" v-model="register.City" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="City" v-model="customer.City" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="City"></span>
</validation-provider>
@@ -345,7 +345,7 @@
<label asp-for="CountryId" class="col-form-label">@Loc["Account.Fields.Country"]:</label>
<span class="required">*</span>
<select asp-for="CountryId" asp-items="Model.AvailableCountries"
- onchange="@Html.IdFor(model => model.CountryId)_select_element(this)" v-bind:class="[classes , 'form-control custom-select']" v-model="register.CountryId"></select>
+ onchange="@Html.IdFor(model => model.CountryId)_select_element(this)" v-bind:class="[classes , 'form-control custom-select']" v-model="customer.CountryId"></select>
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="CountryId"></span>
</validation-provider>
@@ -366,7 +366,7 @@
<label asp-for="StateProvinceId" class="col-form-label">@Loc["Account.Fields.StateProvince"]:</label>
<span class="required">*</span>
<select asp-for="StateProvinceId" data-val-required="@Loc["Address.Fields.StateProvince.Required"]" v-bind:class="[classes , 'form-control custom-select']"
- onchange="@Html.IdFor(model => model.StateProvinceId)_select_element(this)" asp-items="Model.AvailableStates" v-model="register.StateProvinceId"></select>
+ onchange="@Html.IdFor(model => model.StateProvinceId)_select_element(this)" asp-items="Model.AvailableStates" v-model="customer.StateProvinceId"></select>
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="StateProvinceId"></span>
<span id="states-loading-progress" style="display: none;" class="please-wait">@Loc["Common.Wait..."]</span>
@@ -395,7 +395,7 @@
<validation-provider tag="div" rules="required" name="Phone" v-slot="{ errors, classes }">
<label asp-for="Phone" class="col-form-label">@Loc["Account.Fields.Phone"]:</label>
<span class="required">*</span>
- <input asp-for="Phone" v-model="register.Phone" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="Phone" v-model="customer.Phone" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="Phone"></span>
</validation-provider>
@@ -417,7 +417,7 @@
<validation-provider tag="div" rules="required" name="Fax" v-slot="{ errors, classes }">
<label asp-for="Fax" class="col-form-label">@Loc["Account.Fields.Fax"]:</label>
<span class="required">*</span>
- <input asp-for="Fax" v-model="register.Fax" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="Fax" v-model="customer.Fax" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="Fax"></span>
</validation-provider>
@@ -467,17 +467,17 @@
</div>
<div class="card-body">
<div class="form-group">
- <validation-provider tag="div" vid="register.Password" rules="required" v-slot="{ errors, classes }">
+ <validation-provider tag="div" vid="customer.Password" rules="required" v-slot="{ errors, classes }">
<label asp-for="Password" class="col-form-label">@Loc["Account.Fields.Password"]:</label>
- <input asp-for="Password" v-model="register.Password" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="Password" v-model="customer.Password" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="Password"></span>
</validation-provider>
</div>
<div class="form-group">
- <validation-provider tag="div" vid="register.ConfirmPassword" rules="required|confirmed:@@register.Password" v-slot="{ errors, classes }">
+ <validation-provider tag="div" vid="customer.ConfirmPassword" rules="required|confirmed:@@customer.Password" v-slot="{ errors, classes }">
<label asp-for="ConfirmPassword" class="col-form-label">@Loc["Account.Fields.ConfirmPassword"]:</label>
- <input asp-for="ConfirmPassword" v-model="register.ConfirmPassword" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
+ <input asp-for="ConfirmPassword" v-model="customer.ConfirmPassword" v-bind:class="[classes , 'form-control']" autofocus="autofocus" />
<span class="field-validation-error">{{ errors[0] }}</span>
<span asp-validation-for="ConfirmPassword"></span>
</validation-provider>
@@ -494,10 +494,10 @@
@if (Model.AcceptPrivacyPolicyEnabled)
{
- <validation-provider tag="div" vid="register.AcceptPrivacyPolicy" :rules="{ required: { allowFalse: false } }" v-slot="{ errors, classes }">
+ <validation-provider tag="div" vid="customer.AcceptPrivacyPolicy" :rules="{ required: { allowFalse: false } }" v-slot="{ errors, classes }">
<div class="d-inline-flex">
<label class="custom-control custom-checkbox">
- <input id="accept-privacy-policy" name="acceptprivacypolicy" v-model="register.AcceptPrivacyPolicy" autofocus="autofocus" data-val="true" data-val-required="@Loc["account.fields.acceptprivacypolicy.required"]" type="checkbox" v-bind:class="[classes , 'custom-control-input']">
+ <input id="accept-privacy-policy" name="acceptprivacypolicy" v-model="customer.AcceptPrivacyPolicy" autofocus="autofocus" data-val="true" data-val-required="@Loc["account.fields.acceptprivacypolicy.required"]" type="checkbox" v-bind:class="[classes , 'custom-control-input']">
<span class="custom-control-label"></span>
<span class="custom-control-description">@Loc["Account.Fields.AcceptPrivacyPolicy"]</span>
</label>
@@ -507,11 +507,11 @@
</validation-provider>
}
</div>
- <input type="submit" id="register-button" class="btn btn-secondary register-next-step-button my-3" value="@Loc["Account.Register.Button"]" />
+ <input type="submit" id="register-button" class="btn btn-secondary register-next-step-button my-3" value="@Loc["Account.customer.Button"]" />
</form>
</validation-observer>
<script asp-location="Footer" asp-order="300">
- var register = new Vue({
+ var customer = new Vue({
data: () => ({
@{
<text>
@@ -530,7 +530,11 @@
Email: '@Html.Raw(Model.Email)',
Password: '',
ConfirmPassword: '',
- AcceptPrivacyPolicy: false
+ AcceptPrivacyPolicy: false,
+ @foreach (var item in Model.CustomerAttributes)
+ {
+ <text>customer_attribute_</text> @item.Id <text>: '',</text>
+ }
</text>
}
})
diff --git a/src/Web/Grand.Web/Views/Account/_CustomerAttributes.cshtml b/src/Web/Grand.Web/Views/Account/_CustomerAttributes.cshtml
index 45f6ca976..4d8b80e2e 100644
--- a/src/Web/Grand.Web/Views/Account/_CustomerAttributes.cshtml
+++ b/src/Web/Grand.Web/Views/Account/_CustomerAttributes.cshtml
@@ -14,33 +14,43 @@
case AttributeControlType.DropdownList:
{
<label for="@(controlId)" class="col-form-label">@textPrompt:</label>
- <select class="custom-select form-control" name="@(controlId)" id="@(controlId)" @readonlyAttr>
- @if (!attribute.IsRequired)
- {
- <option value="">---</option>
- }
- @foreach (var attributeValue in attribute.Values)
- {
- <option selected="@attributeValue.IsPreSelected" value="@attributeValue.Id">@attributeValue.Name</option>
- }
- </select>
+ <validation-provider @if (attribute.IsRequired) { <text> rules="required" </text> } name="@(controlId)" v-slot="{ errors, classes }">
+ <select v-model="customer.@(controlId)" @readonlyAttr data-val-required="@(string.Format(Loc["Fields.IsRequired"], textPrompt))" v-bind:class="[classes , 'custom-select form-control']" name="@(controlId)" id="@(controlId)">
+ @if (!attribute.IsRequired)
+ {
+ <option value="">---</option>
+ }
+ @foreach (var attributeValue in attribute.Values)
+ {
+ <option selected="@attributeValue.IsPreSelected" value="@attributeValue.Id">@attributeValue.Name</option>
+ }
+ </select>
+ <span class="field-validation-error">{{ errors[0] }}</span>
+ </validation-provider>
}
break;
case AttributeControlType.RadioList:
{
<span class="col-form-label">@textPrompt:</span>
+ @if (attribute.IsRequired)
+ {
+ <span class="required">*</span>
+ }
<ul class="option-list pl-0">
@foreach (var attributeValue in attribute.Values)
{
<li>
<fieldset>
<legend class="sr-only">@(controlId)</legend>
- <label class="custom-control custom-radio">
- <input class="custom-control-input" id="@(controlId)_@(attributeValue.Id)" type="radio" name="@(controlId)" value="@attributeValue.Id" checked="@(attributeValue.IsPreSelected)" @readonlyAttr />
- <span class="custom-control-label"></span>
- <span class="custom-control-description">@attributeValue.Name</span>
- </label>
+ <validation-provider vid="@(controlId)" @if (attribute.IsRequired) { <text> rules="required" </text> } v-slot="{ errors, classes }">
+ <label for="@(controlId)_@(attributeValue.Id)" class="custom-control custom-radio">
+ <input v-bind:class="[classes , 'custom-control-input']" @readonlyAttr data-val="true" data-val-required="@(string.Format(Loc["Fields.IsRequired"], textPrompt))" v-model="customer.@(controlId)" id="@(controlId)_@(attributeValue.Id)" type="radio" name="@(controlId)" value="@(attributeValue.Id)" checked="@attributeValue.IsPreSelected" />
+ <span class="custom-control-label"></span>
+ <span class="custom-control-description">@attributeValue.Name</span>
+ <span class="field-validation-error d-flex w-100">{{ errors[0] }}</span>
+ </label>
+ </validation-provider>
</fieldset>
</li>
@@ -51,18 +61,21 @@
case AttributeControlType.Checkboxes:
{
<span class="col-form-label">@textPrompt:</span>
+ @if (attribute.IsRequired)
+ {
+ <span class="required">*</span>
+ }
<ul class="option-list pl-0">
@foreach (var attributeValue in attribute.Values)
{
- <li>
-
- <label for="@(controlId)_@(attributeValue.Id)" class="custom-control custom-checkbox">
- <input class="custom-control-input" id="@(controlId)_@(attributeValue.Id)" type="checkbox" name="@(controlId)" value="@(attributeValue.Id)" checked="@(attributeValue.IsPreSelected)" @readonlyAttr />
+ <validation-provider tag="li" vid="@(controlId)" @if (attribute.IsRequired) { <text> :rules="{ required: { allowFalse: false } }" </text> } v-slot="{ errors, classes }">
+ <label class="custom-control custom-checkbox">
+ <input v-bind:class="[classes , 'custom-control-input']" data-val="true" @readonlyAttr data-val-required="@(string.Format(Loc["Fields.IsRequired"], textPrompt))" v-model="customer.@(controlId)" id="@(controlId)_@(attributeValue.Id)" type="checkbox" name="@(controlId)" value="@(attributeValue.Id)" checked="@attributeValue.IsPreSelected" @(attribute.AttributeControlType == AttributeControlType.ReadonlyCheckboxes ? Html.Raw(" disabled=\"disabled\"") : null) />
<span class="custom-control-label"></span>
<span class="custom-control-description">@attributeValue.Name</span>
+ <span class="field-validation-error d-flex w-100">{{ errors[0] }}</span>
</label>
-
- </li>
+ </validation-provider>
}
</ul>
}
@@ -74,8 +87,11 @@
{
<span class="required">*</span>
}
- <input name="@(controlId)" type="text" class="form-control textbox" id="@(controlId)" value="@(attribute.DefaultValue)"
- data-val-required="@(string.Format(Loc["Fields.IsRequired"], textPrompt))" @readonlyAttr />
+ <validation-provider @if (attribute.IsRequired) { <text> rules="required" </text> } name="@(controlId)" v-slot="{ errors, classes }">
+ <input name="@(controlId)" type="text"
+ id="@(controlId)" v-model="customer.@(controlId)" @readonlyAttr data-val-required="@(string.Format(Loc["Fields.IsRequired"], textPrompt))" v-bind:class="[classes , 'form-control textbox']" />
+ <span class="field-validation-error">{{ errors[0] }}</span>
+ </validation-provider>
}
break;
case AttributeControlType.MultilineTextbox:
@@ -85,8 +101,11 @@
{
<span class="required">*</span>
}
- <textarea class="form-control" id="@(controlId)" name="@(controlId)" @readonlyAttr
- data-val-required="@(string.Format(Loc["Fields.IsRequired"], textPrompt))">@(attribute.DefaultValue)</textarea>
+ <validation-provider @if (attribute.IsRequired) { <text> rules="required" </text> } name="@(controlId)" v-slot="{ errors, classes }">
+ <textarea name="@(controlId)"
+ id="@(controlId)" v-model="customer.@(controlId)" @readonlyAttr data-val-required="@(string.Format(Loc["Fields.IsRequired"], textPrompt))" v-bind:class="[classes , 'form-control']"></textarea>
+ <span class="field-validation-error">{{ errors[0] }}</span>
+ </validation-provider>
}
break;
case AttributeControlType.Hidden: