diff --git a/ServiceHost/Pages/Register/_Partials/_Step4.cshtml b/ServiceHost/Pages/Register/_Partials/_Step4.cshtml index 2b93c324..8ba18d9f 100644 --- a/ServiceHost/Pages/Register/_Partials/_Step4.cshtml +++ b/ServiceHost/Pages/Register/_Partials/_Step4.cshtml @@ -9,25 +9,28 @@
-
-
مدت قرارداد
+
-
- - +
+
شروع قرارداد:
- - +
+ + + + + +
-
+
-
شروع قرارداد
- +
شروع قرارداد
+
پایان قرارداد
- +
@@ -37,7 +40,7 @@
-
+
@@ -47,7 +50,7 @@
-
+
مدت قرارداد
diff --git a/ServiceHost/wwwroot/AssetsClient/css/style.css b/ServiceHost/wwwroot/AssetsClient/css/style.css index c034777b..3f97a100 100644 --- a/ServiceHost/wwwroot/AssetsClient/css/style.css +++ b/ServiceHost/wwwroot/AssetsClient/css/style.css @@ -96,6 +96,12 @@ outline: none; } +.ss03 { + -moz-font-feature-settings: "ss03"; + -webkit-font-feature-settings: "ss03"; + font-feature-settings: "ss03"; +} + /* Scrollbar Styling */ ::-webkit-scrollbar { width: 10px; @@ -1058,6 +1064,24 @@ ul { /* Buttons */ +button.btn-pdf { + border: 1px solid transparent; + width: 30px; + height: 30px; + border-radius: 5px; + padding: 3px 1px; + color: #E83838; + margin: auto 0 auto 1px; + background-color: rgba(211, 8, 37, 0.2); + box-shadow: 0; + transition: ease .2s; +} + +button.btn-pdf svg { + color: rgb(174, 0, 0); + fill: rgb(174, 0, 0); +} + button.btn-print { border: 1px solid transparent; width: 30px; @@ -1071,18 +1095,18 @@ button.btn-print { transition: ease .2s; } - button.btn-print svg { - color: #1E293B; - } +button.btn-print svg { + color: #1E293B; +} - button.btn-print:hover { - color: #ffffff; - background-color: rgba(52, 209, 209, 0.50); - } +button.btn-print:hover { + color: #ffffff; + background-color: rgba(52, 209, 209, 0.50); +} - button.btn-print:hover svg { - color: #1E293B; - } +button.btn-print:hover svg { + color: #1E293B; +} button.btn-edit, a .btn-edit { diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Register/css/_Partials/_Step4.css b/ServiceHost/wwwroot/AssetsClient/pages/Register/css/_Partials/_Step4.css index 2578e112..57d3d684 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Register/css/_Partials/_Step4.css +++ b/ServiceHost/wwwroot/AssetsClient/pages/Register/css/_Partials/_Step4.css @@ -53,6 +53,9 @@ justify-content: space-between; align-items: center;*/ gap: 9px; + padding: 1rem; + margin-top: 1rem; + margin-bottom: 1rem; } .cardGrid { @@ -130,7 +133,6 @@ font-weight: 600; font-size: 14px; text-align: start; - margin-bottom: 4px; } .radioBtnStartEndContainer { @@ -154,12 +156,18 @@ padding: 12px 9px; } +.start-end-contract-section { + border: 1px solid #eee; + padding: 5px; + border-radius: 8px; +} + .contractSection { background-color: #ECFFFF; padding: 6px; border-radius: 8px; text-align: center; - margin: 0 55px 0 0; + margin: 0 75px 0 0; } .contractSection .startEndCon { @@ -259,7 +267,8 @@ .infoPricesContainer { display: grid; - gap: 2px; + gap: 3px; + column-gap: 12px; grid-auto-flow: column; grid-template-rows: repeat(6, minmax(0, 1fr)); align-content: start; @@ -305,7 +314,7 @@ @media (max-width:1366px) { .step4Container { - height: auto; + height: 80vh; } .cardContainer { @@ -331,6 +340,16 @@ } @media (max-width:992px) { + .step4Container { + height: auto; + } + + .cardBox { + padding: 0.5rem; + margin-top: 0.5rem; + margin-bottom: 0.5rem; + } + .step4Container { height: 74vh; } @@ -352,10 +371,13 @@ .contractSection .startEndCon { position: relative; right: auto; + font-weight: 800; + font-size: 10px; } .contractSection .startEndConSpan { - font-size: 14px; + font-size: 12px; + font-weight: 800; } .infoPricesContainer { @@ -401,6 +423,12 @@ } } +@media (max-height:768px) { + .infoPricesContainerDiv { + height: 100px; + } +} + @media (max-width:540px) { .footerStep4Container .radioBtnFooterContainer { display: flex; diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Register/js/_Partials/_Step4.js b/ServiceHost/wwwroot/AssetsClient/pages/Register/js/_Partials/_Step4.js index ca4102eb..35dd7b3e 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/Register/js/_Partials/_Step4.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/Register/js/_Partials/_Step4.js @@ -8,9 +8,11 @@ $('input[name="radFinanceContract"]').on('change', function () { totalPaymentAndWorkshopList(); + $("#btnDisableDisable").removeClass("disable"); + $("#footerDisableDisable").removeClass("disable"); }); - $('input[name="radFinanceContract"]:checked').trigger('change'); + //$('input[name="radFinanceContract"]:checked').trigger('change'); }); function autoScrollStep4() { @@ -155,12 +157,13 @@ async function totalPaymentAndWorkshopList() { $('#priceStepContainerHtml').html(''); if (response.data.monthlyInstallments) { - response.data.monthlyInstallments?.forEach(function (item) { + response.data.monthlyInstallments?.forEach(function (item, index) { var html = `
-
${item.installmentCounter}
-
${item.instalmentDate}
-
${item.installmentAmountStr} ریال
+
${++index}
+
${item.installmentCounter}
+
${item.instalmentDate}
+
${item.installmentAmountStr} ریال
`; $('#priceStepContainerHtml').append(html); @@ -194,6 +197,18 @@ async function totalPaymentAndWorkshopList() { //$(document).on('change', '.btnCheckContainer .checkOption', createOrUpdateCommand); async function checkInputsStep4() { + + //checkRequirementData(); + if (!$('input[name="radFinanceContract"]:checked').length) { + validateField('.radioLabelStartEndOption', 'لطفاً شروع قرارداد را مشخص نمایید', 3500); + return false; + } + + //if (!$("#priceStatic").hasClass("active") || !$("#priceStep").hasClass("active")) { + // validateField('#btnDisableDisable', 'لطفاً روش پرداخت را مشخص نمایید', 3500); + // return false; + //} + let btnDisable = $('.stepNext').addClass('disable'); let loading = $('.stepNext .loading').show();