diff --git a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs index 27ac6a16..c2201eb0 100644 --- a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs +++ b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs @@ -91,13 +91,13 @@ namespace CompanyManagment.Application public bool HasRollCallRecord(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd) { //موقت - // دادمهرگستر 11 - //585 کاشی گالری سرامیس (بابک ابراهیمی ) - //آموزشگاه ملل 604 - //کاریابی ملل 605 + // دادمهرگستر 11 * + //585 کاشی گالری سرامیس (بابک ابراهیمی ) * + //آموزشگاه ملل 604 * + //کاریابی ملل 605 * //368 پیتزا امیر آماده سازی //367 پیتزا امیر رستوران - //286 مرکز توان بخشی رسالت + //286 مرکز توان بخشی رسالت * bool skipRollCallByWorkshopId = workshopId is 11 or 585 or 604 or 605 or 368 or 367 or 286; //#if DEBUG diff --git a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/CheckoutTemporary.cshtml b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/CheckoutTemporary.cshtml index dd058d12..ab430d45 100644 --- a/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/CheckoutTemporary.cshtml +++ b/ServiceHost/Areas/Client/Pages/Company/CustomizeCheckout/CheckoutTemporary.cshtml @@ -444,7 +444,7 @@
- -
- -
- - + ${response.printPermission === "true" ? ` + + + + + ` : ``} + + ${response.deletePermission === "true" ? ` + + + + ` : ``} +
- - - + + ` : ``} + ${response.deletePermission === "true" ? ` + + + + ` : ``} + + +
diff --git a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js index 3518811f..d2446bc4 100644 --- a/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js +++ b/ServiceHost/wwwroot/AssetsClient/pages/CustomizeCheckout/js/CheckoutUnofficial.js @@ -2,7 +2,7 @@ let $checkAll = $("#checkAll2"); let $checkboxes = $(".foo"); - + $checkAll.on("change", function () { $checkboxes.prop("checked", this.checked); @@ -150,7 +150,7 @@ $(document).on('click', '.btn-search-click', function (event) { const selectedMonth = $('#sendDropdownMonth').val(); const isYearMonthSelected = selectedYear === "0" && selectedMonth === "0"; - if (!isYearMonthSelected && (selectedYear === "0" || selectedMonth === "0") ) { + if (!isYearMonthSelected && (selectedYear === "0" || selectedMonth === "0")) { $('#dropdown-year').addClass("errored"); $('#dropdown-month').addClass("errored"); @@ -175,7 +175,7 @@ $(document).on('click', '.btn-search-click', function (event) { const endDate = $('.end-date').val(); const isStartEndDateSelected = startDate.trim() === "" && endDate.trim() === ""; - if (!isStartEndDateSelected && (startDate.trim() === "" || endDate.trim() === "") ) { + if (!isStartEndDateSelected && (startDate.trim() === "" || endDate.trim() === "")) { $('.start-date').addClass("errored"); $('.end-date').addClass("errored"); @@ -223,7 +223,7 @@ $(document).ready(function () { } else { $('.btn-clear-filter').addClass('disable'); } - if(filterStart !== '') { + if (filterStart !== '') { $('#start-date').text(filterStart); } if (filterEnd !== '') { @@ -1447,7 +1447,7 @@ function loadMore() {
${item.salaryAidDeduction}
-
+
مبلغ قابل پرداخت
${item.totalPayment} ریال
@@ -1481,41 +1481,43 @@ function loadMore() { ${item.contractEndFa}
- + ${response.printPermission === "true" ? ` - + + + + ` : ``} + ${response.deletePermission === "true" ? ` + + + ` : ``} + +
- - + + ` : ``} + ${response.deletePermission === "true" ? ` + + + + ` : ``} + +