From 0d5ccfe98989ab3eae3326fdcb18bdfec66a872e Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Tue, 4 Mar 2025 05:50:44 +0000 Subject: [PATCH] bug fixes 4th mar : ps --- app/Controllers/Emergencypurchaseorder.php | 4 +- app/Controllers/Payslip.php | 4 +- app/Views/EditservicePurchaseorder.php | 17 +- app/Views/addconfig.php | 3 +- app/Views/alterpurchaseorder.php | 101 +++--- app/Views/capitalpurchaseorder.php | 20 +- app/Views/editCapitalAmendPO.php | 11 +- app/Views/editCapitalPo.php | 13 +- app/Views/editImportAmendPO.php | 14 +- app/Views/editRevenueAmendPO.php | 13 +- app/Views/editRevenuepurchaseorder.php | 23 +- app/Views/editServiceAmendPO.php | 324 +++++++++--------- app/Views/editconfig.php | 3 +- app/Views/editimportpo.php | 374 +++++++++++---------- app/Views/importpo.php | 28 +- app/Views/monthlypayinputs.php | 3 +- app/Views/purchaseorder.php | 20 +- app/Views/servicePurchaseorder.php | 18 +- 18 files changed, 503 insertions(+), 490 deletions(-) diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php index d4a143a2..62ba5781 100755 --- a/app/Controllers/Emergencypurchaseorder.php +++ b/app/Controllers/Emergencypurchaseorder.php @@ -125,7 +125,7 @@ class Emergencypurchaseorder extends BaseController // print_r($this->request->getPost());die; $txtRowCount = $this->request->getPost('txtRowCount'); $POdt = $this->request->getPost('PODate'); - $PODate = get_date_time_format($POdt); + $PODate = get_date_time_dynamical_format('d-m-Y','Y-m-d',"$POdt"); $SupplierID = $this->request->getPost('drpSupplier'); $DeliveryAddr = $this->request->getPost('DeliveryAddr'); $CostCenterName = $this->request->getPost('CostCenterName'); @@ -369,7 +369,7 @@ class Emergencypurchaseorder extends BaseController $POdt = $this->request->getPost('PODate'); - $PODate = get_date_time_format($POdt); + $PODate = get_date_time_dynamical_format('d-m-Y','Y-m-d',"$POdt"); $SupplierID = $this->request->getPost('drpSupplier'); $DeliveryAddr = $this->request->getPost('DeliveryAddr'); $dt = $this->request->getPost('Deliverydt'); diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php index f790bb11..977045c3 100755 --- a/app/Controllers/Payslip.php +++ b/app/Controllers/Payslip.php @@ -1168,6 +1168,7 @@ class Payslip extends BaseController $EmpID = $j['Emp ID']; $is_driver = $this->driver_model->getDriverName($EmpID,1); $DaysWorked = $j['Days Worked']; + $NoTrips = isset($j['Number Of Trips']) ? $j['Number Of Trips'] : 0.00 ; $TotalCalDays = isset($j['Total Days']) ? $j['Total Days'] : 0.00 ; $ActualSalary = isset($j['Basic Salary']) ? $j['Basic Salary'] : 0.00 ; $WorkedSalary = isset($j['Worked Salary']) ? $j['Worked Salary'] : 0.00 ; @@ -1228,7 +1229,8 @@ class Payslip extends BaseController $drivermonthlypaydata = array( 'month_year'=>$month, 'driver_id'=>$EmpID, - 'no_of_loads'=>(strpos($TotalCalDays, "(trip)") !== false) ? explode(" ", $TotalCalDays)[0] : 0, + 'TotalCalDays' => $TotalCalDays, + 'no_of_loads'=>(strpos($NoTrips, "(trip)") !== false) ? explode(" ", $NoTrips)[0] : 0, 'monthly_food_amount'=>$Food, 'total_diesel_amount'=>$Diesel, 'total_shed_amount'=>$Shed, diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index f9bd28b4..8b2aa672 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1274,10 +1274,8 @@ if (!empty($getlogpodtl)) { ReqNo ?> MaterialCode ?> - - MaterialName, 0, 13, "..."); - echo $shortName; ?> - + MaterialName, 0, 13, "..."); echo $shortName; ?> + @@ -1288,8 +1286,7 @@ if (!empty($getlogpodtl)) { - LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?> - + LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?> Quantity ?> UOM ?> @@ -3190,7 +3187,7 @@ if (!empty($getlogpodtl)) { // $('#content').loader('show'); var formData = new FormData($('.ServicePO')[0]); $('#loader').show(); - disableButtons(); + // disableButtons(); $.ajax({ // data: $('.ServicePO').serialize(), type: "POST", @@ -3218,10 +3215,10 @@ if (!empty($getlogpodtl)) { $('#SpcialInstruction').val(''); $('#txtDeliveryAddress').val('') window.location = "purchaseorderListing"; - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } else { $('#loader').hide(); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); alert("Error"); } @@ -3229,7 +3226,7 @@ if (!empty($getlogpodtl)) { error: function(jqXHR, textStatus, errorThrown) { console.error("AJAX Error: " + textStatus + ": " + errorThrown); alert("Error: " + textStatus); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } }); diff --git a/app/Views/addconfig.php b/app/Views/addconfig.php index e7c24fd3..9dd7f9bc 100755 --- a/app/Views/addconfig.php +++ b/app/Views/addconfig.php @@ -244,8 +244,7 @@ $('#ConfigValue').show(); var temp = index; - var ConfigValue = $("#ConfigValue").val(); - + var ConfigValue = $.trim($("#ConfigValue").val()); $('#ConfigValue').val(''); diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index 13a8efbc..02eac8c8 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -1875,6 +1875,28 @@ if (!empty($INRSYMBOL)) { } else if ($('#drpSupplier').val() == "0") { alert('Please Select the Supplier details'); $('#drpSupplier').focus(); + return false; + } else if (input == 'REVENUE' && $('#Deliverydate').val() == '' && radioValue == 0) { + alert('Please Select the Delivery Date'); + $('#Deliverydate').focus(); + return false; + } else if (input == 'REVENUE' && $('#Scheduleby').val().trim() == '' && radioValue == 1) { + alert('Please Enter the Schedule By'); + $('#Scheduleby').focus(); + return false; + } else if (input == 'SERVICE' && $('#Deliverydate').val() == '' && radioValue == 0) { + alert('Please Select the Delivery Date'); + $('#Deliverydate').focus(); + return false; + } else if (input == 'SERVICE' && $('#Scheduleby').val().trim() == '' && radioValue == 1) { + alert('Please Enter the Schedule By'); + $('#Scheduleby').focus(); + return false; + } else if ($('#DepartmentName').val() == "0") { + alert('Please Select Department Name ') + return false; + } else if ($('#CostCenterName').val() == "0") { + alert('Please Select Cost Center Name ') return false; } else if ($('#PoTypeOptions').val() == "0") { @@ -1891,40 +1913,19 @@ if (!empty($INRSYMBOL)) { return false; } - - - } else if ($('#DepartmentName').val() == "0") { - alert('Please Select Department Name ') + }else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { + alert('Please Enter Payable Terms Description'); + $('#Otherpayment').focus(); + return false; + }else if($('#insuranceStatus').val() == "1" && $('#InsuranceNumber').val().trim() == ''){ + alert('Please Enter the Insurance No / Insurance Details'); + $('#InsuranceNumber').focus(); return false; - } - else if ($('#CostCenterName').val() == "0") { - alert('Please Select Cost Center Name ') - } - - - - else if ($('#BudgetType').val() == "0") { + }else if ($('#BudgetType').val() == "0") { alert('Please Select Budget Type'); $('#BudgetType').focus(); return false; - - } else if (input == 'REVENUE' && $('#Deliverydate').val() == '' && radioValue == 0) { - alert('Please Select the Delivery Date'); - $('#Deliverydate').focus(); - return false; - } else if (input == 'REVENUE' && $('#Scheduleby').val().trim() == '' && radioValue == 1) { - alert('Please Enter the Schedule By'); - $('#Scheduleby').focus(); - return false; - - } - else if ($('#Otherpayment').length > 0 && $('#Otherpayment').is(':visible') && $('#Otherpayment').val() == '') { - - alert('Please Enter the Description of payable terms'); - $('#Otherpayment').focus(); - return false; - } - else { + } else { $("#" + input).modal('show'); $('#isEdit').val(0); if (StateTaxCheck == "0") { @@ -2634,21 +2635,21 @@ if (!empty($INRSYMBOL)) {
format('Y-m-d'); - $data = array( - 'type' => 'date', - 'name' => 'PODate', - 'value' => set_value('PODate', $formattedDate), - 'min' => $formattedDate, - 'id' => 'PODate', - 'class' => 'form-control', - 'required' => 'true', - 'onkeypress' => 'return false;' - ); - echo form_input($data); + // $poDt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); + // $formattedDate = $poDt->format('d-m-Y'); + // $data = array( + // 'type' => 'text', + // 'name' => 'PODate', + // 'value' => set_value('PODate', $formattedDate), + // 'min' => $formattedDate, + // 'id' => 'PODate', + // 'class' => 'form-control num', + // 'required' => 'true', + // 'onkeypress' => 'return false;' + // ); + // echo form_input($data); ?> +
@@ -7259,7 +7260,7 @@ if (!empty($INRSYMBOL)) { // } else { // Submit the form using AJAX $('#loader').show(); - disableButtons(); + // disableButtons(); $.ajax({ url: "emergencypurchaseorder/addNewServicePurchaseOrder", type: "POST", @@ -7278,13 +7279,13 @@ if (!empty($INRSYMBOL)) { $('#SpcialInstruction').val(''); $('#txtDeliveryAddress').val(''); window.location = "purchaseorderListing"; - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); }, error: function (xhr, status, error) { // Handle errors $('#loader').hide(); alert("Error: " + error); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } }); // } @@ -7369,7 +7370,7 @@ if (!empty($INRSYMBOL)) { // } else { // Submit the form using AJAX $('#loader').show(); - disableButtons(); + // disableButtons(); $.ajax({ url: "emergencypurchaseorder/addNewRevenuePurchaseOrder", type: "POST", @@ -7384,12 +7385,12 @@ if (!empty($INRSYMBOL)) { $('#SpcialInstruction').val(''); $('#txtDeliveryAddress').val(''); window.location = "purchaseorderListing"; - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); }, error: function (xhr, status, error) { // Handle errors alert("Error: " + error); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } }); // } diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index a2143c63..a170aa5d 100755 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -783,7 +783,8 @@ if (!empty($INRSYMBOL)) {
- +
+
@@ -806,6 +807,7 @@ if (!empty($INRSYMBOL)) {
SNo
+
@@ -4554,7 +4556,7 @@ if (!empty($INRSYMBOL)) { formData.append('ExchangeRateOn', ExchangeRateOn); formData.append('PaymentMethod', PaymentMethod); $('#loader').show(); - disableButtons(); + // disableButtons(); $.ajax({ data: formData, processData: false, @@ -4576,18 +4578,18 @@ if (!empty($INRSYMBOL)) { clearAfterAddLineItemAdd(); window.location = "purchaseorderListing"; - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } else { // $('#content').loader('hide'); alert("Error"); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } }, error: function(jqXHR, textStatus, errorThrown) { console.error("AJAX Error: " + textStatus + ": " + errorThrown); alert("Error: " + textStatus); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } }); @@ -5434,11 +5436,11 @@ if (!empty($INRSYMBOL)) { function Reset() { - disableButtons(); + // disableButtons(); location.reload(); - setTimeout(function() { - enableButtons(); - }, 2000); + // setTimeout(function() { + // enableButtons(); + // }, 2000); } $('#insuranceTxtDiv').hide(); diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php index 1dc1ae3c..4c873001 100755 --- a/app/Views/editCapitalAmendPO.php +++ b/app/Views/editCapitalAmendPO.php @@ -796,9 +796,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
-
- +
+
@@ -3497,7 +3496,7 @@ Calculate Landing charge $('#loader').show(); - disableButtons(); + // disableButtons(); $.ajax({ // data:$('.CapitalPO').serialize()+"&ExchangeRateOn="+ExchangeRateOn+"&PaymentMethod="+PaymentMethod+"&PayableAT="+PayableAT+"&PaymentDate="+PaymentDate, type: "POST", @@ -3516,11 +3515,11 @@ Calculate Landing charge $('#SpcialInstruction').val(''); $('#txtDeliveryAddress').val(''); window.location = status == 1 ? "amendmentpurchaseorder" : "purchaseorderListing"; - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } else { $('#loader').hide(); alert("Error"); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } } diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index 714ee71a..e57f3953 100755 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -883,8 +883,9 @@ if (!empty($getlogpodtl)) {
-
SNo
+
+
+
@@ -1288,6 +1289,8 @@ if (!empty($getlogpodtl)) { ?>
SNo
+
+
@@ -6009,7 +6012,7 @@ if (!empty($getlogpodtl)) { //alert('else'); $('#loader').show(); - disableButtons(); + // disableButtons(); //alert('ss'); var formData = new FormData($('.CapitalPO')[0]); formData.append('ExchangeRateOn', ExchangeRateOn); @@ -6060,11 +6063,11 @@ if (!empty($getlogpodtl)) { clearAfterAddLineItemAdd(); window.location = "purchaseorderListing"; - setTimeout(function() { enableButtons(); }, 2000); + // } else { // $('#content').loader('hide'); alert("Error"); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } } diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php index d79e7184..9ba31614 100755 --- a/app/Views/editImportAmendPO.php +++ b/app/Views/editImportAmendPO.php @@ -1198,8 +1198,8 @@ if (!empty($RequistionDetails)) {
-
- +
+
@@ -2933,7 +2933,7 @@ if (!empty($RequistionDetails)) { // return false; // } else { $('#loader').show(); - disableButtons(); + // disableButtons(); var formData = new FormData($('.ImportPO')[0]); if (status == 0) { // for draft @@ -2964,23 +2964,23 @@ if (!empty($RequistionDetails)) { //$('#txtDeliveryAddress').val(''); window.location = status == 1 ? "amendmentpurchaseorder" : "purchaseorderListing"; - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } else { alert("Error"); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } }, error : function (){ console.error(error); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); }, complete : function (){ console.log("ajax call is completed "); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php index 993b0388..46dff31a 100755 --- a/app/Views/editRevenueAmendPO.php +++ b/app/Views/editRevenueAmendPO.php @@ -1219,8 +1219,7 @@ if (!empty($INRSYMBOL)) {
-
+
@@ -2575,7 +2574,7 @@ if (!empty($INRSYMBOL)) { }; $('#loader').show(); - disableButtons(); + // disableButtons(); $.ajax({ // data:$('.CreatePO').serialize(), type: "POST", @@ -2594,21 +2593,21 @@ if (!empty($INRSYMBOL)) { $('#txtDeliveryAddress').val('') window.location = (status == 1) ? "amendmentpurchaseorder" : "purchaseorderListing"; - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } else { $('#loader').hide(); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } }, error : function(error){ console.error("error occured" + error); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); }, complete : function (){ $('#loader').hide(); console.log("ajax call is completed ..!!") - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } }); diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php index 3baeac77..271c9d9c 100755 --- a/app/Views/editRevenuepurchaseorder.php +++ b/app/Views/editRevenuepurchaseorder.php @@ -2132,9 +2132,10 @@ if (!empty($getlogpodtl)) {
+ 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); - echo form_input($data); + // $data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); + // echo form_input($data); ?>
@@ -2161,9 +2162,10 @@ if (!empty($getlogpodtl)) {
+ 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); - echo form_input($data); + // $data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); + // echo form_input($data); ?>
@@ -2326,9 +2328,8 @@ if (!empty($getlogpodtl)) {

-
-
+
+
@@ -5403,7 +5404,7 @@ if (!empty($getlogpodtl)) { // } else { var formData = new FormData($('.CreatePO')[0]); $('#loader').show(); - disableButtons(); + // disableButtons(); $.ajax({ type: "POST", url: "purchaseorder/EditRevenuePurchaseOrder", @@ -5421,11 +5422,11 @@ if (!empty($getlogpodtl)) { $('#SpcialInstruction').val(''); $('#txtDeliveryAddress').val('') window.location = "purchaseorderListing"; - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } else { alert("Something went wrong"); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } }, @@ -5434,7 +5435,7 @@ if (!empty($getlogpodtl)) { $('#loader').hide(); console.error("AJAX Error: ", textStatus, errorThrown); alert("An error occurred: " + textStatus + " - " + errorThrown); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); }, diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php index 0797e057..b369c150 100755 --- a/app/Views/editServiceAmendPO.php +++ b/app/Views/editServiceAmendPO.php @@ -1012,166 +1012,170 @@ foreach ($PaymentTerms as $TER) {
-
- - - - - - - - - - - - - - - - - - - - - Schedule_Type != 'Recurring') { - $FrequencyNo = intval(1); - $Frequency = 'One Time'; - } else { - $FrequencyNo = $record->NumberOfService; - $Frequency = $record->Service_Period; - } - - ?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + After_CGST; + $TotalSgst = $TotalSgst + $record->After_SGST; + $TotalIgst = $TotalIgst + $record->After_IGST; + $Totalotherallowance = $Totalotherallowance + $record->otherallowance; + $TotalSummary = $TotalSummary + $record->TotalValue; + + + $TotalBasicAmount = $TotalBasicAmount + ($record->BasicValue * $FrequencyNo); + } + ?> + + +
SNoRequisition NoItem CodeItem DescriptionQuantityUOMRateBasic AmountTax AmountTotal Order AmountActual QuantityReceived QuantityPending QuantityAction
ReqNo ?> MaterialCode ?>MaterialName, 0, 13, "..."); - echo $shortName; ?>Quantity ?>UOM ?>Rate ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>Taxamount ?>TotalValue ?>Quantity ?>ReceivedQuantity ?>Quantity - $record->ReceivedQuantity, 2, '.', ''); ?>     - - - - +
+
+ + + + + + + + + + + + + + + + + - After_CGST; - $TotalSgst = $TotalSgst + $record->After_SGST; - $TotalIgst = $TotalIgst + $record->After_IGST; - $Totalotherallowance = $Totalotherallowance + $record->otherallowance; - $TotalSummary = $TotalSummary + $record->TotalValue; + + + + BasicValue * $FrequencyNo); - } - ?> - - -
SNoRequisition NoItem CodeItem DescriptionQuantityUOMRateBasic AmountTax AmountTotal Order AmountActual QuantityReceived QuantityPending QuantityAction
+ foreach ($POItem as $record) { + $index = $index + 1; + if ($record->Schedule_Type != 'Recurring') { + $FrequencyNo = intval(1); + $Frequency = 'One Time'; + } else { + $FrequencyNo = $record->NumberOfService; + $Frequency = $record->Service_Period; + } + + ?> +
ReqNo ?> MaterialCode ?>MaterialName, 0, 13, "..."); + echo $shortName; ?>Quantity ?>UOM ?>Rate ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>Taxamount ?>TotalValue ?>Quantity ?>ReceivedQuantity ?>Quantity - $record->ReceivedQuantity, 2, '.', ''); ?>     + + + + +
+
+
@@ -2236,19 +2240,19 @@ foreach ($PaymentTerms as $TER) { $('#txtDeliveryAddress').val('') window.location = status == 1 ? "amendmentpurchaseorder" : "purchaseorderListing"; - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } else { - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); $('#loader').hide(); console.error("Error"); } }, error : function (error){ - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); console.log("error occurred" , error); }, complete : function (){ - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); console.log("Ajax call is completed ..!!"); } }); diff --git a/app/Views/editconfig.php b/app/Views/editconfig.php index ccbfc09c..002f9f9f 100755 --- a/app/Views/editconfig.php +++ b/app/Views/editconfig.php @@ -664,7 +664,8 @@ if (!empty($master)) { \ No newline at end of file diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php index 65926394..f185fc18 100755 --- a/app/Views/monthlypayinputs.php +++ b/app/Views/monthlypayinputs.php @@ -898,8 +898,7 @@ $(document).ready(function () { if (data) { $('#loader').hide(); - // alert(data); - + alert(data); } } diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php index e9df80b3..036b64c6 100755 --- a/app/Views/purchaseorder.php +++ b/app/Views/purchaseorder.php @@ -2029,8 +2029,8 @@ if (!empty($INRSYMBOL)) {
@@ -3946,7 +3946,7 @@ if (!empty($INRSYMBOL)) { // else { var formData = new FormData($('.CreatePO')[0]); - disableButtons(); + // disableButtons(); $.ajax({ type: "POST", @@ -3963,19 +3963,19 @@ if (!empty($INRSYMBOL)) { //$('#SpcialInstruction').val(''); //$('#txtDeliveryAddress').val(''); window.location = "purchaseorderListing"; - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } else { alert("Error"); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } }, error: function(jqXHR, textStatus, errorThrown) { console.error("AJAX Error: " + textStatus + ": " + errorThrown); alert("Error: " + textStatus); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } }); @@ -4219,11 +4219,11 @@ if (!empty($INRSYMBOL)) { } function Reset() { - disableButtons(); + // disableButtons(); location.reload(); - setTimeout(function() { - enableButtons(); - }, 2000); + // setTimeout(function() { + // enableButtons(); + // }, 2000); } diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php index 532405f7..783d52ef 100755 --- a/app/Views/servicePurchaseorder.php +++ b/app/Views/servicePurchaseorder.php @@ -1047,7 +1047,7 @@ if (!empty($INRSYMBOL)) {
- +
@@ -2402,7 +2402,7 @@ if (!empty($INRSYMBOL)) { // return false; // } else { var formData = new FormData($('.ServicePO')[0]); - disableButtons(); + // disableButtons(); console.log("inside add service purchase order view page"); console.log(formData); @@ -2422,17 +2422,17 @@ if (!empty($INRSYMBOL)) { $('#SpcialInstruction').val(''); $('#txtDeliveryAddress').val(''); window.location = "purchaseorderListing"; - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } else { alert("Error"); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } }, error: function(jqXHR, textStatus, errorThrown) { console.error("AJAX Error: " + textStatus + ": " + errorThrown); alert("Error: " + textStatus); - setTimeout(function() { enableButtons(); }, 2000); + // setTimeout(function() { enableButtons(); }, 2000); } }); @@ -2584,11 +2584,11 @@ if (!empty($INRSYMBOL)) { function Reset() { - disableButtons(); + // disableButtons(); location.reload(); - setTimeout(function() { - enableButtons(); - }, 2000); + // setTimeout(function() { + // enableButtons(); + // }, 2000); }
SNo