From 8bc7894126424bfb3b97ef73455861b26a2d9991 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sat, 5 Apr 2025 05:50:38 +0000 Subject: [PATCH] excel helper 1 --- app/Config/Autoload.php | 2 +- app/Controllers/Amendmentpurchaseorder.php | 20 ++- app/Controllers/Emergencypurchaseorder.php | 4 +- app/Controllers/Expense.php | 1 + app/Controllers/Inwardgateregister.php | 1 + app/Controllers/Monthlypay.php | 6 +- app/Controllers/Purchaseorder.php | 4 +- app/Controllers/Servicepurchaseorder.php | 2 +- app/Helpers/excel_helper.php | 49 ++++++ ...chaseorder_helper.php => image_helper.php} | 108 ------------- app/Helpers/numberseries_helper.php | 109 +++++++++++++ app/Models/Monthlypay_model.php | 6 + app/Views/EditservicePurchaseorder.php | 149 +++++++++++------- app/Views/alterpurchaseorder.php | 24 +++ app/Views/attendance.php | 4 +- app/Views/editRevenueAmendPO.php | 33 ++++ app/Views/editRevenuepurchaseorder.php | 29 +++- app/Views/editServiceAmendPO.php | 53 ++++++- app/Views/employeeLeaveApplicationForm.php | 25 ++- app/Views/expense_list.php | 2 +- app/Views/leaveApplicationPDF.php | 104 ++++++++---- app/Views/monthlypayinputs.php | 5 +- 22 files changed, 486 insertions(+), 254 deletions(-) create mode 100755 app/Helpers/excel_helper.php rename app/Helpers/{purchaseorder_helper.php => image_helper.php} (93%) create mode 100755 app/Helpers/numberseries_helper.php diff --git a/app/Config/Autoload.php b/app/Config/Autoload.php index c89dfd5a..be6c1869 100755 --- a/app/Config/Autoload.php +++ b/app/Config/Autoload.php @@ -90,5 +90,5 @@ class Autoload extends AutoloadConfig * * @var list */ - public $helpers = ['datetime','cias','purchaseorder','alert']; + public $helpers = ['cias','datetime','image','alert','excel']; } diff --git a/app/Controllers/Amendmentpurchaseorder.php b/app/Controllers/Amendmentpurchaseorder.php index 90e58bc8..1ea82013 100755 --- a/app/Controllers/Amendmentpurchaseorder.php +++ b/app/Controllers/Amendmentpurchaseorder.php @@ -229,6 +229,7 @@ class Amendmentpurchaseorder extends BaseController */ function EditRevenuePurchaseOrder() { + helper('numberseries'); $NewPO = ''; $MAD = ''; // $changeStatus ,will havestatus code itself provided from front-end , no need of constants @@ -309,8 +310,9 @@ class Amendmentpurchaseorder extends BaseController if ($PaymentTerms != 'PT08') { $Otherpayment = ''; } + $IsOpenOrder = ($this->request->getPost('IsOpenOrder') !== null && !empty($this->request->getPost('IsOpenOrder')) && $this->request->getPost('IsOpenOrder') === '1') ? $this->request->getPost('IsOpenOrder') : null; $AmendmentNewPoNo = generate_amendment_po_number($PONO); - $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $Local_Interstate, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $changeStatus , 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult,'CapitalRange' => $Local_Interstate,'BudgetType' => $BudgetType); // not + $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $Local_Interstate, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $changeStatus , 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Reference' => $supplierreference, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $revenuetype, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpecialInstruction, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'UpdatedOn' => $updateddt, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'IsQualityChkReqired' => $qtycheckresult,'CapitalRange' => $Local_Interstate,'BudgetType' => $BudgetType, 'IsOpenOrder'=>$IsOpenOrder); // not $file = $this->request->getFile('POFile'); $requestfilename = $file->getName(); $PrePOFile = $this->request->getPost('PrePOFile'); @@ -580,13 +582,13 @@ class Amendmentpurchaseorder extends BaseController $recqty = $qty[0]->rec; // $POno = $qtyvalue->PONO; - if ($ordqty == $recqty) { + if(!$IsOpenOrder):if ($ordqty == $recqty) { $Newstatus = array('Status' => IGR_CREATED); $this->purchaseorder_model->POLineItemsupdatestatus($NewPO, $Newstatus); $this->purchaseorder_model->pomasterupdatestatus($NewPO, $Newstatus); - } + }endif; $message = 'Purchase Order ' . $PONO . ' Amended Successfully! - New PO Number is: ' . $NewPO ; @@ -603,7 +605,7 @@ class Amendmentpurchaseorder extends BaseController function UpdateAmendServicePurchaseOrder() { - // dd($this->request->getPost()); + helper('numberseries'); $PONO = $this->request->getPost('txtPONO'); $changeStatus = $this->request->getPost('changeStatus'); @@ -672,6 +674,7 @@ class Amendmentpurchaseorder extends BaseController $qtycheck = $this->purchaseorder_model->getqtycheck($PONO); $qtycheckresult = ''; + $IsOpenOrder = ($this->request->getPost('IsOpenOrder') !== null && !empty($this->request->getPost('IsOpenOrder')) && $this->request->getPost('IsOpenOrder') === '1') ? $this->request->getPost('IsOpenOrder') : null; foreach ($qtycheck as $qty) { $qtycheckresult = $qty->IsQualityChkReqired; } @@ -685,7 +688,7 @@ class Amendmentpurchaseorder extends BaseController } $AmendmentNewPoNo = generate_amendment_po_number($PONO); - $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'POType' => $POType, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' =>$changeStatus , 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $scopeofwork, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $updateddt, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'ServiceWorkStatus' => $WorkStatus, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => strip_tags((string)$DescriptionOfPo), 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult); + $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'POType' => $POType, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' =>$changeStatus , 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $scopeofwork, 'CreatedBy' => $updatedBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $updateddt, 'PaymentTerms' => $PaymentTerms, 'PaymentOtherDescription' => $Otherpayment, 'ServiceWorkStatus' => $WorkStatus, 'ReleasedBy' => $updatedBy, 'ReleasedOn' => $updateddt, 'AmendedDetails' => $MAD, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => strip_tags((string)$DescriptionOfPo), 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $qtycheckresult,'IsOpenOrder'=>$IsOpenOrder); $file = $this->request->getFile('POFile'); $PrePOFile = $this->request->getPost('PrePOFile'); $requestfilename = $file ? $file->getName() : null; @@ -879,13 +882,13 @@ class Amendmentpurchaseorder extends BaseController $recqty = $qty[0]->rec; // $POno = $qtyvalue->PONO; - if ($ordqty == $recqty) { + if(!$IsOpenOrder):if ($ordqty == $recqty) { $Newstatus = array('Status' => IGR_CREATED); $this->purchaseorder_model->POLineItemsupdatestatus($NewPO, $Newstatus); $this->purchaseorder_model->pomasterupdatestatus($NewPO, $Newstatus); - } + }endif; $message = 'Purchase Order ' . $PONO . ' Amended Successfully! - New PO Number is: ' . $NewPO ; if($changeStatus == 'ST014'){ @@ -900,6 +903,7 @@ class Amendmentpurchaseorder extends BaseController */ function EditAmendCapitalPurchaseOrder() { + helper('numberseries'); $changeStatus = $this->request->getPost('changeStatus'); $PONO = $this->request->getPost('txtPONO'); $MAD = ''; @@ -1309,7 +1313,7 @@ class Amendmentpurchaseorder extends BaseController function EditAmendImportPO() { // echo "
"; print_r($this->request->getPost()); echo"
"; - + helper('numberseries'); $MAD = ''; $PONO = $this->request->getPost('txtPONO'); diff --git a/app/Controllers/Emergencypurchaseorder.php b/app/Controllers/Emergencypurchaseorder.php index 08c9dd2d..401cea7d 100755 --- a/app/Controllers/Emergencypurchaseorder.php +++ b/app/Controllers/Emergencypurchaseorder.php @@ -122,6 +122,7 @@ class Emergencypurchaseorder extends BaseController //This used to Create Service Purchase Order function addNewServicePurchaseOrder() { + helper('numberseries'); // print_r($this->request->getPost());die; $txtRowCount = $this->request->getPost('txtRowCount'); $POdt = $this->request->getPost('PODate'); @@ -365,7 +366,7 @@ class Emergencypurchaseorder extends BaseController //This used to Create Revenue Emergency Purchase Order function addNewRevenuePurchaseOrder() { - + helper('numberseries'); // print_r($this->request->getPost());die; $txtspl = $this->request->getPost('txtSpecial'); @@ -1164,6 +1165,7 @@ class Emergencypurchaseorder extends BaseController //This used to Create Revenue Purchase Order function addNewPurchaseOrder() { + helper('numberseries'); $POdt = $this->request->getPost('PODate'); $PODate = get_date_time_format($POdt); $SupplierID = $this->request->getPost('drpSupplier'); diff --git a/app/Controllers/Expense.php b/app/Controllers/Expense.php index 1fe4b2da..5f238411 100755 --- a/app/Controllers/Expense.php +++ b/app/Controllers/Expense.php @@ -51,6 +51,7 @@ class Expense extends BaseController public function addExpense() { + helper('numberseries'); try{ $file = $this->request->getFile('transporterfile'); $fileName = ''; diff --git a/app/Controllers/Inwardgateregister.php b/app/Controllers/Inwardgateregister.php index 65814599..0384f8c3 100755 --- a/app/Controllers/Inwardgateregister.php +++ b/app/Controllers/Inwardgateregister.php @@ -405,6 +405,7 @@ class Inwardgateregister extends BaseController function SaveIGR() { #Step 1 IGR Details + helper('numberseries'); $PONO = $this->request->getPost('PONO'); $IsThisOpenOrderPO = $this->request->getPost('hiddenIsOpenOrder'); $DeliveryChellanOrInvoiceNo = $this->request->getPost('InvoiceNo'); diff --git a/app/Controllers/Monthlypay.php b/app/Controllers/Monthlypay.php index 09f4cb68..453ffa6c 100755 --- a/app/Controllers/Monthlypay.php +++ b/app/Controllers/Monthlypay.php @@ -1045,10 +1045,8 @@ class Monthlypay extends BaseController $data['leave_info'] = $this->monthlypay_model->getheringleaveApplicationForm($leave_application_id); - $data['company_info'] = $this->monthlypay_model->getCompanyInformation(); - - $html = view('leaveApplicationPDF', $data); - // echo $html;die; + $data['company_info'] = $this->monthlypay_model->getCompanyInformation(); + $html = view('leaveApplicationPDF', $data); // echo $html; $mpdf = new Mpdf(); $mpdf->WriteHTML($html); diff --git a/app/Controllers/Purchaseorder.php b/app/Controllers/Purchaseorder.php index 7ffdadc3..b81c8109 100755 --- a/app/Controllers/Purchaseorder.php +++ b/app/Controllers/Purchaseorder.php @@ -1113,6 +1113,7 @@ class Purchaseorder extends BaseController //This used to Create Revenue Purchase Order function addNewPurchaseOrder() { + helper('numberseries'); try { // Extract POST data @@ -1985,6 +1986,7 @@ class Purchaseorder extends BaseController function addNewImportPurchaseOrder() { + helper('numberseries'); try { $POdt = $this->request->getPost('PODate'); $PODate = get_date_time_format($POdt); @@ -2670,7 +2672,7 @@ class Purchaseorder extends BaseController /* Add capital Po*/ function addNewCapitalPurchaseOrder() { - + helper('numberseries'); try { $POdt = $this->request->getPost('PODate'); $PODate = get_date_time_format($POdt); diff --git a/app/Controllers/Servicepurchaseorder.php b/app/Controllers/Servicepurchaseorder.php index 192e58b2..85305bf9 100755 --- a/app/Controllers/Servicepurchaseorder.php +++ b/app/Controllers/Servicepurchaseorder.php @@ -187,7 +187,7 @@ class Servicepurchaseorder extends BaseController //This used to Create Service Purchase Order function addNewServicePurchaseOrder() { - + helper('numberseries'); $POdt = $this->request->getPost('PODate'); $PODate = get_date_time_format($POdt); $SupplierID = $this->request->getPost('drpSupplier'); diff --git a/app/Helpers/excel_helper.php b/app/Helpers/excel_helper.php new file mode 100755 index 00000000..c4ab8e73 --- /dev/null +++ b/app/Helpers/excel_helper.php @@ -0,0 +1,49 @@ +getActiveSheet()->setTitle('Sheet 1'); + + // Set headers into the spreadsheet + $spreadsheet->getActiveSheet()->fromArray([$headers], null, 'A1'); + + // Set data into the spreadsheet + $spreadsheet->getActiveSheet()->fromArray($data, null, 'A2'); + + + + // Create Excel writer + $writer = new Xlsx($spreadsheet); + + try { + // Save Excel file to the specified path + $writer->save($filename); + return true; // Return true if file was successfully saved + } catch (\Exception $e) { + // Log or handle the exception + return false; // Return false if there was an error saving the file + } + } +} diff --git a/app/Helpers/purchaseorder_helper.php b/app/Helpers/image_helper.php similarity index 93% rename from app/Helpers/purchaseorder_helper.php rename to app/Helpers/image_helper.php index 261b1763..5c021c36 100755 --- a/app/Helpers/purchaseorder_helper.php +++ b/app/Helpers/image_helper.php @@ -1,112 +1,4 @@ 1 ? strlen($numeric_part) : 2; - $new_decimal = str_pad($new_numeric_part, $new_decimal_length, '0', STR_PAD_LEFT); - - return $base . '.' . $new_decimal; - } else { - return $PoNo . '.01'; - } -} - if (!function_exists('invoice_logo_pdf')) { function invoice_logo_pdf() diff --git a/app/Helpers/numberseries_helper.php b/app/Helpers/numberseries_helper.php new file mode 100755 index 00000000..a9013bf7 --- /dev/null +++ b/app/Helpers/numberseries_helper.php @@ -0,0 +1,109 @@ + 1 ? strlen($numeric_part) : 2; + $new_decimal = str_pad($new_numeric_part, $new_decimal_length, '0', STR_PAD_LEFT); + + return $base . '.' . $new_decimal; + } else { + return $PoNo . '.01'; + } +} +?> \ No newline at end of file diff --git a/app/Models/Monthlypay_model.php b/app/Models/Monthlypay_model.php index 2895d9c5..d984d3d6 100755 --- a/app/Models/Monthlypay_model.php +++ b/app/Models/Monthlypay_model.php @@ -72,6 +72,8 @@ class Monthlypay_model extends Model ->orderBy('EmpID', 'asc'); $query = $builder->get(); $result = $query->getResult(); + // $last_query = $this->db->getLastQuery(); + // echo $last_query;die; return $result; } @@ -177,6 +179,8 @@ class Monthlypay_model extends Model $year_val = date('Y', strtotime($current)); $date_val = cal_days_in_month(CAL_GREGORIAN, $month_val, $year_val); $lastdate = $year_val . '-' . $month_val . '-' . $date_val; +// echo $current; +// echo "last date - ".$lastdate;die; $builder = $this->db->table('t_attendance') ->select('t_attendance.*,t_employee_details.FirstName,t_employee_details.LastName') @@ -191,6 +195,8 @@ class Monthlypay_model extends Model $query = $builder->get(); $result = $query->getResult(); + // $last_query = $this->db->getLastQuery(); + // echo $last_query;die; return $result; } diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index b61dff04..401b562d 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1252,10 +1252,12 @@ if (!empty($getlogpodtl)) {
- + > IS THIS OPEN ORDER FORMAT + +
@@ -1900,7 +1902,7 @@ if (!empty($getlogpodtl)) {
'AfterSgst', 'value' => set_value('AfterSgst'), 'id' => 'AfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST'); + $data = array('name' => 'AfterSgst', 'value' => set_value('AfterSgst'), 'id' => 'AfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true'); echo form_input($data); ?>
@@ -2545,6 +2547,14 @@ if (!empty($getlogpodtl)) { $('input[type="file"], input[type="radio"], input[type="checkbox"]').attr('disabled', true); $("#PaymentTerms,#drpSupplier,#insuranceStatus,#PoTypeOptions,#workstatus").prop("disabled", true); } + var openOrder = ; + if(openOrder){ + $('#Quantity').val(0); + $('#Quantity').removeAttr('required'); + $('#Quantity').attr('readonly', true); + $('#EditQuantity').removeAttr('required'); + $('#EditQuantity').attr('readonly', true); + } }); @@ -3090,7 +3100,7 @@ if (!empty($getlogpodtl)) { } function validateServiceTax() { - + var openOrder = $('#IsOpenOrder').prop('checked'); if ($('#ReqNo').val() == "0") { alert('Please select the Requisition Number'); $('#ReqNo').focus(); @@ -3103,39 +3113,46 @@ if (!empty($getlogpodtl)) { alert('Please select the Material Code'); $('#MaterialCode').focus(); return false; - } else if ($('#Quantity').val() == '') { - alert('Please Enter the Quantity value'); - $('#Quantity').focus(); - return false; - } else if ($('#Quantity').val() == 0) { - alert('Please Enter the Valid Quantity Value'); - $('#Quantity').focus(); - return false; - } else if ($('#Rate').val() == '') { - alert('Please Enter the Rate of the Item'); - $('#Rate').focus(); - return false; - } else if ($('#Rate').val() == 0) { - alert('Please Enter the Valid Rate of the Item'); - $('#Rate').focus(); - return false; - } else if (ExceedQuantityCheck() == false) { - return false; } else if ($('#txtSpcialInstruction').val() == '') { alert('Please Enter the Service Description'); $('#txtSpcialInstruction').focus(); return false; - } else if (ExceedBudget($('#txtBasicValue').val(), $('#AvlBudAmt').val()) == false) { - $('#Rate').focus(); - return false; } else { - return true; + var openOrder = ; + if(!openOrder){ + if ($('#Quantity').val() == '') { + alert('Please Enter the Quantity value'); + $('#Quantity').focus(); + return false; + } else if ($('#Quantity').val() == 0) { + alert('Please Enter the Valid Quantity Value'); + $('#Quantity').focus(); + return false; + } else if ($('#Rate').val() == '') { + alert('Please Enter the Rate of the Item'); + $('#Rate').focus(); + return false; + } else if ($('#Rate').val() == 0) { + alert('Please Enter the Valid Rate of the Item'); + $('#Rate').focus(); + return false; + } else if (ExceedQuantityCheck() == false) { + return false; + } else if (ExceedBudget($('#txtBasicValue').val(), $('#AvlBudAmt').val()) == false) { + $('#Rate').focus(); + return false; + } else{ + return true; + } + }else{ + return true; + } } } function validateEditServiceTax() { - + var openOrder = $('#IsOpenOrder').prop('checked'); if ($('#EditCostCenter').val() == "0") { alert('Please select the Cost center'); $('#EditCostCenter').focus(); @@ -3144,33 +3161,35 @@ if (!empty($getlogpodtl)) { alert('Please select the Material Code'); $('#EditMaterialCode').focus(); return false; - } else if ($('#EditQuantity').val() == '') { - alert('Please Enter the Quantity value'); - $('#EditQuantity').focus(); - return false; - } else if ($('#EditQuantity').val() == 0) { - alert('Please Enter the Valid Quantity value'); - $('#EditQuantity').focus(); - return false; - } else if ($('#EditRate').val() == 0) { - alert('Please Enter the Valid Rate of the Item'); - $('#EditRate').focus(); - return false; - } else if ($('#EditRate').val() == '') { - alert('Please Enter the Rate of the Item'); - $('#EditRate').focus(); - return false; - } else if (EditExceedQuantityCheck() == false) { - return false; - } else if ($('#EdittxtSpcialInstruction').val() == '') { - alert('Please Enter the Service Description'); - $('#EdittxtSpcialInstruction').focus(); - return false; - } else if (ExceedBudget($('#txtEditBasicValue').val(), $('#EditAvlBudAmt').val()) == false) { - $('#EditRate').focus(); - return false; } else { - return true; + if(!openOrder){ + if ($('#EditQuantity').val() == '') { + alert('Please Enter the Quantity value'); + $('#EditQuantity').focus(); + return false; + } else if ($('#EditQuantity').val() == 0) { + alert('Please Enter the Valid Quantity value'); + $('#EditQuantity').focus(); + return false; + } else if ($('#EditRate').val() == 0) { + alert('Please Enter the Valid Rate of the Item'); + $('#EditRate').focus(); + return false; + } else if ($('#EditRate').val() == '') { + alert('Please Enter the Rate of the Item'); + $('#EditRate').focus(); + return false; + } else if (EditExceedQuantityCheck() == false) { + return false; + } else if ($('#EdittxtSpcialInstruction').val() == '') { + alert('Please Enter the Service Description'); + $('#EdittxtSpcialInstruction').focus(); + return false; + } else if (ExceedBudget($('#txtEditBasicValue').val(), $('#EditAvlBudAmt').val()) == false) { + $('#EditRate').focus(); + return false; + } else{ return true; } + }else{return true; } } } @@ -3884,17 +3903,25 @@ if (!empty($getlogpodtl)) { } } - $('#IsOpenOrder').change(function() { - if (this.checked) { - $('#ServiceQuantity').val(0); - $('#ServiceQuantity').removeAttr('required'); - $('#ServiceQuantity').attr('readonly', true); - } else { - $('#ServiceQuantity').val(''); - $('#ServiceQuantity').removeAttr('readonly'); - $('#ServiceQuantity').attr('required', true); + $('#IsOpenOrder').change(function () { + // alert("IsOpenOrder"); + if (this.checked) { + $('#Quantity').val(0); + $('#Quantity').removeAttr('required'); + $('#Quantity').attr('readonly', true); + $('#EditQuantity').val(0); + $('#EditQuantity').removeAttr('required'); + $('#EditQuantity').attr('readonly', true); + } else { + $('#Quantity').val(''); + $('#Quantity').removeAttr('readonly'); + $('#Quantity').attr('required', true); + $('#EditQuantity').val(''); + $('#EditQuantity').removeAttr('readonly'); + $('#EditQuantity').attr('required', true); } }); + function Reset() { location.reload(); } \ No newline at end of file diff --git a/app/Views/alterpurchaseorder.php b/app/Views/alterpurchaseorder.php index fc1ba2d2..03e67068 100755 --- a/app/Views/alterpurchaseorder.php +++ b/app/Views/alterpurchaseorder.php @@ -8636,22 +8636,46 @@ if (!empty($INRSYMBOL)) { $('#Quantity').val(0); $('#Quantity').removeAttr('required'); $('#Quantity').attr('readonly', true); + $('#txtTotalOrderValue').val(0); + $('#txtBasicValue').val(0); + $('#EditRevenueQuantity').val(0); + $('#EditRevenueQuantity').removeAttr('required'); + $('#EditRevenueQuantity').attr('readonly', true); + } if (input == 'SERVICE') { $('#ServiceQuantity').val(0); $('#ServiceQuantity').removeAttr('required'); $('#ServiceQuantity').attr('readonly', true); + $('#ServiceBasAmt').val(0); + $('#TotalOrderValue').val(0); + $('#EditQuantity').val(0); + $('#EditQuantity').removeAttr('required'); + $('#EditQuantity').attr('readonly', true); } } else { if (input == 'REVENUE') { $('#Quantity').val(''); $('#Quantity').removeAttr('readonly'); $('#Quantity').attr('required', true); + $('#txtTotalOrderValue').val(''); + $('#txtBasicValue').val(''); + + $('#EditRevenueQuantity').val(0); + $('#EditRevenueQuantity').removeAttr('readonly'); + $('#EditRevenueQuantity').attr('required', true); } if (input == 'SERVICE') { $('#ServiceQuantity').val(''); $('#ServiceQuantity').removeAttr('readonly'); $('#ServiceQuantity').attr('required', true); + $('#ServiceBasAmt').val(''); + $('#TotalOrderValue').val(''); + + $('#EditQuantity').val(0); + $('#EditQuantity').removeAttr('readonly'); + $('#EditQuantity').attr('required', true); + } } }); diff --git a/app/Views/attendance.php b/app/Views/attendance.php index bb1789e6..cbc48d02 100755 --- a/app/Views/attendance.php +++ b/app/Views/attendance.php @@ -1,7 +1,7 @@ InsuranceNumber; $BudgetType = $Req->BudgetType; $PrePOFile = $Req->POFile; + $IsOpenOrder = isset($Req->IsOpenOrder) ? $Req->IsOpenOrder : null; + if ($IsOpenOrder !== null && (int)$IsOpenOrder !== 0) { + $isChecked = true; + } else { + $isChecked = false; + } } } @@ -1293,6 +1299,15 @@ if (!empty($INRSYMBOL)) {
+ +
+ +
+ > IS THIS OPEN ORDER FORMAT +
+ +
+
@@ -2850,6 +2865,11 @@ if (!empty($INRSYMBOL)) { \ No newline at end of file diff --git a/app/Views/editRevenuepurchaseorder.php b/app/Views/editRevenuepurchaseorder.php index 0cd076b2..458e83b3 100755 --- a/app/Views/editRevenuepurchaseorder.php +++ b/app/Views/editRevenuepurchaseorder.php @@ -233,6 +233,7 @@ if (!empty($POMaster)) { $IsOpenOrder = isset($Req->IsOpenOrder) ? $Req->IsOpenOrder : null; + if ($IsOpenOrder !== null && (int) $IsOpenOrder !== 0) { $isChecked = true; } else { @@ -378,7 +379,14 @@ if (!empty($getlogpodtl)) { var InsuranceNumber = ''; var statuscheck = ''; $(document).ready(function () { - //alert('capital-'); + var openOrder = ; + if(openOrder){ + $('#Quantity').val(0); + $('#Quantity').removeAttr('required'); + $('#Quantity').attr('readonly', true); + $('#EditQuantity').removeAttr('required'); + $('#EditQuantity').attr('readonly', true); + } if (statuscheck == "") { $('#splpodiv').show(); // var js_array =; @@ -2346,13 +2354,13 @@ if (!empty($getlogpodtl)) {
- + > IS THIS OPEN ORDER FORMAT - - + +
@@ -5381,8 +5389,8 @@ if (!empty($getlogpodtl)) { }); function Save(status) { - // console.log("status"); - // console.log(status); + console.log("status"); + console.log(status); if (status == '0') { stat = ''; @@ -5498,7 +5506,8 @@ if (!empty($getlogpodtl)) { $('#EditUOM').val($('#uom' + userid).val()); $('#EditQuantity').val($('#quantity' + userid).val()); tinyMCE.get('Edit_Service_Description').setContent($('#service_description' + userid).val()); - $('#EditRate').val($('#itemRate' + userid).val()); + var editrate = parseFloat($('#itemRate' + userid).val()).toFixed(2); + $('#EditRate').val(editrate); var per = $('#per' + userid).val() if (per == '') { $('#EditPer').val($('#uom' + userid).val()); @@ -5950,10 +5959,16 @@ if (!empty($getlogpodtl)) { $('#Quantity').val(0); $('#Quantity').removeAttr('required'); $('#Quantity').attr('readonly', true); + $('#EditQuantity').val(0.00); + $('#EditQuantity').removeAttr('required'); + $('#EditQuantity').attr('readonly', true); } else { $('#Quantity').val(''); $('#Quantity').removeAttr('readonly'); $('#Quantity').attr('required', true); + $('#EditQuantity').val(''); + $('#EditQuantity').removeAttr('readonly'); + $('#EditQuantity').attr('required', true); } }); diff --git a/app/Views/editServiceAmendPO.php b/app/Views/editServiceAmendPO.php index 6c3a42c8..7c6ef68c 100755 --- a/app/Views/editServiceAmendPO.php +++ b/app/Views/editServiceAmendPO.php @@ -154,6 +154,14 @@ if (!empty($POMaster)) { $DescriptionOfPo = $Req->Description_Of_Service; $BudgetType = $Req->BudgetType; $PrePOFile = $Req->POFile; + + $IsOpenOrder = isset($Req->IsOpenOrder) ? $Req->IsOpenOrder : null; + if ($IsOpenOrder !== null && (int)$IsOpenOrder !== 0) { + $isChecked = true; + } else { + $isChecked = false; + } + } } @@ -1091,7 +1099,11 @@ foreach ($PaymentTerms as $TER) {
- + +
+ > IS THIS OPEN ORDER FORMAT +
+
@@ -1166,6 +1178,11 @@ foreach ($PaymentTerms as $TER) { + @@ -1243,10 +1260,10 @@ foreach ($PaymentTerms as $TER) { //if($PONOStatus == PO_DRAFT) //{ ?> - @@ -259,6 +255,7 @@
Quantity ?> ReceivedQuantity ?> Quantity - $record->ReceivedQuantity, 2, '.', ''); ?> + + + +     + Requisition details">    --> ; + if(openOrder){ + $('#EditQuantity').removeAttr('required'); + $('#EditQuantity').attr('readonly', true); + } + $("#EDITSERVICE").on("shown.bs.modal", function(e) { var AvlBudAmt = ''; @@ -2275,7 +2298,6 @@ foreach ($PaymentTerms as $TER) { } function validateServiceTax() { - if ($('#ReqNo').val() == "0") { alert('Please select the Requisition Number'); $('#ReqNo').focus(); @@ -2308,7 +2330,10 @@ foreach ($PaymentTerms as $TER) { } function validateEditServiceTax() { - + var openOrder = $('#IsOpenOrder').prop('checked'); + var quantity = parseFloat($('#EditQuantity').val()) || 0; + var rate = parseFloat($('#EditRate').val()) || 0; + console.log(openOrder); if ($('#EditCostCenter').val() == "0") { alert('Please select the Cost center'); $('#EditCostCenter').focus(); @@ -2317,11 +2342,11 @@ foreach ($PaymentTerms as $TER) { alert('Please select the Material Code'); $('#EditMaterialCode').focus(); return false; - } else if ($('#EditQuantity').val() == '' || $('#EditQuantity').val() == 0.00) { + } else if ($('#EditQuantity').val() == '' || (!openOrder && quantity === 0 )){ alert('Please Enter the Quantity value'); $('#EditQuantity').focus(); return false; - } else if ($('#EditRate').val() == '' || $('#EditRate').val() == 0.00) { + } else if ($('#EditRate').val() == '' || (!openOrder && rate === 0 )){ alert('Please Enter the Rate of the Item'); $('#EditRate').focus(); return false; @@ -2500,6 +2525,20 @@ foreach ($PaymentTerms as $TER) { return TAXval; // $('#AfterServiceTax').val(TAXval); } + $('#IsOpenOrder').change(function () { + + // alert("IsOpenOrder"); + if (this.checked) { + $('#EditQuantity').val(0); + $('#EditQuantity').removeAttr('required'); + $('#EditQuantity').attr('readonly', true); + } else { + $('#EditQuantity').val(''); + $('#EditQuantity').removeAttr('readonly'); + $('#EditQuantity').attr('required', true); + } + }); + function Reset() { location.reload(); } $(document).ready(function () { $("#PaymentTerms").change(function() { diff --git a/app/Views/employeeLeaveApplicationForm.php b/app/Views/employeeLeaveApplicationForm.php index fb54a9c3..0347c9ce 100755 --- a/app/Views/employeeLeaveApplicationForm.php +++ b/app/Views/employeeLeaveApplicationForm.php @@ -107,23 +107,19 @@ - ' data-toggle="tooltip" title=" - Click here to view Employee Leave Details"> + ' title=" - Click here to View/Edit Employee Leave Details">     - - - - -     - - - - - -     - - + + +     + + + +     + +