From 229ac1b4a2e57e6b0a7bc497f47ea92618889851 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Mon, 24 Feb 2025 12:55:07 +0000 Subject: [PATCH 01/15] Bug Fixes : ps --- app/Controllers/Driver.php | 23 ++-- app/Controllers/Emergencypurchaseorder.php | 4 +- app/Controllers/Purchaseorder.php | 2 +- app/Controllers/Servicepurchaseorder.php | 2 +- app/Models/Driver_model.php | 11 +- app/Views/EditservicePurchaseorder.php | 11 +- app/Views/addEmployeenew.php | 7 + app/Views/capitalpurchaseorder.php | 151 +++++++++++++-------- app/Views/driverAttendance.php | 42 +++--- app/Views/editCapitalPo.php | 11 +- app/Views/editEmployeenew.php | 7 + app/Views/editRevenuepurchaseorder.php | 13 +- app/Views/editServiceAmendPO.php | 10 +- app/Views/editimportpo.php | 9 +- app/Views/employeeListing.php | 10 +- app/Views/publicholidays.php | 2 +- app/Views/purchaseorder.php | 48 ++++--- app/Views/requisitionform.php | 22 +-- app/Views/requisitionlisting.php | 6 +- 19 files changed, 227 insertions(+), 164 deletions(-) diff --git a/app/Controllers/Driver.php b/app/Controllers/Driver.php index f1f46924..2fd070a2 100755 --- a/app/Controllers/Driver.php +++ b/app/Controllers/Driver.php @@ -136,19 +136,24 @@ class Driver extends BaseController public function loadDriverAttendance() { - $input_driver_id = $this->request->getPost('gobal_driver_id') ? $this->request->getPost('gobal_driver_id') : $this->request->getGet('gobal_driver_id'); - $input_month_year = $this->request->getPost('month_year') ? $this->request->getPost('month_year') : $this->request->getGet('month_year'); - list($month, $year) = explode('-', $input_month_year); + $input_driver_id = $this->request->getGet('gobal_driver_id'); + // $input_month_year = $this->request->getPost('month_year') ? $this->request->getPost('month_year') : get_date_time_dynamical_format('d-M-Y','d-m-',"01-"+$this->request->getGet('month_year')) ; + $input_date = $this->request->getGet('date') + ? $this->request->getGet('date') + : get_date_time_dynamical_format('d-M-Y','d-m-Y',"01-".$this->request->getGet('month_year')); - $month_in_number = get_date_time_dynamical_format('M','m',"$month");// refer helper - $get_last_date_of_the_month = cal_days_in_month(CAL_GREGORIAN, $month_in_number, $year); - $from_mysql_date = get_date_time_dynamical_format('d-m-Y','Y-m-d',"01-$month_in_number-$year"); - $to_mysql_date = get_date_time_dynamical_format('d-m-Y','Y-m-d',"$get_last_date_of_the_month-$month_in_number-$year"); - $indian_date = get_date_time_dynamical_format('d-m-Y','d-m-Y',"$get_last_date_of_the_month-$month_in_number-$year"); + + list($date,$month,$year) = explode('-', $input_date); + + $get_last_date_of_the_month = cal_days_in_month(CAL_GREGORIAN, $month, $year); + $from_mysql_date = get_date_time_dynamical_format('d-m-Y','Y-m-d',"01-$month-$year"); + $to_mysql_date = get_date_time_dynamical_format('d-m-Y','Y-m-d',"$get_last_date_of_the_month-$month-$year"); + $indian_date = get_date_time_dynamical_format('d-m-Y','d-m-Y',"$get_last_date_of_the_month-$month-$year"); + $data['driver_attendance_list'] = $this->driver_model->useDriverAttendanceTable()->getDriverAttendanceList($input_driver_id,$from_mysql_date,$to_mysql_date); $data['page_driver_name'] = $this->driver_model->getDriverName($input_driver_id); $data['invoice_info'] = $this->driver_model->getInvoiceInfo(); - $data['datefordropdown'] = $input_month_year; + $data['datefordropdown'] = $input_date; $data['gobal_driver_id'] = $input_driver_id; $this->global['pageTitle'] = 'Driver Attendance List'; diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php index c18be944..f2c64289 100755 --- a/app/Controllers/Emergencypurchaseorder.php +++ b/app/Controllers/Emergencypurchaseorder.php @@ -632,7 +632,7 @@ class Emergencypurchaseorder extends BaseController if (count($mrirmaster) > 0) { foreach ($mrirmaster as $key) { - $MRIRNO = $key->MRIRNo; + $MRIRNO = $key->MRIRNO; } } @@ -1525,6 +1525,6 @@ class Emergencypurchaseorder extends BaseController $this->purchaseorder_model->DeletePOServiceTax($LineItemNo); } $this->purchaseorder_model->DeletePOLineItem($LineItemNo, $ReqNo, $MaterialCode); - echo "Successfully Deleted the Line item" . $LineItemNo; + echo "Successfully Deleted the Line item " . $LineItemNo; } } diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php index e96f797a..057a65c1 100755 --- a/app/Controllers/Purchaseorder.php +++ b/app/Controllers/Purchaseorder.php @@ -1962,7 +1962,7 @@ class Purchaseorder extends BaseController $this->purchaseorder_model->DeletePOServiceTax($LineItemNo); } $this->purchaseorder_model->DeletePOLineItem($LineItemNo, $ReqNo, $MaterialCode); - echo "Successfully Deleted the Line item" . $LineItemNo; + echo "Successfully Deleted the Line item " . $LineItemNo; } diff --git a/app/Controllers/Servicepurchaseorder.php b/app/Controllers/Servicepurchaseorder.php index 6f810d46..9207e172 100755 --- a/app/Controllers/Servicepurchaseorder.php +++ b/app/Controllers/Servicepurchaseorder.php @@ -341,7 +341,7 @@ class Servicepurchaseorder extends BaseController } } } - echo 'Service Purchase Order Created Successfully!The PO NO Is: ' . $PONO; + echo 'Service Purchase Order Created Successfully! PO Number Is: ' . $PONO; } //update service po function UpdateServicePurchaseOrder() diff --git a/app/Models/Driver_model.php b/app/Models/Driver_model.php index 843cd5e8..bc60b32d 100755 --- a/app/Models/Driver_model.php +++ b/app/Models/Driver_model.php @@ -47,11 +47,11 @@ class Driver_model extends Model return $this->table . '.' . $field; }, $this->allowedFields)); - $selectFields = "CONCAT_WS(' ', t_employee_details.FirstName, t_employee_details.LastName) AS FullName, t_employee_details.IsActive as employee_isactive, t_driver.driver_name,ip_clients.client_name as customer,ip_invoices.received_qty as quantity,t_driver_payroll.id as payroll_id,t_driver_payroll.PayOn," . $fields; + $selectFields = "CONCAT_WS(' ', t_employee_details.FirstName, t_employee_details.LastName) AS FullName, t_employee_details.IsActive as employee_isactive, CONCAT_WS(' ', driver.FirstName, driver.LastName) AS driver_name,ip_clients.client_name as customer,ip_invoices.received_qty as quantity,t_driver_payroll.id as payroll_id,t_driver_payroll.PayOn," . $fields; $month_year = get_date_time_dynamical_format('Y-m-d','m-Y',"$from"); return $this->select($selectFields) - ->join('t_driver', 't_driver.driver_id = ' . $this->table . '.driver_id', 'left') + ->join('t_employee_details as driver', 'driver.EmpID = ' . $this->table . '.driver_id', 'left') ->join('tbl_users', 'tbl_users.userId = ' . $this->table . '.created_by', 'left') ->join('t_employee_details', 'tbl_users.EmpID = t_employee_details.EmpID', 'left') ->join('ip_invoices', 'ip_invoices.invoice_number = ' . $this->table . '.invoice_number', 'left') @@ -60,6 +60,7 @@ class Driver_model extends Model ->where($this->table.'.date BETWEEN "'.$from.'" AND "'.$to.'"') ->where($this->table . '.driver_id', $driver_id) ->where($this->table . '.isactive', 1) + ->where('driver.is_driver', 1) ->findAll(); } @@ -73,9 +74,9 @@ class Driver_model extends Model function getDriverName($id) { - $builder = $this->db->table('t_driver') - ->select('driver_name') - ->where('driver_id', $id); + $builder = $this->db->table('t_employee_details') + ->select('CONCAT_WS(" ", t_employee_details.FirstName, t_employee_details.LastName) as driver_name') + ->where('EmpID', $id); $query = $builder->get()->getRow(); diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 85a67ac0..77c02c3c 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -2991,15 +2991,8 @@ if (!empty($getlogpodtl)) { type: "POST", url: "purchaseorder/DeletePODetails", success: function(data) { - if (data) { - $('#loader').hide(); - alert(data); - } else { - $('#loader').hide(); - - alert("Error"); - } - + $('#loader').hide(); + (data) ? alert(response) : alert("Error"); } }); } diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index c45f93b7..4032c8ad 100755 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -6,6 +6,13 @@ label { font-style: bold; } + + input[type="file"] { + white-space: normal; + word-wrap: break-word; + overflow-wrap: break-word; + width: 100%; + }
diff --git a/app/Views/driverAttendance.php b/app/Views/driverAttendance.php index b7fc4bda..48425ef5 100755 --- a/app/Views/driverAttendance.php +++ b/app/Views/driverAttendance.php @@ -221,7 +221,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
- @@ -234,11 +234,11 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
- +
- +
@@ -463,25 +463,29 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); if (result) { return result; } else { event.preventDefault(); } } - function salary() { - - var type = $('#load_type').val(); - - if(type == 'Load'){ - var value = parseFloat(1300); - $('#salary_amount').val(value); - }else if(type == 'Waste Core'){ - var value = parseFloat(1050); - $('#salary_amount').val(value); - } - var sa = parseFloat($('#salary_amount').val()) || 0; - var fa = parseFloat($('#food_amount').val()) || 0; - var ttl = sa + fa; - - $('#total_amount').val(ttl.toFixed(2)); + $(document).ready(function() { + updateSalaryBasedOnType(); + fetchSalary(); + }); + function updateSalaryBasedOnType() { + var type = $('#load_type').val(); + if (type == 'Load') { + $('#salary_amount').val(1300); + } else if (type == 'Waste Core') { + $('#salary_amount').val(1050); + } + fetchSalary(); } + function fetchSalary() { + var sa = parseFloat($('#salary_amount').val()) || 0; + var fa = parseFloat($('#food_amount').val()) || 0; + var ttl = sa + fa; + + $('#total_amount').val(ttl.toFixed(2)); + } + function customerandquantity(){ if ($('#invoice_number').val() === '') { alert('Please Enter the Valid Invoice Number'); diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index 556e9f2f..0d0226ac 100755 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -5358,15 +5358,8 @@ if (!empty($getlogpodtl)) { type: "POST", url: "purchaseorder/DeletePODetails", success: function (data) { - $('#loader').show(); - - if (data) { - // $('#content').loader('hide'); - alert(data); - } else { - alert("Error"); - } - + $('#loader').hide(); + (data) ? alert(response) : alert("Error"); } }); } diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index e8d6482b..a30ea8c9 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -6,6 +6,13 @@ label { font-style: bold; } + + input[type="file"] { + white-space: normal; + word-wrap: break-word; + overflow-wrap: break-word; + width: 100%; + } ParentPO; @@ -218,6 +218,7 @@ if (!empty($POMaster)) { $DeliveryAddress = $Req->DeliveryAddress; $PONOStatus = $Req->StatusCode; + // dd($PONOStatus); $PONO = $Req->PONO; $ServiceDescription = $Req->ServiceDescription; $CapitalRange = $Req->CapitalRange; @@ -4477,7 +4478,8 @@ if (!empty($getlogpodtl)) { }); index = parseInt(index) + 1; // $PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED - PONOStatus = + var PONOStatus = + console.log("PONOStatus",PONOStatus); // var template = jQuery("#RevenueList").html(); @@ -5087,12 +5089,7 @@ if (!empty($getlogpodtl)) { url: "purchaseorder/DeletePODetails", success: function (data) { $('#loader').hide(); - if (data) { - alert(data); - - } else { - alert("Error"); - } + (data) ? alert(response) : alert("Error"); } }); diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php index a9b852ce..66945d3b 100755 --- a/app/Views/editServiceAmendPO.php +++ b/app/Views/editServiceAmendPO.php @@ -2044,14 +2044,8 @@ foreach ($PaymentTerms as $TER) { type: "POST", url: "purchaseorder/DeletePODetails", success: function(data) { - if (data) { - $('#loader').hide(); - alert(data); - } else { - $('#loader').hide(); - alert("Error"); - } - + $('#loader').hide(); + (data) ? alert(response) : alert("Error"); } }); } diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php index 9a7732dd..82bf24cc 100755 --- a/app/Views/editimportpo.php +++ b/app/Views/editimportpo.php @@ -5334,14 +5334,7 @@ if (!empty($getlogpodtl)) { url: "purchaseorder/DeletePODetails", success: function(data) { $('#loader').hide(); - - if (data) { - // $('#content').loader('hide'); - alert(data); - } else { - alert("Error"); - } - + (data) ? alert(response) : alert("Error"); } }); } diff --git a/app/Views/employeeListing.php b/app/Views/employeeListing.php index c1d033e1..7c160032 100755 --- a/app/Views/employeeListing.php +++ b/app/Views/employeeListing.php @@ -135,7 +135,15 @@ } else { $cdate = date('d-m-Y', strtotime($record->Created_date)); } ?> - EmpID ?> + EmpID ?> + is_driver){ ?> +     + +     + + + + FirstName; ?> ContactNumber ?> Designation ?> diff --git a/app/Views/publicholidays.php b/app/Views/publicholidays.php index 7d001121..0ddb9ca5 100755 --- a/app/Views/publicholidays.php +++ b/app/Views/publicholidays.php @@ -29,7 +29,7 @@
-
+
Holiday Name : diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php index a62b00a0..71630efa 100755 --- a/app/Views/purchaseorder.php +++ b/app/Views/purchaseorder.php @@ -204,15 +204,15 @@ if (!empty($INRSYMBOL)) { function vaildateBeforeOpenModal() { var radioValue = $("input[name='DateRange']:checked").val(); - if ($('#PODate').val() == '') { - alert('Please Enter the Purchase Order date'); - $('#PODate').focus(); - return false; - } else if ($('#drpSupplier').val() == "0") { + if ($('#drpSupplier').val() == "0") { alert('Please Select the Supplier details'); $('#drpSupplier').focus(); return false; - } else if ($('#DeliveryAddr').val() == '') { + } else if ($('#PODate').val() == '') { + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + } else if ($('#DeliveryAddr').val() == '') { alert('Please Enter the Delivery Address'); $('#DeliveryAddr').focus(); return false; @@ -224,15 +224,7 @@ if (!empty($INRSYMBOL)) { alert('Please Enter the Schedule By'); $('#Deliverydate').focus(); return false; - } else if (radioValue == 0 && $('#Deliverydate').val() == '') { - alert('Please Select the Delivery Date'); - $('#Deliverydate').focus(); - return false; - } else if (radioValue == 1 && $('#Scheduleby').val().trim() == '') { - alert('Please Enter the Schedule By'); - $('#Deliverydate').focus(); - return false; - } else if ($('#PoTypeOptions').val() == "0") { + } else if ($('#PoTypeOptions').val() == "0") { alert('Please Select Revenue Type'); $('#PoTypeOptions').focus(); return false; @@ -3944,7 +3936,7 @@ if (!empty($INRSYMBOL)) { } else { var formData = new FormData($('.CreatePO')[0]); - + disableButtons(); $.ajax({ @@ -3962,15 +3954,19 @@ if (!empty($INRSYMBOL)) { //$('#SpcialInstruction').val(''); //$('#txtDeliveryAddress').val(''); window.location = "purchaseorderListing"; + setTimeout(function() { enableButtons(); }, 2000); + } else { alert("Error"); + setTimeout(function() { enableButtons(); }, 2000); } }, error: function(jqXHR, textStatus, errorThrown) { console.error("AJAX Error: " + textStatus + ": " + errorThrown); alert("Error: " + textStatus); + setTimeout(function() { enableButtons(); }, 2000); } }); @@ -4214,9 +4210,29 @@ if (!empty($INRSYMBOL)) { } function Reset() { + disableButtons(); location.reload(); + setTimeout(function() { + enableButtons(); + }, 2000); } + function disableButtons() { + document.querySelectorAll('.Save, .Submit').forEach(function(button) { + button.classList.add('disabled'); + button.setAttribute('disabled', 'disabled'); + }); + } + + + function enableButtons() { + document.querySelectorAll('.Save, .Submit').forEach(function(button) { + button.classList.remove('disabled'); + button.removeAttribute('disabled'); + }); + } + + \ No newline at end of file diff --git a/app/Views/requisitionform.php b/app/Views/requisitionform.php index 24af8fb9..5b9be76d 100755 --- a/app/Views/requisitionform.php +++ b/app/Views/requisitionform.php @@ -407,11 +407,14 @@ if (!empty($Emp)) { $("#UOM").val(''); // Get the ID of the first option var firstOptionId = $('#CostCenter option:first').val(); - // Reset the Select2 dropdown to the first option - $('#CostCenter').val(firstOptionId).select2('data', { - id: firstOptionId, - text: $('#CostCenter option:selected').text() - }); + $('#CostCenter').val("-1"); + + + // // Reset the Select2 dropdown to the first option + // $('#CostCenter').val(firstOptionId).select2('data', { + // id: firstOptionId, + // text: $('#CostCenter option:selected').text() + // }); removeHiddenRows($('#Items').find('tr').length); @@ -605,12 +608,13 @@ if (!empty($Emp)) { diff --git a/app/Views/driverListing.php b/app/Views/driverListing.php index f6cb32c8..184ad120 100755 --- a/app/Views/driverListing.php +++ b/app/Views/driverListing.php @@ -63,9 +63,7 @@     - -     - + diff --git a/app/Views/driverPayslipGeneratePrint (Copy).php b/app/Views/driverPayslipGeneratePrint (Copy).php new file mode 100755 index 00000000..0650169c --- /dev/null +++ b/app/Views/driverPayslipGeneratePrint (Copy).php @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + +
+
+ +
+ + 		+
Resico (India) Pvt Ltd
196/4 B, 126, Mettupalayam Village, Sriperumbudur(Taluk), +
kancheepuram (Dist), Tamil Nadu, India - 631604.
PaySlip for the Month of PayOn ?>
+
+ + + + + + + + + + + + + + + + + + + + + + + + +
Name name; ?>
Designation
No Of Loads no_of_loads ?>
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
EarningsAmount ₹
 Driver Monthly Salary Amount driver_monthly_salary_amount; ?> 
 Driver Monthly Food Amountdriver_monthly_food_amount; ?> 
 Diesel diesel ?> 
 Shed Duty Amount shed_duty_amount ?> 
Net Pay(Rounded)  driver_final_payment),2,'.','') ?> 
Total Amount In Words  
This is a computer generated document. This document does not require signature.
+ + \ No newline at end of file diff --git a/app/Views/driverPayslipGeneratePrint.php b/app/Views/driverPayslipGeneratePrint.php index 0650169c..a9cc7576 100755 --- a/app/Views/driverPayslipGeneratePrint.php +++ b/app/Views/driverPayslipGeneratePrint.php @@ -11,7 +11,7 @@ - +
Resico (India) Pvt Ltd
196/4 B, 126, Mettupalayam Village, Sriperumbudur(Taluk),
kancheepuram (Dist), Tamil Nadu, India - 631604.
PaySlip for the Month of PayOn ?>
@@ -23,24 +23,45 @@ Name -name; ?> +driver_name; ?> - - +Employee ID +EmpID ?> Designation - + Designation ?> - - +Department +DeptName ?> -No Of Loads - no_of_loads ?> +Date Of Joining + DOJ)) ?> - - +No Of Loads + no_of_loads ?> + + +Bank Name +BankName ?> + +PAN Number +Pan;?> + + +Bank Acc No + BankAccountNumber ?> + + Aadhar Number +AadharNo);?> + + +Bank IFSC +IFSCCode ?> + + + @@ -48,35 +69,61 @@ - + - - + + + + - - + + + + - - + + + + + + - - + + + + + + + + + + + + + + - - + + - - - + + + -
EarningsAmount ₹
EarningsAmount ₹DeductionsAmount ₹
 Driver Monthly Salary Amount driver_monthly_salary_amount; ?>  Monthly Salarydriver_monthly_salary_amount; ?>  PF 
 Driver Monthly Food Amountdriver_monthly_food_amount; ?>  Dieseldiesel_amount; ?>  ESI  
 Diesel diesel ?>  Shed Duty Amountshed_amount; ?>   
 Shed Duty Amount shed_duty_amount ?>  BonusFestival_Bonus; ?>   
 Total Earning (Rounded) + driver_monthly_salary_amount + $PayDetails[0]->Festival_Bonus + $PayDetails[0]->diesel_amount + $PayDetails[0]->shed_amount; + echo number_format(round($totEarning),2) + ?> +  Total Deduction (Rounded) + + 
Net Pay(Rounded)  driver_final_payment),2,'.','') ?> 
Net Pay(Rounded)  driver_final_payment),2,'.','') ?> 
Total Amount In Words  
Total Amount In Words  
This is a computer generated document. This document does not require signature.
- - \ No newline at end of file + \ No newline at end of file diff --git a/app/Views/editrequisitionform.php b/app/Views/editrequisitionform.php index 0af694b4..1762c5ee 100755 --- a/app/Views/editrequisitionform.php +++ b/app/Views/editrequisitionform.php @@ -70,12 +70,12 @@ td { .th-requestedQuantity{ - text-align:center !important; + text-align:right !important; width:15%; } .th-PoQuantity{ - text-align:center !important; + text-align:right !important; width:15%; } @@ -85,7 +85,7 @@ td { } .th-uom{ - text-align:center !important; + text-align:left !important; width:10%; } @@ -226,9 +226,9 @@ td { MaterialCode; ?> MaterialName; ?> - UOM; ?> - Quantity; ?> - POQTY; ?> + UOM; ?> + Quantity; ?> + POQTY; ?> StatusName; ?> @@ -818,9 +818,9 @@ td { ${temp} ${materialCode} ${materialName} - ${uom} - ${quantity} - 0.00 + ${uom} + ${quantity} + 0.00 NEW diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php index 2f08bd30..620cbf87 100755 --- a/app/Views/includes/new_header.php +++ b/app/Views/includes/new_header.php @@ -764,13 +764,13 @@
Employee Details - Driver Details + Attendance
Monthly Pay Information @@ -781,7 +781,7 @@
-
+
$record) { @@ -353,7 +351,7 @@ } ?> - TotalSalary; ?> + TotalSalary; ?> TotalSalary / $record->NoofDays; @@ -496,7 +494,8 @@ - + @@ -508,9 +507,146 @@ } } } - - + $inx = $index; + if(!empty($drivermonthinputs)){ + foreach ($drivermonthinputs as $i => $record) { + $inx++; + $salary_amount = ($record->driver_basic); + ?> + + + + EmpID; ?> + + FirstName; ?> + + + DateofJoining); + $newDateFormat = $date->format('d-m-Y'); + echo $newDateFormat; + ?> + + + + Designation; ?> + + + no_of_loads." (trip)"; ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + esi_amount; ?> + + pf_amount; ?> + + + + + + + Monthly_Due; + echo number_format(0.00, 2, '.', ''); ?> + + + + + + + + + + payroll_id)) { + echo "contenteditable='true';"; + } ?> + payroll_id)) { ?> title="Payslip Calculated" + style="text-align:right;color:blue;" + style="text-align:right;" > + Festival_Bonus)) { + echo $record->Festival_Bonus; + $totalfestival[] = $record->Festival_Bonus; + } else { + echo number_format(0.00, 2, '.', '');; + } ?> + + + + + payroll_id)) { + echo "contenteditable='false';"; + } ?> + payroll_id)) { ?> title="Payslip Calculated" + style="text-align:right;color:blue;" style="text-align:right;" > + driver_final_payment)) { + echo $record->driver_final_payment; + $estTotal[] = $record->driver_final_payment; + } else { + echo $empSalary[$i]; + $estTotal[] = $empSalary[$i]; + } + ?> + + + + + + + + @@ -732,7 +868,7 @@ $(document).ready(function () { if (data) { $('#loader').hide(); - alert(data); + // alert(data); } @@ -971,6 +1107,44 @@ $(document).ready(function () { calculategrandtotal(); } + + function driverchangeInput(event, k) { + var str = event.target.id; + var sno = str.substr(8); + + var driverEarn = parseFloat(document.getElementById('ttlsalary' + sno).textContent); + + var Festivals = parseFloat(document.getElementById('Festival' + sno).textContent); + totalfestival[sno] = Festivals; + + if (isNaN(driverEarn)) { driverEarn = 0; } + + var driverMonthSalary = driverEarn + Festivals + + var driverSalary = Math.round(driverMonthSalary); + + var cals = (driverSalary).toFixed(0); + + document.getElementById("empsal" + sno).innerHTML = cals; + + // copied from calculategrandtotal() because we need those two only thats why + var FestivalBonusIndex = 23; + var FestivalBonus = 0; + $('#monthlylistings tbody tr').each(function() { + var value = $(this).find('td').eq(FestivalBonusIndex).text(); + FestivalBonus += parseFloat(value) || 0; + }); + $('#fest').text(FestivalBonus); + + var EstimateIndex = 24; + var Estimate = 0; + $('#monthlylistings tbody tr').each(function() { + var value = $(this).find('td').eq(EstimateIndex).text(); + Estimate += parseFloat(value) || 0; + }); + $('#estsal').text(Estimate); + + } function calculategrandtotal() { diff --git a/app/Views/payslipgenerate.php b/app/Views/payslipgenerate.php index d15dd227..09364f18 100755 --- a/app/Views/payslipgenerate.php +++ b/app/Views/payslipgenerate.php @@ -57,16 +57,17 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr }, type: "POST", url: "payslip/checkExistPay", - + dataType: "json", success: function(result) { - if (result != 1) { + + if (result['count'] != 1) { $.ajax({ data: { payon: payon, employee: employee }, type: "POST", - url: "payslip/callsp", + url: "".result['path'], success: function(result) { console.log(result); $('#loader').hide(); @@ -94,11 +95,9 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr }, type: "POST", url: "payslip/checkExistPay", - + dataType: "json", success: function(result) { - - - if (result == 1) { + if (result['count'] == 1) { $('form#PayslipGenerator').submit(); $('#loader').hide(); @@ -111,7 +110,7 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr employee: employee }, type: "POST", - url: "payslip/callsp", + url: ""+result['path'], success: function(result) { $('form#PayslipGenerator').submit(); $('#loader').hide(); @@ -185,11 +184,11 @@ $monthsoptions = array("01" => "Jan", "02" => "Feb", "03" => "Mar", "04" => "Apr
- Select All
+
-
+
diff --git a/app/Views/requisitionform.php b/app/Views/requisitionform.php index 5b9be76d..c04d9b09 100755 --- a/app/Views/requisitionform.php +++ b/app/Views/requisitionform.php @@ -144,8 +144,8 @@ if (!empty($Emp)) { Material Code Material Name Material Category - Uom - Quantity + Uom + Quantity Action @@ -684,8 +684,8 @@ if (!empty($Emp)) { ${materialCode} ${materialName} ${categoryName} - ${uom} - ${quantity} + ${uom} + ${quantity} Date: Thu, 27 Feb 2025 13:37:23 +0000 Subject: [PATCH 03/15] driver loan : ps --- app/Controllers/Driver.php | 80 ++++++++++- app/Controllers/Payslip.php | 168 +++++++++++++++++------ app/Models/Driver_model.php | 37 ++++- app/Views/driverPayslipGeneratePrint.php | 22 +-- app/Views/monthlypayinputs.php | 97 +++++++++++-- 5 files changed, 328 insertions(+), 76 deletions(-) diff --git a/app/Controllers/Driver.php b/app/Controllers/Driver.php index 8f091691..f73d7c7b 100755 --- a/app/Controllers/Driver.php +++ b/app/Controllers/Driver.php @@ -401,7 +401,7 @@ class Driver extends BaseController echo json_encode(count($result)); } - public function driverPayslip() + public function driverPayslip_old() { $PayOn = $this->request->getPost('payon'); @@ -426,6 +426,84 @@ class Driver extends BaseController } + public function driverPayslip() + { + + $PayOn = $this->request->getPost('payon'); + + $Driver = $this->request->getPost('employee'); + + $res = $this->driver_model->getMonthlyPayDetails($Driver, $PayOn); + + $result = $res[0]; + + + $loan = []; + $loanHistory = []; + $loan_id = 0; + $BalanceAdvance = 0; + if(is_null($result->Loan_ID)){ + + }else{ + if($result->Loan_Recovered > 0) + { + $loan_id = $result->Loan_ID; + + if($result->Remaining_Due - 1 == 0){ $is_Active = 0; }else{ $is_Active = 1; } + + $loan = [ + 'Paid_Due' => $result->Paid_Due + 1, + 'Remaining_Due' => $result->Remaining_Due - 1, + 'Paid_Amount' => $result->Paid_Amount + $result->Loan_Recovered, + 'is_Active' => $is_Active + ]; + + + $loanHistory = [ + 'Loan_ID' => $loan_id, + 'Due_Amount' => $result->Loan_Recovered, + 'Balance_Amount' => (int)$result->Loan_Amount - ((int)$result->Paid_Amount + (int)$result->Loan_Recovered), + 'Due_Date' => (string)$PayOn, + ]; + + $BalanceAdvance = $result->Loan_Amount - ($result->Paid_Amount + $result->Loan_Recovered); + + + } + } + + $data = [ + 'PayOn' => $result->month_year, + 'driver_id' => $result->driver_id, + 'no_of_loads' => $result->no_of_loads, + 'monthly_salary_amount' => $result->monthly_salary_amount, + 'monthly_food_amount' => $result->monthly_food_amount, + 'final_payment' => $result->final_payment, + 'created_by' => $this->session->get('userId'), + 'shed_amount' => $result->total_shed_amount, + 'diesel_amount' => $result->total_diesel_amount, + 'ESI' => $result->ESI, + 'PF' => $result->PF, + 'Advance' => $result->Loan_Recovered, + 'BalanceAdvance' => $BalanceAdvance, + 'LessAdvance' => 0, + 'Festival_Bonus' => $result->Festival_Bonus, + ]; + + + + $insert = $this->driver_model->insertPayroll($data); + if($insert){ + if(count($loan)){ + $this->driver_model->updateLoan($loan_id,$result->driver_id,$loan); + } + if(count($loanHistory)){ + $this->driver_model->insertLoanHistory($loanHistory); + } + } + return $insert; + } + public function driverPrintPdf() { diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php index e1c7b5b2..28566e81 100755 --- a/app/Controllers/Payslip.php +++ b/app/Controllers/Payslip.php @@ -737,7 +737,7 @@ class Payslip extends BaseController $from_mysql_date = get_date_time_dynamical_format('d-m-Y','Y-m-d',"01-$month_in_number-$year"); $to_mysql_date = get_date_time_dynamical_format('d-m-Y','Y-m-d',"$get_last_date_of_the_month-$month_in_number-$year"); - + // $data['monthinputs'] $load_driver_data = $this->driver_model->driverAttendanceForMonthlyPayInputs($from_mysql_date,$to_mysql_date); // dd($load_driver_data); @@ -762,35 +762,108 @@ class Payslip extends BaseController $PF_Rate = $load_driver_data[$i]->PF_Rate; $ESI_Rate = $load_driver_data[$i]->ESI_Rate; - $basic = isset($load_driver_data[$i]->driver_earnings_amount) ? (int)$load_driver_data[$i]->driver_earnings_amount + (int)$load_driver_data[$i]->shed_amount+(int)$load_driver_data[$i]->diesel_amount : 0; + $salary = isset($load_driver_data[$i]->monthly_salary_amount) ? (int)$load_driver_data[$i]->monthly_salary_amount : 0; + $food = isset($load_driver_data[$i]->monthly_food_amount) ? (int)$load_driver_data[$i]->monthly_food_amount : 0; + $shed = isset($load_driver_data[$i]->shed_amount) ? (int)$load_driver_data[$i]->shed_amount : 0; + $diesel = isset($load_driver_data[$i]->diesel_amount) ? (int)$load_driver_data[$i]->diesel_amount : 0; - $load_driver_data[$i]->driver_basic = $basic; - $load_driver_data[$i]->driver_earnings_amount = $monthly_pay_array[$driver_id]->driver_earnings_amount; + $Monthly_Due = $load_driver_data[$i]->Monthly_Due; // AUTO LOAN DUE + $Loan_Recovered = $load_driver_data[$i]->Loan_Recovered; //MANUAL LOAN DUE + $loan = 0; + $due_start_date = $load_driver_data[$i]->DueDate; + $paydate = $current; //From POST parm + if ($Loan_Recovered == 'NA') { + $loan = 0.00; + } else if ($Loan_Recovered == 0.00) { + if (strtotime($due_start_date) <= strtotime($to_mysql_date)) { + $loan = $Monthly_Due; + } + } else if ($Loan_Recovered >= 0.00) { + if (strtotime($due_start_date) <= strtotime($to_mysql_date)) { + $loan = $Loan_Recovered; + } + } - // $load_driver_data[$i]->diesel = $monthly_pay_array[$driver_id]->diesel; - // $load_driver_data[$i]->shed_duty_amount = $monthly_pay_array[$driver_id]->shed_duty_amount; - $load_driver_data[$i]->driver_final_payment = $monthly_pay_array[$driver_id]->driver_final_payment; + $load_driver_data[$i]->driver_basic = $salary+$food; + $Loan_amount = $load_driver_data[$i]->Loan_Amount; + $Paid_Amount = $load_driver_data[$i]->Paid_Amount; + $Balance_Amount = $Loan_amount - $Paid_Amount; + if ($Monthly_Due > $Balance_Amount) { + $loan = $Balance_Amount; + } + + $empSalaryAdd = $salary+$food; + $empSalarySub = $loan; + $salaryInCurrentday = $empSalaryAdd - $empSalarySub; + $load_driver_data[$i]->driver_final_payment = $salaryInCurrentday+$shed+$diesel; + + $load_driver_data[$i]->driver_salary = $salary; + $load_driver_data[$i]->driver_food = $food; + $load_driver_data[$i]->driver_shed = $shed; + $load_driver_data[$i]->driver_diesel = $diesel; + $load_driver_data[$i]->payroll_id = $monthly_pay_array[$driver_id]->payroll_id; $load_driver_data[$i]->Festival_Bonus = $monthly_pay_array[$driver_id]->Festival_Bonus; - $load_driver_data[$i]->esi_amount = ($load_driver_data[$i]->esi_applicable == 1) ? $basic * $ESI_Rate / 100 : 0; - $load_driver_data[$i]->pf_amount = ($load_driver_data[$i]->pf_applicable == 1) ? $basic * $PF_Rate / 100 : 0; - $load_driver_data[$i]->basic_worked = $basic * 30 / 100; - $load_driver_data[$i]->hra_worked = $basic * 70 / 100; + + $load_driver_data[$i]->esi_amount = ($load_driver_data[$i]->esi_applicable == 1) ? ($salary+$food) * $ESI_Rate / 100 : 0; + $load_driver_data[$i]->pf_amount = ($load_driver_data[$i]->pf_applicable == 1) ? ($salary+$food) * $PF_Rate / 100 : 0; + $load_driver_data[$i]->basic_worked = ($salary+$food) * 30 / 100; + $load_driver_data[$i]->hra_worked = ($salary+$food) * 70 / 100; }else { $PF_Rate = $load_driver_data[$i]->PF_Rate; $ESI_Rate = $load_driver_data[$i]->ESI_Rate; + + $salary = isset($load_driver_data[$i]->monthly_salary_amount) ? (int)$load_driver_data[$i]->monthly_salary_amount : 0; + $food = isset($load_driver_data[$i]->monthly_food_amount) ? (int)$load_driver_data[$i]->monthly_food_amount : 0; + $shed = isset($load_driver_data[$i]->shed_amount) ? (int)$load_driver_data[$i]->shed_amount : 0; + $diesel = isset($load_driver_data[$i]->diesel_amount) ? (int)$load_driver_data[$i]->diesel_amount : 0; + + $load_driver_data[$i]->driver_basic = $salary+$food; + + $load_driver_data[$i]->driver_salary = $salary; + $load_driver_data[$i]->driver_food = $food; + $load_driver_data[$i]->driver_shed = $shed; + $load_driver_data[$i]->driver_diesel = $diesel; - $basic = isset($load_driver_data[$i]->driver_earnings_amount) ? (int)$load_driver_data[$i]->driver_earnings_amount + (int)$load_driver_data[$i]->shed_amount+(int)$load_driver_data[$i]->diesel_amount : 0; - $load_driver_data[$i]->driver_basic = $basic; - $load_driver_data[$i]->driver_earnings_amount = $load_driver_data[$i]->driver_earnings_amount; - $load_driver_data[$i]->driver_final_payment = $basic; $load_driver_data[$i]->payroll_id = ''; $load_driver_data[$i]->Festival_Bonus = 0; - $load_driver_data[$i]->esi_amount = ($load_driver_data[$i]->esi_applicable == 1) ? $basic * $ESI_Rate / 100 : 0; - $load_driver_data[$i]->pf_amount = ($load_driver_data[$i]->pf_applicable == 1) ? $basic * $PF_Rate / 100 : 0; - $load_driver_data[$i]->basic_worked = $basic * 30 / 100; - $load_driver_data[$i]->hra_worked = $basic * 70 / 100; + + $load_driver_data[$i]->esi_amount = ($load_driver_data[$i]->esi_applicable == 1) ? ($salary+$food) * $ESI_Rate / 100 : 0; + $load_driver_data[$i]->pf_amount = ($load_driver_data[$i]->pf_applicable == 1) ? ($salary+$food) * $PF_Rate / 100 : 0; + $load_driver_data[$i]->basic_worked = ($salary+$food) * 30 / 100; + $load_driver_data[$i]->hra_worked = ($salary+$food) * 70 / 100; + + $Monthly_Due = $load_driver_data[$i]->Monthly_Due; // AUTO LOAN DUE + $Loan_Recovered = $load_driver_data[$i]->Loan_Recovered; //MANUAL LOAN DUE + $loan = 0; + $due_start_date = $load_driver_data[$i]->DueDate; + $paydate = $current; //From POST parm + if ($Loan_Recovered == 'NA') { + $loan = 0.00; + } else if ($Loan_Recovered == 0.00) { + if (strtotime($due_start_date) <= strtotime($to_mysql_date)) { + $loan = $Monthly_Due; + } + } else if ($Loan_Recovered >= 0.00) { + if (strtotime($due_start_date) <= strtotime($to_mysql_date)) { + $loan = $Loan_Recovered; + } + } + + $load_driver_data[$i]->driver_basic = $salary+$food; + $Loan_amount = $load_driver_data[$i]->Loan_Amount; + $Paid_Amount = $load_driver_data[$i]->Paid_Amount; + $Balance_Amount = $Loan_amount - $Paid_Amount; + if ($Monthly_Due > $Balance_Amount) { + $loan = $Balance_Amount; + } + + $empSalaryAdd = $salary+$food; + $empSalarySub = $loan; + $salaryInCurrentday = $empSalaryAdd - $empSalarySub; + $load_driver_data[$i]->driver_final_payment = $salaryInCurrentday+$shed+$diesel; + } } // dd($load_driver_data); @@ -973,7 +1046,6 @@ class Payslip extends BaseController $month = $mon . "-" . $year; - //echo $month;die(); $total = 0; $ErrorEmpId = ''; $TotalErrorFlag = 0; @@ -1102,16 +1174,7 @@ class Payslip extends BaseController $Festival_Bonus = isset($j['Festival Bonus in ₹']) ? $j['Festival Bonus in ₹'] : 0.00; $tds_Deductions = isset($j['TDS Deductions in ₹']) ? $j['TDS Deductions in ₹'] : 0.00; $Estimate = isset($j['Estimate in ₹']) ? $j['Estimate in ₹'] : 0.00; - $Created_By = $this->session->get('userId'); - - $ID = $EmpID ; - $LOAD = $DaysWorked; - $SALARY = $Basic ; - $TOTAL = $Basic ; - $DIESEL = $Festival_Bonus ; - $GRAND = $Estimate; - $CREATED = $this->session->get('userId'); - $UPDATED = $this->session->get('userId'); + $Created_By = $this->session->get('userId'); if($is_driver == 0){ @@ -1142,21 +1205,35 @@ class Payslip extends BaseController $result = $this->monthlypay_model->saveMonthlyData_model($monthlypaydata); }else{ - $CREATED = $this->session->get('userId'); - $UPDATED = $this->session->get('userId'); + + $get_last_date_of_the_month = cal_days_in_month(CAL_GREGORIAN, $mon, $year); + $from_mysql_date = get_date_time_dynamical_format('d-m-Y','Y-m-d',"01-$mon-$year"); + $to_mysql_date = get_date_time_dynamical_format('d-m-Y','Y-m-d',"$get_last_date_of_the_month-$mon-$year"); + $load_driver_data = $this->driver_model->driverAttendanceForMonthlyPayInputs($from_mysql_date,$to_mysql_date); + $Food = isset($load_driver_data[0]->monthly_food_amount) ? (int)$load_driver_data[0]->monthly_food_amount : 0; + $Shed = isset($load_driver_data[0]->shed_amount) ? (int)$load_driver_data[0]->shed_amount : 0; + $Diesel = isset($load_driver_data[0]->diesel_amount) ? (int)$load_driver_data[0]->diesel_amount : 0; $drivermonthlypaydata = array( - 'month_year' => $month, - 'driver_id' =>$EmpID, - 'no_of_loads' =>(strpos($TotalCalDays, "(trip)") !== false) ? explode(" ", $TotalCalDays)[0] : 0, - 'driver_monthly_salary_amount' => $WorkedSalary, - 'Festival_Bonus' => $Festival_Bonus, - 'driver_final_payment' =>$Estimate, - 'created_by'=>$CREATED, - 'updated_by'=>$UPDATED + 'month_year'=>$month, + 'driver_id'=>$EmpID, + 'no_of_loads'=>(strpos($TotalCalDays, "(trip)") !== false) ? explode(" ", $TotalCalDays)[0] : 0, + 'monthly_food_amount'=>$Food, + 'total_diesel_amount'=>$Diesel, + 'total_shed_amount'=>$Shed, + 'monthly_salary_amount'=>($Basic+$Food), + 'final_payment'=>$Estimate, + 'HRA'=>$HRA, + 'ESI'=>$ESI, + 'PF'=>$PF, + 'Festival_Bonus'=>$Festival_Bonus, + 'Loan_Recovered'=>$Loan_Recovered, + 'created_by'=>$Created_By, + 'updated_by'=>$Created_By ); - + + // print_r($drivermonthlypaydata);die; $result = $this->driver_model->saveMonthlyData($drivermonthlypaydata); } @@ -1290,6 +1367,7 @@ class Payslip extends BaseController $y = substr((string)$Payon, 3); + // if condition for all while checkbox is checked means. if ($All != '') { $filename = 'PayslipFor-' . $m . '-' . $y; $result = $this->payroll_model->getEmpAll($Payon); @@ -1314,18 +1392,20 @@ class Payslip extends BaseController } } else { $EmpID = $this->request->getPost('Employee'); + // $EmpID = "RIPL136"; $is_driver = $this->driver_model->getDriverName($EmpID,1); + // print_r($is_driver);die; if($is_driver == "1"){ $Data['PayDetails'] = $this->driver_model->GetPayslipdata($Payon, $EmpID); - + // print_r($Data['PayDetails']);die; $name = $Data['PayDetails'][0]->driver_name; $filename = 'PayslipFor-' . $EmpID . ' ' . $name . ' ' . $m . ' ' . $y; - $totalsalary = $Data['PayDetails'][0]->driver_final_payment; + $totalsalary = $Data['PayDetails'][0]->final_payment; $totalsalaryinwords = $this->convertNumberToWords(round($totalsalary)); $Data['amtinwords'] = $totalsalaryinwords; - $currentDayBasic = isset($Data['PayDetails'][0]->driver_monthly_salary_amount) ? $Data['PayDetails'][0]->driver_monthly_salary_amount : 0; + $currentDayBasic = isset($Data['PayDetails'][0]->monthly_salary_amount) ? $Data['PayDetails'][0]->monthly_salary_amount : 0; $PF_Rate = $Data['PayDetails'][0]->PF_Rate; $ESI_Rate = $Data['PayDetails'][0]->ESI_Rate; $Data['esi_amount'] = ($Data['PayDetails'][0]->esi_applicable == 1) ? $currentDayBasic * $ESI_Rate / 100 : 0; diff --git a/app/Models/Driver_model.php b/app/Models/Driver_model.php index 6a15d465..55965a99 100755 --- a/app/Models/Driver_model.php +++ b/app/Models/Driver_model.php @@ -105,12 +105,15 @@ class Driver_model extends Model $builder = $this->db->table('t_driver_attendance') ->select('t_driver_attendance.driver_id,driver_details.FirstName as driver_name,driver_details.is_driver, DATE_FORMAT(date, "%M-%Y") AS month_year,COUNT(t_driver_attendance.load_type) AS no_of_loads,driver_details.*,t_emp_pay_data.PF_Rate,t_emp_pay_data.ESI_Rate') - ->select('SUM(t_driver_attendance.salary_amount) as driver_monthly_salary_amount, - SUM(t_driver_attendance.food_amount) as driver_monthly_food_amount, - SUM(salary_amount + food_amount) AS driver_earnings_amount, + ->select('SUM(t_driver_attendance.salary_amount) as monthly_salary_amount, + SUM(t_driver_attendance.food_amount) as monthly_food_amount, diesel_amount,shed_amount,CONCAT_WS(" ", driver_details.FirstName, driver_details.LastName) AS FullName') + ->select('t_loan_master.Loan_ID,Loan_Amount,Loan_Issued_Date,Monthly_Due,Due_Start_Date as DueDate,No_of_Dues,Paid_Due,Remaining_Due,Paid_Amount,t_loan_history.Balance_Amount, t_driver_monthly_pay_inputs.Loan_Recovered') ->join('t_employee_details as driver_details', 'driver_details.EmpID = t_driver_attendance.driver_id', 'left') ->join('t_emp_pay_data','t_emp_pay_data.EmpID=driver_details.EmpID','Left') + ->join('t_loan_master','t_loan_master.EmpID = driver_details.EmpID','Left') + ->join('t_loan_history','t_loan_history.Loan_ID = t_loan_master.Loan_ID','Left') + ->join('t_driver_monthly_pay_inputs','t_driver_monthly_pay_inputs.driver_id = driver_details.EmpID','Left') ->where('t_driver_attendance.date BETWEEN "'.$from.'" AND "'.$to.'"') ->groupBy('DATE_FORMAT(t_driver_attendance.date, "%M-%Y")'); @@ -226,15 +229,32 @@ class Driver_model extends Model function getMonthlyPayDetails($driver_id, $PayOn) { $builder = $this->db->table('t_driver_monthly_pay_inputs MonthlyPay ') - ->select('MonthlyPay.*,driver.EmpID as EmpId,CONCAT_WS(" ", driver.FirstName, driver.LastName) AS FullName') + ->select('CONCAT_WS(" ", driver.FirstName, driver.LastName) AS FullName') + ->select('MonthlyPay.*,driver.BankAccountNo , driver.PFNO , driver.ESI as ESINO , L.Loan_ID, L.Loan_Amount, L.Loan_Issued_Date, L.Monthly_Due, L.Due_Start_Date, L.No_of_Dues, L.Paid_Due, L.Remaining_Due, L.Paid_Amount') ->join('t_employee_details as driver', 'driver.EmpID = MonthlyPay.driver_id and driver.is_driver = 1', 'left') + ->join('t_loan_master as L', 'MonthlyPay.driver_id = L.EmpID and L.is_Active = 1', 'left') ->where('MonthlyPay.driver_id', $driver_id) ->where('MonthlyPay.month_year', $PayOn); $query = $builder->get(); return $query->getResult(); } - + function insertLoanHistory($data) + { + $builder = $this->db->table('t_loan_history'); + $builder->insert($data); + $count = $this->db->affectedRows(); + return $count; + } + function updateLoan($LoanID,$EmpID,$data) + { + $builder = $this->db->table('t_loan_master') + ->where('Loan_ID', $LoanID) + ->where('EmpID', $EmpID) + ->update($data); + $count = $this->db->affectedRows(); + return $count; + } function insertPayroll($data) { $builder = $this->db->table('t_driver_payroll'); @@ -261,13 +281,16 @@ class Driver_model extends Model function GetPayslipdata($PayOn = '', $EmpId = '') { //echo "FROM MODEL" . $PayOn . $EmpId; + + $builder = $this->db->table('t_driver_payroll Pay')->select('Pay.*') ->select('Emp.EmpID,CONCAT_WS(" ", Emp.FirstName, Emp.LastName) as driver_name,Emp.DateofBirth as Dob,Emp.PANNo as Pan,Emp.BankBranchName as BankName,Emp.BankAccountNo as BankAccountNumber,Emp.IFSCCode as IFSCCode,Emp.DateofJoining as DOJ,Emp.AadharNo,Emp.Designation as Designation,Dep.DepartmentName as DeptName,Emp.esi_applicable,Emp.pf_applicable') - ->select('att.diesel_amount , att.shed_amount,t_emp_pay_data.PF_Rate,t_emp_pay_data.ESI_Rate,month.Festival_Bonus') + ->select('t_emp_pay_data.PF_Rate,t_emp_pay_data.ESI_Rate') + ->select('month.Festival_Bonus,month.HRA,month.Loan_Recovered,month.total_diesel_amount,month.total_shed_amount') + // ->select('month.monthly_salary_amount,month.monthly_food_amount,month.Festival_Bonus,month.final_payment,month.HRA,month.ESI,month.PF,month.Loan_Recovered,month.total_diesel_amount,month.total_shed_amount') ->join('t_employee_details Emp', 'Pay.driver_id = Emp.EmpID') ->join('t_departmentdetails Dep', 'Emp.Departmentcode = Dep.DEPCode') ->join('t_emp_pay_data','t_emp_pay_data.EmpID=Emp.EmpID','Left') - ->join('t_driver_attendance att', 'att.driver_id = Emp.EmpID') ->join('t_driver_monthly_pay_inputs month', 'month.driver_id = Emp.EmpID'); if ($PayOn != '') { $builder->where('Pay.PayOn', $PayOn); diff --git a/app/Views/driverPayslipGeneratePrint.php b/app/Views/driverPayslipGeneratePrint.php index a9cc7576..9e82bc46 100755 --- a/app/Views/driverPayslipGeneratePrint.php +++ b/app/Views/driverPayslipGeneratePrint.php @@ -20,7 +20,7 @@ - + @@ -60,8 +60,8 @@ - - + +
Name driver_name; ?>Bank IFSC IFSCCode ?> Loan Balance BalanceAdvance ?>
@@ -71,8 +71,8 @@ - - + + @@ -85,8 +85,8 @@ - - + + @@ -103,7 +103,7 @@ @@ -111,18 +111,18 @@ - + - + diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php index c6974478..badc95a6 100755 --- a/app/Views/monthlypayinputs.php +++ b/app/Views/monthlypayinputs.php @@ -511,8 +511,7 @@ if(!empty($drivermonthinputs)){ foreach ($drivermonthinputs as $i => $record) { $inx++; - $salary_amount = ($record->driver_basic); - + $sum_of_amount = ($record->driver_basic+$record->driver_shed+$record->driver_diesel); ?> @@ -593,13 +593,23 @@ - + @@ -640,6 +650,14 @@ ?> + + + + + @@ -854,7 +872,7 @@ $(document).ready(function () { // Convert the filtered array back to a JSON string if needed alldata = JSON.stringify(alldata); var month = $('#monthyear').val(); - + $('#loader').show(); $.ajax({ data: { @@ -1112,15 +1130,60 @@ $(document).ready(function () { var str = event.target.id; var sno = str.substr(8); + // console.log(sno);return true; + var driverEarn = parseFloat(document.getElementById('ttlsalary' + sno).textContent); var Festivals = parseFloat(document.getElementById('Festival' + sno).textContent); totalfestival[sno] = Festivals; + + var element = document.getElementById('loanatm' + sno); + + var loanamt = parseFloat(element.value); + + var paidamt = parseFloat(document.getElementById('paidamt' + sno).value); + var monthDue = parseFloat(document.getElementById('monthDue' + sno).textContent); + var duedate = document.getElementById('duedate' + sno).value; + + duedate = new Date(duedate); + var paydate = document.getElementById('paydate').value; + var paydate = document.getElementById('paydate').value; + if (paydate.length == 6) { + paydate = '0' + paydate; + } + var pmonthonly = paydate.substring(0, 2); + var pyearonly = paydate.substring(3); + var pday = new Date(pyearonly, pmonthonly, 0).getDate(); + var finalpaydate = pyearonly + '-' + pmonthonly + '-' + pday; + finalpaydate = new Date(finalpaydate); + + + var current_loan_amt = 0; + var autoLoan = parseFloat(monthDue); + var Balance_Amount = loanamt - paidamt; + + if (autoLoan > Balance_Amount) { + if (duedate <= finalpaydate) { + current_loan_amt = Balance_Amount; + } + } else { + current_loan_amt = autoLoan; + } if (isNaN(driverEarn)) { driverEarn = 0; } - var driverMonthSalary = driverEarn + Festivals + + + + + var driverSalaryAdd = driverEarn + Festivals; + + var driverSalarySub = current_loan_amt; + console.log(current_loan_amt); + + + var driverMonthSalary = driverSalaryAdd - driverSalarySub var driverSalary = Math.round(driverMonthSalary); var cals = (driverSalary).toFixed(0); @@ -1128,6 +1191,14 @@ $(document).ready(function () { document.getElementById("empsal" + sno).innerHTML = cals; // copied from calculategrandtotal() because we need those two only thats why + var AutoLoanDueIndex = 21; + var AutoLoanDue = 0; + $('#monthlylistings tbody tr').each(function() { + var value = $(this).find('td').eq(AutoLoanDueIndex).text(); + AutoLoanDue += parseFloat(value) || 0; + }); + $('#monthloan').text(AutoLoanDue); + var FestivalBonusIndex = 23; var FestivalBonus = 0; $('#monthlylistings tbody tr').each(function() { From a7fb249cd2fd6ba9ad1225fecaaecbf5aad141c2 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Fri, 28 Feb 2025 13:22:47 +0000 Subject: [PATCH 04/15] tracker bugs : ps --- app/Config/Routes.php | 1 + app/Controllers/Employeedetails.php | 19 +++ app/Controllers/Inwardgateregister.php | 2 + app/Controllers/Rawmaterialdetails.php | 7 +- app/Models/Employeedetails_model.php | 11 ++ app/Models/Inwardgateregister_model.php | 11 ++ app/Models/Monthlypay_model.php | 2 + app/Views/EditservicePurchaseorder.php | 30 ++--- app/Views/addEmployeenew.php | 45 ++++++- app/Views/addRawMaterial.php | 153 ++++++++++++----------- app/Views/addUser.php | 4 +- app/Views/alterpurchaseorder.php | 12 +- app/Views/attendance.php | 5 +- app/Views/capitalpurchaseorder.php | 26 ++-- app/Views/editCapitalAmendPO.php | 44 ++++--- app/Views/editCapitalPo.php | 108 ++++++++-------- app/Views/editEmployeenew.php | 57 ++++++++- app/Views/editImportAmendPO.php | 29 +++-- app/Views/editRawmaterial.php | 159 +++++++++++++----------- app/Views/editRevenueAmendPO.php | 20 +-- app/Views/editRevenuepurchaseorder.php | 30 ++--- app/Views/editServiceAmendPO.php | 38 +++--- app/Views/editimportpo.php | 34 ++--- app/Views/importpo.php | 31 ++--- app/Views/inwardgateregister.php | 6 +- app/Views/leavereports.php | 6 +- app/Views/monthlypayinputs.php | 2 +- app/Views/publicholidays.php | 6 +- app/Views/purchaseorder.php | 36 +++--- app/Views/servicePurchaseorder.php | 32 ++--- app/Views/viewinwardgateregister.php | 20 +-- 31 files changed, 579 insertions(+), 407 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 99b93bea..c3dfa6d4 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -125,6 +125,7 @@ $routes->get('exportemployee', 'Employeedetails::exportemployee'); $routes->post('employeeEmailExist', 'Employeedetails::CheckEmail'); +$routes->post('employeeMobileExist', 'Employeedetails::CheckMobile'); $routes->post('employeePANExist', 'Employeedetails::checkPAN'); $routes->post('employeecheckAadharNoExist', 'Employeedetails::checkAadharNo'); diff --git a/app/Controllers/Employeedetails.php b/app/Controllers/Employeedetails.php index aa6e91d0..7f0aa25a 100755 --- a/app/Controllers/Employeedetails.php +++ b/app/Controllers/Employeedetails.php @@ -481,6 +481,25 @@ class Employeedetails extends BaseController return $this->response->setJSON($response); } + + function CheckMobile() + { + $ContactNumber = $this->request->getPost('ContactNumber'); + //print_r($id); + + $result = $this->employeedetails_model->checkMobileExists($ContactNumber); + + $result = $result->getResultArray(); + + $response = [ + "message" => "success", + "data" => $result + ]; + + + return $this->response->setJSON($response); + } + function checkPAN() { diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 438272e9..1df68778 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -1413,6 +1413,8 @@ function updateIGRWeight(){ foreach ($request as $key => $value) { foreach ($dbIGRMaster as $key1 => $value1) { if ($value1 != $value && $key1 == $key) { + $value = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value) : $value; + $value1 = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value1) : $value1; // Store each changed field in an array $history_entries[] = [ 'field' => $key1, diff --git a/app/Controllers/Rawmaterialdetails.php b/app/Controllers/Rawmaterialdetails.php index 738e2c69..6575995d 100755 --- a/app/Controllers/Rawmaterialdetails.php +++ b/app/Controllers/Rawmaterialdetails.php @@ -248,9 +248,9 @@ class Rawmaterialdetails extends BaseController } $HSNcode = ($HSN == '') ? null : $HSN; - + $material_rate = $this->request->getPost('material_rate'); - $RawMaterial = array('MaterialName' => $MaterialName, 'MaterialType' => $MaterialType, 'UOM' => $UOM, 'Category' => $MaterialCategory, 'CreatedBy' => $CreatedBy, 'Remarks' => $Remarks, 'HSNCODE' => $HSNcode, 'stock' => $stock, 'stockdate' => $stockdate, 'reorder' => $reorder, 'Current_stock' => $currentstock); + $RawMaterial = array('MaterialName' => $MaterialName, 'MaterialType' => $MaterialType, 'UOM' => $UOM, 'Category' => $MaterialCategory, 'CreatedBy' => $CreatedBy, 'Remarks' => $Remarks, 'HSNCODE' => $HSNcode, 'stock' => $stock, 'stockdate' => $stockdate, 'reorder' => $reorder, 'Current_stock' => $currentstock, 'material_rate'=>$material_rate); //print_r($RawMaterial);die(); $result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial); @@ -310,6 +310,7 @@ class Rawmaterialdetails extends BaseController $MaterialType = $this->request->getPost('MaterialType'); $MaterialCategory = $this->request->getPost('MaterialCategory'); $materialcategoryarray = $this->rawmaterialdetails_model->getmaterialCategory(); + $material_rate = $this->request->getPost('material_rate'); foreach ($materialcategoryarray as $mc) { $TempArr[] = $mc->ConfigValue; @@ -337,7 +338,7 @@ class Rawmaterialdetails extends BaseController $HSNcode = ($HSN == '') ? null : $HSN; $RawMaterial = array(); - $RawMaterial = array('MaterialName' => $MaterialName, 'MaterialType' => $MaterialType, 'UpdatedBy' => $UpdatedBy, 'UOM' => $UOM, 'IsActive' => $IsActive, 'Category' => $MaterialCategory, 'Remarks' => $Remarks, 'HSNCODE' => $HSNcode, 'stock' => $stock, 'stockdate' => $stockdate, 'reorder' => $reorder); //,'RMCode'=>$rmcode); + $RawMaterial = array('MaterialName' => $MaterialName, 'MaterialType' => $MaterialType, 'UpdatedBy' => $UpdatedBy, 'UOM' => $UOM, 'IsActive' => $IsActive, 'Category' => $MaterialCategory, 'Remarks' => $Remarks, 'HSNCODE' => $HSNcode, 'stock' => $stock, 'stockdate' => $stockdate, 'reorder' => $reorder,'material_rate'=>$material_rate); //,'RMCode'=>$rmcode); $result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode); diff --git a/app/Models/Employeedetails_model.php b/app/Models/Employeedetails_model.php index 48e3eed2..a69ac2fa 100755 --- a/app/Models/Employeedetails_model.php +++ b/app/Models/Employeedetails_model.php @@ -172,6 +172,17 @@ class Employeedetails_model extends Model return $query; } + function checkMobileExists($ContactNumber= '', $Empid = ''){ + $builder = $this->db->table('t_employee_details')->select('ContactNumber') + ->where('ContactNumber', $ContactNumber); + if ($Empid != '') { + $builder->where('EmpID !=', $Empid); + } + $query = $builder->get(); + + return $query; + } + function checkAadharExists($aadharNo, $Empid = '') { diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index d8e6aa41..0546849a 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -1336,5 +1336,16 @@ $builder = $this->db->table('t_igr_history') return $result; } + public function get_status($value){ + $builder = $this->db->table('t_status') + ->select('StatusCode,StatusName') + ->where('StatusCode', $value); + + $query = $builder->get()->getRow(); + + $StatusName = $query ? $query->StatusName : null; + return $StatusName; + } + } \ No newline at end of file diff --git a/app/Models/Monthlypay_model.php b/app/Models/Monthlypay_model.php index e50c3b83..c2e59ce0 100755 --- a/app/Models/Monthlypay_model.php +++ b/app/Models/Monthlypay_model.php @@ -67,6 +67,7 @@ class Monthlypay_model extends Model ->select('t_employee_details.EmpID,t_employee_details.FirstName,t_employee_details.LastName,t_employee_details.DateofJoining,t_employee_details.is_driver') //->join('t_emp_pay_data','t_emp_pay_data.EmpID=t_employee_details.EmpID','Left') ->where('t_employee_details.IsActive', 1) + ->where('t_employee_details.is_driver', 0) ->where('t_employee_details.DateofJoining <=', $lastdate) ->orderBy('EmpID', 'asc'); $query = $builder->get(); @@ -184,6 +185,7 @@ class Monthlypay_model extends Model // ->where('month(t_employee_details.DateofJoining) <= ',$month_val) ->where('t_employee_details.DateofJoining <= ', $lastdate) ->where('Month_Year', $current) + ->where('t_employee_details.is_driver', 0) // ->where('t_employee_details.IsActive',1) ->orderBy('t_attendance.EmpID', 'asc'); $query = $builder->get(); diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index 77c02c3c..c4965983 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1229,17 +1229,19 @@ if (!empty($getlogpodtl)) { +
-
-
EarningsAmount ₹DeductionsAmount ₹
 Monthly Salarydriver_monthly_salary_amount; ?>  Basicmonthly_salary_amount; ?>   PF  
 Shed Duty Amount shed_amount; ?>    Salary Advance Advance ?> 
 Total Earning (Rounded) driver_monthly_salary_amount + $PayDetails[0]->Festival_Bonus + $PayDetails[0]->diesel_amount + $PayDetails[0]->shed_amount; + $totEarning = $PayDetails[0]->monthly_salary_amount + $PayDetails[0]->Festival_Bonus + $PayDetails[0]->diesel_amount + $PayDetails[0]->shed_amount; echo number_format(round($totEarning),2) ?>   Total Deduction (Rounded) Advance+$esi_amount + $pf_amount ; echo number_format(round($totDeduction),2) ?>  
Net Pay(Rounded)  driver_final_payment),2,'.','') ?> final_payment),2,'.','') ?> 
Total Amount In Words  
This is a computer generated document. This document does not require signature.
@@ -552,7 +551,7 @@ - + @@ -560,7 +559,7 @@ - + @@ -568,16 +567,17 @@ - + + driver_basic, 2, '.', ''); ?> - driver_basic) * 70 / 100; echo number_format($basicWorked, 2, '.', ''); ?> - driver_basic) * 30 / 100; echo number_format($hraWorked, 2, '.', ''); ?> - Monthly_Due; - echo number_format(0.00, 2, '.', ''); ?> + + payroll_id)) { echo "contenteditable='true';"; } ?> + payroll_id)) { ?> title="Payslip Calculated" + style="text-align:right;color:blue;" + style="text-align:right;" > + + Monthly_Due)) { + echo $record->Monthly_Due; + $totalmonthloan[] = $record->Monthly_Due; + } else { + echo number_format(0.00, 2, '.', ''); + } ?>
+
+
- + - + - + @@ -1268,10 +1270,10 @@ if (!empty($getlogpodtl)) { ?> - - - - + + + + - + - + - + - - + + diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index 4032c8ad..d71e2506 100755 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -1249,7 +1249,7 @@ return false; } if ($('#ContactNumber').val().length < 1) { - alert('Please Enter Contact Number'); + alert('Please Enter Contact Number'); return false; } else if (!getMobileValidation()) { return false; @@ -1389,6 +1389,49 @@ }); + +$('#ContactNumber').change(function() { + +var ContactNumber = $('#ContactNumber').val(); +if (getMobileValidation()) { + $('#loader').show(); + $.ajax({ + data: { + ContactNumber + }, + + type: "POST", + url: "employeeMobileExist", + success: function(response) { + $('#loader').hide(); + + let responseCheck = response.data[0]; + let responseContactNumber=response.data[0].ContactNumber; + + if(responseCheck ){ + if (responseContactNumber == ContactNumber) { + + var answer = confirm(" Contact Number details is already exists !!.Kindly Provide us another Contact Number" + ) + + $('#ContactNumber').val(''); + $('#ContactNumber').focus(); + return false; + + + } + } + + }, + complete: function() { + $('#loader').hide(); // Ensure the loader is always hidden after the request completes + } + + }); +} + +}); + $('#panno').change(function() { var panNo = $('#panno').val(); diff --git a/app/Views/addRawMaterial.php b/app/Views/addRawMaterial.php index 66c40e91..001df8d9 100755 --- a/app/Views/addRawMaterial.php +++ b/app/Views/addRawMaterial.php @@ -49,7 +49,7 @@
- +
@@ -66,11 +66,11 @@ ?>
- +
- @@ -109,6 +109,10 @@
+
+ + +
@@ -120,19 +124,19 @@ echo form_input($data); ?>
+
+
-
-
- +
@@ -195,28 +199,28 @@
- * - + +
diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index cded8c49..618819e2 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -2811,10 +2811,10 @@ if (!empty($INRSYMBOL)) {
- + - + @@ -6031,10 +6031,10 @@ if (!empty($INRSYMBOL)) { var html = ` - + - + @@ -6699,10 +6699,10 @@ if (!empty($INRSYMBOL)) { var html = ` - + - + diff --git a/app/Views/attendance.php b/app/Views/attendance.php index a4c608f7..01592c6a 100755 --- a/app/Views/attendance.php +++ b/app/Views/attendance.php @@ -224,7 +224,7 @@ $currentday = date('d');
-
    +
    1. HR

    2. Attendance

      @@ -234,9 +234,6 @@ $currentday = date('d');
-
- -
diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index 52aacbe3..93f2b6f1 100755 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -787,16 +787,16 @@ if (!empty($INRSYMBOL)) {
- + - + - - - - + + + + @@ -3526,10 +3526,10 @@ if (!empty($INRSYMBOL)) { var rowHtml = ` - + - - + - - - - + + + +
SNoSNo Requisition NoItem CodeItem Code Item Name Line Item SpecsQuantityQuantity UOM Rate Basic Amount
ReqNo ?>MaterialCode ?>MaterialName ?>ReqNo ?>MaterialCode ?>MaterialName ?> LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?> Quantity ?>Quantity ?> UOM ?>Rate ?>Rate ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>Taxamount ?>TotalValue ?>Taxamount ?>TotalValue ?>
SNoRequisition NoRequisition No Item Code Item DescriptionQuantityQuantity UOM Rate Basic Amount
${temp}${Reqnumber}${Reqnumber} ${materialCode} ${materialName}${quantity}${quantity} ${uom} ${itemRate} ${basicval}
${temp}${Reqnumber}${Reqnumber} ${materialCode} ${materialName}${quantity}${quantity} ${uom} ${itemRate} ${basicval}
SNoRequisition NoRequisition No Item Code Item Description Line Item SpecsQuantityQuantity UOMRateBasic AmountTax AmountTotal Order AmountRateBasic AmountTax AmountTotal Order Amount Action
${temp}${Reqnumber}${Reqnumber} ${materialCode} ${materialName} + - ${quantity}${quantity} ${uom}${itemRate}${basicval}${TotalTaxValue}${Total}${itemRate}${basicval}${TotalTaxValue}${Total}     diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php index 3a6058c8..9ead78a5 100755 --- a/app/Views/editCapitalAmendPO.php +++ b/app/Views/editCapitalAmendPO.php @@ -797,22 +797,20 @@ if (!empty($POItem) && $CapitalRange == '1') {
- - - - - - - - - - - - - + + + + + + + + + + @@ -826,16 +824,16 @@ if (!empty($POItem) && $CapitalRange == '1') { ?> - - - - - - - + + + + + + - - diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index 0d0226ac..3c1dfbfd 100755 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -870,7 +870,7 @@ if (!empty($getlogpodtl)) {
- +
@@ -888,16 +888,16 @@ if (!empty($getlogpodtl)) {
- + - + - - - - + + + + @@ -920,7 +920,7 @@ if (!empty($getlogpodtl)) { ?> - + - - - - + + + + - - + - + - + - + $record->MaterialCode, "ReqNo" => $record->ReqNo); array_push($res_arr_values, $row); @@ -990,11 +990,11 @@ if (!empty($getlogpodtl)) { - - @@ -1021,11 +1021,11 @@ if (!empty($getlogpodtl)) { - - - - - - - @@ -1159,13 +1159,13 @@ if (!empty($getlogpodtl)) { - - - @@ -1564,7 +1564,7 @@ if (!empty($getlogpodtl)) { -
+
@@ -1957,7 +1957,7 @@ if (!empty($getlogpodtl)) { echo form_input($data); ?>
-
+
@@ -1982,7 +1982,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2011,7 +2011,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2038,7 +2038,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2049,7 +2049,7 @@ if (!empty($getlogpodtl)) { ?>
-
+
@@ -2645,7 +2645,7 @@ if (!empty($getlogpodtl)) { ?>
-
+
@@ -2669,7 +2669,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2694,7 +2694,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2721,7 +2721,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -2733,7 +2733,7 @@ if (!empty($getlogpodtl)) { ?>
-
+
@@ -3278,7 +3278,7 @@ if (!empty($getlogpodtl)) {
-
+
CGST In %
@@ -3295,7 +3295,7 @@ if (!empty($getlogpodtl)) {
-
+
SGST In %
@@ -3312,7 +3312,7 @@ if (!empty($getlogpodtl)) {
-
+
IGST In %
@@ -3329,7 +3329,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -3340,7 +3340,7 @@ if (!empty($getlogpodtl)) {
-
+
@@ -3642,7 +3642,7 @@ if (!empty($getlogpodtl)) {
-
`; } - rowHtml += ` - - - - - + rowHtml += ` + + + + +
SNoRequisition NoItem NameQuantityUOMRateBasic AmountTax AmountTotal Order AmountActionSNoRequisition NoItem NameQuantityUOMRateBasic AmountTax AmountTotal Order AmountAction
ReqNo ?>MaterialName ?>Quantity ?>UOM ?>Rate ?> + ReqNo ?>MaterialName ?>Quantity ?>UOM ?>Rate, 2, '.', ''); ?> Rate * $record->Quantity, 2, '.', ''); ?> ServiceTaxamount; } else if ($CapitalRange == '0') { echo "0.0"; @@ -845,12 +843,12 @@ if (!empty($POItem) && $CapitalRange == '1') { - Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?> + Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?> + Rate * $record->Quantity), 2, '.', ''); ?>
SNoRequisition NoRequisition No Item Code Item Description Line Item SpecsQuantityQuantity UOMRateBasic AmountTax AmountTotal Order AmountRateBasic AmountTax AmountTotal Order Amount
ReqNo ?>ReqNo ?> MaterialCode ?> MaterialName ?> @@ -937,28 +937,28 @@ if (!empty($getlogpodtl)) { LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?> Quantity ?>UOM ?>Rate ?>Rate * $record->Quantity, 2, '.', '') ?>Quantity ?>UOM ?>Rate ?>Rate * $record->Quantity, 2, '.', '') ?> ServiceTaxamount; ?> + ServiceTaxamount; ?> Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?> Rate * $record->Quantity, 2, '.', '') ?>Rate * $record->Quantity, 2, '.', '') ?> -${quantity}${uom}${itemRate}${basicval}${TotalTaxValue}${Total}${quantity}${uom}${itemRate}${basicval}${TotalTaxValue}${Total} diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index a30ea8c9..5b216f6b 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -244,6 +244,11 @@ if (!empty($EmpDetails)) { + ProfilePic){ ?> +
+ +
- +
- + + onkeypress="return isNumberKey(event)" required>
- + + value="" required>
@@ -1905,6 +1910,48 @@ if (!empty($EmpDetails)) { } }); + $('#ContactNumber').change(function() { + +var ContactNumber = $('#ContactNumber').val(); + +if (getMobileValidation() && ContactNumber != "") { + $('#loader').show(); + $.ajax({ + data: { + ContactNumber + }, + + type: "POST", + url: "employeeMobileExist", + success: function(response) { + $('#loader').hide(); + + let responseCheck = response.data[0]; + let responseContactNumber=response.data[0].ContactNumber; + + if(responseCheck ){ + if (responseContactNumber == ContactNumber) { + + var answer = confirm(" Contact Number details is already exists !!.Kindly Provide us another Contact Number" + ) + + $('#ContactNumber').val(''); + $('#ContactNumber').focus(); + return false; + + } + } + + }, + complete: function() { + $('#loader').hide(); // Ensure the loader is always hidden after the request completes + } + + }); +} + +}); + $('#panno').change(function () { var panNo = $('#panno').val(); diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php index dacd1a37..dc7e9895 100755 --- a/app/Views/editImportAmendPO.php +++ b/app/Views/editImportAmendPO.php @@ -1202,13 +1202,18 @@ if (!empty($RequistionDetails)) { - - - - - - - + + + + + + + + + + + + @@ -1225,13 +1230,13 @@ if (!empty($RequistionDetails)) { ?> - - + + - + - - + + diff --git a/app/Views/editRawmaterial.php b/app/Views/editRawmaterial.php index 5f4ac772..5b73dbcc 100755 --- a/app/Views/editRawmaterial.php +++ b/app/Views/editRawmaterial.php @@ -26,6 +26,7 @@ if (!empty($materialDetails)) { $UOM = $MD->UOM; $remarks = $MD->Remarks; $HSNcode = $MD->HSNCODE; + $material_rate = $MD->material_rate; $openstock = $MD->stock; $date = $MD->stockdate; $reorder = $MD->reorder; @@ -161,25 +162,25 @@ if ($total <= $reorder) { - +
- -
@@ -211,6 +212,12 @@ if ($total <= $reorder) { +
+
+ + +
+
@@ -226,7 +233,8 @@ if ($total <= $reorder) {
- + +
@@ -242,9 +250,6 @@ if ($total <= $reorder) {
-
-
-
@@ -264,19 +269,27 @@ if ($total <= $reorder) {
+
+
-
-
- +
+
+ + +
+
-
- > + +
@@ -284,9 +297,9 @@ if ($total <= $reorder) {
- +
@@ -304,28 +317,28 @@ if ($total <= $reorder) {
-
-
SNoRequisition NoItem NameQuantityUOMRateBasic AmountSNoRequisition NoItem NameQuantityUOMRateBasic Amount Action
ReqNo ?>ReqNo ?> MaterialName ?>Quantity ?>Quantity ?> UOM ?>Rate ?>BasicValue ?>Rate ?>BasicValue ?>
+
- + - + @@ -1248,17 +1248,17 @@ if (!empty($INRSYMBOL)) { ?> - + - + - + - - - + + diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php index 729fddf8..eaf2de39 100755 --- a/app/Views/editRevenuepurchaseorder.php +++ b/app/Views/editRevenuepurchaseorder.php @@ -2332,13 +2332,13 @@ if (!empty($getlogpodtl)) { - + - + - - - + + + + @@ -2365,11 +2365,11 @@ if (!empty($getlogpodtl)) { $index = $index + 1; ?> - + - + - - - + + - + `; if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") { - rowHtml += ``; - }else{ rowHtml += ``; } + }else{ rowHtml += ``; } rowHtml += ` - + diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php index 66945d3b..7a1da430 100755 --- a/app/Views/editServiceAmendPO.php +++ b/app/Views/editServiceAmendPO.php @@ -1016,18 +1016,18 @@ foreach ($PaymentTerms as $TER) { - + - + - - - - - - - + + + + + + + @@ -1053,19 +1053,19 @@ foreach ($PaymentTerms as $TER) { ?> - - + + - + - - - - - - - + + + + + + + diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php index 82bf24cc..7c7f960a 100755 --- a/app/Views/editimportpo.php +++ b/app/Views/editimportpo.php @@ -828,15 +828,15 @@ if (!empty($getlogpodtl)) {
SNoRequisition NoRequisition No Item NameQuantityQuantity UOM Rate Basic Amount
ReqNo ?>ReqNo ?> MaterialName ?>Quantity ?>Quantity ?> UOM ?>Rate ?>Rate ?> + BasicValue, 2, '.', '') ?>Taxamount ?>TotalValue ?>Taxamount ?>TotalValue ?>
SNoSNo Requisition NoItem CodeItem Code Item DescriptionLine Item SpecsQuantityUOMLine Item SpecsQuantityUOM Rate Basic Amount @@ -2353,7 +2353,7 @@ if (!empty($getlogpodtl)) { - ActionAction
ReqNo ?>MaterialCode ?>MaterialCode ?> MaterialName ?> + LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?> Quantity ?>UOM ?>Quantity ?>UOM ?> Rate ?> @@ -4505,11 +4505,11 @@ if (!empty($getlogpodtl)) { var rowHtml = `
${temp}${Reqnumber}${Reqnumber} ${materialCode} ${materialName}- --${quantity}${quantity} ${uom} ${itemRate} ${basicval}
SNoRequisition NoRequisition No Item Code Item NameQuantityQuantity UOMRateBasic AmountTax AmountTotal Order AmountActual QuantityReceived QuantityPending QuantityRateBasic AmountTax AmountTotal Order AmountActual QuantityReceived QuantityPending Quantity Action
ReqNo ?> ReqNo ?> MaterialCode ?> MaterialName ?>Quantity ?>Quantity ?> UOM ?>Rate ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>Taxamount ?>TotalValue ?>Quantity ?>ReceivedQuantity ?>Quantity - $record->ReceivedQuantity, 2, '.', ''); ?>Rate ?>BasicValue * $FrequencyNo, 2, '.', ''); ?>Taxamount ?>TotalValue ?>Quantity ?>ReceivedQuantity ?>Quantity - $record->ReceivedQuantity, 2, '.', ''); ?>
- - - - - - - - - + + + + + + + + + @@ -857,10 +857,10 @@ if (!empty($getlogpodtl)) { ?> - - - - + + + - - - - + + + + diff --git a/app/Views/importpo.php b/app/Views/importpo.php index 2649fe30..4cfe8c3f 100755 --- a/app/Views/importpo.php +++ b/app/Views/importpo.php @@ -813,19 +813,20 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
-
-
SNoRequisition NoMaterial CodeDescriptionLine Item SpecsQuantityUOMRateBasic AmountSNoRequisition NoMaterial CodeDescriptionLine Item SpecsQuantityUOMRateBasic Amount
ReqNo ?>MaterialCode ?>MaterialName ?> + ReqNo ?>MaterialCode ?>MaterialName ?> LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?> Quantity ?>UOM ?>Rate ?>BasicValue ?>Quantity ?>UOM ?>Rate ?>BasicValue ?>
+
+
- + - + - - + + @@ -3515,11 +3516,11 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) { // })); var rowHtml = ` - - - - - + + + + - - - - + + + +
SNoRequisition NoRequisition No Material Code Description Line Item SpecsQuantityQuantity UOMRateBasic AmountRateBasic Amount
${temp}${Reqnumber}${materialCode}${materialName} + ${temp}${Reqnumber}${materialCode}${materialName} - ${quantity}${uom}${itemRate}${BasicAmt}${quantity}${uom}${itemRate}${BasicAmt} diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php index 8798edd0..6c202920 100755 --- a/app/Views/inwardgateregister.php +++ b/app/Views/inwardgateregister.php @@ -23,7 +23,7 @@
-
    +
    1. Inward

    2. Inward Gate Register

      @@ -91,7 +91,7 @@
- +
@@ -99,7 +99,7 @@
- +
diff --git a/app/Views/leavereports.php b/app/Views/leavereports.php index cce2fe9f..1f9eed8b 100755 --- a/app/Views/leavereports.php +++ b/app/Views/leavereports.php @@ -25,7 +25,7 @@
-
    +
    1. HR
    2. Leave
    3. @@ -46,8 +46,8 @@
      -
      -
      +
      +
      -
        +
        1. HR
        2. PaySlip
        3. diff --git a/app/Views/publicholidays.php b/app/Views/publicholidays.php index 0ddb9ca5..7dcc8b83 100755 --- a/app/Views/publicholidays.php +++ b/app/Views/publicholidays.php @@ -13,8 +13,9 @@
          -
          -
            +
            + +
            1. HR
            2. Leave
            3. @@ -22,7 +23,6 @@
            -
          diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php index 71630efa..1fcb4103 100755 --- a/app/Views/purchaseorder.php +++ b/app/Views/purchaseorder.php @@ -2160,17 +2160,17 @@ if (!empty($INRSYMBOL)) { - - + + - + - - - - + + + + @@ -3450,11 +3450,11 @@ if (!empty($INRSYMBOL)) { // Define your template using ES6 template literals var rowHtml = ` - - - - - + + + + - - - - - - + + + + + + - + - + - - - - + + + + @@ -1977,10 +1977,10 @@ if (!empty($INRSYMBOL)) { var rowHtml = ` - - - - + + + + - - - - - - + + + + + + + $invdate = $record->DeliveryChellanDate; + if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){ + echo ""; + }else{ + $date = new DateTime($invdate); + echo $date->format('d-m-Y'); } ?> @@ -937,13 +941,15 @@ } // Format dates - var dcd = new Date(item.DeliveryChellanDate); - var dcd2 = (String(dcd.getDate()).padStart(2, '0') + '-' + (String(dcd.getMonth() + 1).padStart(2, '0')) + '-' + dcd.getFullYear()); - $("#InvoiceDate").val(dcd2); - console.log(item.MaterialRcvdDate) + // (item.DeliveryChellanDate && item.DeliveryChellanDate !== "0000-00-00 00:00:00") + + + var dcd = (item.DeliveryChellanDate == 'null') ? ' ' : formatDateTime(item.DeliveryChellanDate, 1); + $("#InvoiceDate").val(dcd); + var Mat_rcv_date = (item.MaterialRcvdDate == 'null') ? ' ' : formatDateTime(item.MaterialRcvdDate, 1); $("#MaterialRcvdDate").val(Mat_rcv_date); - console.log(item.MaterialRcvdDate) + // console.log(item.MaterialRcvdDate) var gross_rcv_date = (item.GrossWeightDate == 'null') ? ' ' : formatDateTime(item.GrossWeightDate, 2); $("#ser").val(item.ServiceDescription); var amount = item.Rate*item.QuantityAsPerInvoice; From 267e871d7aa9921b11b6ebef6b13c6e63516ddf0 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sat, 1 Mar 2025 04:32:43 +0000 Subject: [PATCH 05/15] drive bug fixes : ps --- app/Controllers/Payslip.php | 8 ++++++-- app/Models/Driver_model.php | 3 +-- app/Views/monthlypayinputs.php | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php index 28566e81..2c5fb4ff 100755 --- a/app/Controllers/Payslip.php +++ b/app/Controllers/Payslip.php @@ -593,8 +593,7 @@ class Payslip extends BaseController public function monthlyInputs() { - $current = date("m-Y"); - + $current = $this->request->getPost('monthyear') ? $this->request->getPost('monthyear') :date("m-Y"); $data['month'] = $this->monthlypay_model->monthlyListing($current); $data['dropdownvalue'] = $current; @@ -627,6 +626,11 @@ class Payslip extends BaseController $Loan_Recovered = $value->Loan_Recovered; //MANUAL LOAN DUE $due_start_date = $value->DueDate; $paydate = $current; //From POST parm + if (strlen((string)$paydate) == 6) { + $paydate = '0' . $paydate; + } + $pmonth = substr($paydate, 0, 2); + $pyear = substr($paydate, -4); $pmonth = substr($paydate, 0, 2); $pyear = substr($paydate, -4); diff --git a/app/Models/Driver_model.php b/app/Models/Driver_model.php index 55965a99..cfea2b94 100755 --- a/app/Models/Driver_model.php +++ b/app/Models/Driver_model.php @@ -115,8 +115,7 @@ class Driver_model extends Model ->join('t_loan_history','t_loan_history.Loan_ID = t_loan_master.Loan_ID','Left') ->join('t_driver_monthly_pay_inputs','t_driver_monthly_pay_inputs.driver_id = driver_details.EmpID','Left') ->where('t_driver_attendance.date BETWEEN "'.$from.'" AND "'.$to.'"') - ->groupBy('DATE_FORMAT(t_driver_attendance.date, "%M-%Y")'); - + ->groupBy('DATE_FORMAT(t_driver_attendance.date, "%M-%Y"),t_driver_attendance.driver_id'); $query = $builder->get(); // $last_query = $this->db->getLastQuery(); // echo $last_query;die; diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php index c2f76f8c..fac621c9 100755 --- a/app/Views/monthlypayinputs.php +++ b/app/Views/monthlypayinputs.php @@ -904,7 +904,7 @@ $(document).ready(function () { $("#formid").attr("method", "post"); //alert($s); - $("#formid").attr("action", "payslip/changeMonth"); + $("#formid").attr("action", "monthlypay"); $('#formid').submit(); From b6567d1801fbc0839ed2c291cf7fbec7a8c51385 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sat, 1 Mar 2025 05:24:28 +0000 Subject: [PATCH 06/15] account igr : ps --- app/Views/accountsDashboard.php | 101 ++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 43 deletions(-) diff --git a/app/Views/accountsDashboard.php b/app/Views/accountsDashboard.php index be4a77cc..186bbdfc 100644 --- a/app/Views/accountsDashboard.php +++ b/app/Views/accountsDashboard.php @@ -93,41 +93,41 @@ var mindt = year - 70; var maxdt = year - 15; - $("#Invoice_Date , #MaterialRcvdDate").datepicker({ - minDate: new Date(year - SIAStartYear, 1, 1), - maxDate: 'now', - dateFormat: 'dd-mm-yy', - changeMonth: true, - changeYear: true, - yearRange: '-100:+0' - }); - $('#Driver_Name').autocomplete({ + // $("#Invoice_Date , #MaterialRcvdDate").datepicker({ + // minDate: new Date(year - SIAStartYear, 1, 1), + // maxDate: 'now', + // dateFormat: 'dd-mm-yy', + // changeMonth: true, + // changeYear: true, + // yearRange: '-100:+0' + // }); + // $('#Driver_Name').autocomplete({ - onSearchStart: function(query) { - //alert(query); - $('#Driver_Name').autocomplete("option", "minLength", 0); - }, + // onSearchStart: function(query) { + // //alert(query); + // $('#Driver_Name').autocomplete("option", "minLength", 0); + // }, - serviceUrl: "drivernameautocomplete", - onSelect: function(suggestion) { - var data = suggestion.DriverName; + // serviceUrl: "drivernameautocomplete", + // onSelect: function(suggestion) { + // var data = suggestion.DriverName; - } - }); - $('#DriverMobileNumber').autocomplete({ - serviceUrl: "drivermobileautocomplete", - params: { - driverName: function() { - return $('#Driver_Name').val(); // Pass the value of the DriverName input field - } - }, - onSearchStart: function(query) { - $('#DriverMobileNumber').autocomplete("option", "minLength", 0); - }, - onSelect: function(suggestion) { - var data = suggestion.DriverMobileNumber; - } - }); + // } + // }); + // $('#DriverMobileNumber').autocomplete({ + // serviceUrl: "drivermobileautocomplete", + // params: { + // driverName: function() { + // return $('#Driver_Name').val(); // Pass the value of the DriverName input field + // } + // }, + // onSearchStart: function(query) { + // $('#DriverMobileNumber').autocomplete("option", "minLength", 0); + // }, + // onSelect: function(suggestion) { + // var data = suggestion.DriverMobileNumber; + // } + // }); }); @@ -219,8 +219,13 @@ + $invdate = $record->DeliveryChellanDate; + if(!$invdate || $invdate == 'null' || $invdate === '0000-00-00 00:00:00'){ + echo ""; + }else{ + $date = new DateTime($invdate); + echo $date->format('d-m-Y'); } + ?> @@ -772,9 +777,11 @@ } // Format dates - var dcd = new Date(item.DeliveryChellanDate); - var dcd2 = (String(dcd.getDate()).padStart(2, '0') + '-' + (String(dcd.getMonth() + 1).padStart(2, '0')) + '-' + dcd.getFullYear()); - $("#Invoice_Date").val(dcd2); + if(item.DeliveryChellanDate !== '0000-00-00 00:00:00' ){ + var dcd = new Date(item.DeliveryChellanDate); + var dcd2 = (String(dcd.getDate()).padStart(2, '0') + '-' + (String(dcd.getMonth() + 1).padStart(2, '0')) + '-' + dcd.getFullYear()); + $("#Invoice_Date").val(dcd2); + } console.log(item.MaterialRcvdDate) var Mat_rcv_date = (item.MaterialRcvdDate == 'null') ? ' ' : formatDateTime(item.MaterialRcvdDate, 1); $("#MaterialRcvdDate").val(Mat_rcv_date); @@ -1179,15 +1186,22 @@ }); function constructSentence(record) { - let str = record.field; - let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2'); - let sentence = record.FullName + ' on ' + formatDateTime(record.history_dated, 2) + " " + fieldName + " "; + + // let str = record.field; + // let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2'); + let sentence = " "; if (parseInt(record.is_add) === 1) { - sentence += record.new_data + " was added."; + sentence += record.IGR_No + " was Created by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time; } else if (parseInt(record.is_edit) === 1) { - sentence += record.old_data + " was updated into " + record.new_data + "."; + let str = record.field; + if (str !== "UpdateBY" && str !== "MaterialRcvdDate" && str !== "DeliveryChellanDate") { + let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2'); + sentence += ((record.IGRItem_No) ? record.MaterialName+" ( "+ record.MaterialCode + " ) - " : "")+fieldName+" "+record.old_data + " was Updated into " + record.new_data + " by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time; + } } else if (parseInt(record.is_delete) === 1) { - sentence += record.new_data + " was deleted."; + let str = record.field; + let fieldName = str.replace(/([a-z])([A-Z])/g, '$1 $2'); + sentence += fieldName+" "+record.new_data + " was deleted by "+record.FullName+ " on "+record.indian_date+" at "+record.indian_time; } return sentence; } @@ -1396,6 +1410,7 @@ @@ -120,7 +124,7 @@
          'Date', 'value' => set_value('Date'), 'id' => 'Date', 'class' => 'form-control', 'onkeypress' => 'return false;'); + $data = array('name' => 'Date', 'value' => set_value('Date'), 'id' => 'Date', 'class' => 'form-control', 'onkeypress' => 'return false;', 'autocomplete'=>'"off"'); echo form_input($data); ?>
          diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index 618819e2..c49318e5 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -1955,12 +1955,14 @@ if (!empty($INRSYMBOL)) { if (selectedMaterialCode == value.MaterialCode) { $("#ServiceDescription").val(value.MaterialName); $("#ServiceUOM").val(value.UOM); + $("#ServiceRate").val(value.material_rate); if ($('#ScheduleType').val().trim() != 'Recurring') { $('#FrequencyChange').val('One Time'); $('#ServiceNo').val(1); + } else { $('#FrequencyChange').val($('#ScheduleType').val()); @@ -2167,7 +2169,7 @@ if (!empty($INRSYMBOL)) { if (selectedRevenueMaterialCode == value.MaterialCode) { $("#ItemName").val(value.MaterialName); $("#UOM").val(value.UOM); - + $("#Rate").val(value.material_rate); } }); @@ -3577,7 +3579,7 @@ if (!empty($INRSYMBOL)) { class="badge mandatory">*
          'ServiceRate', 'value' => set_value('ServiceRate'), 'id' => 'ServiceRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange()'); + $data = array('name' => 'ServiceRate', 'value' => set_value('ServiceRate'), 'id' => 'ServiceRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange();UpdateTheRateMaster();'); echo form_input($data); ?>
          @@ -6555,7 +6557,19 @@ if (!empty($INRSYMBOL)) { $('#ServiceMaterialCode').focus(); return false; } + function UpdateTheRateMaster(){ + if ($('#ServiceMaterialCode').val() != "0" && $('#ServiceRate').val() != "0" ) { + var MaterialCode = $('#ServiceMaterialCode').val(); + var Rate = $('#ServiceRate').val(); + } + if ($('#ServiceMaterialCode').val() != "0" && $('#ServiceRate').val() != "0" ) { + var MaterialCode = $('#MaterialCode').val(); + var Rate = $('#Rate').val(); + } + if (MaterialCode != "0" && Rate != "0" ) { + } + } if ($('#ServiceQuantity').val() != '' && $('#ServiceRate').val() != '') { diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php index dc7e9895..ba27c03f 100755 --- a/app/Views/editImportAmendPO.php +++ b/app/Views/editImportAmendPO.php @@ -1199,7 +1199,7 @@ if (!empty($RequistionDetails)) {
          -
          SNoRequisition NoSNoRequisition No Item Code Item Description Line Item SpecsQuantityQuantity UOMRate Basic Amount Tax Amount Total Order Amount RateBasic AmountTax AmountTotal Order Amount Action
          ${temp}${Reqnumber}${materialCode}${materialName} + ${temp}${Reqnumber}${materialCode}${materialName} - ${quantity}${uom}${itemRate}${basicval}${TotalTaxValue}${TotalOrderValue}${quantity}${uom}${itemRate}${basicval}${TotalTaxValue}${TotalOrderValue} diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php index ca1c1f45..3b57b6fb 100755 --- a/app/Views/servicePurchaseorder.php +++ b/app/Views/servicePurchaseorder.php @@ -1048,16 +1048,16 @@ if (!empty($INRSYMBOL)) {
          SNoRequisition NoRequisition No Item Code Item Name Line Item SpecsQuantityQuantity UOMRate Basic Amount Tax Amount Total Order Amount Rate Basic Amount Tax Amount Total Order Amount Action
          ${temp}${Reqnumber}${materialCode}${materialName}${temp}${Reqnumber}${materialCode}${materialName} - @@ -1990,12 +1990,12 @@ if (!empty($INRSYMBOL)) { ${quantity}${uom}${itemRate}${basicval}${TotalTaxValue}${TotalOrderValue}${quantity}${uom}${itemRate}${basicval}${TotalTaxValue}${TotalOrderValue} diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index 5bf60e71..cf455b80 100755 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -251,8 +251,12 @@ SupplierName ?> DeliveryChellanOrInvoiceNo ?> DeliveryChellanDate); - echo $date->format('d-m-Y'); ?> itemCount ?>SupplierName ?> DeliveryChellanOrInvoiceNo ?> DeliveryChellanDate); - echo $date->format('d-m-Y'); ?> itemCount ?> ReceivedQuantity ?> NetWeight ?>
          +
          diff --git a/app/Views/importpo.php b/app/Views/importpo.php index 4cfe8c3f..07bc9dcb 100755 --- a/app/Views/importpo.php +++ b/app/Views/importpo.php @@ -399,14 +399,19 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) { } function vaildateBeforeOpenModal() { - if ($('#PODate').val() == '') { - alert('Please Enter the Purchase Order date'); - $('#PODate').focus(); - return false; - } else if ($('#drpSupplier').val() == "0") { + + if ($('#drpSupplier').val() == "0") { alert('Please Select the Supplier details'); $('#drpSupplier').focus(); return false; + } else if ($('#currencytype').val() == '0') { + alert('Please Select the Currency Type'); + $('#currencytype').focus(); + return false; + } else if ($('#PODate').val() == '') { + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; } else if ($('#DeliveryAddr').val() == '') { alert('Please Enter the Delivery Address'); $('#DeliveryAddr').focus(); @@ -4185,15 +4190,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) { //alert(JSON.stringify(txtStatus)); //exit(); if (validate() && Budgetcheck()) { - if (document.getElementById('ImportTax').rows.length <= 0) { - - alert('Please Select Line item to Create PO'); - $('#Deliverydt').focus(); - return false; - - - - } else if ($('#Importoption').val() == "0") { + else if ($('#Importoption').val() == "0") { alert('Please Select Import Type'); $('#Importoption').focus(); return false; diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php index 1fcb4103..45de4b7c 100755 --- a/app/Views/purchaseorder.php +++ b/app/Views/purchaseorder.php @@ -203,38 +203,47 @@ if (!empty($INRSYMBOL)) { } function vaildateBeforeOpenModal() { - var radioValue = $("input[name='DateRange']:checked").val(); - if ($('#drpSupplier').val() == "0") { - alert('Please Select the Supplier details'); - $('#drpSupplier').focus(); - return false; - } else if ($('#PODate').val() == '') { - alert('Please Enter the Purchase Order date'); - $('#PODate').focus(); - return false; - } else if ($('#DeliveryAddr').val() == '') { - alert('Please Enter the Delivery Address'); - $('#DeliveryAddr').focus(); - return false; - } else if (radioValue == 0 && $('#Deliverydate').val() == '') { - alert('Please Select the Delivery Date'); - $('#Deliverydate').focus(); - return false; - } else if (radioValue == 1 && $('#Scheduleby').val().trim() == '') { + var radioValue = parseInt($("input[name='DateRange']:checked").val()); + + if ($('#drpSupplier').val() == "0") { + alert('Please Select the Supplier details'); + $('#drpSupplier').focus(); + return false; + }else if ($('#PODate').val().trim() == '') { + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + }else if ($('#DeliveryAddr').val().trim() == '') { + alert('Please Enter the Delivery Address'); + $('#DeliveryAddr').focus(); + return false; + }else if (radioValue === 0 && $('#Deliverydt').val() == '') { + alert('Please Select the Delivery Date'); + $('#Deliverydt').focus(); + return false; + }else if (radioValue == 1) { + var scheduleBy = $('#Scheduleby').val(); // Get the value + if (!scheduleBy || scheduleBy.trim() == '') { // Check if it's empty or undefined alert('Please Enter the Schedule By'); - $('#Deliverydate').focus(); + $('#Scheduleby').focus(); return false; - } else if ($('#PoTypeOptions').val() == "0") { - alert('Please Select Revenue Type'); - $('#PoTypeOptions').focus(); - return false; - } else if ($('#BudgetType').val() == "0") { - alert('Please Select Budget Type'); - $('#BudgetType').focus(); - return false; - } else { - return true; } + }else if ($('#PoTypeOptions').val() == "0") { + alert('Please Select Revenue Type'); + $('#PoTypeOptions').focus(); + return false; + }else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { + alert('Please Enter Payable Terms Description'); + $('#Otherpayment').focus(); + return false; + }else if ($('#BudgetType').val() == "0") { + alert('Please Select Budget Type'); + $('#BudgetType').focus(); + return false; + } else { + return true; + } + } var NilType = ''; @@ -2157,7 +2166,7 @@ if (!empty($INRSYMBOL)) {
          -
          +
          @@ -3909,36 +3918,33 @@ if (!empty($INRSYMBOL)) { var txtTotalDiscount = $('#txtTotalDiscount').val(); var finalBasicAmount = txtTotBasicAmount - txtTotalDiscount; //alert(txtTotBasicAmount+"--"+txtTotalDiscount+"--"+finalBasicAmount+"--"+AvlBudAmt); - if (validate()) { - if (document.getElementById('revenueTax').rows.length < 1) { - alert('Please Select Line item to Create PO'); - $('#Deliverydt').focus(); - return false; - } - // else if(parseInt(AvlBudAmt) < parseInt(finalBasicAmount)) { - // alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); - + if (revenueValidate()) { + // if (document.getElementById('revenueTax').rows.length < 1) { + // alert('Please Select Line item to Create PO'); + // return false; + // } + // else if(parseInt(AvlBudAmt) < parseInt(finalBasicAmount)) { + // alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); // return false; - // } - else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { - alert('Please Enter Payable Terms Description'); - $('#Otherpayment').focus(); - return false; - } else if ($('#insurance').val() == 1 && $('#InsuranceNumber').val() == '') { - alert('Please Enter Insurance No / Insurance Details..!'); - $('#insurance').focus(); - return false; - } else if ($('#PoTypeOptions').val() == "0") { - alert('Please Select Revenue Type'); - $('#PoTypeOptions').focus(); - return false; - - } else { + // } + // else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { + // alert('Please Enter Payable Terms Description'); + // $('#Otherpayment').focus(); + // return false; + // } else if ($('#insurance').val() == 1 && $('#InsuranceNumber').val() == '') { + // alert('Please Enter Insurance No / Insurance Details..!'); + // $('#insurance').focus(); + // return false; + // } else if ($('#PoTypeOptions').val() == "0") { + // alert('Please Select Revenue Type'); + // $('#PoTypeOptions').focus(); + // return false; + // } + // else { var formData = new FormData($('.CreatePO')[0]); disableButtons(); - $.ajax({ type: "POST", url: "purchaseorder/addNewPurchaseOrder", @@ -3970,7 +3976,7 @@ if (!empty($INRSYMBOL)) { } }); - } + // } } } diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php index 3b57b6fb..75e71157 100755 --- a/app/Views/servicePurchaseorder.php +++ b/app/Views/servicePurchaseorder.php @@ -239,20 +239,21 @@ if (!empty($INRSYMBOL)) { }); // Conditional logic for PaymentID - if (PaymentID === 'PT08') { - $('#otheroptiondiv').show(); - $('#Otherpayment').val(''); - } else { + if (PaymentID != 'PT08') { $('#otheroptiondiv').hide(); + $('#Otherpayment').prop('required', false); $('#Otherpayment').val(''); + } else if (PaymentID == 'PT08') { + $('#otheroptiondiv').show(); + $('#Otherpayment').prop('required', true); } - // Populate Payment Terms + var Payment = ; $('#PaymentTerms').empty(); - $.each(payments, function(pay, payobj) { - $("#PaymentTerms").append($('').val(payobj.PaymentID).html(payobj.PaymentTerms)); + $.each(Payment, function(idx, obj) { + $("#PaymentTerms").append($('').val(obj.PaymentID).html(obj.PaymentTerms)); }); - + $("#PaymentTerms").val(PaymentID); } else { alert('Please select a Supplier.'); return false; @@ -1044,7 +1045,7 @@ if (!empty($INRSYMBOL)) {
          -
          SNo
          +
          @@ -2376,33 +2377,30 @@ if (!empty($INRSYMBOL)) { $('#txtStatus').val(stat); var AvlBudAmt = ''; var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val(); - if (validate()) { - if (document.getElementById('serviceTax').rows.length < 2) { - alert('Please Select Line item to Create PO'); - $('#Deliverydt').focus(); - return false; - } - // else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) { + if (serviceValidate()) { + // if (document.getElementById('serviceTax').rows.length < 2) { + // alert('Please Select Line item to Create PO'); + // return false; + // } + // else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) { // alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); - // return false; - // } - else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { - alert('Please Enter Other Payable Terms Description'); - $('#Otherpayment').focus(); - return false; - } else if ($('#descofpo').val().trim() == '') { - alert('Please Enter Description Of Service'); - $('#descofpo').focus(); - return false; - } else if ($('#PoTypeOptions').val() == "0") { - alert('Please Select POType'); - $('#PoTypeOptions').focus(); - return false; - - } else { + // } + // else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { + // alert('Please Enter Other Payable Terms Description'); + // $('#Otherpayment').focus(); + // return false; + // } else if ($('#descofpo').val().trim() == '') { + // alert('Please Enter Description Of Service'); + // $('#descofpo').focus(); + // return false; + // } else if ($('#PoTypeOptions').val() == "0") { + // alert('Please Select POType'); + // $('#PoTypeOptions').focus(); + // return false; + // } else { var formData = new FormData($('.ServicePO')[0]); - + disableButtons(); console.log("inside add service purchase order view page"); console.log(formData); @@ -2422,15 +2420,21 @@ if (!empty($INRSYMBOL)) { $('#SpcialInstruction').val(''); $('#txtDeliveryAddress').val(''); window.location = "purchaseorderListing"; - + setTimeout(function() { enableButtons(); }, 2000); } else { alert("Error"); + setTimeout(function() { enableButtons(); }, 2000); } + }, + error: function(jqXHR, textStatus, errorThrown) { + console.error("AJAX Error: " + textStatus + ": " + errorThrown); + alert("Error: " + textStatus); + setTimeout(function() { enableButtons(); }, 2000); } }); - } + // } } } @@ -2454,45 +2458,58 @@ if (!empty($INRSYMBOL)) { } function vaildateBeforeOpenModal() { - var radioValue = $("input[name='DateRange']:checked").val(); - if ($('#PODate').val() == '') { - alert('Please Enter the Purchase Order date'); - $('#PODate').focus(); - return false; - } else if ($('#drpSupplier').val() == "0") { - alert('Please Select the Supplier details'); - $('#drpSupplier').focus(); - return false; - } else if ($('#DeliveryAddr').val() == '') { - alert('Please Enter the Delivery Address'); - $('#DeliveryAddr').focus(); - return false; - } else if (radioValue == 0 && $('#Deliverydate').val() == '') { - alert('Please Select the Delivery Date'); - $('#Deliverydate').focus(); - return false; - } else if (radioValue == 1 && $('#Scheduleby').val().trim() == '') { + var radioValue = parseInt($("input[name='DateRange']:checked").val()); + if ($('#drpSupplier').val() == "0") { + alert('Please Select the Supplier details'); + $('#drpSupplier').focus(); + return false; + }else if ($('#workstatus').val() == "0") { + alert('Please Select the Work Status'); + $('#drpSupplier').focus(); + return false; + }else if ($('#PODate').val().trim() == '') { + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + }else if ($('#DeliveryAddr').val().trim() == '') { + alert('Please Enter the Delivery Address'); + $('#DeliveryAddr').focus(); + return false; + }else if (radioValue === 0 && $('#Deliverydt').val() == '') { + alert('Please Select the Delivery Date'); + $('#Deliverydt').focus(); + return false; + }else if (radioValue == 1) { + var scheduleBy = $('#Scheduleby').val(); // Get the value + if (!scheduleBy || scheduleBy.trim() == '') { // Check if it's empty or undefined alert('Please Enter the Schedule By'); - $('#Deliverydate').focus(); + $('#Scheduleby').focus(); return false; - } else if ($('#workstatus').val() == "0") { - alert('Please Enter WorkStatus'); - $('#workstatus').focus(); - return false; - - } else if ($('#PoTypeOptions').val() == "0") { - alert('Please Select POType'); - $('#PoTypeOptions').focus(); - return false; - - } else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { - alert('Please Enter Other Payable Terms Description'); - $('#Otherpayment').focus(); - return false; - - } else { - return true; } + }else if($('#PODate').val() == ''){ + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + }else if ($('#PoTypeOptions').val() == "0") { + alert('Please Select Service Type'); + $('#PoTypeOptions').focus(); + return false; + }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 ($('#BudgetType').val() == "0") { + alert('Please Select Budget Type'); + $('#BudgetType').focus(); + return false; + }else { + return true; + } + } function calculateCgstTax(varBasicValue, Cgst) { @@ -2565,9 +2582,14 @@ if (!empty($INRSYMBOL)) { function Reset() { + disableButtons(); location.reload(); + setTimeout(function() { + enableButtons(); + }, 2000); } + $('#insuranceTxtDiv').hide(); $("#insuranceStatus").change(function() { diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index cf455b80..7fbb9f08 100755 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -1257,7 +1257,10 @@ success: function(data) { alert(data); - // location.reload(); + // setTimeout(function () { + // $("#Igrshow").modal('hide'); + // }, 2000); + location.reload(); }, error: function(xhr, status, error) { // Error callback console.error('AJAX Error:', status, error); diff --git a/public/assets/js/CreatePOValidation.js b/public/assets/js/CreatePOValidation.js index c4869792..f1e86374 100755 --- a/public/assets/js/CreatePOValidation.js +++ b/public/assets/js/CreatePOValidation.js @@ -26,6 +26,285 @@ function myFunction() { } } + +function disableButtons() { + document.querySelectorAll('.Save, .Submit').forEach(function(button) { + button.classList.add('disabled'); + button.setAttribute('disabled', 'disabled'); + }); +} + +function enableButtons() { + document.querySelectorAll('.Save, .Submit').forEach(function(button) { + button.classList.remove('disabled'); + button.removeAttribute('disabled'); + }); +} + +function revenueValidate(){ + var radioValue = parseInt($("input[name='DateRange']:checked").val()); + + if ($('#drpSupplier').val() == "0") { + alert('Please Select the Supplier details'); + $('#drpSupplier').focus(); + return false; + }else if ($('#PODate').val().trim() == '') { + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + }else if ($('#DeliveryAddr').val().trim() == '') { + alert('Please Enter the Delivery Address'); + $('#DeliveryAddr').focus(); + return false; + }else if (radioValue === 0 && $('#Deliverydt').val() == '') { + alert('Please Select the Delivery Date'); + $('#Deliverydt').focus(); + return false; + }else if (radioValue == 1) { + var scheduleBy = $('#Scheduleby').val(); // Get the value + if (!scheduleBy || scheduleBy.trim() == '') { // Check if it's empty or undefined + alert('Please Enter the Schedule By'); + $('#Scheduleby').focus(); + return false; + } + }else if($('#PODate').val() == ''){ + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + }else if ($('#PoTypeOptions').val() == "0") { + alert('Please Select Revenue Type'); + $('#PoTypeOptions').focus(); + return false; + }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 ($('#BudgetType').val() == "0") { + alert('Please Select Budget Type'); + $('#BudgetType').focus(); + return false; + }else if ($('#revenueTax tbody tr').length < 1) { + alert('Please Select Line item to Create PO'); + return false; + }else { + return true; + } +} + +function serviceValidate(){ + var radioValue = parseInt($("input[name='DateRange']:checked").val()); + + if ($('#drpSupplier').val() == "0") { + alert('Please Select the Supplier details'); + $('#drpSupplier').focus(); + return false; + }else if ($('#workstatus').val() == "0") { + alert('Please Select the Work Status'); + $('#workstatus').focus(); + return false; + }else if ($('#PODate').val().trim() == '') { + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + }else if ($('#DeliveryAddr').val().trim() == '') { + alert('Please Enter the Delivery Address'); + $('#DeliveryAddr').focus(); + return false; + }else if (radioValue === 0 && $('#Deliverydt').val() == '') { + alert('Please Select the Delivery Date'); + $('#Deliverydt').focus(); + return false; + }else if (radioValue == 1) { + var scheduleBy = $('#Scheduleby').val(); // Get the value + if (!scheduleBy || scheduleBy.trim() == '') { // Check if it's empty or undefined + alert('Please Enter the Schedule By'); + $('#Scheduleby').focus(); + return false; + } + }else if($('#PODate').val() == ''){ + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + }else if ($('#PoTypeOptions').val() == "0") { + alert('Please Select Service Type'); + $('#PoTypeOptions').focus(); + return false; + }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 ($('#BudgetType').val() == "0") { + alert('Please Select Budget Type'); + $('#BudgetType').focus(); + return false; + }else if ($('#serviceTax tbody tr').length < 1) { + alert('Please Select Line item to Create PO'); + return false; + } else if ($('#descofpo').val().trim() == '') { + alert('Please Enter Description Of Service'); + $('#descofpo').focus(); + return false; + }else { + return true; + } +} + +function capitalValidate(){ + var radioValue = parseInt($("input[name='DateRange']:checked").val()); + var PoType = $('#POType').val(); + if(PoType=='CAPITAL' && capitalType=='International'){ + if ($('#drpSupplier').val() == "0") { + alert('Please Select the Supplier details'); + $('#drpSupplier').focus(); + return false; + } + }else{ + if ($('#drpSupplier').val() == "0") { + alert('Please Select the Supplier details'); + $('#drpSupplier').focus(); + return false; + } + } + + else if ($('#PODate').val().trim() == '') { + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + }else if ($('#DeliveryAddr').val().trim() == '') { + alert('Please Enter the Delivery Address'); + $('#DeliveryAddr').focus(); + return false; + }else if (radioValue === 0 && $('#Deliverydt').val() == '') { + alert('Please Select the Delivery Date'); + $('#Deliverydt').focus(); + return false; + }else if (radioValue == 1) { + var scheduleBy = $('#Scheduleby').val(); // Get the value + if (!scheduleBy || scheduleBy.trim() == '') { // Check if it's empty or undefined + alert('Please Enter the Schedule By'); + $('#Scheduleby').focus(); + return false; + } + }else if($('#PODate').val() == ''){ + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + }else if ($('#PoTypeOptions').val() == "0") { + alert('Please Select Service Type'); + $('#PoTypeOptions').focus(); + return false; + }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 ($('#BudgetType').val() == "0") { + alert('Please Select Budget Type'); + $('#BudgetType').focus(); + return false; + }else if ($('#serviceTax tbody tr').length < 1) { + alert('Please Select Line item to Create PO'); + return false; + } else if ($('#descofpo').val().trim() == '') { + alert('Please Enter Description Of Service'); + $('#descofpo').focus(); + return false; + }else { + return true; + } +} + +function importValidate(){ + var radioValue = parseInt($("input[name='DateRange']:checked").val()); + + if ($('#drpSupplier').val() == "0") { + alert('Please Select the Supplier details'); + $('#drpSupplier').focus(); + return false; + } else if ($('#currencytype').val() == '0') { + alert('Please Select the Currency Type'); + $('#currencytype').focus(); + return false; + } else if ($('#DeliveryAddr').val().trim() == '') { + alert('Please Enter the Delivery Address'); + $('#DeliveryAddr').focus(); + return false; + } else if (radioValue === 0 && $('#Deliverydt').val() == '') { + alert('Please Select the Delivery Date'); + $('#Deliverydt').focus(); + return false; + } else if (radioValue == 1) { + var scheduleBy = $('#Scheduleby').val(); // Get the value + if (!scheduleBy || scheduleBy.trim() == '') { // Check if it's empty or undefined + alert('Please Enter the Schedule By'); + $('#Scheduleby').focus(); + return false; + } + } else if ($('#Dispatch').val() == '' && $('#Scheduleby').val() == '') { + if (document.getElementById("Schedule").checked) { + alert('Please Enter Schedule By'); + return false; + } else if (document.getElementById("Date").checked) { + alert('Please Enter Dispatch Instruction'); + return false; + } + + } else if ($('#ExchangeRate').val() == '') { + alert('Please Enter the Exchange Rate'); + $('#ExchangeRate').focus(); + return false; + } else if ($('#ExchangeRate').val() == 0) { + alert('Please Enter the Exchange Rate'); + $('#ExchangeRate').focus(); + return false; + } else if ($('#PlaceOforigin').val() == '') { + alert('Please Enter Place Of Origin'); + $('#PlaceOforigin').focus(); + return false; + } else if ($('#PoTypeOptions').val() == "0") { + alert('Please Select Service Type'); + $('#PoTypeOptions').focus(); + return false; + } else if($('#PODate').val() == ''){ + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + } else if ($('#PaymentTerms').val() == '') { + alert('Please Select Payment Terms'); + $('#PaymentTerms').focus(); + return false; + + } 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 ($('#BudgetType').val() == "0") { + alert('Please Select Budget Type'); + $('#BudgetType').focus(); + return false; + }else if ($('#ImportTax tbody tr').length < 1) { + alert('Please Select Line item to Create PO'); + return false; + }else { + return true; + } +} + function validate() { var radioValue = $("input[name='DateRange']:checked").val(); From d7bfa6f674b0eddd2bd186b10cd66acdc78179c3 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sun, 2 Mar 2025 16:57:34 +0000 Subject: [PATCH 09/15] issues fixes : ps --- app/Controllers/Amendmentpurchaseorder.php | 8 + app/Controllers/Emergencypurchaseorder.php | 10 +- app/Controllers/Payslip.php | 3 +- app/Controllers/Purchaseorder.php | 18 +- app/Models/Driver_model.php | 2 +- app/Models/Purchaseorder_model.php | 19 +- app/Views/EditservicePurchaseorder.php | 75 +++--- app/Views/alterpurchaseorder.php | 97 ++++--- app/Views/capitalpurchaseorder.php | 270 ++++++++++--------- app/Views/editCapitalAmendPO.php | 59 +++-- app/Views/editCapitalPo.php | 55 ++-- app/Views/editEmployeenew.php | 16 ++ app/Views/editImportAmendPO.php | 38 ++- app/Views/editRevenueAmendPO.php | 43 +-- app/Views/editRevenuepurchaseorder.php | 68 ++--- app/Views/editServiceAmendPO.php | 58 ++-- app/Views/editimportpo.php | 42 +-- app/Views/importpo.php | 121 +++++---- app/Views/monthlypayinputs.php | 22 +- app/Views/purchaseorder.php | 30 ++- app/Views/servicePurchaseorder.php | 26 +- public/assets/js/CreatePOValidation.js | 294 +++++++++++---------- 22 files changed, 772 insertions(+), 602 deletions(-) diff --git a/app/Controllers/Amendmentpurchaseorder.php b/app/Controllers/Amendmentpurchaseorder.php index 34d8c875..df3325dc 100755 --- a/app/Controllers/Amendmentpurchaseorder.php +++ b/app/Controllers/Amendmentpurchaseorder.php @@ -546,6 +546,8 @@ class Amendmentpurchaseorder extends BaseController $RecQtyvalue = $ReceivedQty[0]['ReceivedQuantity']; } + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $POLineItemList = array('PONO' => $NewPO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'ReceivedQuantity' => $RecQtyvalue, 'Quantity' => $Quantity, 'Per' => $per, 'ServiceMaterialDescription' => $servicematerialdescription, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'CostCenterCode' => $CostCenter, 'ServiceFrequency' => $ServiceFrequency, 'AmendedDetails' => $CAD); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); @@ -815,6 +817,8 @@ class Amendmentpurchaseorder extends BaseController $CAD = ""; $CAD .= $CAD2; } + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $POLineItemList = array('PONO' => $NewPO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'ServiceMaterialDescription' => $servicematerialdescription, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'CostCenterCode' => $CostCenter, 'ServiceFrequency' => $ServiceFrequency, 'ReceivedQuantity' => $RecQtyvalue, 'AmendedDetails' => $CAD, 'Per' => $Per); @@ -1248,6 +1252,8 @@ class Amendmentpurchaseorder extends BaseController $CAD = ""; $CAD .= $CAD2; } + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $POLineItemList = array('PONO' => $NewPO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter, 'AmendedDetails' => $CAD, 'Per' => $Per, 'ServiceMaterialDescription' => $CapitalItemDescrition); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); @@ -1636,6 +1642,8 @@ class Amendmentpurchaseorder extends BaseController $CAD = ""; $CAD .= $CAD2; } + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $POLineItemList = array('PONO' => $NewPO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter, 'AmendedDetails' => $CAD, 'Per' => $per, 'ServiceMaterialDescription' => $specialinstruction); diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php index f2c64289..d4a143a2 100755 --- a/app/Controllers/Emergencypurchaseorder.php +++ b/app/Controllers/Emergencypurchaseorder.php @@ -257,6 +257,8 @@ class Emergencypurchaseorder extends BaseController $TotalOrderValue = $this->request->getPost('TotalOrderValue' . $i); $ServiceFrequency = $this->request->getPost('Frequency' . $i) . ' - ' . $this->request->getPost('FrequencyValue' . $i); $ServiceMaterialDescription = $this->request->getPost('ItemServiceDescription' . $i); + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $SkipInsert = "False"; if (count($comma_separated) > 0) { for ($j = 1; $j < count($comma_separated); $j++) { @@ -524,6 +526,8 @@ class Emergencypurchaseorder extends BaseController $AfterCgst = $this->request->getPost('RevenueAfterCgst' . $i); $AfterSgst = $this->request->getPost('RevenueAfterSgst' . $i); $AfterIgst = $this->request->getPost('RevenueAfterIgst' . $i); + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $SkipInsert = "False"; if (count($comma_separated) > 0) { for ($j = 1; $j < count($comma_separated); $j++) { @@ -1231,7 +1235,8 @@ class Emergencypurchaseorder extends BaseController $InsuranceValue = $this->request->getPost('Insval' . $i); $TotalOrderValue = $this->request->getPost('TotalOrderValue' . $i); $CostCenter = $this->request->getPost('costCode' . $i); - + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $SkipInsert = "False"; if (count($comma_separated) > 0) { for ($j = 1; $j < count($comma_separated); $j++) { @@ -1398,7 +1403,8 @@ class Emergencypurchaseorder extends BaseController /*----------end--------------------*/ - + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $SkipInsert = "False"; if (count($comma_separated) > 0) { diff --git a/app/Controllers/Payslip.php b/app/Controllers/Payslip.php index 7b6b79e6..f790bb11 100755 --- a/app/Controllers/Payslip.php +++ b/app/Controllers/Payslip.php @@ -817,8 +817,8 @@ class Payslip extends BaseController $load_driver_data[$i]->esi_amount = ($load_driver_data[$i]->esi_applicable == 1) ? ($basic) * $ESI_Rate / 100 : 0; $load_driver_data[$i]->pf_amount = ($load_driver_data[$i]->pf_applicable == 1) ? ($basic) * $PF_Rate / 100 : 0; + $load_driver_data[$i]->total_cal_days = $get_last_date_of_the_month; - }else { $PF_Rate = $load_driver_data[$i]->PF_Rate; $ESI_Rate = $load_driver_data[$i]->ESI_Rate; @@ -873,6 +873,7 @@ class Payslip extends BaseController $empSalarySub = $loan; $salaryInCurrentday = $empSalaryAdd - $empSalarySub; $load_driver_data[$i]->driver_final_payment = $salaryInCurrentday+$shed+$diesel; + $load_driver_data[$i]->total_cal_days = $get_last_date_of_the_month; } } diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php index 020efadd..ee194634 100755 --- a/app/Controllers/Purchaseorder.php +++ b/app/Controllers/Purchaseorder.php @@ -1226,7 +1226,8 @@ class Purchaseorder extends BaseController $AfterSgst = $this->request->getPost('RevenueAfterSgst' . $i); $AfterIgst = $this->request->getPost('RevenueAfterIgst' . $i); $LineitemAuditorNotes = $this->request->getPost('LineItemNoteForAuditor' . $i); - + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $SkipInsert = "False"; if (count($comma_separated) > 0) { for ($j = 1; $j < count($comma_separated); $j++) { @@ -1437,7 +1438,8 @@ class Purchaseorder extends BaseController $this->purchaseorder_model->insertlogpo($logpo); } - + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $SkipInsert = "False"; if (count($comma_separated) > 0) { for ($j = 1; $j < count($comma_separated); $j++) { @@ -2111,6 +2113,8 @@ class Purchaseorder extends BaseController $per = $this->request->getPost('Per' . $i); $LineitemAuditorNotes = $this->request->getPost('LineItemNoteForAuditor' . $i); + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $SkipInsert = "False"; if (count($comma_separated) > 0) { for ($j = 1; $j < count($comma_separated); $j++) { @@ -2452,6 +2456,8 @@ class Purchaseorder extends BaseController //die(); $currencytypeID = $this->request->getPost('currencytype'); + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $SkipInsert = "False"; if (count($comma_separated) > 0) { for ($j = 1; $j < count($comma_separated); $j++) { @@ -2839,6 +2845,8 @@ class Purchaseorder extends BaseController $CapitalItemDescription = $this->request->getPost('CapitalItemDescrition' . $i); $Per = $this->request->getPost('per' . $i); $LineitemAuditorNotes = $this->request->getPost('LineItemNoteForAuditor' . $i); + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $SkipInsert = "False"; if (count($comma_separated) > 0) { for ($j = 1; $j < count($comma_separated); $j++) { @@ -3189,7 +3197,8 @@ class Purchaseorder extends BaseController /*----------end--------------------*/ - + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $SkipInsert = "False"; if (count($comma_separated) > 0) { for ($j = 1; $j < count($comma_separated); $j++) { @@ -3279,7 +3288,8 @@ class Purchaseorder extends BaseController } else { $LineItemNo = $POLineItemNo; - + if($itemRate != 0){ + $this->purchaseorder_model->updateMaterialRate($MaterialCode, $itemRate); } $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CostCenterCode' => $CostCenter, 'ServiceMaterialDescription' => $CapitalItemDescription, 'Per' => $Per,'LineitemAuditorNotes'=>$LineitemAuditorNotes); $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO, $LineItemNo, $POLineItemList); diff --git a/app/Models/Driver_model.php b/app/Models/Driver_model.php index cfea2b94..d0b5e716 100755 --- a/app/Models/Driver_model.php +++ b/app/Models/Driver_model.php @@ -103,7 +103,7 @@ class Driver_model extends Model function driverAttendanceForMonthlyPayInputs($from,$to){ $builder = $this->db->table('t_driver_attendance') - ->select('t_driver_attendance.driver_id,driver_details.FirstName as driver_name,driver_details.is_driver, + ->select('t_driver_attendance.driver_id,driver_details.FirstName as driver_name,driver_details.is_driver,COUNT(DISTINCT t_driver_attendance.date) AS unique_days, DATE_FORMAT(date, "%M-%Y") AS month_year,COUNT(t_driver_attendance.load_type) AS no_of_loads,driver_details.*,t_emp_pay_data.PF_Rate,t_emp_pay_data.ESI_Rate') ->select('SUM(t_driver_attendance.salary_amount) as monthly_salary_amount, SUM(t_driver_attendance.food_amount) as monthly_food_amount, diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php index 9aef1057..049f8966 100755 --- a/app/Models/Purchaseorder_model.php +++ b/app/Models/Purchaseorder_model.php @@ -2565,11 +2565,28 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath, $query = $builder->get()->getRow(); - $material_rate = $query ? $query->material_rate : null; + $material_rate = $query ? $query->material_rate : 0; return $material_rate; } + public function updateMaterialRate($code, $incoming_rate) + { + $default_rate = $this->materialRate($code); + + if ($incoming_rate == $default_rate) { + return 1; + } else { + $this->db->table('t_materialmaster') + ->where('MaterialCode', $code) + ->set('material_rate', $incoming_rate) + ->update(); + + return $this->db->affectedRows(); + } + } + + function lastPONO() { $query = $this->db->table('t_purchaseorder_master')->select('PONO')->orderBy('PONO', 'DESC')->limit(1)->get(); diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index c4965983..f9bd28b4 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1236,17 +1236,18 @@ if (!empty($getlogpodtl)) { style="font-size:12px;"> - - - - - - - - - - - + + + + + + + + + + + + @@ -1273,8 +1274,9 @@ if (!empty($getlogpodtl)) { - - + var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; var rowHtml = ` - `; + `; if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") { rowHtml += ` - - - - - - - - - - + + + + + + + + + + @@ -6029,13 +6029,14 @@ if (!empty($INRSYMBOL)) { index = parseInt(index) + 1; var template = jQuery("#RevenueList").html(); + var rshorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; var html = ` - + @@ -6709,13 +6710,15 @@ if (!empty($INRSYMBOL)) { index = parseInt(index) + 1; var template = jQuery("#ServiceList").html(); + + var sshorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; var html = ` - + @@ -7236,26 +7239,27 @@ if (!empty($INRSYMBOL)) { // Perform form validation - if (validate()) { - if (document.getElementById('serviceTax').rows.length < 2) { - alert('Please Select Line item to Create PO'); - $('#Deliverydt').focus(); - return false; - } else if ($('#Otherpayment').val() == '' && $('#PaymentMethod').val() == 'PT08') { - alert('Please Enter Other Payable Terms Description'); - $('#Otherpayment').focus(); - return false; - } else if ($('#emergdescofpo').val().trim() == '') { - alert('Please Enter Description Of Service'); - $('#emergdescofpo').focus(); - return false; - } else if ($('#PoTypeOptions').val() == "0") { - alert('Please Select POType'); - $('#PoTypeOptions').focus(); - return false; - } else { + if (serviceValidate()) { + // if (document.getElementById('serviceTax').rows.length < 2) { + // alert('Please Select Line item to Create PO'); + // $('#Deliverydt').focus(); + // return false; + // } else if ($('#Otherpayment').val() == '' && $('#PaymentMethod').val() == 'PT08') { + // alert('Please Enter Other Payable Terms Description'); + // $('#Otherpayment').focus(); + // return false; + // } else if ($('#emergdescofpo').val().trim() == '') { + // alert('Please Enter Description Of Service'); + // $('#emergdescofpo').focus(); + // return false; + // } else if ($('#PoTypeOptions').val() == "0") { + // alert('Please Select POType'); + // $('#PoTypeOptions').focus(); + // return false; + // } else { // Submit the form using AJAX $('#loader').show(); + disableButtons(); $.ajax({ url: "emergencypurchaseorder/addNewServicePurchaseOrder", type: "POST", @@ -7274,14 +7278,16 @@ if (!empty($INRSYMBOL)) { $('#SpcialInstruction').val(''); $('#txtDeliveryAddress').val(''); window.location = "purchaseorderListing"; + setTimeout(function() { enableButtons(); }, 2000); }, error: function (xhr, status, error) { // Handle errors $('#loader').hide(); alert("Error: " + error); + setTimeout(function() { enableButtons(); }, 2000); } }); - } + // } } } @@ -7347,22 +7353,23 @@ if (!empty($INRSYMBOL)) { // Perform form validation - if (validate()) { - if (document.getElementById('serviceTax').rows.length < 2) { - alert('Please Select Line item to Create PO'); - $('#Deliverydt').focus(); - return false; - } else if ($('#insuranceStatus').val() == 'YES' && $('#InsuranceNumber').val() == '') { - alert('Please Enter Insurance Number..!'); + if (revenueValidate()) { + // if (document.getElementById('serviceTax').rows.length < 2) { + // alert('Please Select Line item to Create PO'); + // $('#Deliverydt').focus(); + // return false; + // } else if ($('#insuranceStatus').val() == 'YES' && $('#InsuranceNumber').val() == '') { + // alert('Please Enter Insurance Number..!'); - return false; - } else if ($('#PaymentMethod').val() == 'PT08' && $('#Otherpayment').val() == '') { - alert('Please Enter Other Payment Description..!'); + // return false; + // } else if ($('#PaymentMethod').val() == 'PT08' && $('#Otherpayment').val() == '') { + // alert('Please Enter Other Payment Description..!'); - return false; - } else { + // return false; + // } else { // Submit the form using AJAX $('#loader').show(); + disableButtons(); $.ajax({ url: "emergencypurchaseorder/addNewRevenuePurchaseOrder", type: "POST", @@ -7377,13 +7384,15 @@ if (!empty($INRSYMBOL)) { $('#SpcialInstruction').val(''); $('#txtDeliveryAddress').val(''); window.location = "purchaseorderListing"; + setTimeout(function() { enableButtons(); }, 2000); }, error: function (xhr, status, error) { // Handle errors alert("Error: " + error); + setTimeout(function() { enableButtons(); }, 2000); } }); - } + // } } } diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index 93f2b6f1..27d9c9b1 100755 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -334,98 +334,98 @@ if (!empty($INRSYMBOL)) { var radioValue = $("input[name='DateRange']:checked").val(); if (capitalType == 'International') { - if ($('#drpSupplier').val() == "0") { - alert('Please Select the Supplier details'); - $('#drpSupplier').focus(); - return false; - } else if ($('#PODate').val() == '') { - alert('Please Enter the Purchase Order date'); - $('#PODate').focus(); - return false; - } else if (radioValue == 0 && $('#Deliverydate').val() == '') { - alert('Please Select the Delivery Date'); - $('#Deliverydate').focus(); - return false; - } else if (radioValue == 1 && $('#Scheduleby').val() == '') { - alert('Please Enter the Schedule By'); - $('#Deliverydate').focus(); - return false; - } else if (radioValue == 2 && $('#Dispatch').val().trim() == '') { - alert('Please Enter the Dispatch Instruction'); - $('#Deliverydate').focus(); - return false; - } else if ($('#Deliverydt').val() == '' && $('#Scheduleby').val() == '') { - alert('Please Enter the Dispatch Instruction'); - $('#Deliverydt').focus(); - return false; - } else if ($('#DeliveryAddr').val() == '') { - alert('Please Enter the Delivery Address'); - $('#DeliveryAddr').focus(); - return false; - } else if ($('#PoTypeOptions').val() == "0") { - alert('Please Select Capital Type'); - $('#PoTypeOptions').focus(); - return false; - - } else if ($('#BudgetType').val() == "0") { - alert('Please Select Budget Type'); - $('#BudgetType').focus(); - return false; - - } + if ($('#drpSupplier').val() == "0") { + alert('Please Select the Supplier details'); + $('#drpSupplier').focus(); + return false; + } else if ($('#currencytype').val() == '0') { + alert('Please Select the Currency Type'); + $('#currencytype').focus(); + return false; + } else if ($('#PODate').val() == '') { + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + } else if (radioValue == 0 && $('#Deliverydate').val() == '') { + alert('Please Select the Delivery Date'); + $('#Deliverydate').focus(); + return false; + } else if (radioValue == 1 && $('#Scheduleby').val() == '') { + alert('Please Enter the Schedule By'); + $('#Deliverydate').focus(); + return false; + } else if (radioValue == 2 && $('#Dispatch').val().trim() == '') { + alert('Please Enter the Dispatch Instruction'); + $('#Deliverydate').focus(); + return false; + } else if ($('#ExchangeRate').val() == '') { + alert('Please Enter the Exchange Rate'); + $('#ExchangeRate').focus(); + return false; + } else if ($('#ExchangeRate').val() == 0) { + alert('Please Enter the Exchange Rate'); + $('#ExchangeRate').focus(); + return false; + } else if ($('#PlaceOforigin').val() == '') { + alert('Please Enter Place Of Origin'); + $('#PlaceOforigin').focus(); + return false; + } else if ($('#PoTypeOptions').val() == "0") { + alert('Please Select Capital Type'); + $('#PoTypeOptions').focus(); + return false; + } else if ($('#PaymentTerms').val() == '') { + alert('Please Select Payment Terms'); + $('#PaymentTerms').focus(); + return false; + } else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { + alert('Please Enter Payable Terms Description'); + $('#Otherpayment').focus(); + return false; + } else if ($('#BudgetType').val() == "0") { + alert('Please Select Budget Type'); + $('#BudgetType').focus(); + return false; + } else { return true; } } if (capitalType == 'Domestic') { - if ($('#drpSupplier').val() == "0") { - alert('Please Select the Supplier details'); - $('#drpSupplier').focus(); - return false; - } else if ($('#currencytype').val() == '0') { - alert('Please Select the Currency Type'); - $('#currencytype').focus(); - return false; - } else if ($('#PODate').val() == '') { - alert('Please Enter the Purchase Order date'); - $('#PODate').focus(); - return false; - } else if (radioValue == 0 && $('#Deliverydate').val() == '') { - alert('Please Select the Delivery Date'); - $('#Deliverydate').focus(); - return false; - } else if (radioValue == 1 && $('#Scheduleby').val() == '') { - alert('Please Enter the Schedule By'); - $('#Deliverydate').focus(); - return false; - } else if (radioValue == 2 && $('#Dispatch').val().trim() == '') { - alert('Please Enter the Dispatch Instruction'); - $('#Deliverydate').focus(); - return false; - } else if ($('#Deliverydt').val() == '' && $('#Scheduleby').val() == '') { - alert('Please Enter the Dispatch Instruction'); - $('#Deliverydt').focus(); - return false; - } else if ($('#ExchangeRt').val() == '') { - alert('Please Enter the Exchange Rate'); - $('#ExchangeRt').focus(); - return false; - } else if ($('#PlaceOforigin').val().trim() == '') { - alert('Please Enter the Place Of Origin'); - $('#PlaceOforigin').focus(); - return false; - } else if ($('#DeliveryAddr').val() == '') { - alert('Please Enter the Delivery Address'); - $('#DeliveryAddr').focus(); - return false; - } else if ($('#PoTypeOptions').val() == "0") { - alert('Please Select Capital Type'); - $('#PoTypeOptions').focus(); - return false; - - } else if ($('#BudgetType').val() == "0") { - alert('Please Select Budget Type'); - $('#BudgetType').focus(); - return false; - - } + if ($('#drpSupplier').val() == "0") { + alert('Please Select the Supplier details'); + $('#drpSupplier').focus(); + return false; + } else if ($('#PODate').val() == '') { + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + } else if (radioValue == 0 && $('#Deliverydate').val() == '') { + alert('Please Select the Delivery Date'); + $('#Deliverydate').focus(); + return false; + } else if (radioValue == 1 && $('#Scheduleby').val() == '') { + alert('Please Enter the Schedule By'); + $('#Deliverydate').focus(); + return false; + } else if (radioValue == 2 && $('#Dispatch').val().trim() == '') { + alert('Please Enter the Dispatch Instruction'); + $('#Deliverydate').focus(); + return false; + } else if ($('#PoTypeOptions').val() == "0") { + alert('Please Select Capital Type'); + $('#PoTypeOptions').focus(); + return false; + } else if ($('#PaymentTerms').val() == '') { + alert('Please Select Payment Terms'); + $('#PaymentTerms').focus(); + return false; + } else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { + alert('Please Enter Payable Terms Description'); + $('#Otherpayment').focus(); + return false; + } else if ($('#BudgetType').val() == "0") { + alert('Please Select Budget Type'); + $('#BudgetType').focus(); + return false; + } else { return true; } } @@ -555,7 +555,7 @@ if (!empty($INRSYMBOL)) { 'Scheduleby', 'value' => set_value('Scheduleby'), 'id' => 'Scheduleby', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110'); - echo Form_textarea($data); + echo form_textarea($data); ?> @@ -566,7 +566,7 @@ if (!empty($INRSYMBOL)) { // $data = array('name' => 'Dispatch','value' => set_value('Dispatch'),'id'=>'Dispatch', 'class' => 'form-control' ,'required' => 'true'); // echo form_input($data); $data = array('name' => 'Dispatch', 'value' => set_value('Dispatch'), 'id' => 'Dispatch', 'class' => 'form-control', 'required' => 'true', 'rows' => '3', 'cols' => '40', 'maxlength' => '110'); - echo Form_textarea($data); + echo form_textarea($data); ?> @@ -786,17 +786,17 @@ if (!empty($INRSYMBOL)) {
          SNo
          " . $MaterialCode . "-" . $MaterialName . "
          " . $MaterialCode . "
          " . $MaterialCode . "
          SNoRequisition NoItem CodeItem NameLine Item SpecsQuantityUOMRate Basic Amount Tax Amount Total Order Amount SNoRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRate Basic Amount Tax Amount Total Order Amount Action
          ReqNo ?> MaterialCode ?>MaterialName ?> + + MaterialName, 0, 13, "..."); + echo $shortName; ?>
          ${temp} ${Reqnumber} ${materialCode}${materialName}${shorten}
          SNoRequisition NoItem CodeItem DescriptionQuantityUOMRateBasic AmountTax AmountTotal Order AmountSNoRequisition NoItem CodeItem DescriptionQuantityUOMRateBasic AmountTax AmountTotal Order Amount Action
          ${temp} ${Reqnumber} ${materialCode}${materialName}${rshorten} ${quantity} ${uom} ${itemRate}
          ${temp} ${Reqnumber} ${materialCode}${materialName}${sshorten} ${quantity} ${uom} ${itemRate}
          - - - - - - - - - - - + + + + + + + + + + + @@ -2648,6 +2648,7 @@ if (!empty($INRSYMBOL)) { $("#MaterialCode").empty(); $("#CapitalDepartmentName").val(''); $("#CPUOM").val(''); + $("#CPRate").val(''); $("#CPQuantity").val(''); $("#CapitalItemName").val(''); $("#CPTotalAmount").val(''); @@ -2717,6 +2718,7 @@ if (!empty($INRSYMBOL)) { var id = $('#MaterialCode').val(); $("#CapitalItemName").val(''); $("#CPUOM").val(''); + $("#CPRate").val(''); $("#CPQuantity").val(''); $("#CPTotalAmount").val(''); RequistQuantity = ''; @@ -2729,6 +2731,7 @@ if (!empty($INRSYMBOL)) { if (obj.MaterialCode === id) { $("#CapitalItemName").val(obj.MaterialName); $("#CPUOM").val(obj.UOM); + $("#CPRate").val(obj.material_rate); var CPUOMDisplay = obj.UOM; $("#CPQuantity").val(obj.Quantity); RequistQuantity = obj.Quantity; @@ -3522,13 +3525,13 @@ if (!empty($INRSYMBOL)) { // Taxvalue: TotalTaxValue, // TotalValue: Total // })); - + var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; var rowHtml = ` - + - - - - - - - - - - + + + + + + + + + + @@ -826,7 +826,8 @@ if (!empty($POItem) && $CapitalRange == '1') { - + @@ -3451,29 +3452,27 @@ Calculate Landing charge //alert(basicamt); } - if (validate()) { + if (capitalValidate()) { var ex = $('#ExchangeRt').val(); //alert(ex); //alert(parseInt($('#CapitalToatlOrder').val() * ex)); var AvlBudAmt = ''; //alert(AvlBudAmt); - if (document.getElementById('serviceTax').rows.length < 2) { - alert('Please Select Line item to Create PO'); - $('#Deliverydt').focus(); - return false; - } else if ($('#Otherpayment').val() == '' && $('#PaymentMethod').val() == 'PT08') { - alert('Please Enter Other Payable Terms Description'); - $('#Otherpayment').focus(); - return false; - } - + // if (document.getElementById('serviceTax').rows.length < 2) { + // alert('Please Select Line item to Create PO'); + // $('#Deliverydt').focus(); + // return false; + // } else if ($('#Otherpayment').val() == '' && $('#PaymentMethod').val() == 'PT08') { + // alert('Please Enter Other Payable Terms Description'); + // $('#Otherpayment').focus(); + // return false; + // } // else if(parseInt(AvlBudAmt) < parseInt(basicamt)) { - // alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); - - // return false; - // } - else { + // alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); + // return false; + // } + // else { //alert('else'); @@ -3498,7 +3497,7 @@ Calculate Landing charge $('#loader').show(); - + disableButtons(); $.ajax({ // data:$('.CapitalPO').serialize()+"&ExchangeRateOn="+ExchangeRateOn+"&PaymentMethod="+PaymentMethod+"&PayableAT="+PayableAT+"&PaymentDate="+PaymentDate, type: "POST", @@ -3517,15 +3516,17 @@ Calculate Landing charge $('#SpcialInstruction').val(''); $('#txtDeliveryAddress').val(''); window.location = status == 1 ? "amendmentpurchaseorder" : "purchaseorderListing"; + setTimeout(function() { enableButtons(); }, 2000); } else { $('#loader').hide(); alert("Error"); + setTimeout(function() { enableButtons(); }, 2000); } } }); - } + // } } } diff --git a/app/Views/editCapitalPo.php b/app/Views/editCapitalPo.php index 3c1dfbfd..714ee71a 100755 --- a/app/Views/editCapitalPo.php +++ b/app/Views/editCapitalPo.php @@ -888,16 +888,16 @@ if (!empty($getlogpodtl)) { - - - - - - - - - - + + + + + + + + + + @@ -922,7 +922,8 @@ if (!empty($getlogpodtl)) { - + - `; + `; if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") { rowHtml += ` - - - - - + + + + + + + @@ -1232,7 +1232,8 @@ if (!empty($RequistionDetails)) { - + @@ -2925,13 +2926,14 @@ if (!empty($RequistionDetails)) { if (validate() && Budgetcheck()) { - if (document.getElementById('ImportTax').rows.length <= 0) { + // if (document.getElementById('ImportTax').rows.length <= 0) { - alert('Please Select Line item to Create PO'); - $('#Deliverydt').focus(); - return false; - } else { + // alert('Please Select Line item to Create PO'); + // $('#Deliverydt').focus(); + // return false; + // } else { $('#loader').show(); + disableButtons(); var formData = new FormData($('.ImportPO')[0]); if (status == 0) { // for draft @@ -2962,21 +2964,29 @@ if (!empty($RequistionDetails)) { //$('#txtDeliveryAddress').val(''); window.location = status == 1 ? "amendmentpurchaseorder" : "purchaseorderListing"; + setTimeout(function() { enableButtons(); }, 2000); + } else { alert("Error"); + setTimeout(function() { enableButtons(); }, 2000); + } }, error : function (){ console.error(error); + setTimeout(function() { enableButtons(); }, 2000); + }, complete : function (){ console.log("ajax call is completed "); + setTimeout(function() { enableButtons(); }, 2000); + } }); - } + // } } } diff --git a/app/Views/editRevenueAmendPO.php b/app/Views/editRevenueAmendPO.php index 6f5abf94..993b0388 100755 --- a/app/Views/editRevenueAmendPO.php +++ b/app/Views/editRevenueAmendPO.php @@ -1224,15 +1224,15 @@ if (!empty($INRSYMBOL)) { - - - - - - - - - + + + + + + + + + @@ -1249,7 +1249,8 @@ if (!empty($INRSYMBOL)) { - + @@ -2547,21 +2548,21 @@ if (!empty($INRSYMBOL)) { var txtTotBasicAmount = $('#txtTotBasicAmount').val(); var txtTotalDiscount = $('#txtTotalDiscount').val(); //alert('Before Validate IF condition'); - if (validate()) { + if (revenueValidate()) { //alert('insdie Validate IF condition'); var realrows = document.getElementById('txtRowCount').value; //alert(realrows); - if (document.getElementById('revenueTax').rows.length < 2) { - alert('Please Select Line item to Create PO'); - $('#Deliverydt').focus(); - return false; - } + // if (document.getElementById('revenueTax').rows.length < 2) { + // alert('Please Select Line item to Create PO'); + // $('#Deliverydt').focus(); + // return false; + // } // else if(parseInt(AvlBudAmt) < (parseInt(txtTotBasicAmount) - parseInt(txtTotalDiscount))) { // alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); // return false; // } - else { + // else { //alert('final else for store data'); // $('.content').loader('show'); var formData = new FormData($('.CreatePO')[0]); @@ -2574,6 +2575,7 @@ if (!empty($INRSYMBOL)) { }; $('#loader').show(); + disableButtons(); $.ajax({ // data:$('.CreatePO').serialize(), type: "POST", @@ -2592,22 +2594,25 @@ if (!empty($INRSYMBOL)) { $('#txtDeliveryAddress').val('') window.location = (status == 1) ? "amendmentpurchaseorder" : "purchaseorderListing"; - + setTimeout(function() { enableButtons(); }, 2000); } else { $('#loader').hide(); + setTimeout(function() { enableButtons(); }, 2000); } }, error : function(error){ console.error("error occured" + error); + setTimeout(function() { enableButtons(); }, 2000); }, complete : function (){ $('#loader').hide(); console.log("ajax call is completed ..!!") + setTimeout(function() { enableButtons(); }, 2000); } }); - } + // } } } diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php index eaf2de39..3baeac77 100755 --- a/app/Views/editRevenuepurchaseorder.php +++ b/app/Views/editRevenuepurchaseorder.php @@ -2332,28 +2332,28 @@ if (!empty($getlogpodtl)) { - - - - - - - - + + + + + + + - - - - + @@ -2368,7 +2368,8 @@ if (!empty($getlogpodtl)) { - + - `; + `; if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") { rowHtml += ` - - - - - - - - - - - - + + + + + + + + + + + + @@ -1056,7 +1056,8 @@ foreach ($PaymentTerms as $TER) { - + @@ -2191,31 +2192,32 @@ foreach ($PaymentTerms as $TER) { var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val(); // alert("worked"); - // if (validate()) { + if (serviceValidate()) { // if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) { // alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); // return false; // } - if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { - alert('Please Enter Other Payment Details'); - $('#Otherpayment').focus(); - return false; - } else if ($('#amenddescofpo').val().trim() == '') { - alert('Please Enter Description Of Service'); - $('#amenddescofpo').focus(); - return false; - } else { + // if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { + // alert('Please Enter Other Payment Details'); + // $('#Otherpayment').focus(); + // return false; + // } else if ($('#amenddescofpo').val().trim() == '') { + // alert('Please Enter Description Of Service'); + // $('#amenddescofpo').focus(); + // return false; + // } else { // $('#content').loader('show'); - var formData = new FormData($('.ServicePO')[0]); - if (status == 0) { // for draft + var formData = new FormData($('.ServicePO')[0]); + if (status == 0) { // for draft formData.append('changeStatus','ST014'); }; if (status == 1) { // for approve formData.append('changeStatus','ST026'); }; - $('#loader').show(); + disableButtons(); + $('#loader').show(); $.ajax({ // data: $('.ServicePO').serialize(), type: "POST", @@ -2234,15 +2236,19 @@ foreach ($PaymentTerms as $TER) { $('#txtDeliveryAddress').val('') window.location = status == 1 ? "amendmentpurchaseorder" : "purchaseorderListing"; + setTimeout(function() { enableButtons(); }, 2000); } else { + setTimeout(function() { enableButtons(); }, 2000); $('#loader').hide(); console.error("Error"); } }, error : function (error){ + setTimeout(function() { enableButtons(); }, 2000); console.log("error occurred" , error); }, complete : function (){ + setTimeout(function() { enableButtons(); }, 2000); console.log("Ajax call is completed ..!!"); } }); diff --git a/app/Views/editimportpo.php b/app/Views/editimportpo.php index 7c7f960a..24a5928b 100755 --- a/app/Views/editimportpo.php +++ b/app/Views/editimportpo.php @@ -828,15 +828,15 @@ if (!empty($getlogpodtl)) {
          SNoRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRateBasic AmountTax AmountTotal Order AmountSNoRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRateBasic AmountTax AmountTotal Order Amount Action
          ${temp} ${Reqnumber} ${materialCode}${materialName}${shorten} - @@ -4431,6 +4434,7 @@ if (!empty($INRSYMBOL)) { var id = $('#EditMaterialCode').val(); $("#EditCapitalItemName").val(''); $("#EditCPUOM").val(''); + $("#EditCPRate").val(''); $("#EditCPQuantity").val(''); $("#EditCPTotalAmount").val(''); RequistQuantity = ''; @@ -4443,6 +4447,7 @@ if (!empty($INRSYMBOL)) { if (obj.MaterialCode === id) { $("#EditCapitalItemName").val(obj.MaterialName); $("#EditCPUOM").val(obj.UOM); + $("#EditCPRate").val(obj.material_rate); $("#EditCPQuantity").val(obj.Quantity); RequistQuantity = obj.Quantity; } @@ -4523,32 +4528,32 @@ if (!empty($INRSYMBOL)) { } else { basicAmountRate = parseFloat($('#CapitalBasicOrder').val()) - parseFloat($('#txtTotalDiscount').val()); } - if (validate()) { - if (document.getElementById('serviceTax').rows.length < 2) { - alert('Please Select Line item to Create PO'); - $('#Deliverydt').focus(); - return false; - } else if ($('#Otherpayment').val() == '' && $('#PaymentMethod').val() == 'PT08') { - alert('Please Enter Other Payable Terms Description'); - $('#Otherpayment').focus(); - return false; - } - // else if(parseInt(AvlBudAmt) < parseInt(basicAmountRate)) { + if (capitalValidate()) { + // if (document.getElementById('serviceTax').rows.length < 2) { + // alert('Please Select Line item to Create PO'); + // $('#Deliverydt').focus(); + // return false; + // } else if ($('#Otherpayment').val() == '' && $('#PaymentMethod').val() == 'PT08') { + // alert('Please Enter Other Payable Terms Description'); + // $('#Otherpayment').focus(); + // return false; + // } + // else if(parseInt(AvlBudAmt) < parseInt(basicAmountRate)) { // alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); - // return false; // } - else if ($('#PoTypeOptions').val() == "0") { - alert('Please Select POType'); - $('#PoTypeOptions').focus(); - return false; + // else if ($('#PoTypeOptions').val() == "0") { + // alert('Please Select POType'); + // $('#PoTypeOptions').focus(); + // return false; - } else { + // } else { // $('#content').loader('show'); var formData = new FormData($('.CapitalPO')[0]); formData.append('ExchangeRateOn', ExchangeRateOn); formData.append('PaymentMethod', PaymentMethod); $('#loader').show(); + disableButtons(); $.ajax({ data: formData, processData: false, @@ -4570,16 +4575,22 @@ if (!empty($INRSYMBOL)) { clearAfterAddLineItemAdd(); window.location = "purchaseorderListing"; - + setTimeout(function() { enableButtons(); }, 2000); } else { // $('#content').loader('hide'); alert("Error"); + setTimeout(function() { enableButtons(); }, 2000); } - } + }, + error: function(jqXHR, textStatus, errorThrown) { + console.error("AJAX Error: " + textStatus + ": " + errorThrown); + alert("Error: " + textStatus); + setTimeout(function() { enableButtons(); }, 2000); + } }); - } + // } } } @@ -5422,9 +5433,12 @@ if (!empty($INRSYMBOL)) { function Reset() { - location.reload(); - - } + disableButtons(); + location.reload(); + setTimeout(function() { + enableButtons(); + }, 2000); + } $('#insuranceTxtDiv').hide(); $("#insuranceStatus").change(function() { diff --git a/app/Views/editCapitalAmendPO.php b/app/Views/editCapitalAmendPO.php index 9ead78a5..1dc1ae3c 100755 --- a/app/Views/editCapitalAmendPO.php +++ b/app/Views/editCapitalAmendPO.php @@ -801,16 +801,16 @@ if (!empty($POItem) && $CapitalRange == '1') { style="font-size:12px;">
          SNoRequisition NoItem NameQuantityUOMRateBasic AmountTax AmountTotal Order AmountActionSNoRequisition NoItem DescriptionQuantityUOMRateBasic AmountTax AmountTotal Order AmountAction
          ReqNo ?>MaterialName ?>MaterialName, 0, 13, "..."); + echo $shortName; ?> Quantity ?> UOM ?> Rate, 2, '.', ''); ?>
          SNoRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRateBasic AmountTax AmountTotal Order AmountRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRateBasic AmountTax AmountTotal Order Amount ReqNo ?> MaterialCode ?>MaterialName ?>MaterialName, 0, 13, "..."); + echo $shortName; ?> + var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; var rowHtml = `
          ${temp} ${Reqnumber} ${materialCode}${materialName}${shorten}SNo - Requisition NoItem NameQuantityUOMRateBasic AmountSNoRequisition NoItem DescriptionQuantityUOMRateBasic Amount Action
          ReqNo ?>MaterialName ?>MaterialName, 0, 13, "..."); + echo $shortName; ?> Quantity ?> UOM ?> Rate ?>
          SNoRequisition NoItem NameQuantityUOMRateBasic AmountTax AmountTotal Order AmountSNoRequisition NoItem DescriptionQuantityUOMRateBasic AmountTax AmountTotal Order Amount Action
          ReqNo ?>MaterialName ?>MaterialName, 0, 13, "..."); + echo $shortName; ?> Quantity ?> UOM ?> Rate ?>
          SNoRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRate + SNoRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRate Basic Amount + Basic Amount Tax Amount + Tax Amount Total Order Amount + Total Order Amount ActionAction
          ReqNo ?> MaterialCode ?>MaterialName ?>MaterialName, 0, 13, "..."); + echo $shortName; ?> console.log("PONOStatus",PONOStatus); + var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; + // var template = jQuery("#RevenueList").html(); @@ -4507,7 +4510,7 @@ if (!empty($getlogpodtl)) { ${temp} ${Reqnumber} ${materialCode}${materialName}${shorten}purchaseorder/EditRevenuePurchaseOrder", @@ -5417,9 +5421,11 @@ if (!empty($getlogpodtl)) { $('#SpcialInstruction').val(''); $('#txtDeliveryAddress').val('') window.location = "purchaseorderListing"; + setTimeout(function() { enableButtons(); }, 2000); } else { alert("Something went wrong"); + setTimeout(function() { enableButtons(); }, 2000); } }, @@ -5428,6 +5434,7 @@ if (!empty($getlogpodtl)) { $('#loader').hide(); console.error("AJAX Error: ", textStatus, errorThrown); alert("An error occurred: " + textStatus + " - " + errorThrown); + setTimeout(function() { enableButtons(); }, 2000); }, @@ -5435,10 +5442,11 @@ if (!empty($getlogpodtl)) { // // Actions that should always happen regardless of success or error // console.log("AJAX request completed."); // $('#loader').hide(); // Hide the loader in any case + // setTimeout(function() { enableButtons(); }, 2000); // } }); - } + // } } } $(document).ready(function () { diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php index 7a1da430..0797e057 100755 --- a/app/Views/editServiceAmendPO.php +++ b/app/Views/editServiceAmendPO.php @@ -1016,18 +1016,18 @@ foreach ($PaymentTerms as $TER) {
          SNoRequisition NoItem CodeItem NameQuantityUOMRateBasic AmountTax AmountTotal Order AmountActual QuantityReceived QuantityPending QuantityRequisition NoItem CodeItem DescriptionQuantityUOMRateBasic AmountTax AmountTotal Order AmountActual QuantityReceived QuantityPending Quantity Action
          ReqNo ?> MaterialCode ?>MaterialName ?>MaterialName, 0, 13, "..."); + echo $shortName; ?> Quantity ?> UOM ?> Rate ?>
          - - - - - - - - - + + + + + + + + + @@ -859,7 +859,8 @@ if (!empty($getlogpodtl)) { - + - `; + `; if (PONOStatus === "PO_DRAFT" || PONOStatus === "PO_CREATED") { rowHtml += ` - - - - - - - - - + + + + + + + + + @@ -980,30 +982,26 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
          -
          - - Save as Draft - -
          -
          - -
          - -
          +
          - - + +
          - - Submit - + + +   Reset +   Save as Draft +   Submit + + +
          @@ -3519,12 +3517,13 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) { // RejectedQty: rejectedqty, // PendingQty: pendingqty // })); + var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; var rowHtml = `
          - + + @@ -294,7 +295,7 @@ - + - + + + - + diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php index 45de4b7c..ec5fd8ce 100755 --- a/app/Views/purchaseorder.php +++ b/app/Views/purchaseorder.php @@ -411,7 +411,7 @@ if (!empty($INRSYMBOL)) { }); $('#MaterialCode').change(function() { - +alert("**"); var id = $('#MaterialCode').val(); var drpSupplier = $('#drpSupplier').val(); $("#ItemName").val(''); @@ -432,6 +432,7 @@ if (!empty($INRSYMBOL)) { $("#ItemName").val(obj.MaterialName); $("#UOM").val(obj.UOM); $("#Quantity").val(obj.Quantity); + $("#Rate").val(obj.Rate); RequistQuantity = obj.Quantity; } }); @@ -2166,20 +2167,20 @@ if (!empty($INRSYMBOL)) {
          -
          SNoRequisition NoMaterial CodeDescriptionLine Item SpecsQuantityUOMRateBasic AmountSNoRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRateBasic Amount ReqNo ?> MaterialCode ?>MaterialName ?>MaterialName, 0, 13, "..."); + echo $shortName; ?> + var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; var rowHtml = `
          ${temp} ${Reqnumber} ${materialCode}${materialName}${shorten}
          SNoRequisition NoMaterial CodeDescriptionLine Item SpecsQuantityUOMRateBasic AmountSNoRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRateBasic Amount
          ${temp} ${Reqnumber} ${materialCode}${materialName}${shorten} - @@ -4189,19 +4188,14 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) { //alert(stat); //alert(JSON.stringify(txtStatus)); //exit(); - if (validate() && Budgetcheck()) { - else if ($('#Importoption').val() == "0") { - alert('Please Select Import Type'); - $('#Importoption').focus(); - return false; - - } else { + if (importValidate() && Budgetcheck()) { // $('#content').loader('show'); var formData = new FormData($('.ImportPO')[0]); formData.append('txtRowCount', txtRowCount); formData.append('txtDeletedRow', txtDeletedRow); formData.append('textStatus', stat); + disableButtons(); $.ajax({ // data:$('.ImportPO').serialize()+"&txtRowCount="+txtRowCount+"&txtDeletedRow="+txtDeletedRow+"&textStatus="+stat, @@ -4220,17 +4214,22 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) { //$('#SpcialInstruction').val(''); //$('#txtDeliveryAddress').val(''); window.location = "purchaseorderListing"; + setTimeout(function() { enableButtons(); }, 2000); } else { alert("Error"); + setTimeout(function() { enableButtons(); }, 2000); } - } + }, + error: function(jqXHR, textStatus, errorThrown) { + console.error("AJAX Error: " + textStatus + ": " + errorThrown); + alert("Error: " + textStatus); + setTimeout(function() { enableButtons(); }, 2000); + } }); - } - } @@ -4333,4 +4332,12 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) { calculateFreight(1); }); + function Reset() { + disableButtons(); + location.reload(); + setTimeout(function() { + enableButtons(); + }, 2000); + + } \ No newline at end of file diff --git a/app/Views/monthlypayinputs.php b/app/Views/monthlypayinputs.php index 4b5759f6..65926394 100755 --- a/app/Views/monthlypayinputs.php +++ b/app/Views/monthlypayinputs.php @@ -233,6 +233,7 @@ DOJ Designation Total DaysNumber Of Trips Days Worked LOP Days Paid Leave NoofDays; ?> Key)) { echo "contenteditable='false';"; @@ -534,10 +535,16 @@ Designation; ?> no_of_loads." (trip)"; ?> + total_cal_days; ?> + + no_of_loads." (trip)"; ?> + - + unique_days, 2, '.', ''); ?> @@ -557,7 +564,9 @@ - + total_cal_days ; + echo number_format($worked_amt, 2, '.', ''); ?> @@ -565,7 +574,8 @@ - + @@ -675,7 +685,7 @@ Total Total
          +
          - - - - - - - - - - - + + + + + + + + + + + @@ -3457,12 +3458,13 @@ if (!empty($INRSYMBOL)) { // })); // Define your template using ES6 template literals + var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; var rowHtml = ` - + - + @@ -1808,6 +1808,7 @@ + \ 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)) {
          -
          SNoRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRateBasic AmountTax AmountTotal Order AmountSNoRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRateBasic AmountTax AmountTotal Order Amount Action
          ${temp} ${Reqnumber} ${materialCode}${materialName}${shorten} - diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php index 75e71157..ccf805dd 100755 --- a/app/Views/servicePurchaseorder.php +++ b/app/Views/servicePurchaseorder.php @@ -1048,17 +1048,17 @@ if (!empty($INRSYMBOL)) { - - - - - - - - - - - + + + + + + + + + + + @@ -1975,13 +1975,13 @@ if (!empty($INRSYMBOL)) { // Taxvalue: TotalTaxValue, // TotalValue: TotalOrderValue // })); - + var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; var rowHtml = ` - + + @@ -281,6 +282,7 @@ + - +
          SNoRequisition NoItem CodeItem NameLine Item SpecsQuantityUOMRate Basic Amount Tax Amount Total Order Amount SNoRequisition NoItem CodeItem DescriptionLine Item SpecsQuantityUOMRate Basic Amount Tax Amount Total Order Amount Action
          ${temp} ${Reqnumber} ${materialCode}${materialName}${shorten} - diff --git a/public/assets/js/CreatePOValidation.js b/public/assets/js/CreatePOValidation.js index f1e86374..92e8ab86 100755 --- a/public/assets/js/CreatePOValidation.js +++ b/public/assets/js/CreatePOValidation.js @@ -88,7 +88,7 @@ function revenueValidate(){ $('#BudgetType').focus(); return false; }else if ($('#revenueTax tbody tr').length < 1) { - alert('Please Select Line item to Create PO'); + alert('Atleast One Line needed'); return false; }else { return true; @@ -146,7 +146,7 @@ function serviceValidate(){ $('#BudgetType').focus(); return false; }else if ($('#serviceTax tbody tr').length < 1) { - alert('Please Select Line item to Create PO'); + alert('Atleast One Line needed'); return false; } else if ($('#descofpo').val().trim() == '') { alert('Please Enter Description Of Service'); @@ -161,148 +161,170 @@ function capitalValidate(){ var radioValue = parseInt($("input[name='DateRange']:checked").val()); var PoType = $('#POType').val(); if(PoType=='CAPITAL' && capitalType=='International'){ - if ($('#drpSupplier').val() == "0") { - alert('Please Select the Supplier details'); - $('#drpSupplier').focus(); - return false; - } - }else{ - if ($('#drpSupplier').val() == "0") { - alert('Please Select the Supplier details'); - $('#drpSupplier').focus(); - return false; - } - } + + + if ($('#drpSupplier').val() == "0") { + alert('Please Select the Supplier details'); + $('#drpSupplier').focus(); + return false; + } else if ($('#currencytype').val() == '0') { + alert('Please Select the Currency Type'); + $('#currencytype').focus(); + return false; + } else if ($('#PODate').val() == '') { + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + } else if (radioValue == 0 && $('#Deliverydate').val() == '') { + alert('Please Select the Delivery Date'); + $('#Deliverydate').focus(); + return false; + } else if (radioValue == 1 && $('#Scheduleby').val() == '') { + alert('Please Enter the Schedule By'); + $('#Deliverydate').focus(); + return false; + } else if (radioValue == 2 && $('#Dispatch').val().trim() == '') { + alert('Please Enter the Dispatch Instruction'); + $('#Deliverydate').focus(); + return false; + } else if ($('#ExchangeRate').val() == '') { + alert('Please Enter the Exchange Rate'); + $('#ExchangeRate').focus(); + return false; + } else if ($('#ExchangeRate').val() == 0) { + alert('Please Enter the Exchange Rate'); + $('#ExchangeRate').focus(); + return false; + } else if ($('#PlaceOforigin').val() == '') { + alert('Please Enter Place Of Origin'); + $('#PlaceOforigin').focus(); + return false; + } else if ($('#PoTypeOptions').val() == "0") { + alert('Please Select Capital Type'); + $('#PoTypeOptions').focus(); + return false; + } else if ($('#PaymentTerms').val() == '') { + alert('Please Select Payment Terms'); + $('#PaymentTerms').focus(); + return false; + } else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { + alert('Please Enter Payable Terms Description'); + $('#Otherpayment').focus(); + return false; + } else if ($('#BudgetType').val() == "0") { + alert('Please Select Budget Type'); + $('#BudgetType').focus(); + return false; + } else if ($('#serviceTax tbody tr').length < 1) { + alert('Atleast One Line needed'); + return false; + } else { return true; } - else if ($('#PODate').val().trim() == '') { - alert('Please Enter the Purchase Order date'); - $('#PODate').focus(); - return false; - }else if ($('#DeliveryAddr').val().trim() == '') { - alert('Please Enter the Delivery Address'); - $('#DeliveryAddr').focus(); - return false; - }else if (radioValue === 0 && $('#Deliverydt').val() == '') { - alert('Please Select the Delivery Date'); - $('#Deliverydt').focus(); - return false; - }else if (radioValue == 1) { - var scheduleBy = $('#Scheduleby').val(); // Get the value - if (!scheduleBy || scheduleBy.trim() == '') { // Check if it's empty or undefined - alert('Please Enter the Schedule By'); - $('#Scheduleby').focus(); - return false; + } + if(PoType=='CAPITAL' && capitalType=='Domestic'){ + if ($('#drpSupplier').val() == "0") { + alert('Please Select the Supplier details'); + $('#drpSupplier').focus(); + return false; + } else if ($('#PODate').val() == '') { + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + } else if (radioValue == 0 && $('#Deliverydate').val() == '') { + alert('Please Select the Delivery Date'); + $('#Deliverydate').focus(); + return false; + } else if (radioValue == 1 && $('#Scheduleby').val() == '') { + alert('Please Enter the Schedule By'); + $('#Deliverydate').focus(); + return false; + } else if (radioValue == 2 && $('#Dispatch').val().trim() == '') { + alert('Please Enter the Dispatch Instruction'); + $('#Deliverydate').focus(); + return false; + } else if ($('#PoTypeOptions').val() == "0") { + alert('Please Select Capital Type'); + $('#PoTypeOptions').focus(); + return false; + } else if ($('#PaymentTerms').val() == '') { + alert('Please Select Payment Terms'); + $('#PaymentTerms').focus(); + return false; + } else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { + alert('Please Enter Payable Terms Description'); + $('#Otherpayment').focus(); + return false; + } else if ($('#BudgetType').val() == "0") { + alert('Please Select Budget Type'); + $('#BudgetType').focus(); + return false; + } else if ($('#serviceTax tbody tr').length < 1) { + alert('Atleast One Line needed'); + return false; + } else { return true; } } - }else if($('#PODate').val() == ''){ - alert('Please Enter the Purchase Order date'); - $('#PODate').focus(); - return false; - }else if ($('#PoTypeOptions').val() == "0") { - alert('Please Select Service Type'); - $('#PoTypeOptions').focus(); - return false; - }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 ($('#BudgetType').val() == "0") { - alert('Please Select Budget Type'); - $('#BudgetType').focus(); - return false; - }else if ($('#serviceTax tbody tr').length < 1) { - alert('Please Select Line item to Create PO'); - return false; - } else if ($('#descofpo').val().trim() == '') { - alert('Please Enter Description Of Service'); - $('#descofpo').focus(); - return false; - }else { - return true; - } } function importValidate(){ var radioValue = parseInt($("input[name='DateRange']:checked").val()); - - if ($('#drpSupplier').val() == "0") { - alert('Please Select the Supplier details'); - $('#drpSupplier').focus(); - return false; - } else if ($('#currencytype').val() == '0') { - alert('Please Select the Currency Type'); - $('#currencytype').focus(); - return false; - } else if ($('#DeliveryAddr').val().trim() == '') { - alert('Please Enter the Delivery Address'); - $('#DeliveryAddr').focus(); - return false; - } else if (radioValue === 0 && $('#Deliverydt').val() == '') { - alert('Please Select the Delivery Date'); - $('#Deliverydt').focus(); - return false; - } else if (radioValue == 1) { - var scheduleBy = $('#Scheduleby').val(); // Get the value - if (!scheduleBy || scheduleBy.trim() == '') { // Check if it's empty or undefined - alert('Please Enter the Schedule By'); - $('#Scheduleby').focus(); + if ($('#drpSupplier').val() == "0") { + alert('Please Select the Supplier details'); + $('#drpSupplier').focus(); + return false; + } else if ($('#currencytype').val() == '0') { + alert('Please Select the Currency Type'); + $('#currencytype').focus(); + return false; + } else if ($('#PODate').val() == '') { + alert('Please Enter the Purchase Order date'); + $('#PODate').focus(); + return false; + } else if ($('#DeliveryAddr').val() == '') { + alert('Please Enter the Delivery Address'); + $('#DeliveryAddr').focus(); + return false; + } else if (radioValue === 1 && $('#Scheduleby').val() == '') { + alert('Please Enter Schedule By'); + $('#Scheduleby').focus(); + return false; + } else if (radioValue === 2 && $('#Dispatch').val() == '') { + alert('Please Enter Dispatch Instruction'); + $('#Dispatch').focus(); + return false; + } else if ($('#ExchangeRate').val() == '') { + alert('Please Enter the Exchange Rate'); + $('#ExchangeRate').focus(); + return false; + } else if ($('#ExchangeRate').val() == 0) { + alert('Please Enter the Exchange Rate'); + $('#ExchangeRate').focus(); + return false; + } else if ($('#PlaceOforigin').val() == '') { + alert('Please Enter Place Of Origin'); + $('#PlaceOforigin').focus(); + return false; + } else if ($('#Importoption').val() == "0") { + alert('Please Select Import Type'); + $('#Importoption').focus(); + return false; + } else if ($('#PaymentTerms').val() == '') { + alert('Please Select Payment Terms'); + $('#PaymentTerms').focus(); + return false; + } else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { + alert('Please Enter Payable Terms Description'); + $('#Otherpayment').focus(); + return false; + } else if ($('#BudgetType').val() == "0") { + alert('Please Select Budget Type'); + $('#BudgetType').focus(); + return false; + } else if ($('#ImportTax tbody tr').length < 1) { + alert('Atleast One Line needed'); return false; + }else { + return true; } - } else if ($('#Dispatch').val() == '' && $('#Scheduleby').val() == '') { - if (document.getElementById("Schedule").checked) { - alert('Please Enter Schedule By'); - return false; - } else if (document.getElementById("Date").checked) { - alert('Please Enter Dispatch Instruction'); - return false; - } - - } else if ($('#ExchangeRate').val() == '') { - alert('Please Enter the Exchange Rate'); - $('#ExchangeRate').focus(); - return false; - } else if ($('#ExchangeRate').val() == 0) { - alert('Please Enter the Exchange Rate'); - $('#ExchangeRate').focus(); - return false; - } else if ($('#PlaceOforigin').val() == '') { - alert('Please Enter Place Of Origin'); - $('#PlaceOforigin').focus(); - return false; - } else if ($('#PoTypeOptions').val() == "0") { - alert('Please Select Service Type'); - $('#PoTypeOptions').focus(); - return false; - } else if($('#PODate').val() == ''){ - alert('Please Enter the Purchase Order date'); - $('#PODate').focus(); - return false; - } else if ($('#PaymentTerms').val() == '') { - alert('Please Select Payment Terms'); - $('#PaymentTerms').focus(); - return false; - - } 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 ($('#BudgetType').val() == "0") { - alert('Please Select Budget Type'); - $('#BudgetType').focus(); - return false; - }else if ($('#ImportTax tbody tr').length < 1) { - alert('Please Select Line item to Create PO'); - return false; - }else { - return true; - } } function validate() From 4018698331e87e9c54874c5804887a840076baf3 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Mon, 3 Mar 2025 05:31:29 +0000 Subject: [PATCH 10/15] Material rate : ps --- app/Views/capitalpurchaseorder.php | 1 + app/Views/purchaseorder.php | 5 +++-- app/Views/servicePurchaseorder.php | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/Views/capitalpurchaseorder.php b/app/Views/capitalpurchaseorder.php index 27d9c9b1..a2143c63 100755 --- a/app/Views/capitalpurchaseorder.php +++ b/app/Views/capitalpurchaseorder.php @@ -2783,6 +2783,7 @@ if (!empty($INRSYMBOL)) { if (obj.MaterialCode === id) { $("#EditItemName").val(obj.MaterialName); $("#EditUOM").val(obj.UOM); + $("#EditRate").val(obj.material_rate); var EDITUOMDisplay = obj.UOM; $("#EditQuantity").val(obj.Quantity); RequistQuantity = obj.Quantity; diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php index ec5fd8ce..e9df80b3 100755 --- a/app/Views/purchaseorder.php +++ b/app/Views/purchaseorder.php @@ -411,7 +411,7 @@ if (!empty($INRSYMBOL)) { }); $('#MaterialCode').change(function() { -alert("**"); +// alert("**"); var id = $('#MaterialCode').val(); var drpSupplier = $('#drpSupplier').val(); $("#ItemName").val(''); @@ -432,7 +432,7 @@ alert("**"); $("#ItemName").val(obj.MaterialName); $("#UOM").val(obj.UOM); $("#Quantity").val(obj.Quantity); - $("#Rate").val(obj.Rate); + $("#Rate").val(obj.material_rate); RequistQuantity = obj.Quantity; } }); @@ -476,6 +476,7 @@ alert("**"); $("#EditItemName").val(obj.MaterialName); $("#EditUOM").val(obj.UOM); $("#EditQuantity").val(obj.Quantity); + $("#EditRate").val(obj.material_rate); RequistQuantity = obj.Quantity; } }); diff --git a/app/Views/servicePurchaseorder.php b/app/Views/servicePurchaseorder.php index ccf805dd..532405f7 100755 --- a/app/Views/servicePurchaseorder.php +++ b/app/Views/servicePurchaseorder.php @@ -360,6 +360,7 @@ if (!empty($INRSYMBOL)) { $("#ItemName").val(obj.MaterialName); $("#UOM").val(obj.UOM); $("#Quantity").val(obj.Quantity); + $("#Rate").val(obj.material_rate); RequistQuantity = obj.Quantity; var materialn = obj.MaterialName; var materialname = materialn.toUpperCase(); @@ -410,6 +411,7 @@ if (!empty($INRSYMBOL)) { $("#EditItemName").val(obj.MaterialName); $("#EditUOM").val(obj.UOM); $("#EditQuantity").val(obj.Quantity); + $("#EditRate").val(obj.material_rate); RequistQuantity = obj.Quantity; } }); From 01f982f0934c1ea7643b737220202218c44916f7 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Mon, 3 Mar 2025 08:57:39 +0000 Subject: [PATCH 11/15] driver bug fixes : ps --- app/Views/addEmployeenew.php | 4 ++-- app/Views/driverAttendance.php | 30 +++++++++++++----------------- app/Views/editEmployeenew.php | 8 ++++---- 3 files changed, 19 insertions(+), 23 deletions(-) diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php index 9c28bd2c..41316e59 100755 --- a/app/Views/addEmployeenew.php +++ b/app/Views/addEmployeenew.php @@ -1092,12 +1092,12 @@
          - +
          -
          +
          diff --git a/app/Views/driverAttendance.php b/app/Views/driverAttendance.php index 9a843fbd..25d9846d 100755 --- a/app/Views/driverAttendance.php +++ b/app/Views/driverAttendance.php @@ -377,7 +377,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); $("#attendanceModal").on("shown.bs.modal", function (e) { var id = $(e.relatedTarget).data('id'); - let fields = ['invoice_number', 'vehicle_number', 'load_type', 'salary_amount', 'food_amount','customer','quantity']; + let fields = ['invoice_number', 'vehicle_number', 'load_type', 'salary_amount', 'food_amount','customer','quantity','total_amount']; fields.forEach(function(field) { $("#" + field).val(""); @@ -398,10 +398,18 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); if(field == 'driver_id'){ $("#driver_id").val(arr && arr['driver_id']); } - if(field == 'salary_amount' || field == 'food_amount') { - var ttl = parseFloat(arr['salary_amount']) + (parseFloat(arr['food_amount'] || 0)); + var salary = arr['salary_amount'] ? parseFloat(arr['salary_amount']) : 0; + var food = arr['food_amount'] ? parseFloat(arr['food_amount']) : 0; + + if (isNaN(salary)) salary = 0; + if (isNaN(food)) food = 0; + + var ttl = salary + food; + $('#total_amount').val(ttl.toFixed(2)); + + var ttl = parseFloat(salary) + parseFloat(food) ; $('#total_amount').val(ttl.toFixed(2)); - } + }); $('#attendanceTitle').html("Edit Driver Trip"); } @@ -486,21 +494,9 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); buttons: [ 'excel', 'pdf' ], - pageLength: 10, - lengthMenu: [ - [10, 20, 30, 50, -1], - [10, 20, 30, 50, "All"] - ], responsive: false, order: false, - language: { - paginate: { - next: '', // Next button icon - previous: '' // Previous button icon - } - }, - - + paging: false, footerCallback: function (row, data, start, end, display) { var api = this.api(); var isTableEmpty = api.data().length === 0; diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php index 77861569..c4420bcf 100755 --- a/app/Views/editEmployeenew.php +++ b/app/Views/editEmployeenew.php @@ -1136,7 +1136,7 @@ if (!empty($EmpDetails)) {
          - + @@ -1154,7 +1154,7 @@ if (!empty($EmpDetails)) {
          -
          +
          @@ -1263,13 +1263,13 @@ if (!empty($EmpDetails)) {
          - +
          - +
          From 9fe727a880a5ccd40bc7cd35767aa962f90ec257 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Mon, 3 Mar 2025 09:21:56 +0000 Subject: [PATCH 12/15] Material master date : ps --- app/Controllers/Rawmaterialdetails.php | 3 ++- app/Views/addRawMaterial.php | 7 ++++--- app/Views/editRawmaterial.php | 18 ++++++++++++++---- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/app/Controllers/Rawmaterialdetails.php b/app/Controllers/Rawmaterialdetails.php index 6575995d..679b5cec 100755 --- a/app/Controllers/Rawmaterialdetails.php +++ b/app/Controllers/Rawmaterialdetails.php @@ -331,7 +331,7 @@ class Rawmaterialdetails extends BaseController $stock = $this->request->getPost('openstock'); $reorder = $this->request->getPost('reorder'); $stockdate = $this->request->getPost('Date'); - $stockdate = (empty($stockdate)) ? NULL : format_date($stockdate,0,"Y-m-d"); + $stockdate = (empty($stockdate)) ? NULL : get_date_time_dynamical_format('d-m-Y','Y-m-d',"$stockdate"); $chked = $this->request->getPost('isactive'); $IsActive = ($chked != '') ? '1' : '0'; @@ -339,6 +339,7 @@ class Rawmaterialdetails extends BaseController $RawMaterial = array(); $RawMaterial = array('MaterialName' => $MaterialName, 'MaterialType' => $MaterialType, 'UpdatedBy' => $UpdatedBy, 'UOM' => $UOM, 'IsActive' => $IsActive, 'Category' => $MaterialCategory, 'Remarks' => $Remarks, 'HSNCODE' => $HSNcode, 'stock' => $stock, 'stockdate' => $stockdate, 'reorder' => $reorder,'material_rate'=>$material_rate); //,'RMCode'=>$rmcode); + // print_r($RawMaterial);die; $result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode); diff --git a/app/Views/addRawMaterial.php b/app/Views/addRawMaterial.php index f9bf39d7..f4707fda 100755 --- a/app/Views/addRawMaterial.php +++ b/app/Views/addRawMaterial.php @@ -11,7 +11,7 @@ $("#Date").datepicker({ //minDate :'now', //maxDate : 'now', - dateFormat: 'dd-mm-yy', + format: 'dd-mm-yyyy', changeMonth: true, changeYear: true, yearRange: '-100:+1', @@ -124,8 +124,9 @@
          'Date', 'value' => set_value('Date'), 'id' => 'Date', 'class' => 'form-control', 'onkeypress' => 'return false;', 'autocomplete'=>'"off"'); - echo form_input($data); + $formattedDate = $dt->format('d-m-Y'); + $data = array('name' => 'Date', 'value' => set_value('Date', $formattedDate), 'id' => 'Date', 'class' => 'form-control', 'onkeypress' => 'return false;', 'autocomplete'=>'"off"'); + echo form_input($data); ?>
          diff --git a/app/Views/editRawmaterial.php b/app/Views/editRawmaterial.php index 5b73dbcc..76b374a8 100755 --- a/app/Views/editRawmaterial.php +++ b/app/Views/editRawmaterial.php @@ -85,10 +85,11 @@ if ($total <= $reorder) { $("#Date").datepicker({ //minDate :'now', //maxDate : 'now', - dateFormat: 'dd-mm-yy', + format: 'dd-mm-yyyy', changeMonth: true, changeYear: true, - yearRange: '-100:+1' + yearRange: '-100:+1', + orientation: 'bottom', }); }); @@ -239,14 +240,23 @@ if ($total <= $reorder) {
          - + 'Date', 'value' => set_value('Date',$formattedDate), 'id' => 'Date', 'class' => 'form-control', 'onkeypress' => 'return false;','readonly'=>true, 'autocomplete'=>'"off"'); + echo form_input($data); + ?> +
          - + 'Date', 'value' => set_value('Date'), 'id' => 'Date', 'class' => 'form-control', 'onkeypress' => 'return false;', 'autocomplete'=>'"off"'); + echo form_input($data); + ?> +
          From 87f7734a0c486f511299dc103b7bdc5269957d0d Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Mon, 3 Mar 2025 11:47:46 +0000 Subject: [PATCH 13/15] fixes : ps --- app/Controllers/Assetdetails.php | 3 ++- app/Controllers/CostCenter.php | 14 +++++++++----- app/Models/Costcenter_model.php | 6 ++++-- app/Views/addRawMaterial.php | 1 + 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/Controllers/Assetdetails.php b/app/Controllers/Assetdetails.php index d1b2977a..8d512fcb 100755 --- a/app/Controllers/Assetdetails.php +++ b/app/Controllers/Assetdetails.php @@ -235,11 +235,12 @@ class Assetdetails extends BaseController $DateOfCommission = $this->request->getPost('DateOfCommission'); $CreatedBy = $this->session->get('userId'); $DateOfPurchase = $this->request->getPost('DateOfPurchase'); + $DOpurchase = ""; if ($DateOfPurchase != '') { $DOpurchase = get_date_time_format($DateOfPurchase); } $AssetValue = $this->request->getPost('Assetvalue'); - + $DOCommission = ""; if ($DateOfCommission != '') { $DOCommission = get_date_time_format($DateOfCommission); //$DOCommission= get_date_time_format($DateOfCommission); diff --git a/app/Controllers/CostCenter.php b/app/Controllers/CostCenter.php index d23a4a2d..478b0bfa 100755 --- a/app/Controllers/CostCenter.php +++ b/app/Controllers/CostCenter.php @@ -102,11 +102,13 @@ class CostCenter extends BaseController if(!empty($CostCenterCode)){ $updatedBy = $this->session->get('userId'); $message = $this->costcenter_model->reActivateCostCenter($CostCenterCode, $updatedBy); + return redirect()->route('costListing'); }else{ - $message = "Cost Center Code Not Avalable"; + // $message = "Cost Center Code Not Avalable"; + return redirect()->route('costListing'); } - $this->session->setFlashdata('success', $message); - return redirect()->route('costListing'); + // $this->session->setFlashdata('success', $message); + // return redirect()->route('costListing'); } @@ -121,11 +123,13 @@ class CostCenter extends BaseController if(!empty($CostCenterID)){ $updatedBy = $this->session->get('userId'); $message = $this->costcenter_model->deleteCostCenter($CostCenterID, $updatedBy); + return redirect()->route('costListing'); }else{ $message = "Cost Center Code Not Avalable"; + return redirect()->route('costListing'); } - $this->session->setFlashdata('success', $message); - return redirect()->route('costListing'); + // $this->session->setFlashdata('success', $message); + // return redirect()->route('costListing'); } diff --git a/app/Models/Costcenter_model.php b/app/Models/Costcenter_model.php index 01c6d783..ad1290a1 100755 --- a/app/Models/Costcenter_model.php +++ b/app/Models/Costcenter_model.php @@ -399,7 +399,8 @@ where Dept.DEPCode not in } } - return "Cost center $CostCenterCode Reactivated successfully."; + // return "Cost center $CostCenterCode Reactivated successfully."; + return true; } function deleteCostCenter($CostCenterCode,$UpdatedBy) @@ -426,7 +427,8 @@ where Dept.DEPCode not in } } - return "Cost center $CostCenterCode deactivated successfully."; + // return "Cost center $CostCenterCode deactivated successfully."; + return true; } function checkCostCenter($CostCenterId,$CostCenterName){ diff --git a/app/Views/addRawMaterial.php b/app/Views/addRawMaterial.php index f4707fda..d7d682fc 100755 --- a/app/Views/addRawMaterial.php +++ b/app/Views/addRawMaterial.php @@ -124,6 +124,7 @@
          format('d-m-Y'); $data = array('name' => 'Date', 'value' => set_value('Date', $formattedDate), 'id' => 'Date', 'class' => 'form-control', 'onkeypress' => 'return false;', 'autocomplete'=>'"off"'); echo form_input($data); From 520572206fded81feac02449e5996a42989e2d1e Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Tue, 4 Mar 2025 10:37:17 +0530 Subject: [PATCH 14/15] Auditing team sales report: GWM --- app/Config/Routes.php | 1 + app/Controllers/Sales.php | 38 +++ app/Controllers/User.php | 7 +- app/Helpers/zohobook_helper.php | 90 +++++++ app/Models/Inwardgateregister_model.php | 2 + app/Models/Ipinvoice_model.php | 136 +++++++--- app/Views/includes/new_header.php | 1 + app/Views/report_sales.php | 319 ++++++++++++++++++++++++ app/Views/sales_invoice.php | 5 +- app/Views/viewinwardgateregister.php | 16 +- 10 files changed, 569 insertions(+), 46 deletions(-) create mode 100644 app/Views/report_sales.php diff --git a/app/Config/Routes.php b/app/Config/Routes.php index b08ca39c..a7164a8c 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -437,6 +437,7 @@ $routes->get('sales_invoice', 'Sales::sales_invoice'); $routes->post('sales_invoice', 'Sales::sales_invoice'); $routes->post('download_sales_invoice', 'Sales::download_sales_invoice'); $routes->post('updateInvRecQty', 'Sales::updateInvRecQty'); +$routes->match(['GET', 'POST'], 'sales_report', 'Sales::sales_report'); // transporter Routes $routes->get('transporterListing', 'Supplier::transporterListing'); diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php index 48b2656b..a58fb3ee 100755 --- a/app/Controllers/Sales.php +++ b/app/Controllers/Sales.php @@ -118,6 +118,44 @@ class Sales extends BaseController $this->loadViews("sales_invoice", $this->global, $data, NULL); } + + public function sales_report() + { + $headline = ''; + $report = []; + + if ($this->request->getMethod(true) === 'POST' && $this->request->getPost('btn_submit')) { + + + $from_date = $this->request->getPost('from_date'); + $to_date = $this->request->getPost('to_date'); + $hsn_number = $this->request->getPost('hsn_number'); + $product_id = $this->request->getPost('product'); + $client_id = $this->request->getPost('client'); + + + + $headline .= ((isset($from_date) && isset($to_date)) && (!empty($from_date) && !empty($to_date))) ? $from_date . ' to ' . $to_date. ', ' : ''; + $headline .= (isset($hsn_number) && !empty($hsn_number)) ? $hsn_number . ', ' : ''; + $headline .= (isset($product_id) && !empty($product_id)) ? $this->ipinvoice_model->getProductName($product_id) . ', ' : ''; + $headline .= (isset($client_id) && !empty($client_id)) ? $this->ipinvoice_model->getClientName($client_id) . ', ' : ''; + + + + $report = $this->ipinvoice_model->sales_report($from_date, $to_date, $hsn_number, $product_id, $client_id); + } + $data['hsn'] = $this->ipinvoice_model->getHsn(); + $data['product'] = $this->ipinvoice_model->getProducts(); + $data['client'] = $this->ipinvoice_model->getClients(); + + $data['headline'] = $headline; + $data['sales_invoice'] = $report; + + // Load the view + $this->global['pageTitle'] = 'Reports'; + $this->loadviews("report_sales", $this->global, $data, NULL); + } + public function download_sales_invoice() { // Fetch data from the model diff --git a/app/Controllers/User.php b/app/Controllers/User.php index 5cea8b2e..6209aefd 100755 --- a/app/Controllers/User.php +++ b/app/Controllers/User.php @@ -1368,6 +1368,10 @@ class User extends BaseController $headers_new = $result['headers_new']; $res = json_decode($result['data'], true); $inv_array = $res['invoices']; + + // $cteditNotes = getAllCreditNotes($date_today, $date_yesterday, $token); + // dd($cteditNotes); + // dd($inv_array); // print_r($inv_array); // echo "rrrr"; @@ -1388,6 +1392,7 @@ class User extends BaseController // dd($res2); foreach ($res2 as $rs) { + $gst_no = $rs['gst_no']; $customer_id = $rs['customer_id']; $customer_name = $rs['customer_name']; @@ -1538,7 +1543,7 @@ class User extends BaseController if (isset($rs['line_items']) && count($rs['line_items']) > 0) { log_message('error', 'Processing line items' . count($rs['line_items'])); - dd($rs); + // dd($rs); for ($i = 0; $i < count($rs['line_items']); $i++) { //start insert line items $sku = $rs['line_items'][$i]['sku']; diff --git a/app/Helpers/zohobook_helper.php b/app/Helpers/zohobook_helper.php index bfce0ba3..4d957e05 100755 --- a/app/Helpers/zohobook_helper.php +++ b/app/Helpers/zohobook_helper.php @@ -110,4 +110,94 @@ if (! function_exists('test_helper')) { } } +if (! function_exists('getAllCreditNotes')) { + // function getAllCreditNotes($date_today, $date_yesterday, $accesstoken) + // { + // // Initialize cURL + // $ch = curl_init(); + + // // Zoho API credentials + // $organization_id = '776847408'; + // // $url_org = "https://books.zoho.com/api/v3/creditnotes?"; + // $url_org = "https://www.zohoapis.com/books/v3/creditnotes?"; + + // // Construct query parameters + // $fields = array( + // "usestate" => "true", + // "organization_id" => $organization_id, + // "date_start" => $date_yesterday, + // "date_end" => $date_today + // ); + // $data_all = http_build_query($fields); + + // // Set headers + // $headers = array( + // 'Authorization: Zoho-oauthtoken '.$accesstoken, + // 'Content-Type: application/json' + // ); + + // // Construct URL + // $data_access = $url_org.$data_all; + + // // Set cURL options + // curl_setopt($ch, CURLOPT_URL, $data_access); + // curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + + // curl_setopt($ch, CURLOPT_HEADER, 0); + // curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET"); + // curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + + // // Execute cURL request + // $result = curl_exec($ch); + + // // Store headers and data + // $data['headers_new'] = $headers; + // $data['data'] = curl_exec($ch); + // // Return data + // return $data; + // } + + function getAllCreditNotes($date_today, $date_yesterday, $accesstoken) + { + // Initialize cURL + $ch = curl_init(); + var_dump($accesstoken); + // Zoho API credentials + $organization_id = '776847408'; + $url_org = "https://books.zoho.com/api/v3/creditnotes?"; + + // Construct query parameters manually (Zoho might need raw values) + $query_string = "usestate=true&organization_id=$organization_id&date_start=$date_yesterday&date_end=$date_today"; + + // Set headers + $headers = array( + 'Authorization: Zoho-oauthtoken ' . $accesstoken, + 'Content-Type: application/json' + ); + + // Set cURL options + curl_setopt($ch, CURLOPT_URL, $url_org . $query_string); + curl_setopt($ch, CURLOPT_HTTPHEADER, $headers); + curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET"); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + + // Execute cURL request + $result = curl_exec($ch); + + // Check for errors + if ($result === false) { + return ['error' => curl_error($ch)]; + } + + // Close cURL session + curl_close($ch); + + return [ + 'headers_new' => $headers, + 'data' => $result + ]; + } + +} + ?> \ No newline at end of file diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index 4ec07343..f8f6a1b3 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -410,6 +410,7 @@ class Inwardgateregister_model extends Model LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode LEFT JOIN t_revenue_tax tax ON tax.LineItemNo = POL.LineItemNo WHERE IGRD.IGRNO = igr.IGRNO AND IGRD.QuantityAsPerInvoice != 0 + GROUP BY POL.PONO LIMIT 1 ) WHEN (PO.POType = 'service' OR (PO.POType = 'capital' AND PO.CapitalRange = '1')) THEN ( @@ -421,6 +422,7 @@ class Inwardgateregister_model extends Model LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode LEFT JOIN t_service_tax tax ON tax.LineItemNo = POL.LineItemNo WHERE IGRD.IGRNO = igr.IGRNO AND IGRD.QuantityAsPerInvoice != 0 + GROUP BY POL.PONO LIMIT 1 ) diff --git a/app/Models/Ipinvoice_model.php b/app/Models/Ipinvoice_model.php index 40f8b1c7..dc662e6f 100755 --- a/app/Models/Ipinvoice_model.php +++ b/app/Models/Ipinvoice_model.php @@ -4,6 +4,7 @@ namespace App\Models; use CodeIgniter\Model; + class Ipinvoice_model extends Model { @@ -23,7 +24,7 @@ class Ipinvoice_model extends Model ip_invoices.invoice_number, ip_invoices.invoice_terms, ip_invoices.status, ip_invoices.e_invoice_number, ip_invoices.invoice_url, ip_clients.client_name, ip_payment_methods.payment_method_name, ip_users.user_name, ip_products.product_name, ip_invoice_items.item_price, ip_products.cgst, ip_products.sgst, - ip_invoice_items.item_quantity, ip_invoice_items.item_price, ip_invoice_items.item_name, ip_invoice_items.item_quantity, + ip_invoice_items.item_quantity, ip_invoice_items.item_price, ip_invoice_items.item_name, ip_invoice_items.item_quantity,ip_invoice_items.hsn_or_sac, ip_invoice_amounts.invoice_total, ip_invoice_amounts.invoice_item_subtotal, ip_invoice_amounts.invoice_item_tax_total ,ip_invoice_attachment.file_name , ip_invoices.received_qty') ->join('ip_payment_methods', 'ip_invoices.payment_method = ip_payment_methods.payment_method_id', 'left') @@ -41,47 +42,100 @@ class Ipinvoice_model extends Model $result = $query->getResult(); // $results = $query->getResultArray(); return $result; - // $invoices = []; - - // foreach ($results as $row) { - // $invoice_id = $row['invoice_id']; - - // // If the invoice_id doesn't exist in the $invoices array, initialize it - // if (!isset($invoices[$invoice_id])) { - // $invoices[$invoice_id] = [ - // 'invoice_id' => $row['invoice_id'], - // 'user_id' => $row['user_id'], - // 'client_id' => $row['client_id'], - // 'invoice_group_id' => $row['invoice_group_id'], - // 'invoice_status_id' => $row['invoice_status_id'], - // 'invoice_date_due' => $row['invoice_date_due'], - // 'invoice_date_created' => $row['invoice_date_created'], - // 'invoice_number' => $row['invoice_number'], - // 'invoice_terms' => $row['invoice_terms'], - // 'status' => $row['status'], - // 'e_invoice_number' => $row['e_invoice_number'], - // 'invoice_url' => $row['invoice_url'], - // 'client_name' => $row['client_name'], - // 'payment_method_name' => $row['payment_method_name'], - // 'user_name' => $row['user_name'], - // 'invoice_total' => $row['invoice_total'], - // 'invoice_item_subtotal' => $row['invoice_item_subtotal'], - // 'invoice_item_tax_total' => $row['invoice_item_tax_total'], - // 'products' => [] // Initialize the products array - // ]; - // } - - // // Add the product to the products array for the current invoice - // $invoices[$invoice_id]['products'][] = [ - // 'product_name' => $row['product_name'], - // 'item_quantity' => $row['item_quantity'], - // 'item_price' => $row['item_price'], - // ]; - // } - - // // Return the grouped invoices - // return $invoices; + } + + function getHsn() + { + return $this->db->table('ip_invoice_items') + ->select('hsn_or_sac') + ->distinct() + ->get() + ->getResult(); + } + + function getProducts() + { + return $this->db->table('ip_products') + ->select('product_id,product_name') + ->distinct() + ->get() + ->getResult(); + } + + function getProductName($id) + { + return $this->db->table('ip_products') + ->select('product_id,product_name') + ->where('product_id',$id) + ->get()->getRow()->product_name; + + } + + + function getClientName($id) + { + return $this->db->table('ip_clients') + ->select('client_id,client_name') + ->where('client_id',$id) + ->get()->getRow()->client_name; + } + + function getClients() + { + return $this->db->table('ip_clients') + ->select('client_id,client_name') + ->distinct() + ->get() + ->getResult(); + } + + public function sales_report($from_date, $to_date, $hsn_number, $product_id, $client_id) + { + $builder = $this->db->table('ip_invoices') + ->select('ip_invoices.invoice_id, ip_invoices.user_id, ip_invoices.client_id, + ip_invoices.invoice_group_id, ip_invoices.invoice_status_id, ip_invoices.invoice_date_due, ip_invoices.invoice_date_created, + ip_invoices.invoice_number, ip_invoices.invoice_terms, ip_invoices.status, ip_invoices.e_invoice_number, ip_invoices.invoice_url, ip_clients.client_name, + ip_payment_methods.payment_method_name, ip_users.user_name, + ip_products.product_name, ip_invoice_items.item_price, ip_products.cgst, ip_products.sgst, + ip_invoice_items.item_quantity, ip_invoice_items.item_price, ip_invoice_items.item_name, ip_invoice_items.item_quantity,ip_invoice_items.hsn_or_sac, + ip_invoice_amounts.invoice_total, ip_invoice_amounts.invoice_item_subtotal, ip_invoice_amounts.invoice_item_tax_total, + ip_invoice_attachment.file_name, ip_invoices.received_qty') + ->join('ip_payment_methods', 'ip_invoices.payment_method = ip_payment_methods.payment_method_id', 'left') + ->join('ip_clients', 'ip_invoices.client_id = ip_clients.client_id', 'left') + ->join('ip_users', 'ip_invoices.user_id = ip_users.user_id', 'left') + ->join('ip_invoice_items', 'ip_invoices.invoice_id = ip_invoice_items.invoice_id', 'left') + ->join('ip_products', 'ip_invoice_items.item_product_id = ip_products.product_id', 'left') + ->join('ip_invoice_amounts', 'ip_invoices.invoice_id = ip_invoice_amounts.invoice_id', 'left') + ->join('ip_invoice_attachment', 'ip_invoices.invoice_id = ip_invoice_attachment.invoice_id AND ip_invoice_attachment.is_active = 1', 'left'); + + // Apply filters only if values are provided + if (!empty($from_date) && !empty($to_date)) { + $from_date = get_date_time_dynamical_format('d-m-Y', 'Y-m-d', $from_date); + $to_date = get_date_time_dynamical_format('d-m-Y', 'Y-m-d', $to_date); + $builder->where('ip_invoices.invoice_date_created >=', $from_date); + $builder->where('ip_invoices.invoice_date_created <=', $to_date); + } + + if (!empty($hsn_number)) { + $builder->where('ip_invoice_items.hsn_or_sac', $hsn_number); + } + + if (!empty($product_id)) { + $builder->where('ip_invoice_items.item_product_id', $product_id); + } + + if (!empty($client_id)) { + $builder->where('ip_invoices.client_id', $client_id); + } + + // Order by invoice number in descending order + $builder->orderBy('ip_invoices.invoice_number', 'DESC'); + + $query = $builder->get(); + return $query->getResult(); + } + diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php index 2f08bd30..eedc8e88 100755 --- a/app/Views/includes/new_header.php +++ b/app/Views/includes/new_header.php @@ -654,6 +654,7 @@
          Invoice + Invoice Report get('roleText') == 'System Administrator'){?> diff --git a/app/Views/report_sales.php b/app/Views/report_sales.php new file mode 100644 index 00000000..17d5d175 --- /dev/null +++ b/app/Views/report_sales.php @@ -0,0 +1,319 @@ + + + + + +
          +
          + +
          + +
          +
          +
          +
          +
          +
            +
          1. Sales
            2. +
          2. +

            Sales Report

            +
            3. +
          +
          + +
          +
          + + +
          +
          + Result filter by :

          +
          +
          + +
          +
          +
          +
          + + +
          + + "> +
          + +
          +
          + +
          + + +
          +
          +
          + +
          + +
          + +
          +
          + + +
          + +
          + + +
          + +
          + + +
          +
          +

          + +
          + +
          +
          +
          + +
          + + + + + + + + + + + + + + + + + + + + + + + item_price * $invoice->item_quantity; + // Calculate CGST and SGST + $cgst_amount = ($subtotal * $invoice->cgst) / 100; + $sgst_amount = ($subtotal * $invoice->sgst) / 100; + $total = $subtotal + $cgst_amount + $sgst_amount; ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          Invoice DateInvoice NoClient NameProductHSNQuantityRateSub TotalGSTTotal
          invoice_date_created)); ?> + invoice_url)) { ?> + + + invoice_number; ?> + invoice_url)) { ?> + + + client_name ?>item_name ?>hsn_or_sac ?>item_quantity, 2, '.', ',') ?>item_price, 2, '.', ',') ?>
          Total
          +
          +
          +
          +
          +
          +
          +
          +
          + + + + + + + + + + \ No newline at end of file diff --git a/app/Views/sales_invoice.php b/app/Views/sales_invoice.php index 51408abd..11eab401 100755 --- a/app/Views/sales_invoice.php +++ b/app/Views/sales_invoice.php @@ -239,6 +239,7 @@
          		Received File Client Name ProductHSN Quantity Rec Qty Rate client_name ?> item_name ?>hsn_or_sac ?> item_quantity, 2, '.', ',') ?>
          diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index bf6ab9c7..8a00b012 100755 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -262,7 +262,7 @@           		NetWeight ?> taxable_value ?> gst_amount ?>gst_amount + (int)$record->gst_amount) ?>taxable_value + (int)$record->gst_amount) ?> VehicleNo ?> DriverName ?>
          +
          @@ -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