From 3390fcc385dc21ae432c3e14d0339e9aeb81753b Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 4 Mar 2025 11:28:48 +0000 Subject: [PATCH] 0001425 --- app/Views/EditservicePurchaseorder.php | 4 +- app/Views/capitalpurchaseorder.php | 2 +- app/Views/editCapitalAmendPO.php | 2 +- app/Views/editCapitalPo.php | 8 +- app/Views/editImportAmendPO.php | 2 +- app/Views/editOldemppay.php | 204 ++++++++++++------------- app/Views/editRevenueAmendPO.php | 8 +- app/Views/editRevenuepurchaseorder.php | 4 +- app/Views/editServiceAmendPO.php | 4 +- app/Views/editimportpo.php | 6 +- app/Views/importpo.php | 2 +- app/Views/purchaseorder.php | 2 +- app/Views/servicePurchaseorder.php | 2 +- 13 files changed, 123 insertions(+), 127 deletions(-) diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 8b2aa672..df5aafb0 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -2813,7 +2813,7 @@ if (!empty($getlogpodtl)) { function populateValueMainFormForEditServiceTax() { - var rows = document.getElementById('ServiceTable').rows.length; + var rows = $('#ServiceTable tbody tr').length; // alert(rows); var editrow = parseFloat(rows) - 1; var TotCgst = 0; @@ -3336,7 +3336,7 @@ if (!empty($getlogpodtl)) { AvlBudAmt = ''; //ServiceTable - var rows = document.getElementById('ServiceTable').rows.length; + var rows = $('#ServiceTable tbody tr').length; if (DeletedMaterialCode != undefined && DeletedMaterialCode != '') { diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index a170aa5d..fffe84d9 100755 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -4070,7 +4070,7 @@ if (!empty($INRSYMBOL)) { */ function populateValueMainFormForDeleteServiceTax(deletedRow) { - var rows = document.getElementById('serviceTax').rows.length; + var rows = $('#serviceTax tbody tr').length; var TotalOrderValueSummary = 0; diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php index 4c873001..0b1a2591 100755 --- a/app/Views/editCapitalAmendPO.php +++ b/app/Views/editCapitalAmendPO.php @@ -4055,7 +4055,7 @@ Calculate Landing charge */ function populateValueMainFormForEditCapitalTax() { - var rows = document.getElementById('serviceTax').rows.length; + var rows = $('#serviceTax tbody tr').length; var TotalOrderValueSummary = 0; var basicfordometic = 0; var qty = 0; diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index e57f3953..9991086e 100755 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -5380,7 +5380,7 @@ if (!empty($getlogpodtl)) { */ function populateValueMainFormForDeleteServiceTax(deletedRow) { - var rows = document.getElementById('serviceTax').rows.length; + var rows = $('#serviceTax tbody tr').length; var capital = ; var TotalOrderValueSummary = 0; @@ -6767,7 +6767,7 @@ if (!empty($getlogpodtl)) { */ function populateValueMainFormForEditCapitalTax() { - var rows = document.getElementById('serviceTax').rows.length; + var rows = $('#serviceTax tbody tr').length; var capital = ; var TotalOrderValueSummary = 0; @@ -6917,7 +6917,7 @@ if (!empty($getlogpodtl)) { function populateValueMainFormForViewCapitalTax() { - var rows = document.getElementById('serviceTax').rows.length; + var rows = $('#serviceTax tbody tr').length; var capital = ; var TotalOrderValueSummary = 0; @@ -8108,7 +8108,7 @@ if (!empty($getlogpodtl)) { function populateValueMainFormForupdateCapitalTax() { - var rows = document.getElementById('serviceTax').rows.length; + var rows = $('#serviceTax tbody tr').length; var TotalFreight = 0; var i = 0; do { diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php index 9ba31614..98e9f3e7 100755 --- a/app/Views/editImportAmendPO.php +++ b/app/Views/editImportAmendPO.php @@ -2786,7 +2786,7 @@ if (!empty($RequistionDetails)) { function populateValueMainFormForEditImportTax() { - var rows = document.getElementById('ImportTax').rows.length; + var rows = $('#ImportTax tbody tr').length; var TotalLanding = 0; var TotalCustom = 0; var TotalCustomED = 0; diff --git a/app/Views/editOldemppay.php b/app/Views/editOldemppay.php index 857d5d2a..627347c3 100755 --- a/app/Views/editOldemppay.php +++ b/app/Views/editOldemppay.php @@ -16,9 +16,6 @@ autoclose: true }); }); - - - "> - - + +
@@ -191,7 +188,7 @@ if (!empty($emppay)) {
- +
@@ -207,7 +204,7 @@ if (!empty($emppay)) {
Loan Issue(d) Date - +
@@ -216,109 +213,110 @@ if (!empty($emppay)) {
Due Started - +
- +
Paid Amount - +
-
- Paid Due - -
+
+ Paid Due + +
- Remaining Due - -
+ Remaining Due + +
- -

Loan Documents

- -
-
-
- Request letter - - -
-
- -
-
- - - Previously Uploaded Document - - - -
-
- -
+ +

Loan Documents

+ +
+
+
+ Request letter + + +
+
+ +
+
+ + + Previously Uploaded Document - + + +
+
+ +
-
-
-
- Payment Receipt - - -
-
- -
-
- - - Previously Uploaded Document - - - -
-
- - -
+
+
+
+ Payment Receipt + + +
+
+ +
+
+ + + Previously Uploaded Document - + + +
+
+ + +
-
-

Loan History

- - - - - - - - - - - - - - - - - - - - - - - -
Due AmountBalance Amount Debit Date
Due_Amount, 2); ?>Balance_Amount, 2); ?>Entry_Date); echo $entryDate->format('F j, Y, g:i A'); ?>
No Loan History Found
-
+
+

Loan History

+ + + + + + + + + + + + + + + + + + + + + + + +
Due AmountBalance Amount Debit Date
Due_Amount, 2); ?>Balance_Amount, 2); ?>Entry_Date); + echo $entryDate->format('F j, Y, g:i A'); ?>
No Loan History Found
+
@@ -383,10 +381,6 @@ if (!empty($emppay)) { + \ No newline at end of file diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php index 46dff31a..be615a82 100755 --- a/app/Views/editRevenueAmendPO.php +++ b/app/Views/editRevenueAmendPO.php @@ -1554,7 +1554,7 @@ if (!empty($INRSYMBOL)) {
-

+

@@ -2270,6 +2270,7 @@ if (!empty($INRSYMBOL)) { $('#BudgetType').attr("style", "pointer-events: none;"); $('#EditRevenue').click(function () { + console.log("####"); tinyMCE.triggerSave(); if (validateEditRevenueTax() && validateEditExceedLimit()) { var CostCode = $("#EditCostCenter").val(); @@ -2407,7 +2408,7 @@ if (!empty($INRSYMBOL)) { } function populateValueMainFormForEditRevenueTax() { - var rows = document.getElementById('revenueTax').rows.length; + var rows = $('#revenueTax tbody tr').length; var totBasicAmt = 0; var totDiscountAmt = 0; var totPackagingAmt = 0; @@ -2483,7 +2484,8 @@ if (!empty($INRSYMBOL)) {