From 802f9a39c54d3dab7cce8825c6451095adfb29d5 Mon Sep 17 00:00:00 2001
From: MahanCh <www.mahan.13831012c@gmail.com>
Date: Sat, 10 May 2025 16:40:42 +0330
Subject: [PATCH] fix small front bugs for salaryAid and edit checkout

---
 .../SalaryAid/SalaryAidImportExcel.cs         |   2 +-
 .../pages/Fine/css/ModalCreateNewFine.css     |  16 +++++-
 .../pages/Fine/js/ModalCreateNewFine.js       |  10 +++-
 .../pages/Fine/js/ModalEditFine.js            |  10 +++-
 .../pages/Loan/css/ModalCreateNewLoan.css     |  16 +++++-
 .../pages/Loan/css/ModalDetailLoan.css        |   4 +-
 .../AssetsClient/pages/Loan/js/Index.js       |  50 +++++++++---------
 .../pages/Reward/css/ModalCreateNewReward.css |  16 +++++-
 .../pages/Reward/js/ModalCreateNewReward.js   |  10 +++-
 .../pages/Reward/js/ModalEditReward.js        |  11 +++-
 .../SalaryAid/js/ModalCreateNewSalaryAid.js   |  11 +++-
 .../pages/SalaryAid/js/ModalEditSalaryAid.js  |  10 +++-
 .../pages/SalaryAid/js/ModalImportExcel.js    |  11 +++-
 .../Templates/SalaryAid/SA-Template.xlsx      | Bin 11054 -> 11046 bytes
 14 files changed, 137 insertions(+), 40 deletions(-)

diff --git a/CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs b/CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs
index 2504e958..fe393695 100644
--- a/CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs
+++ b/CompanyManagement.Infrastructure.Excel/SalaryAid/SalaryAidImportExcel.cs
@@ -86,7 +86,7 @@ public class SalaryAidImportExcel
             worksheet.Cells[3, 4].Text != "مبلغ قابل پرداخت" ||
             worksheet.Cells[1, 3].Text != "تاریخ پرداخت" ||
             worksheet.Cells[1, 1].Text != "سال محاسبه" ||
-            worksheet.Cells[1, 2].Text != "ماه محسابه")
+            worksheet.Cells[1, 2].Text != "ماه محاسبه")
         {
             result.Errors.Add(new SalaryAidImportExcelError("ساختار فایل اکسل اشتباه است.", 0, SalaryAidExcelColumns.None.ToString()));
             return result;
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Fine/css/ModalCreateNewFine.css b/ServiceHost/wwwroot/AssetsClient/pages/Fine/css/ModalCreateNewFine.css
index 7821b4dd..fd09e249 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/Fine/css/ModalCreateNewFine.css
+++ b/ServiceHost/wwwroot/AssetsClient/pages/Fine/css/ModalCreateNewFine.css
@@ -1,4 +1,18 @@
-.errored {
+.scroll-container-amount {
+    font-size: 12px;
+    color: #4f4f4f;
+    white-space: nowrap;
+    width: 100%;
+    overflow: hidden;
+    cursor: grab;
+    user-select: none;
+}
+
+.scroll-container-amount:active {
+    cursor: grabbing;
+}
+
+.errored {
     animation: shake 300ms;
     color: #eb3434 !important;
     background-color: #fef2f2 !important;
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalCreateNewFine.js b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalCreateNewFine.js
index 4bb619cb..55a53792 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalCreateNewFine.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalCreateNewFine.js
@@ -352,9 +352,17 @@ function CheckExistAjax() {
         },
         success: function (response) {
             //if (response.checkout)
+            var checkoutType = "";
+
+            if (response.customizeCheckout) {
+                checkoutType = "نهایی";
+            } else if (response.customizeCheckoutTemp) {
+                checkoutType = "موقت";
+            } 
+
             if (response.customizeCheckout || response.customizeCheckoutTemp) {
                 swal({
-                    title: "آیا میخواهید ادامه دهید؟",
+                    title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
                     text: "",
                     type: "warning",
                     showCancelButton: true,
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalEditFine.js b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalEditFine.js
index 0940ad8a..045e24b6 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalEditFine.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/Fine/js/ModalEditFine.js
@@ -237,9 +237,17 @@ function CheckExistAjax() {
         },
         success: function (response) {
             //if (response.checkout)
+            var checkoutType = "";
+
+            if (response.customizeCheckout) {
+                checkoutType = "نهایی";
+            } else if (response.customizeCheckoutTemp) {
+                checkoutType = "موقت";
+            }
+
             if (response.customizeCheckout || response.customizeCheckoutTemp) {
                 swal({
-                    title: "آیا میخواهید ادامه دهید؟",
+                    title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
                     text: "",
                     type: "warning",
                     showCancelButton: true,
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Loan/css/ModalCreateNewLoan.css b/ServiceHost/wwwroot/AssetsClient/pages/Loan/css/ModalCreateNewLoan.css
index 68795618..ca48ca73 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/Loan/css/ModalCreateNewLoan.css
+++ b/ServiceHost/wwwroot/AssetsClient/pages/Loan/css/ModalCreateNewLoan.css
@@ -1,4 +1,18 @@
-.errored {
+.scroll-container-amount {
+    font-size: 12px;
+    color: #4f4f4f;
+    white-space: nowrap;
+    width: 100%;
+    overflow: hidden;
+    cursor: grab;
+    user-select: none;
+}
+
+.scroll-container-amount:active {
+    cursor: grabbing;
+}
+
+.errored {
     animation: shake 300ms;
     color: #eb3434 !important;
     background-color: #fef2f2 !important;
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Loan/css/ModalDetailLoan.css b/ServiceHost/wwwroot/AssetsClient/pages/Loan/css/ModalDetailLoan.css
index 6f0a25a5..1c958e21 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/Loan/css/ModalDetailLoan.css
+++ b/ServiceHost/wwwroot/AssetsClient/pages/Loan/css/ModalDetailLoan.css
@@ -62,14 +62,16 @@
     border-radius: 30px;
     padding: 3px 6px;
     width: 160px;
+    white-space: nowrap;
 }
 
 .widthTableBadgeNone {
     background-color: #E8E0E0;
     color: #BF3737;
     border-radius: 30px;
-    /*padding: 3px 6px;*/
+    padding: 3px 6px;
     width: 160px;
+    white-space: nowrap;
 }
 
 
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/Index.js b/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/Index.js
index 217d4958..b359b45e 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/Index.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/Loan/js/Index.js
@@ -41,7 +41,7 @@ $(document).ready(function () {
             element.val(value);
         });
 
-        new Cleave(this', {
+        new Cleave(this, {
             delimiters: ['/', '/'],
             blocks: [4, 2, 2],
             numericOnly: true
@@ -393,8 +393,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
                                             </svg>
                                         </button>
                                         ${detailsPermission
-                                        ?
-                                        `<button type="button" class="btn-detail position-relative d-md-flex d-none" style="width: 30px;height: 30px;padding: 0;" onclick="DetailLoan(${item.id})">
+                    ?
+                    `<button type="button" class="btn-detail position-relative d-md-flex d-none" style="width: 30px;height: 30px;padding: 0;" onclick="DetailLoan(${item.id})">
                                             <svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
                                                 <path d="M4.58325 4.58333C4.58325 3.57081 5.40406 2.75 6.41659 2.75H10.7708C10.8973 2.75 10.9999 2.8526 10.9999 2.97917V7.33333C10.9999 8.34586 11.8207 9.16667 12.8333 9.16667H17.1874C17.314 9.16667 17.4166 9.26924 17.4166 9.39583V17.4167C17.4166 18.4292 16.5958 19.25 15.5833 19.25H6.41659C5.40406 19.25 4.58325 18.4292 4.58325 17.4167V4.58333Z" fill="#58E85B"/>
                                                 <path d="M12.4167 7.33392V3.95768L16.2096 7.75058H12.8334C12.6033 7.75058 12.4167 7.56404 12.4167 7.33392Z" fill="#248826" stroke="#248826"/>
@@ -405,8 +405,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
                                             </svg>
                                             <span class="mx-1 d-md-none d-flex">جزئیات</span>
                                         </button>`
-                                        :
-                                        `<button type="button" class="btn-detail position-relative d-md-flex d-none disable" style="width: 30px;height: 30px;padding: 0;">
+                    :
+                    `<button type="button" class="btn-detail position-relative d-md-flex d-none disable" style="width: 30px;height: 30px;padding: 0;">
                                             <svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
                                                 <path d="M4.58325 4.58333C4.58325 3.57081 5.40406 2.75 6.41659 2.75H10.7708C10.8973 2.75 10.9999 2.8526 10.9999 2.97917V7.33333C10.9999 8.34586 11.8207 9.16667 12.8333 9.16667H17.1874C17.314 9.16667 17.4166 9.26924 17.4166 9.39583V17.4167C17.4166 18.4292 16.5958 19.25 15.5833 19.25H6.41659C5.40406 19.25 4.58325 18.4292 4.58325 17.4167V4.58333Z" fill="#58E85B"/>
                                                 <path d="M12.4167 7.33392V3.95768L16.2096 7.75058H12.8334C12.6033 7.75058 12.4167 7.56404 12.4167 7.33392Z" fill="#248826" stroke="#248826"/>
@@ -418,8 +418,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
                                             <span class="mx-1 d-md-none d-flex">جزئیات</span>
                                         </button>`}
                                         ${deletePermission
-                                            ?
-                                            `<button data-remove-id="${item.id}" type="button" class="btn-delete removeLoan d-md-block d-none">
+                    ?
+                    `<button data-remove-id="${item.id}" type="button" class="btn-delete removeLoan d-md-block d-none">
                                                 <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 22 22" fill="none" stroke="currentColor">
                                                     <path d="M8.70825 13.2915L8.70825 10.5415" stroke-width="1.5" stroke-linecap="round" />
                                                     <path d="M13.2917 13.2915L13.2917 10.5415" stroke-width="1.5" stroke-linecap="round" />
@@ -428,8 +428,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
                                                 </svg>
                                                 <span class="mx-1">حذف</span>
                                             </button>`
-                                            :
-                                            `<button type="button" class="btn-delete removeLoan d-md-block d-none disable">
+                    :
+                    `<button type="button" class="btn-delete removeLoan d-md-block d-none disable">
                                                 <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 22 22" fill="none" stroke="currentColor">
                                                     <path d="M8.70825 13.2915L8.70825 10.5415" stroke-width="1.5" stroke-linecap="round" />
                                                     <path d="M13.2917 13.2915L13.2917 10.5415" stroke-width="1.5" stroke-linecap="round" />
@@ -438,7 +438,7 @@ function htmlLoadSimpleListData(loadLoanListData) {
                                                 </svg>
                                                 <span class="mx-1">حذف</span>
                                             </button>`
-                                        }
+                }
 										<button type="button" class="btn-operation-more btn-open-div position-relative d-md-none d-block">
 											<span class="align-items-center d-flex justify-content-center">
                                                 <span class="mx-1">عملیات</span>
@@ -492,8 +492,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
                                             </button>
 
                                             ${detailsPermission
-                                            ?
-                                            `<button type="button" class="btn-detail position-relative d-md-none d-flex w-100" onclick="DetailLoan(${item.id})">
+                    ?
+                    `<button type="button" class="btn-detail position-relative d-md-none d-flex w-100" onclick="DetailLoan(${item.id})">
                                                 <svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
                                                     <path d="M4.58325 4.58333C4.58325 3.57081 5.40406 2.75 6.41659 2.75H10.7708C10.8973 2.75 10.9999 2.8526 10.9999 2.97917V7.33333C10.9999 8.34586 11.8207 9.16667 12.8333 9.16667H17.1874C17.314 9.16667 17.4166 9.26924 17.4166 9.39583V17.4167C17.4166 18.4292 16.5958 19.25 15.5833 19.25H6.41659C5.40406 19.25 4.58325 18.4292 4.58325 17.4167V4.58333Z" fill="#58E85B"/>
                                                     <path d="M12.4167 7.33392V3.95768L16.2096 7.75058H12.8334C12.6033 7.75058 12.4167 7.56404 12.4167 7.33392Z" fill="#248826" stroke="#248826"/>
@@ -504,8 +504,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
                                                 </svg>
                                                 <span class="mx-1 d-md-none d-flex">جزئیات</span>
                                             </button>`
-                                            :
-                                            `<button type="button" class="btn-detail position-relative d-md-none d-flex disable w-100">
+                    :
+                    `<button type="button" class="btn-detail position-relative d-md-none d-flex disable w-100">
                                                 <svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
                                                     <path d="M4.58325 4.58333C4.58325 3.57081 5.40406 2.75 6.41659 2.75H10.7708C10.8973 2.75 10.9999 2.8526 10.9999 2.97917V7.33333C10.9999 8.34586 11.8207 9.16667 12.8333 9.16667H17.1874C17.314 9.16667 17.4166 9.26924 17.4166 9.39583V17.4167C17.4166 18.4292 16.5958 19.25 15.5833 19.25H6.41659C5.40406 19.25 4.58325 18.4292 4.58325 17.4167V4.58333Z" fill="#58E85B"/>
                                                     <path d="M12.4167 7.33392V3.95768L16.2096 7.75058H12.8334C12.6033 7.75058 12.4167 7.56404 12.4167 7.33392Z" fill="#248826" stroke="#248826"/>
@@ -517,8 +517,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
                                                 <span class="mx-1 d-md-none d-flex">جزئیات</span>
                                             </button>`}
                                             ${deletePermission
-                                                ?
-                                                `<button data-remove-id="${item.id}" type="button" class="btn-delete removeLoan w-100">
+                    ?
+                    `<button data-remove-id="${item.id}" type="button" class="btn-delete removeLoan w-100">
                                                     <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 22 22" fill="none" stroke="currentColor">
                                                         <path d="M8.70825 13.2915L8.70825 10.5415" stroke-width="1.5" stroke-linecap="round" />
                                                         <path d="M13.2917 13.2915L13.2917 10.5415" stroke-width="1.5" stroke-linecap="round" />
@@ -527,8 +527,8 @@ function htmlLoadSimpleListData(loadLoanListData) {
                                                     </svg>
                                                     <span class="mx-1">حذف</span>
                                                 </button>`
-                                                :
-                                                `<button type="button" class="btn-delete removeLoan disable w-100">
+                    :
+                    `<button type="button" class="btn-delete removeLoan disable w-100">
                                                     <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 22 22" fill="none" stroke="currentColor">
                                                         <path d="M8.70825 13.2915L8.70825 10.5415" stroke-width="1.5" stroke-linecap="round" />
                                                         <path d="M13.2917 13.2915L13.2917 10.5415" stroke-width="1.5" stroke-linecap="round" />
@@ -537,12 +537,12 @@ function htmlLoadSimpleListData(loadLoanListData) {
                                                     </svg>
                                                     <span class="mx-1">حذف</span>
                                                 </button>`
-                                            }
+                }
 	                                    </div>
                                      </div>
                                  </div>
                              </div>`;
-                                    
+
             pageIndexJs++;
         });
 
@@ -805,7 +805,7 @@ function htmlLoadWithEmployeeDataByFullname(loadLoanListData) {
                                 <div class="Rtable-cell--content text-center">${item.personnelCode}</div>
                             </div>
                             <div class="Rtable-cell width3">
-                                <div class="Rtable-cell--content">${item.totalAmountFa + " ریال"  ?? "-"}</div>
+                                <div class="Rtable-cell--content">${item.totalAmountFa + " ریال" ?? "-"}</div>
                             </div>
                             <div class="Rtable-cell d-md-flex d-none width4">
                                 <div class="Rtable-cell--content">${item.amountPerMonth + " ریال"}</div>
@@ -1029,7 +1029,7 @@ function htmlLoadWithEmployeeMobileDataByFullname(loadLoanListData) {
                                             </button>
                                               ${detailsPermission
                         ?
-                    `<button type="button" class="btn-detail position-relative d-md-none d-flex w-100" onclick="DetailLoan(${loanItem.id})">
+                        `<button type="button" class="btn-detail position-relative d-md-none d-flex w-100" onclick="DetailLoan(${loanItem.id})">
                                                 <svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
                                                     <path d="M4.58325 4.58333C4.58325 3.57081 5.40406 2.75 6.41659 2.75H10.7708C10.8973 2.75 10.9999 2.8526 10.9999 2.97917V7.33333C10.9999 8.34586 11.8207 9.16667 12.8333 9.16667H17.1874C17.314 9.16667 17.4166 9.26924 17.4166 9.39583V17.4167C17.4166 18.4292 16.5958 19.25 15.5833 19.25H6.41659C5.40406 19.25 4.58325 18.4292 4.58325 17.4167V4.58333Z" fill="#58E85B"/>
                                                     <path d="M12.4167 7.33392V3.95768L16.2096 7.75058H12.8334C12.6033 7.75058 12.4167 7.56404 12.4167 7.33392Z" fill="#248826" stroke="#248826"/>
@@ -1187,7 +1187,7 @@ function htmlLoadWithEmployeeMobileDataByDate(loadLoanListData) {
                                     </div>
                                     <div class="d-flex align-items-center justify-content-between">
                                         <div>مبلغ</div>
-                                        <div>${loanItem.totalAmountFa + " ریال" ??"-"}</div>
+                                        <div>${loanItem.totalAmountFa + " ریال" ?? "-"}</div>
                                     </div>
                                     <div class="d-flex align-items-center justify-content-between">
                                         <div>مبلغ هر ماه</div>
@@ -1203,7 +1203,7 @@ function htmlLoadWithEmployeeMobileDataByDate(loadLoanListData) {
 
                                                ${detailsPermission
                         ?
-                                            `<button type="button" class="btn-detail position-relative d-md-none d-flex w-100" onclick="DetailLoan(${loanItem.id})">
+                        `<button type="button" class="btn-detail position-relative d-md-none d-flex w-100" onclick="DetailLoan(${loanItem.id})">
                                                 <svg width="22" height="22" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
                                                     <path d="M4.58325 4.58333C4.58325 3.57081 5.40406 2.75 6.41659 2.75H10.7708C10.8973 2.75 10.9999 2.8526 10.9999 2.97917V7.33333C10.9999 8.34586 11.8207 9.16667 12.8333 9.16667H17.1874C17.314 9.16667 17.4166 9.26924 17.4166 9.39583V17.4167C17.4166 18.4292 16.5958 19.25 15.5833 19.25H6.41659C5.40406 19.25 4.58325 18.4292 4.58325 17.4167V4.58333Z" fill="#58E85B"/>
                                                     <path d="M12.4167 7.33392V3.95768L16.2096 7.75058H12.8334C12.6033 7.75058 12.4167 7.56404 12.4167 7.33392Z" fill="#248826" stroke="#248826"/>
@@ -1361,7 +1361,7 @@ function removeAjax(id) {
 }
 
 
-                
+
 function DetailLoan(LoanId) {
     var id = Number(LoanId);
     var url = `/Client/Company/Loan/Index?id=${id}&handler=Detail`;
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Reward/css/ModalCreateNewReward.css b/ServiceHost/wwwroot/AssetsClient/pages/Reward/css/ModalCreateNewReward.css
index e4c8d307..6354a65a 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/Reward/css/ModalCreateNewReward.css
+++ b/ServiceHost/wwwroot/AssetsClient/pages/Reward/css/ModalCreateNewReward.css
@@ -1,4 +1,18 @@
-.errored {
+.scroll-container-amount {
+    font-size: 12px;
+    color: #4f4f4f;
+    white-space: nowrap;
+    width: 100%;
+    overflow: hidden;
+    cursor: grab;
+    user-select: none;
+}
+
+.scroll-container-amount:active {
+    cursor: grabbing;
+}
+
+.errored {
     animation: shake 300ms;
     color: #eb3434 !important;
     background-color: #fef2f2 !important;
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalCreateNewReward.js b/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalCreateNewReward.js
index 44417769..79d50482 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalCreateNewReward.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalCreateNewReward.js
@@ -205,9 +205,17 @@ function CheckExistAjax() {
         },
         success: function (response) {
             //if (response.checkout)
+            var checkoutType = "";
+
+            if (response.customizeCheckout) {
+                checkoutType = "نهایی";
+            } else if (response.customizeCheckoutTemp) {
+                checkoutType = "موقت";
+            }
+
             if (response.customizeCheckout || response.customizeCheckoutTemp) {
                 swal({
-                    title: "آیا میخواهید ادامه دهید؟",
+                    title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
                     text: "",
                     type: "warning",
                     showCancelButton: true,
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalEditReward.js b/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalEditReward.js
index 5cd7f41e..07b4fd64 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalEditReward.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/Reward/js/ModalEditReward.js
@@ -168,10 +168,17 @@ function CheckExistAjax() {
             employeeIds: employeeSelect
         },
         success: function (response) {
-            //if (response.checkout)
+            var checkoutType = "";
+
+            if (response.customizeCheckout) {
+                checkoutType = "نهایی";
+            } else if (response.customizeCheckoutTemp) {
+                checkoutType = "موقت";
+            }
+
             if (response.customizeCheckout || response.customizeCheckoutTemp) {
                 swal({
-                    title: "آیا میخواهید ادامه دهید؟",
+                    title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
                     text: "",
                     type: "warning",
                     showCancelButton: true,
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalCreateNewSalaryAid.js b/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalCreateNewSalaryAid.js
index a558b3d0..e5d96753 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalCreateNewSalaryAid.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalCreateNewSalaryAid.js
@@ -342,10 +342,17 @@ function CheckExistAjax() {
             employeeIds: employeeSelect
         },
         success: function (response) {
-            //if (response.checkout)
+            var checkoutType = "";
+
+            if (response.customizeCheckout) {
+                checkoutType = "نهایی";
+            } else if (response.customizeCheckoutTemp) {
+                checkoutType = "موقت";
+            }
+
             if (response.customizeCheckout || response.customizeCheckoutTemp) {
                 swal({
-                    title: "آیا میخواهید ادامه دهید؟",
+                    title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
                     text: "",
                     type: "warning",
                     showCancelButton: true,
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalEditSalaryAid.js b/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalEditSalaryAid.js
index 7d190ccd..ceae33bf 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalEditSalaryAid.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalEditSalaryAid.js
@@ -273,9 +273,17 @@ function CheckExistAjax() {
         },
         success: function (response) {
             //if (response.checkout)
+            var checkoutType = "";
+
+            if (response.customizeCheckout) {
+                checkoutType = "نهایی";
+            } else if (response.customizeCheckoutTemp) {
+                checkoutType = "موقت";
+            }
+
             if (response.customizeCheckout || response.customizeCheckoutTemp) {
                 swal({
-                    title: "آیا میخواهید ادامه دهید؟",
+                    title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
                     text: "",
                     type: "warning",
                     showCancelButton: true,
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalImportExcel.js b/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalImportExcel.js
index 939f516b..2fa2f488 100644
--- a/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalImportExcel.js
+++ b/ServiceHost/wwwroot/AssetsClient/pages/SalaryAid/js/ModalImportExcel.js
@@ -762,9 +762,17 @@ function CheckExistAjax() {
         },
         success: function (response) {
             //if (response.checkout)
+            var checkoutType = "";
+
+            if (response.customizeCheckout) {
+                checkoutType = "نهایی";
+            } else if (response.customizeCheckoutTemp) {
+                checkoutType = "موقت";
+            }
+
             if (response.customizeCheckout || response.customizeCheckoutTemp) {
                 swal({
-                    title: "آیا میخواهید ادامه دهید؟",
+                    title: `برای این پرسنل فیش حقوقی غیررسمی ${checkoutType} صادر شده است. در صورت تایید، این فیش حقوقی به صورت خودکار تغییر پیدا میکند.`,
                     text: "",
                     type: "warning",
                     showCancelButton: true,
@@ -777,7 +785,6 @@ function CheckExistAjax() {
                     if (isConfirm) {
                         SaveDataAjax();
                     } else {
-                        loading.hide();
                         $('#createData').removeClass('disable');
                     }
                 });
diff --git a/ServiceHost/wwwroot/Excel/Templates/SalaryAid/SA-Template.xlsx b/ServiceHost/wwwroot/Excel/Templates/SalaryAid/SA-Template.xlsx
index 57c6c3b2c46b0f643f858d34a73a5fd7cd9b30a0..f88f6cd4c81ae312a791d63032201bb8b9001008 100644
GIT binary patch
delta 2103
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

delta 2107
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