diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 9de4bb53..749509f5 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1631,6 +1631,7 @@ if (!empty($getlogpodtl)) { +
    
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index d6f6bc21..574d1695 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -7424,7 +7424,6 @@ if (!empty($INRSYMBOL)) { } }); console.log("Data before AJAX call:", Object.fromEntries(formData)); -return; // Perform form validation if (validate()) { diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index 6bb5e4d3..d68b4185 100755 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -977,31 +977,40 @@ if (!empty($INRSYMBOL)) {
-
-
-
-
-
-
+ +
+
+
+
+
+
+
+
+ + +
+ + + + + + + +
+ + +
+
+
+ +   Cancel +   Save as Draft +   Submit +
+
+
+ -
- - - - - - - - - - - - -   Cancel -   Save as Draft -   Submit - -

@@ -4504,6 +4513,7 @@ if (!empty($INRSYMBOL)) { var formData = new FormData($('.CapitalPO')[0]); formData.append('ExchangeRateOn', ExchangeRateOn); formData.append('PaymentMethod', PaymentMethod); + // console.log("Data before AJAX call:", Object.fromEntries(formData)); $('#loader').show(); // disableButtons(); $.ajax({ diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php index dd753064..c7086cad 100755 --- a/app/Views/editCapitalAmendPO.php +++ b/app/Views/editCapitalAmendPO.php @@ -4,7 +4,6 @@ align-items: center; gap: 10px; } - $CapitalRange .edit-input-field { padding: 2px; font-size: 14px; @@ -1663,96 +1662,86 @@ if (!empty($POItem) && $CapitalRange == '1') { - -
-
-
- -
-
- - -
-
-
- -
- - - - - - - - -
-

-
+
    
+ + +
+ +
+
+ + +
+
+
+ format('d-m-Y'); ?> +
+ +
+ + + 'AWAITING APPROVE', + 'AWAITING RELEASE' => 'AWAITING APPROVE', + 'RELEASER ONHOLD' => 'APPROVER ONHOLD', + 'PO RELEASED' => 'PO APPROVED', + ]; + if (isset($PoStatusName) && !empty($PoStatusName)) { + if (isset($statusMappings[$PoStatusName])) { + echo $statusMappings[$PoStatusName]; + } else { + echo $PoStatusName; + } + } else { + echo "Status not provided"; + } + ?> +
- -   Save as Draft -   Approve +
+ +   Save as Draft +   Approve +
+
-
- - -
-
- - -
-
- format('d-m-Y'); ?> -
- -
- - - 'AWAITING APPROVE', - 'AWAITING RELEASE' => 'AWAITING APPROVE', - 'RELEASER ONHOLD' => 'APPROVER ONHOLD', - 'PO RELEASED' => 'PO APPROVED', - ]; - - if (isset($PoStatusName) && !empty($PoStatusName)) { - if (isset($statusMappings[$PoStatusName])) { - echo $statusMappings[$PoStatusName]; - } else { - echo $PoStatusName; - } - } else { - echo "Status not provided"; - } - ?> -
- -
-
- +
+
diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index 5dd4d777..ce8e19ec 100755 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -301,10 +301,6 @@ if (!empty($getlogpodtl)) { text-align: right; } - - - - .centered { display: flex; /* justify-content: center; */ @@ -886,7 +882,7 @@ if (!empty($getlogpodtl)) {
- +
@@ -906,8 +902,8 @@ if (!empty($getlogpodtl)) { Tax Amount Total Order Amount + Received Quantity + Pending Quantity --> Action @@ -967,8 +963,8 @@ if (!empty($getlogpodtl)) { + ReceivedQuantity ?> + Quantity - $record->ReceivedQuantity, 2, '.', ''); ?> --> $record->MaterialCode, "ReqNo" => $record->ReqNo); array_push($res_arr_values, $row); @@ -1227,10 +1223,11 @@ if (!empty($getlogpodtl)) { data-userid="" id="Del"> - +     + class="fa fa-eye" data-toggle="tooltip">    + -
-
- - - - - - - + + +
@@ -1363,7 +1354,7 @@ if (!empty($getlogpodtl)) { ?>
-
+
@@ -1451,7 +1442,7 @@ if (!empty($getlogpodtl)) { -
+
@@ -1462,9 +1453,7 @@ if (!empty($getlogpodtl)) { echo form_input($data); ?>
-
- - + @@ -1546,6 +1535,7 @@ if (!empty($getlogpodtl)) { +
-
+ -
- -
-
+
+ +
+
+
- - -
-
-
-
-
+
+ +
+
- -      - +
+ +      + + + +
+ +
    
-
-
- - -
-
+
+ +
- - - - -   Cancel - -   Save as Draft - -   Submit -   Approve - - OK - - OK - -   Submit -   OK - -   Submit -   OK - - - -
+ -
-
- - 'AWAITING APPROVE', - 'AWAITING RELEASE' => 'AWAITING APPROVE', - 'RELEASER ONHOLD' => 'APPROVER ONHOLD', - 'PO RELEASED' => 'PO APPROVED', - ]; + +
+
+
+
+
+ 'AWAITING APPROVE', + 'AWAITING RELEASE' => 'AWAITING APPROVE', + 'RELEASER ONHOLD' => 'APPROVER ONHOLD', + 'PO RELEASED' => 'PO APPROVED', + ]; - if (isset($PoStatusName) && !empty($PoStatusName)) { - if (isset($statusMappings[$PoStatusName])) { - echo $statusMappings[$PoStatusName]; - } else { - echo $PoStatusName; - } - } else { - echo "Status not provided"; - } - ?> + if (isset($PoStatusName) && !empty($PoStatusName)) { + if (isset($statusMappings[$PoStatusName])) { + echo $statusMappings[$PoStatusName]; + } else { + echo $PoStatusName; + } + } else { + echo "Status not provided"; + } + ?> +
+
+ +   Cancel + +   Save as Draft + +   Submit +   Approve + + OK + + OK + +   Submit +   OK + +   Submit +   OK + + + +
+
+
+ - - -
-
-
- - - - - - + + + + + + + - -
+ + +
+
@@ -3726,19 +3739,16 @@ if (!empty($getlogpodtl)) { $data = array('name' => 'ViewItemDescription', 'value' => set_value('ViewItemDescription'), 'id' => 'ViewItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); echo form_textarea($data); ?>
-
- + +
- Cancel - - - -
+ Cancel + - + - - + + @@ -5096,12 +5106,12 @@ if (!empty($getlogpodtl)) { function calculateTaxValue() { var Cgst = $('#AfterCgst').val() == '' ? '0.00' : $('#AfterCgst').val(); var Sgst = $('#AfterSgst').val() == '' ? '0.00' : $('#AfterSgst').val(); - + var Igst = 0.00; if (capitalType == 'Domestic') { Igst = $('#AfterIgst').val() == '' ? '0.00' : $('#AfterIgst').val(); - } - if(capitalType == 'International') { + } + if (capitalType == 'International') { Igst = $('#AfterIgstInt').val() == '' ? '0.00' : $('#AfterIgstInt').val(); // caps interna } var landingCharge = $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val(); @@ -5142,7 +5152,7 @@ if (!empty($getlogpodtl)) { var OtherAmt = $('#OtherAllowances').val() == '' ? '0.00' : $('#OtherAllowances').val(); var landingCharge = $('#AfterLandingCharge').val() == '' ? '0.00' : $('#AfterLandingCharge').val(); - console.log("$('#AfterLandingCharge').val()",$('#AfterLandingCharge').val()); + console.log("$('#AfterLandingCharge').val()", $('#AfterLandingCharge').val()); var CustomDuty = $('#AfterCustomduty').val() == '' ? '0.00' : $('#AfterCustomduty').val(); @@ -5470,7 +5480,7 @@ if (!empty($getlogpodtl)) { */ function populateValueMainFormForDeleteServiceTax(deletedRow) { - var rows = document.getElementById('serviceTax').rows.length; + var rows = document.getElementById('serviceTax').rows.length; var capital = ; var TotalOrderValueSummary = 0; @@ -6118,6 +6128,7 @@ if (!empty($getlogpodtl)) { console.log(fileInput.vlaue); console.log(prePOFileInput.value); + // console.log("Data before AJAX call:", Object.fromEntries(formData)); if (fileInput && fileInput.vlaue && fileInput.files.length > 0) { formData.append('POFile', fileInput.files[0]); @@ -6134,6 +6145,7 @@ if (!empty($getlogpodtl)) { formData.append(inputID, input.val()); }); + // console.log("Data before AJAX call:", Object.fromEntries(formData)); $.ajax({ data: formData, processData: false, @@ -6479,8 +6491,8 @@ if (!empty($getlogpodtl)) { var AfterCgst = $("#EditAfterCgst").val(); var Sgst = $("#EditSgst").val(); var AfterSgst = $("#EditAfterSgst").val(); - var Igst = $("#EditIgst").val();//Dom Caps - var AfterIgst = $("#EditAfterIgst").val();//Dom Caps + var Igst = $("#EditIgst").val(); //Dom Caps + var AfterIgst = $("#EditAfterIgst").val(); //Dom Caps var OtherAmt = parseFloat($("#EditOtherAllowances").val() == '' ? "0.00" : $('#EditOtherAllowances').val()).toFixed(2); var TotalTaxValue = EditcalculateTaxValue(); @@ -6638,7 +6650,7 @@ if (!empty($getlogpodtl)) { $('#ClearingCharge' + userid).val(ClearingCharges); - var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; + var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; cellval[2].innerHTML = materialCode; cellval[3].innerHTML = shorten; @@ -6647,7 +6659,7 @@ if (!empty($getlogpodtl)) { cellval[6].innerHTML = uom; cellval[7].innerHTML = parseFloat(itemRate).toFixed(2); cellval[8].innerHTML = parseFloat(basicval).toFixed(2); - cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2);// what should i display here ?? if international means + cellval[9].innerHTML = parseFloat(TotalTaxValue).toFixed(2); // what should i display here ?? if international means cellval[10].innerHTML = parseFloat(Total).toFixed(2); @@ -6808,8 +6820,8 @@ if (!empty($getlogpodtl)) { var Igst = 0.00; if (capitalType == 'Domestic') { Igst = $('#EditAfterIgst').val() == '' ? '0.00' : $('#EditAfterIgst').val(); // caps dom - } - if(capitalType == 'International') { + } + if (capitalType == 'International') { Igst = $('#EditAfterIgstInt').val() == '' ? '0.00' : $('#EditAfterIgstInt').val(); // caps interna } console.log(Igst); @@ -6867,8 +6879,8 @@ if (!empty($getlogpodtl)) { */ function populateValueMainFormForEditCapitalTax() { - var rows = document.getElementById('serviceTax').rows.length; - console.log("rr",rows); + var rows = document.getElementById('serviceTax').rows.length; + console.log("rr", rows); var capital = ; var TotalOrderValueSummary = 0; @@ -6911,7 +6923,7 @@ if (!empty($getlogpodtl)) { var discountedRateValue = $('#AfterDisVal' + i).val() == '' ? '0.00' : $('#AfterDisVal' + i).val(); var TotLandingI = $('#landingCharge' + i).val() == '' ? '0.00' : $('#landingCharge' + i).val(); - console.log(TotLandingI,"TotLandingI"); + console.log(TotLandingI, "TotLandingI"); var TotCustomI = $('#CustomDuty' + i).val() == '' ? '0.00' : $('#CustomDuty' + i).val(); @@ -7019,7 +7031,7 @@ if (!empty($getlogpodtl)) { function populateValueMainFormForViewCapitalTax() { - var rows = document.getElementById('serviceTax').rows.length; + var rows = document.getElementById('serviceTax').rows.length; var capital = ; var TotalOrderValueSummary = 0; @@ -8210,8 +8222,8 @@ if (!empty($getlogpodtl)) { function populateValueMainFormForupdateCapitalTax() { - - var rows = document.getElementById('serviceTax').rows.length; + + var rows = document.getElementById('serviceTax').rows.length; var TotalFreight = 0; var i = 0; do { diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php index c4f4e758..19c36ff6 100755 --- a/app/Views/editRevenueAmendPO.php +++ b/app/Views/editRevenueAmendPO.php @@ -1657,11 +1657,37 @@ if (!empty($INRSYMBOL)) { - -
-

-
+ +
+
+
+
+ +
+ +
+ +      + +
+ +
+ +
+
+
    
+ + +
+ +
@@ -1670,51 +1696,50 @@ if (!empty($INRSYMBOL)) { - - -   Save as Draft -   Approve - -
-
-
- + + +
+
+
+ format('d-m-Y'); ?> +
+ +
+ + 'AWAITING APPROVE', + 'AWAITING RELEASE' => 'AWAITING APPROVE', + 'RELEASER ONHOLD' => 'APPROVER ONHOLD', + 'PO RELEASED' => 'PO APPROVED', + ]; - -
-
- format('d-m-Y'); ?> -
- -
- - 'AWAITING APPROVE', - 'AWAITING RELEASE' => 'AWAITING APPROVE', - 'RELEASER ONHOLD' => 'APPROVER ONHOLD', - 'PO RELEASED' => 'PO APPROVED', - ]; + if (isset($POStatus) && !empty($POStatus)) { + if (isset($statusMappings[$POStatus])) { + echo $statusMappings[$POStatus]; + } else { + echo $POStatus; + } + } else { + echo "Status not provided"; + } + ?> +
- if (isset($POStatus) && !empty($POStatus)) { - if (isset($statusMappings[$POStatus])) { - echo $statusMappings[$POStatus]; - } else { - echo $POStatus; - } - } else { - echo "Status not provided"; - } - ?> -
-
- +
+ +   Save as Draft +   Approve +
+
+
+
diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php index 46e1acb9..3cd5d4ca 100755 --- a/app/Views/editRevenuepurchaseorder.php +++ b/app/Views/editRevenuepurchaseorder.php @@ -2898,21 +2898,17 @@ if (!empty($getlogpodtl)) { -
-
-
- -
-
- - - -
-
-
+ +
+
+
+ +
+ +
+ + + +
+
+
+
    
+ + +
+ +
+ + + + + + + + +
+ + +
+
+
+
+ +
+ + 'AWAITING APPROVE', + 'AWAITING RELEASE' => 'AWAITING APPROVE', + 'RELEASER ONHOLD' => 'APPROVER ONHOLD', + 'PO RELEASED' => 'PO APPROVED', + ]; + + if (isset($StatusName) && !empty($StatusName)) { + if (isset($statusMappings[$StatusName])) { + echo $statusMappings[$StatusName]; + } else { + echo $StatusName; + } + } else { + echo "Status not provided"; + } + ?> +
+ +
+ +   Cancel + +   Save as Draft + +   Submit +   Approve + +   Submit + +   OK + + +
- - - - - - - -
-

-
- - -
- - - - - - - - -
- -   Cancel - -   Save as Draft - -   Submit -   Approve - -   Submit - -   OK - -
- - - -

-
- - - - - - -
-
- -
- -
- - 'AWAITING APPROVE', - 'AWAITING RELEASE' => 'AWAITING APPROVE', - 'RELEASER ONHOLD' => 'APPROVER ONHOLD', - 'PO RELEASED' => 'PO APPROVED', - ]; - - if (isset($StatusName) && !empty($StatusName)) { - if (isset($statusMappings[$StatusName])) { - echo $statusMappings[$StatusName]; - } else { - echo $StatusName; - } - } else { - echo "Status not provided"; - } - ?> -
-
+
diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php index 53719fbd..d47fd7e1 100755 --- a/app/Views/editServiceAmendPO.php +++ b/app/Views/editServiceAmendPO.php @@ -1355,7 +1355,7 @@ foreach ($PaymentTerms as $TER) { -
+

@@ -1372,13 +1372,12 @@ foreach ($PaymentTerms as $TER) {      - -
+
-
+
    
@@ -1422,12 +1421,9 @@ foreach ($PaymentTerms as $TER) {   Save as Draft   Approve - - + + - - - diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php index 8cd6ec81..54639ecf 100755 --- a/app/Views/purchaseorder.php +++ b/app/Views/purchaseorder.php @@ -2291,35 +2291,38 @@ if (!empty($INRSYMBOL)) { - -
- -
- -
-
- - -
- -
-
-
- + +
+
+
+
+
+
+
+
+ + +
-
-   Cancel -   Save as Draft -   Submit +
+ + +
+
+
+   Cancel +   Save as Draft +   Submit +
-

-
+ +