diff --git a/app/Controllers/Amendmentpurchaseorder.php b/app/Controllers/Amendmentpurchaseorder.php index df3325dc..ea0fc03c 100755 --- a/app/Controllers/Amendmentpurchaseorder.php +++ b/app/Controllers/Amendmentpurchaseorder.php @@ -266,7 +266,8 @@ class Amendmentpurchaseorder extends BaseController } $POType = $this->request->getPost('POType'); - $PoRange = $this->request->getPost('Range'); + $Local_Interstate = $this->request->getPost('Range'); + $PaymentTermsText = $this->request->getPost('beforePaymentTermsText'); $PaymentTerms = $this->request->getPost('PaymentTerms'); $Otherpayment = $this->request->getPost('Otherpayment'); @@ -308,7 +309,7 @@ class Amendmentpurchaseorder extends BaseController } $AmendmentNewPoNo = generate_amendment_po_number($PONO); - $POMaster = array('PONO' => $AmendmentNewPoNo, 'ParentPO' => $PONO, 'SupplierID' => $SupplierID, 'POType' => $POType, 'PORange' => $PoRange, '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); + $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); $file = $this->request->getFile('POFile'); $requestfilename = $file->getName(); $PrePOFile = $this->request->getPost('PrePOFile'); diff --git a/app/Controllers/Assetdetails.php b/app/Controllers/Assetdetails.php index ec4fe370..24396451 100755 --- a/app/Controllers/Assetdetails.php +++ b/app/Controllers/Assetdetails.php @@ -435,6 +435,7 @@ class Assetdetails extends BaseController $User = $this->request->getPost('User'); $SupplierName = $this->request->getPost('SupplierName'); $DateOfPurchase = $this->request->getPost('DateOfPurchase'); + $DOpurchase = ""; if ($DateOfPurchase != '') { $DOpurchase = get_date_time_format($DateOfPurchase); } diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 77651838..dbc2587b 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -1331,13 +1331,6 @@ class StockController extends BaseController - - - - - - - // Get the previous month's last date diesel stock details for next month updation $previousMonth = DateTime::createFromFormat('Y-m', $month)->modify('-1 month')->format('Y-m'); @@ -1416,46 +1409,7 @@ class StockController extends BaseController // Reset the structure to have indexed arrays without the date keys $data['groupedDieselMachineStockDetails'] = array_values($groupedByDate); - - - - //temp_code_s_2025_02 - - // getting diesel machines for creating table headers - // checking already existing stock if yes then get the diesel machines id from the existing stock - // if not get all the diesel machines from the factory Machine master table - - // if (!empty($data['groupedDieselMachineStockDetails'])) { - - // $result = $groupedByDate[$date]; - - // $distinctMachineId = []; - - // foreach ($result as $index => $eachResult) { - // $distinctMachineId[] = $result[$index]['machine_id']; - // } - - // $dieselMachines = $this->factoryMachine_model - // ->whereIn('id', $distinctMachineId) - // ->orderBy('id', 'asc') - // ->get() - // ->getResultArray(); - - - // } else { - - // $dieselMachines = $this->factoryMachine_model - // ->where('is_active', 1) - // ->where('energy_type', 'Diesel') - // ->orderBy('id', 'asc') - // ->get() - // ->getResultArray(); - - // } - - //temp_code_e_2025_02 - - + @@ -1819,35 +1773,6 @@ class StockController extends BaseController $data['groupedPowerConsumptionStockDetails'] = array_values($groupedByDate); - //temp_code_s_2025_02 - - // getting electric machines for creating table headers - // checking already existing stock if yes then get the electric machines id from the existing stock - // if not get all the electric machines from the factory Machine master table - - // if (!empty($data['groupedPowerConsumptionStockDetails'])) { - - // $result = $groupedByDate[$date]; - - // $distinctMachineId = []; - - // foreach ($result as $index => $eachResult) { - // $distinctMachineId[] = $result[$index]['machine_id']; - // } - - // $electricMachines = $this->factoryMachine_model->getSelectedElectricMachines($distinctMachineId); - - - // } else { - - // $electricMachines = $this->factoryMachine_model->getAllActiveElectricMachines(); - - // } - - //temp_code_e_2025_02 - - - $electricMachinesCount = count($electricMachines); $data['electricMachinesCount'] = $electricMachinesCount; @@ -2279,34 +2204,7 @@ class StockController extends BaseController // Reset the structure to have indexed arrays without the date keys $data['groupedResinStockDetails'] = array_values($groupedByDate); - - //temp_code_s_2025_02 - - // getting resin material for creating table headers - // checking already existing stock if yes then get the material code from the existing stock - // if not get all the material codes currently isActive from the raw material details table - - // if (!empty($data['groupedResinStockDetails'])) { - - // $result = $groupedByDate[$date]; - - // $distinctMaterialCodes = []; - - // foreach ($result as $index => $eachResult) { - // $distinctMaterialCodes[] = $result[$index]['materialCode']; - // } - - // $resinMaterials = $this->rawmaterialdetails_model->getSelectedResinMaterialCode($distinctMaterialCodes); - - // } else { - - // $resinMaterials = $this->rawmaterialdetails_model->getAllResinMaterialCode(); - - // } - - //temp_code_e_2025_02 - - + // getting customer for creating table headers // checking already existing stock if yes then get customer from the existing stock // if not set customer in db , then set '' empty string @@ -2655,32 +2553,7 @@ class StockController extends BaseController // Reset the structure to have indexed arrays without the date keys $data['groupedBagStockDetails'] = array_values($groupedByDate); - - - - //temp_code_s_2025_02 - - // // getting bag material for creating table headers - // // checking already existing stock if yes then get the material code from the existing bag - // // if not get all the material codes from the raw material details table - - // if (!empty($data['groupedBagStockDetails'])) { - // $result = $groupedByDate[$date]; - - // $distinctMaterialCodes = []; - - // foreach ($result as $index => $eachResult) { - // $distinctMaterialCodes[] = $result[$index]['materialCode']; - // } - - // $bagMaterials = $this->rawmaterialdetails_model->getSelectedBagMaterialCode($distinctMaterialCodes); - - // } else { - // $bagMaterials = $this->rawmaterialdetails_model->getAllBagMaterialCode(); - // } - - //temp_code_e_2025_02 - + // getting customer for creating table headers // checking already existing stock if yes then get customer from the existing stock diff --git a/app/Models/FactoryMachineModel.php b/app/Models/FactoryMachineModel.php index 6c363b76..3e77c081 100644 --- a/app/Models/FactoryMachineModel.php +++ b/app/Models/FactoryMachineModel.php @@ -92,7 +92,7 @@ class FactoryMachineModel extends Model $result = $this->db->table('t_factorymachinemaster') ->where('is_active', 1) ->where('energy_type', 'diesel') - ->orderBy('id', 'desc') + ->orderBy('id', 'asc') ->get() ->getResultArray(); diff --git a/app/Models/TrpProductionModel.php b/app/Models/TrpProductionModel.php index 55277d90..de14aba0 100644 --- a/app/Models/TrpProductionModel.php +++ b/app/Models/TrpProductionModel.php @@ -146,7 +146,7 @@ class TrpProductionModel extends Model $builder->join('t_trp_sand_use tsu', 'tsu.date = tpmd.date', 'left'); // Subquery: Coating Machine Gas Consumption - $subquery1 = $this->db->table('t_coatingMachineDetails') + $subquery1 = $this->db->table('t_coatingmachinedetails') ->select('date, SUM(totalGasConsumption) AS totalGasConsumption') ->groupBy('date') ->getCompiledSelect(false); // Convert Query Builder to raw SQL; @@ -154,7 +154,7 @@ class TrpProductionModel extends Model $builder->join("({$subquery1}) tcmd", 'tcmd.date = tpmd.date', 'left'); // Subquery: Drier Machine Gas Consumption - $subquery2 = $this->db->table('t_drierMachineDetails') + $subquery2 = $this->db->table('t_driermachinedetails') ->select('date, SUM(total_gas_consumption) AS totalGasConsumption') ->groupBy('date') ->getCompiledSelect(false); // Convert Query Builder to raw SQL; diff --git a/app/Views/EditservicePurchaseorder.php b/app/Views/EditservicePurchaseorder.php index ae89c7d9..ba342ca7 100755 --- a/app/Views/EditservicePurchaseorder.php +++ b/app/Views/EditservicePurchaseorder.php @@ -1251,8 +1251,8 @@ if (!empty($getlogpodtl)) { Item Code Item Description Line Item Specs - Quantity UOM + Quantity Rate Basic Amount Tax Amount @@ -1285,7 +1285,8 @@ if (!empty($getlogpodtl)) { MaterialCode ?> MaterialName, 0, 13, "..."); echo $shortName; ?> - + + @@ -1296,9 +1297,7 @@ if (!empty($getlogpodtl)) { - LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; - } ?> + LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?> Quantity ?> UOM ?> @@ -1309,9 +1308,9 @@ if (!empty($getlogpodtl)) { Taxamount ?> TotalValue ?> - + + + @@ -1660,7 +1659,7 @@ if (!empty($getlogpodtl)) {   Submit   OK -   Submit + @@ -2622,7 +2621,7 @@ if (!empty($getlogpodtl)) { // Taxvalue: TotalTaxValue, // TotalValue: TotalOrderValue // })); - PONOStatus = + var PONOStatus = ""; var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; var rowHtml = ` @@ -2917,8 +2916,6 @@ if (!empty($getlogpodtl)) { $('#OtheritemDescription').val(''); } - var DeletedMaterialCode = ''; - var DeletedMaterialName = ''; function DeleteRow(rowid) { @@ -3152,6 +3149,7 @@ if (!empty($getlogpodtl)) { +
@@ -456,49 +460,26 @@ } ?> - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ Total + - - - - - (avg) (avg)
Date ShiftMachine On TimeMachine Off TimeMachine Running(hr)Customer Name GradeTotal CoatingTotal Coating Sand(kg)Total Gas ConsumptionHour GasHour QTY(kg)
- Total - - - - - - (avg) (avg)
diff --git a/app/Views/stock/bagStockDetails.php b/app/Views/stock/bagStockDetails.php index 6b529812..9820c631 100644 --- a/app/Views/stock/bagStockDetails.php +++ b/app/Views/stock/bagStockDetails.php @@ -235,6 +235,9 @@ } */ + tfoot tr { + background-color:rgb(235, 236, 203); + } @@ -304,7 +307,7 @@
" - class="form-control mt-2" data-provide="datepicker" + class="form-control mt-2" data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
@@ -419,7 +422,7 @@
- " + " class="form-control mt-2" data-provide="datepicker" data-date-format="M-yyyy" data-date-min-view-mode="1"> @@ -585,45 +588,27 @@ + + -
- + - - - - - - - - - - - + - + + + + + - - - - - - - - - - - + - + - -
+ Total +
Total SumOpening StockReceiptUsedBalance Stock
- Total -
-
@@ -682,12 +667,15 @@ > + foreach($previousMonthBagStockDetails as $index => $previousMonthBagStockDetail) + { + if($previousMonthBagStockDetail['materialCode'] == $bagMaterial['MaterialCode']){ + echo $previousMonthBagStockDetail['balanceStock'] ; + break; + } + + } + ?> @@ -704,8 +692,15 @@ data-id=" " > + foreach($previousMonthBagStockDetails as $index => $previousMonthBagStockDetail) + { + if($previousMonthBagStockDetail['materialCode'] == $bagMaterial['MaterialCode']){ + echo $previousMonthBagStockDetail['balanceStock'] ; + break; + } + + } + ?> @@ -1272,4 +1267,17 @@ }; }); + + + \ No newline at end of file diff --git a/app/Views/stock/dieselStockDetails.php b/app/Views/stock/dieselStockDetails.php index 5f0fedf1..4e46e21c 100644 --- a/app/Views/stock/dieselStockDetails.php +++ b/app/Views/stock/dieselStockDetails.php @@ -226,8 +226,9 @@ max-width: 100px; } - - + tfoot tr{ + background-color:rgb(235, 236, 203); + } @@ -683,67 +684,40 @@ foreach ($period as $day) { } ?> -
- + + - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + - + - - - - - - + + + + + + + + + + + - - - - -
Total Sum Opening Purchase Diesel Filling Diesel Balance StockOpening ReadingClosing ReadingFilling DieselConsumptionRunning HoursMileage
- Total - + Total +
-
@@ -839,10 +813,18 @@ foreach ($period as $day) { - > + > + + $previousMonthDieselMachineStockDetail) + { + if($previousMonthDieselMachineStockDetail['machine_id'] == $dieselMachine['id']){ + echo $previousMonthDieselMachineStockDetail['closing_reading'] ; + break; + } + + } + ?> - + $previousMonthDieselMachineStockDetail) + { + if($previousMonthDieselMachineStockDetail['machine_id'] == $dieselMachine['id']){ + echo $previousMonthDieselMachineStockDetail['closing_reading'] ; + break; + } + + } + + ?>
@@ -503,62 +507,29 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - -
Date valueDrier On Time Drier Off TimeRunning HrsSupplier Name input Sand Qty (Metric Ton)inputp Sand Moisture(%)Sand Dried Qty (Metric Ton)Total Gas ConsumptionGas Per TonQty Per Hrs (Metric Ton)Moisture Loss Qty (Metric Ton)Dust Qty (Metric Ton)
- Total - ----
- - + + Total + + - + - + + - + + - + + + + + + + + + +

diff --git a/app/Views/stock/dustAndRoughStockDetails.php b/app/Views/stock/dustAndRoughStockDetails.php index a9860050..405c77ff 100644 --- a/app/Views/stock/dustAndRoughStockDetails.php +++ b/app/Views/stock/dustAndRoughStockDetails.php @@ -228,6 +228,10 @@ max-width: 150px; } + tfoot tr { + background-color:rgb(235, 236, 203); + } + @@ -273,10 +277,9 @@ data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
-
+
-
Total - - - + + + @@ -680,3 +683,18 @@ + + + diff --git a/app/Views/stock/gasStockDetails.php b/app/Views/stock/gasStockDetails.php index 672242db..23dc0fa8 100644 --- a/app/Views/stock/gasStockDetails.php +++ b/app/Views/stock/gasStockDetails.php @@ -217,6 +217,9 @@ max-width: 100px; } + tfoot tr { + background-color:rgb(235, 236, 203); + } @@ -501,50 +504,8 @@ } ?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - -
RIPL Gas Stock FBD 10 Ton DryerSand DriedCoating MachineSand CoatedTRP Sand TRPRotary Drier
Date Opening StockPurchase(Bharath)Purchase(Indian)TotalConsumption Balance StockConsumption ton Consumptionton Panel ConsumptionPhysical Consumptionton Consumption
Total @@ -568,12 +529,8 @@ -
-
+ + diff --git a/app/Views/stock/incomingSilicaSandDetails.php b/app/Views/stock/incomingSilicaSandDetails.php index c5f9cd4c..ecedf7c4 100644 --- a/app/Views/stock/incomingSilicaSandDetails.php +++ b/app/Views/stock/incomingSilicaSandDetails.php @@ -226,6 +226,9 @@ z-index: 5!important; } + tfoot tr { + background-color:rgb(235, 236, 203); + } @@ -669,48 +672,14 @@ } ?> - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - @@ -718,6 +687,7 @@ + @@ -732,13 +702,11 @@ - - - - + +
S.NO IGR No Invoice NoInvoice DateReceived DateSupplier NameGrade Grade ConditionVehicle NoQtyLab ReportAFS SpecAFS ActualPlus 20 loss%Plus 30 Loss %Moisture % SpecMoisture ActualMoisture LossMoisture loss QtySieve Loss QtySalable Qty
-
Total
- - - - - - -

diff --git a/app/Views/stock/powerConsumptionDetails.php b/app/Views/stock/powerConsumptionDetails.php index 2de8b655..d7712d73 100644 --- a/app/Views/stock/powerConsumptionDetails.php +++ b/app/Views/stock/powerConsumptionDetails.php @@ -235,6 +235,12 @@ min-width: 100px; max-width: 100px; } + + tfoot tr { + background-color:rgb(235, 236, 203); + } + + @@ -685,71 +691,37 @@ foreach ($period as $day) { } ?> -
- + + - + - - - - - - - - - - + + + + + + + + - - - - - - - - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - + } + ?> - - - - -
+ Total +
Date Opening Reading Final ReadingTotal ReadingTotal Units Average PFPresent PFMD MF *60Opening UnitsFinal UnitsTotal Units
- Total -
-
+ + @@ -786,7 +758,8 @@ foreach ($period as $day) { oninput="openingTPStockChange(this)" contenteditable="true" - >> + + + @@ -859,11 +834,19 @@ foreach ($period as $day) { data-id=" "> - $previousMonthPowerConsumptionStockDetail) + { + if($previousMonthPowerConsumptionStockDetail['machine_id'] == $powerMachine['id']){ + echo $previousMonthPowerConsumptionStockDetail['closing_units'] ; + break; + } + + } ?> + - $previousMonthPowerConsumptionStockDetail) + { + if($previousMonthPowerConsumptionStockDetail['machine_id'] == $powerMachine['id']){ + echo $previousMonthPowerConsumptionStockDetail['closing_units'] ; + break; + } + + } ?> + @@ -569,44 +573,27 @@ foreach ($period as $day) { -
- + + - - - - - - - - - + - - - - - - - + - - - - + + + + - + - + + - -
Total SumOpening StockReceiptUsedBalance Stock
+ Total +
- Total -
-
- @@ -659,7 +646,20 @@ foreach ($period as $day) { oninput="openingStockChange(this)" contenteditable="true" - > + > + + $previousMonthResinStockDetail) + { + if($previousMonthResinStockDetail['materialCode'] == $resinMaterial['MaterialCode']){ + echo $previousMonthResinStockDetail['balanceStock'] ; + break; + } + + } + ?> + + + data-id=" "> + + $previousMonthResinStockDetail) + { + if($previousMonthResinStockDetail['materialCode'] == $resinMaterial['MaterialCode']){ + echo $previousMonthResinStockDetail['balanceStock'] ; + break; + } + + } + ?> + + diff --git a/app/Views/stock/trpProductionStockDetails.php b/app/Views/stock/trpProductionStockDetails.php index 1317bcf7..3a6d6b0e 100644 --- a/app/Views/stock/trpProductionStockDetails.php +++ b/app/Views/stock/trpProductionStockDetails.php @@ -230,6 +230,10 @@ min-height: 200px; } + tfoot tr { + background-color:rgb(235, 236, 203); + } + @@ -1004,421 +1008,274 @@ $timeOtions[] = "12:00 AM"; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0){?> - - - - - - - - - - - - - 0){?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + - - - + + + - - - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - -
Date Opening Time Closing Time Total Hours Cold Start Break Down Hours Burner Firing Hours Sand Feeding Hours Gas Receipt Physical Gas Consumption Drier Gas Consumption Coating Gas Consumption TRP plus Drier Gas Consumption TRP Physical Gas Per Ton Panel Gas Consumption Panel Gas Per Ton Incoming Sand/ Lump details ED details TRP Sand Coating Usage Water EB Reading EB Unit Per Ton Working Persons Maintanence Details Description MS Seperation ED Waste Cooler Bags ED +20 Waste Cyclone Waste
BGPG Running Hours Production Usage Production Production Per Hour Receipt Consumption Engineers SupervisorsOperators Roller Drivers Nature Of Maintenance Location
- Total - + Total + - - + + + + + - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - - - - - - - + + - - + + - - + + - - + + - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + +
+


diff --git a/app/Views/stock/trpSandUseStockDetails.php b/app/Views/stock/trpSandUseStockDetails.php index 9fe0ee10..24823027 100644 --- a/app/Views/stock/trpSandUseStockDetails.php +++ b/app/Views/stock/trpSandUseStockDetails.php @@ -222,6 +222,11 @@ min-width: 150px; max-width: 150px; } + + tfoot tr { + background-color:rgb(235, 236, 203); + } + @@ -378,35 +383,27 @@ } ?> -
+ - + - - - - - - - - + - + + + + + - - - - - - + + - -
Total Rough Kgs Fine Kgs Total Kgs
+ Total +
- Total -
+ diff --git a/public/assets/js/CreatePOValidation.js b/public/assets/js/CreatePOValidation.js index aba375d6..de40f5aa 100755 --- a/public/assets/js/CreatePOValidation.js +++ b/public/assets/js/CreatePOValidation.js @@ -43,7 +43,7 @@ function enableButtons() { function revenueValidate(){ var radioValue = parseInt($("input[name='DateRange']:checked").val()); - + var scheduleBy = $('#Scheduleby').val(); // Get the value if ($('#drpSupplier').val() == "0") { alert('Please Select the Supplier details'); $('#drpSupplier').focus(); @@ -60,13 +60,10 @@ function revenueValidate(){ 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 + }else if (radioValue == 1 && (!scheduleBy || scheduleBy.trim() == '')) { alert('Please Enter the Schedule By'); $('#Scheduleby').focus(); return false; - } }else if($('#PODate').val() == ''){ alert('Please Enter the Purchase Order date'); $('#PODate').focus(); @@ -97,54 +94,68 @@ function revenueValidate(){ function serviceValidate(){ var radioValue = parseInt($("input[name='DateRange']:checked").val()); + var scheduleBy = $('#Scheduleby').val(); // Get the value if ($('#drpSupplier').val() == "0") { + console.log('Please Select the Supplier details'); alert('Please Select the Supplier details'); $('#drpSupplier').focus(); return false; }else if ($('#workstatus').val() == "0") { + console.log('Please Select the Work Status'); alert('Please Select the Work Status'); $('#workstatus').focus(); return false; }else if ($('#PODate').val().trim() == '') { + console.log('Please Enter the Purchase Order date'); alert('Please Enter the Purchase Order date'); $('#PODate').focus(); return false; }else if ($('#DeliveryAddr').val().trim() == '') { + console.log('Please Enter the Delivery Address'); alert('Please Enter the Delivery Address'); $('#DeliveryAddr').focus(); return false; }else if (radioValue === 0 && $('#Deliverydt').val() == '') { + console.log('Please Select the Delivery Date'); 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 + }else if (radioValue == 1 && (!scheduleBy || scheduleBy.trim() == '')) { + console.log('Please Enter the Schedule By'); alert('Please Enter the Schedule By'); $('#Scheduleby').focus(); return false; - } + }else if($('#PODate').val() == ''){ + console.log('Please Enter the Purchase Order date'); alert('Please Enter the Purchase Order date'); $('#PODate').focus(); return false; }else if ($('#PoTypeOptions').val() == "0") { + console.log('Please Select Service Type'); alert('Please Select Service Type'); $('#PoTypeOptions').focus(); return false; }else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { + console.log('Please Enter Payable Terms Description'); alert('Please Enter Payable Terms Description'); $('#Otherpayment').focus(); return false; }else if($('#insuranceStatus').val() == "1" && $('#InsuranceNumber').val().trim() == ''){ + console.log('Please Enter the Insurance No / Insurance Details'); alert('Please Enter the Insurance No / Insurance Details'); $('#InsuranceNumber').focus(); return false; }else if ($('#BudgetType').val() == "0") { + console.log('Please Select Budget Type'); alert('Please Select Budget Type'); $('#BudgetType').focus(); return false; + } + else { + console.log("JS else part"); + return true; } // else if ($('#ServiceTable tbody tr').length < 1) { // alert('Atleast One Line needed'); @@ -154,9 +165,7 @@ function serviceValidate(){ // $('#descofpo').focus(); // return false; // } - else { - return true; - } + } function capitalValidate(){ @@ -332,21 +341,21 @@ function importValidate(){ function validate() { var radioValue = $("input[name='DateRange']:checked").val(); - - var PoType = $('#POType').val(); - var currencyType = $('#currencytype').val(); - if($('#PODate').val() == '') + var PoType = $('#POType').val(); + var currencyType = $('#currencytype').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($('#drpSupplier').val() == "0") - { - alert('Please Select the Supplier details'); - $('#drpSupplier').focus(); - return false; - } else if(radioValue==0 && $('#Deliverydate').val()==''){ alert('Please Select the Delivery Date'); $('#Deliverydate').focus();