RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
Gowtham M 2025-03-07 17:10:01 +05:30
commit 90d452e69e
29 changed files with 718 additions and 1062 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/Amendmentpurchaseorder.php
View File

@ -266,7 +266,8 @@ class Amendmentpurchaseorder extends BaseController
} }
$POType = $this->request->getPost('POType'); $POType = $this->request->getPost('POType');
$PoRange = $this->request->getPost('Range'); $Local_Interstate = $this->request->getPost('Range');
$PaymentTermsText = $this->request->getPost('beforePaymentTermsText'); $PaymentTermsText = $this->request->getPost('beforePaymentTermsText');
$PaymentTerms = $this->request->getPost('PaymentTerms'); $PaymentTerms = $this->request->getPost('PaymentTerms');
$Otherpayment = $this->request->getPost('Otherpayment'); $Otherpayment = $this->request->getPost('Otherpayment');
@ -308,7 +309,7 @@ class Amendmentpurchaseorder extends BaseController
} }
$AmendmentNewPoNo = generate_amendment_po_number($PONO); $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'); $file = $this->request->getFile('POFile');
$requestfilename = $file->getName(); $requestfilename = $file->getName();
$PrePOFile = $this->request->getPost('PrePOFile'); $PrePOFile = $this->request->getPost('PrePOFile');

1
app/Controllers/Assetdetails.php
View File

@ -435,6 +435,7 @@ class Assetdetails extends BaseController
$User = $this->request->getPost('User'); $User = $this->request->getPost('User');
$SupplierName = $this->request->getPost('SupplierName'); $SupplierName = $this->request->getPost('SupplierName');
$DateOfPurchase = $this->request->getPost('DateOfPurchase'); $DateOfPurchase = $this->request->getPost('DateOfPurchase');
$DOpurchase = "";
if ($DateOfPurchase != '') { if ($DateOfPurchase != '') {
$DOpurchase = get_date_time_format($DateOfPurchase); $DOpurchase = get_date_time_format($DateOfPurchase);
} }

127
app/Controllers/StockController.php
View File

@ -1331,13 +1331,6 @@ class StockController extends BaseController
// Get the previous month's last date diesel stock details for next month updation // 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'); $previousMonth = DateTime::createFromFormat('Y-m', $month)->modify('-1 month')->format('Y-m');
@ -1419,45 +1412,6 @@ class StockController extends BaseController
//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
$dieselMachinesCount = count($dieselMachines); $dieselMachinesCount = count($dieselMachines);
@ -1819,35 +1773,6 @@ class StockController extends BaseController
$data['groupedPowerConsumptionStockDetails'] = array_values($groupedByDate); $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); $electricMachinesCount = count($electricMachines);
$data['electricMachinesCount'] = $electricMachinesCount; $data['electricMachinesCount'] = $electricMachinesCount;
@ -2280,33 +2205,6 @@ class StockController extends BaseController
$data['groupedResinStockDetails'] = array_values($groupedByDate); $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 // getting customer for creating table headers
// checking already existing stock if yes then get customer from the existing stock // checking already existing stock if yes then get customer from the existing stock
// if not set customer in db , then set '' empty string // if not set customer in db , then set '' empty string
@ -2657,31 +2555,6 @@ class StockController extends BaseController
$data['groupedBagStockDetails'] = array_values($groupedByDate); $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 // getting customer for creating table headers
// checking already existing stock if yes then get customer from the existing stock // checking already existing stock if yes then get customer from the existing stock
// if not set customer as '' empty string // if not set customer as '' empty string

2
app/Models/FactoryMachineModel.php
View File

@ -92,7 +92,7 @@ class FactoryMachineModel extends Model
$result = $this->db->table('t_factorymachinemaster') $result = $this->db->table('t_factorymachinemaster')
->where('is_active', 1) ->where('is_active', 1)
->where('energy_type', 'diesel') ->where('energy_type', 'diesel')
->orderBy('id', 'desc') ->orderBy('id', 'asc')
->get() ->get()
->getResultArray(); ->getResultArray();

4
app/Models/TrpProductionModel.php
View File

@ -146,7 +146,7 @@ class TrpProductionModel extends Model
$builder->join('t_trp_sand_use tsu', 'tsu.date = tpmd.date', 'left'); $builder->join('t_trp_sand_use tsu', 'tsu.date = tpmd.date', 'left');
// Subquery: Coating Machine Gas Consumption // Subquery: Coating Machine Gas Consumption
$subquery1 = $this->db->table('t_coatingMachineDetails') $subquery1 = $this->db->table('t_coatingmachinedetails')
->select('date, SUM(totalGasConsumption) AS totalGasConsumption') ->select('date, SUM(totalGasConsumption) AS totalGasConsumption')
->groupBy('date') ->groupBy('date')
->getCompiledSelect(false); // Convert Query Builder to raw SQL; ->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'); $builder->join("({$subquery1}) tcmd", 'tcmd.date = tpmd.date', 'left');
// Subquery: Drier Machine Gas Consumption // 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') ->select('date, SUM(total_gas_consumption) AS totalGasConsumption')
->groupBy('date') ->groupBy('date')
->getCompiledSelect(false); // Convert Query Builder to raw SQL; ->getCompiledSelect(false); // Convert Query Builder to raw SQL;

41
app/Views/EditservicePurchaseorder.php
View File

@ -1251,8 +1251,8 @@ if (!empty($getlogpodtl)) {
<th style="text-align:left !important; white-space: nowrap !important;">Item Code</th> <th style="text-align:left !important; white-space: nowrap !important;">Item Code</th>
<th style="white-space: nowrap !important;">Item Description</th> <th style="white-space: nowrap !important;">Item Description</th>
<th style="white-space: nowrap !important;">Line Item Specs</th> <th style="white-space: nowrap !important;">Line Item Specs</th>
<th style="text-align: left; white-space: nowrap !important;">Quantity</th>
<th style="white-space: nowrap !important;">UOM</th> <th style="white-space: nowrap !important;">UOM</th>
<th style="text-align: left; white-space: nowrap !important;">Quantity</th>
<th style="text-align: right; white-space: nowrap !important;">Rate <?php echo "($INRSYM)" ?></th> <th style="text-align: right; white-space: nowrap !important;">Rate <?php echo "($INRSYM)" ?></th>
<th style="text-align: right; white-space: nowrap !important;">Basic Amount <?php echo "($INRSYM)" ?></th> <th style="text-align: right; white-space: nowrap !important;">Basic Amount <?php echo "($INRSYM)" ?></th>
<th style="text-align: right; white-space: nowrap !important;">Tax Amount <?php echo "($INRSYM)" ?></th> <th style="text-align: right; white-space: nowrap !important;">Tax Amount <?php echo "($INRSYM)" ?></th>
@ -1285,7 +1285,8 @@ if (!empty($getlogpodtl)) {
<td style="text-align:left !important;"><?php echo $record->MaterialCode ?></td> <td style="text-align:left !important;"><?php echo $record->MaterialCode ?></td>
<td style="text-align:left !important;"><?php $shortName = mb_strimwidth($record->MaterialName, 0, 13, "..."); <td style="text-align:left !important;"><?php $shortName = mb_strimwidth($record->MaterialName, 0, 13, "...");
echo $shortName; ?></td> echo $shortName; ?></td>
<td style="text-align:left !important;"><?php if ($PONOStatus === PO_DRAFT || $PONOStatus === PO_CREATED) { ?> <td style="text-align:left !important;">
<?php if ($PONOStatus === PO_DRAFT || $PONOStatus === PO_CREATED) { ?>
<a href="#" <a href="#"
class="editable-field" class="editable-field"
data-id="<?php echo $index ?>" data-notes="<?php echo $record->LineitemAuditorNotes; ?>"> data-id="<?php echo $index ?>" data-notes="<?php echo $record->LineitemAuditorNotes; ?>">
@ -1296,9 +1297,7 @@ if (!empty($getlogpodtl)) {
<button class="save-btn">✔</button> <button class="save-btn">✔</button>
<button class="cancel-btn">✖</button> <button class="cancel-btn">✖</button>
</div> </div>
<?php } else { <?php } else { echo !empty($record->LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-"; } ?>
echo !empty($record->LineitemAuditorNotes) ? $record->LineitemAuditorNotes : "-";
} ?>
</td> </td>
<td style="text-align:left !important;"><?php echo $record->Quantity ?></td> <td style="text-align:left !important;"><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td> <td><?php echo $record->UOM ?></td>
@ -1309,9 +1308,9 @@ if (!empty($getlogpodtl)) {
<td style="text-align:right !important;"><?php echo $record->Taxamount ?></td> <td style="text-align:right !important;"><?php echo $record->Taxamount ?></td>
<td style="text-align:right !important;"><?php echo $record->TotalValue ?></td> <td style="text-align:right !important;"><?php echo $record->TotalValue ?></td>
<!-- <td align="right"><?php echo $record->Quantity ?></td> <!-- <td align="right"><?php // echo $record->Quantity ?></td> -->
<td align="right"><?php echo $record->ReceivedQuantity ?></td> <!-- <td align="right"><?php // echo $record->ReceivedQuantity ?></td> -->
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> --> <!-- <td align="right"><?php // echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->
<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" /> <input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
@ -1660,7 +1659,7 @@ if (!empty($getlogpodtl)) {
<a class="btn btn-success Save" ID="Submit" onclick="Save(3)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Save" ID="Submit" onclick="Save(3)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<?php } else { ?> <?php } else { ?>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> <a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <!-- <a class="btn btn-success Save" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a> -->
<?php } ?> <?php } ?>
</div> </div>
@ -2622,7 +2621,7 @@ if (!empty($getlogpodtl)) {
// Taxvalue: TotalTaxValue, // Taxvalue: TotalTaxValue,
// TotalValue: TotalOrderValue // TotalValue: TotalOrderValue
// })); // }));
PONOStatus = <?php echo $PONOStatus; ?> var PONOStatus = "<?php echo $PONOStatus; ?>";
var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;
var rowHtml = ` var rowHtml = `
<tr id="${temp}"> <tr id="${temp}">
@ -2917,8 +2916,6 @@ if (!empty($getlogpodtl)) {
$('#OtheritemDescription').val(''); $('#OtheritemDescription').val('');
} }
var DeletedMaterialCode = '';
var DeletedMaterialName = '';
function DeleteRow(rowid) { function DeleteRow(rowid) {
@ -3152,6 +3149,7 @@ if (!empty($getlogpodtl)) {
</script> </script>
<script> <script>
function Save(status) { function Save(status) {
console.log("serviceValidate",status);
if (status == '0') { if (status == '0') {
stat = '<?php echo PO_DRAFT; ?>'; stat = '<?php echo PO_DRAFT; ?>';
} else if (status == '1') { } else if (status == '1') {
@ -3179,7 +3177,8 @@ if (!empty($getlogpodtl)) {
if (serviceValidate()) { if (serviceValidate()) {
if (document.getElementById('ServiceTable').rows.length < 2) { console.log("serviceValidate");
if ($('#ServiceTable tbody tr').length < 1) {
alert('Atleast One Line needed'); alert('Atleast One Line needed');
return false; return false;
} }
@ -3187,15 +3186,16 @@ if (!empty($getlogpodtl)) {
// alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); // alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
// return false; // return false;
// } // }
// else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') {
// alert('Please Enter Payable Terms'); alert('Please Enter Payable Terms');
// $('#Otherpayment').focus(); $('#Otherpayment').focus();
// return false; return false;
else if ($('#editdescofpo').val().trim() == '') { } else if ($('#editdescofpo').val().trim() == '') {
alert('Please Enter Description Of Service'); alert('Please Enter Description Of Service');
$('#editdescofpo').focus(); $('#editdescofpo').focus();
return false; return false;
} else { } else {
console.log("serviceValidate else");
// $('#content').loader('show'); // $('#content').loader('show');
var formData = new FormData($('.ServicePO')[0]); var formData = new FormData($('.ServicePO')[0]);
$('#loader').show(); $('#loader').show();
@ -3243,7 +3243,6 @@ if (!empty($getlogpodtl)) {
}); });
} }
} }
} }
// this function is used to clear data changing schedule option // this function is used to clear data changing schedule option
@ -3346,12 +3345,14 @@ if (!empty($getlogpodtl)) {
//ServiceTable //ServiceTable
var rows = $('#ServiceTable tbody tr').length; var rows = $('#ServiceTable tbody tr').length;
var DeletedMaterialCode = '';
var DeletedMaterialName = '';
if (DeletedMaterialCode != undefined && DeletedMaterialCode != '') { if (DeletedMaterialCode != undefined && DeletedMaterialCode != '') {
$("#MaterialCode").append($('<option></option>').val(DeletedMaterialCode).html(DeletedMaterialCode + "-" + DeletedMaterialName)); $("#MaterialCode").append($('<option></option>').val(DeletedMaterialCode).html(DeletedMaterialCode + "-" + DeletedMaterialName));
DeletedMaterialCode = ''; DeletedMaterialCode = '';
DeletedMaterialCode = ''; DeletedMaterialName = '';
} }
for (i = 2; i <= rows; i++) { for (i = 2; i <= rows; i++) {

17
app/Views/alterpurchaseorder.php
View File

@ -1839,10 +1839,14 @@ if (!empty($INRSYMBOL)) {
function showsubmit() { function showsubmit() {
var isChecked = $('#IsOpenOrder').is(':checked'); var isChecked = $('#IsOpenOrder').is(':checked');
console.log("Step 1 = SS"); console.log("Step 1 = SS");
var PO = $('#POType').val(); var POTy = $('#POType').val();
if (PO == 'SERVICE') { if (POTy == 'SERVICE') {
if ($('#emergdescofpo').val().trim() == '') {
var descValue = tinymce.get('emergdescofpo').getContent().trim();
descValue = $.trim(descValue);
if (descValue == '') {
alert('Please Enter Description Of Service'); alert('Please Enter Description Of Service');
$('#emergdescofpo').focus(); $('#emergdescofpo').focus();
return false; return false;
@ -3026,10 +3030,9 @@ if (!empty($INRSYMBOL)) {
<label>Description Of Service <span <label>Description Of Service <span
class="badge mandatory">*</span></label> class="badge mandatory">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <textarea name="emergdescofpo" id="emergdescofpo" class="form-control" rows="3" cols="40">
$data = array('name' => 'emergdescofpo', 'value' => set_value('emergdescofpo'), 'id' => 'emergdescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); <?php echo set_value('emergdescofpo'); ?>
echo form_textarea($data); </textarea>
?>
</div> </div>
</div> </div>

8
app/Views/capitalpurchaseorder.php
View File

@ -1135,7 +1135,7 @@ if (!empty($INRSYMBOL)) {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-3" id="hideModalExchange"> <div class="form-group col-md-3" id="hideModalExchange">
<label> Exchange Rate</label> <label> Exchange Rate</label>
@ -1657,7 +1657,7 @@ if (!empty($INRSYMBOL)) {
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label> <label><?php echo "Net per Uom($INR)"; ?></label>
<?php <?php
$data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -1767,7 +1767,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-3" id="hideModalExchangeEdit"> <div class="form-group col-md-3" id="hideModalExchangeEdit">
<label> Exchange Rate</label> <label> Exchange Rate</label>
@ -2374,7 +2374,7 @@ if (!empty($INRSYMBOL)) {
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label> <label><?php echo "Net per Uom($INR)"; ?></label>
<div> <div>
<?php <?php
$data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');

2
app/Views/editCapitalAmendPO.php
View File

@ -2326,7 +2326,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-group col-md-4 " style="margin-top: -4.8%"> <div class="form-group col-md-4 " style="margin-top: -4.8%">
<label for="EditNett">Nett per UOM<?php echo "($INR)"; ?></label> <label for="EditNett">Net per Uom<?php echo "($INR)"; ?></label>
<?php <?php
$data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data); echo form_input($data);

19
app/Views/editCapitalPo.php
View File

@ -1583,17 +1583,12 @@ if (!empty($getlogpodtl)) {
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) { ?> <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) { ?>
<a class="btn btn-success Save" ID="Cancel" <a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span <?php if ($PONOStatus == PO_DRAFT) { ?>
class="bold">Cancel</span></a> <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) { ?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as
Draft</span></a>
<?php } ?> <?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span <a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
class="bold">Submit</span></a> <a class="btn btn btn-soft-primary waves-effect waves-light Save" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<a class="btn btn btn-soft-primary waves-effect waves-light Save" ID="Submit"
onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else { <?php } else {
if ($DEPCode == FINANCE) { ?> if ($DEPCode == FINANCE) { ?>
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a> <a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
@ -2383,7 +2378,7 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-4" style="margin-top: -25px;"> <div class="form-group col-md-4" style="margin-top: -25px;">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<span><?php echo "Nett per UOM($INR)"; ?></span> <span><?php echo "Net per Uom($INR)"; ?></span>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -3635,7 +3630,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-group col-md-4" style="margin-top: -25px;"> <div class="form-group col-md-4" style="margin-top: -25px;">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<span><?php echo "Nett per UOM($INR)"; ?></span> <span><?php echo "Net per Uom($INR)"; ?></span>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');

9
app/Views/editImportAmendPO.php
View File

@ -1141,7 +1141,7 @@ if (!empty($RequistionDetails)) {
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label> <label><?php echo "Net per Uom($INR)"; ?></label>
<div> <div>
<?php <?php
$data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -1202,11 +1202,6 @@ if (!empty($RequistionDetails)) {
<table id="ImportTax" class="table nowrap table-bordered table-hover mb-0" style="font-size:12px;"> <table id="ImportTax" class="table nowrap table-bordered table-hover mb-0" style="font-size:12px;">
<thead> <thead>
<tr> <tr>
<th style="white-space: nowrap !important; text-align:left !important">SNo</th> <th style="white-space: nowrap !important; text-align:left !important">SNo</th>
<th style="white-space: nowrap !important; text-align:center !important">Requisition No</th> <th style="white-space: nowrap !important; text-align:center !important">Requisition No</th>
<th style="white-space: nowrap !important; text-align:left !important">Item Description</th> <th style="white-space: nowrap !important; text-align:left !important">Item Description</th>
@ -1352,7 +1347,7 @@ if (!empty($RequistionDetails)) {
<?php <?php
// } else { // } else {
?> ?>
<td> <!-- <a data-toggle="tooltip" href="#"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?> - Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a> </td> --> </td> <!-- <a data-toggle="tooltip" href="#"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?> - Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a> </td> -->
<?php <?php
// } // }
?> ?>

7
app/Views/editRevenueAmendPO.php
View File

@ -64,7 +64,7 @@ $insurenceno = '';
$BudgetType = ''; $BudgetType = '';
if (!empty($POMaster)) { if (!empty($POMaster)) {
// print_r($POMaster); // dd($POMaster);
// print_r($Payment); // print_r($Payment);
// echo "****"; // echo "****";
@ -1218,10 +1218,10 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<br> <br>
<div class="form-row"> <div class="form-row">
<div class="scrollable-table">
<div class="table-responsive" style="padding-bottom: 30px;"> <div class="table-responsive" style="padding-bottom: 30px;">
<table id="ServiceTable" class="table table-bordered table-hover" style="font-size:12px;"> <table id="revenueTax" class="table table-bordered table-hover" style="font-size:12px;">
<thead> <thead>
<tr> <tr>
<th style="white-space: nowrap !important;">SNo</th> <th style="white-space: nowrap !important;">SNo</th>
<th class="text-center" style="white-space: nowrap !important;">Requisition No</th> <th class="text-center" style="white-space: nowrap !important;">Requisition No</th>
@ -1457,6 +1457,7 @@ if (!empty($INRSYMBOL)) {
</table> </table>
</div> </div>
</div> </div>
</div>
<br> <br>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"> <div class="form-group col-md-3">

26
app/Views/editServiceAmendPO.php
View File

@ -649,6 +649,19 @@ foreach ($PaymentTerms as $TER) {
}); });
}); });
</script> </script>
<style>
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
</style>
<style> <style>
#mceu_5{ #mceu_5{
border-width: 0px 0px 0px !important; border-width: 0px 0px 0px !important;
@ -952,7 +965,7 @@ foreach ($PaymentTerms as $TER) {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Insurance Options<span class="text-danger">*</span></label> <label>Insurance Options<span class="text-danger">*</span></label>
<div class="form-group"> <div>
<?php <?php
@ -975,15 +988,19 @@ foreach ($PaymentTerms as $TER) {
endforeach; endforeach;
} }
echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus" required="true" class="form-control select2'); echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus" required="true" class="form-control select2"');
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-3" id="insuranceTxtDiv" style="display:block;"> <div class="form-group col-md-3" id="insuranceTxtDiv" style="display:block;">
<label>Insurance No / Insurance Details<span class="text-danger">*</span></label> <label>Insurance No / Insurance Details<span class="text-danger">*</span></label>
<div class="form-group"> <div>
<?php <?php
$data = array('name' => 'InsuranceNumber', 'value' => set_value('InsuranceNumber', $InsuranceNumber), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true'); $data = array('name' => 'InsuranceNumber', 'value' => set_value('InsuranceNumber', $InsuranceNumber), 'id' => 'InsuranceNumber', 'class' => 'form-control', 'required' => 'true');
echo form_input($data); echo form_input($data);
@ -1013,7 +1030,7 @@ foreach ($PaymentTerms as $TER) {
<br /> <br />
<div class="form-row"> <div class="form-row">
<div class="table-responsive" style="padding-bottom: 30px;"> <div class="table-responsive scrollable-table" style="padding-bottom: 30px;">
<table id="ServiceTable" class="table nowrap table-bordered table-hover mb-0" style="font-size:12px;"> <table id="ServiceTable" class="table nowrap table-bordered table-hover mb-0" style="font-size:12px;">
<thead> <thead>
<tr> <tr>
@ -1175,6 +1192,7 @@ foreach ($PaymentTerms as $TER) {
</tbody> </tbody>
</table> </table>
</div> </div>
</div> </div>

4
app/Views/editimportpo.php
View File

@ -2959,7 +2959,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label> <label><?php echo "Net per Uom($INR)"; ?></label>
<div> <div>
<?php <?php
$data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -4277,7 +4277,7 @@ if (!empty($getlogpodtl)) {
//alert('in'); //alert('in');
PONOStatus = <?php echo $PONOStatus; ?> var PONOStatus = "<?php echo $PONOStatus; ?>";
var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName; var shorten = materialName.length > 13 ? materialName.slice(0, 13) + "..." : materialName;
var rowHtml = ` var rowHtml = `
<tr id="${temp}"> <tr id="${temp}">

15
app/Views/importpo.php
View File

@ -827,7 +827,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<thead> <thead>
<tr> <tr>
<th style="white-space: nowrap !important;">SNo</th> <th style="white-space: nowrap !important;">SNo</th>
<th style="white-space: nowrap !important; text-align:right !important">Requisition No</th> <th style="white-space: nowrap !important; text-align:center !important">Requisition No</th>
<th style="white-space: nowrap !important;">Item Code</th> <th style="white-space: nowrap !important;">Item Code</th>
<th style="white-space: nowrap !important;">Item Description</th> <th style="white-space: nowrap !important;">Item Description</th>
<th style="white-space: nowrap !important;">Line Item Specs</th> <th style="white-space: nowrap !important;">Line Item Specs</th>
@ -1535,7 +1535,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<label><?php echo "Nett per UOM($INR)"; ?></label> <label><?php echo "Net per Uom($INR)"; ?></label>
<div> <div>
<?php <?php
$data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -2106,7 +2106,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label><?php echo "Nett per UOM($INR)"; ?></label> <label><?php echo "Net per Uom($INR)"; ?></label>
<div> <div>
<?php <?php
@ -3530,7 +3530,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
var rowHtml = ` var rowHtml = `
<tr id="${temp}"> <tr id="${temp}">
<td style="text-align:left !important">${temp}</td> <td style="text-align:left !important">${temp}</td>
<td style="text-align:right !important">${Reqnumber}</td> <td style="text-align:center !important">${Reqnumber}</td>
<td style="text-align:left !important">${materialCode}</td> <td style="text-align:left !important">${materialCode}</td>
<td style="text-align:left !important">${shorten}</td> <td style="text-align:left !important">${shorten}</td>
<td style="text-align:left !important"> <td style="text-align:left !important">
@ -3645,7 +3645,8 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
clearTaxField(); clearTaxField();
$('#IMPORT').modal('hide'); $('#IMPORT').modal('hide');
setTimeout(() => { setTimeout(() => {
alert('Line Item Added SuccesFully..'); // alert('Line Item Added SuccesFully..'); tracker id - 1444
console.log('Line Item Added SuccesFully..');
}, 1000); }, 1000);
} }
@ -3924,7 +3925,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
populateValueMainFormForEditImportTax(); populateValueMainFormForEditImportTax();
$('#editimportpomodel').modal('hide'); $('#editimportpomodel').modal('hide');
setTimeout(() => { setTimeout(() => {
alert("Line Item Update SuccesFully.."); // alert("Line Item Update SuccesFully.."); tracker id - 1444
console.log('Line Item Added SuccesFully..');
}, 1000); }, 1000);
} }
}); });

12
app/Views/inwardgateregister.php
View File

@ -311,8 +311,14 @@
} }
function Save() { function Save() {
$('#loader').show();
if (validate()) { if (validate()) {
$('#IGRForm').submit(); // $('#IGRForm').submit();
$('#loader').hide();
alert("###");
}else{
$('#loader').hide();
alert("***");
} }
} }
}); });
@ -411,7 +417,7 @@
var status = ''; var status = '';
var isOpenOrder = 0; var isOpenOrder = 0;
if (id != '-1') { if (id != '-1') {
$('#content').loader('show'); $('#loader').show();
var y = <?php echo json_encode($PO_NO, JSON_PRETTY_PRINT) ?>; var y = <?php echo json_encode($PO_NO, JSON_PRETTY_PRINT) ?>;
$.each(y, function(idx, obj) { $.each(y, function(idx, obj) {
if (id == obj.PONO) { if (id == obj.PONO) {
@ -443,7 +449,7 @@
type: "POST", type: "POST",
url: "<?php echo base_url() ?>GetIGRLineItemDetails", url: "<?php echo base_url() ?>GetIGRLineItemDetails",
success: function(data) { success: function(data) {
$('#content').loader('hide'); $('#loader').hide();
//alert(data); //alert(data);
var trHTML = ''; var trHTML = '';
var j = 0; var j = 0;

6
app/Views/servicePurchaseorder.php
View File

@ -2385,7 +2385,7 @@ if (!empty($INRSYMBOL)) {
var AvlBudAmt = '<?php echo $AvlAmount ?>'; var AvlBudAmt = '<?php echo $AvlAmount ?>';
var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val(); var txtTotalOrderValueSummary = $('#txtTotBasicAmount').val();
if (serviceValidate()) { if (serviceValidate()) {
if (document.getElementById('ServiceTable').rows.length < 1) { if ($('#ServiceTable tbody tr').length < 1) {
alert('Atleast One Line needed'); alert('Atleast One Line needed');
return false; return false;
} }
@ -2397,7 +2397,7 @@ if (!empty($INRSYMBOL)) {
// alert('Please Enter Other Payable Terms Description'); // alert('Please Enter Other Payable Terms Description');
// $('#Otherpayment').focus(); // $('#Otherpayment').focus();
// return false; // return false;
} else if ($('#descofpo').val().trim() == '') { else if ($('#descofpo').val().trim() == '') {
alert('Please Enter Description Of Service'); alert('Please Enter Description Of Service');
$('#descofpo').focus(); $('#descofpo').focus();
return false; return false;
@ -2443,7 +2443,7 @@ if (!empty($INRSYMBOL)) {
} }
}); });
// } }
} }
} }

33
app/Views/stock/CoatingMachineDetail.php
View File

@ -235,6 +235,10 @@
z-index: 5!important; z-index: 5!important;
} }
tfoot tr {
background-color:rgb(235, 236, 203);
}
</style> </style>
<div class="content-page"> <div class="content-page">
@ -456,34 +460,11 @@
} ?> } ?>
<table id="coatingMachineStockDetailsTableSummaryId" class="fht-table table-hover table-bordered"> <tfoot>
<thead >
<th class="celda_encabezado_total"
style="padding: 10px; background-color:#ffff;"> Date </th>
<th class="celda_encabezado_total" >Shift</th>
<th class="celda_encabezado_total" >Machine On Time</th>
<th class="celda_encabezado_total" >Machine Off Time</th>
<th class="celda_encabezado_total" >Machine Running(hr)</th>
<th class="celda_encabezado_total" >Customer Name </th>
<th class="celda_encabezado_total" >Grade</th>
<th class="celda_encabezado_total" >Total Coating</th>
<th class="celda_encabezado_total" >Total Coating Sand(kg)</th>
<th class="celda_encabezado_total" >Total Gas Consumption</th>
<th class="celda_encabezado_total" >Hour Gas</th>
<th class="celda_encabezado_total" >Hour QTY(kg)</th>
</thead>
<tbody>
<tr> <tr>
<td style="background-color:rgb(189, 9, 6); color:#ffff;"> <td style="background-color:rgb(189, 9, 6); color:#ffff;">
<b> Total </b> <b> Total </b>
</td> </td>
<td class="celda_normal "> - </td> <td class="celda_normal "> - </td>
<td class="celda_normal "> - </td> <td class="celda_normal "> - </td>
<td class="celda_normal "> - </td> <td class="celda_normal "> - </td>
@ -496,9 +477,9 @@
<td class="celda_normal "><?=number_format($summary['totalGasConsumption']/$summary['totalMachineRunningHrs'], 2)?> (avg)</td> <td class="celda_normal "><?=number_format($summary['totalGasConsumption']/$summary['totalMachineRunningHrs'], 2)?> (avg)</td>
<td class="celda_normal "><?=number_format($summary['totalCoatingSandInKg']/$summary['totalMachineRunningHrs'], 2)?> (avg)</td> <td class="celda_normal "><?=number_format($summary['totalCoatingSandInKg']/$summary['totalMachineRunningHrs'], 2)?> (avg)</td>
</tr> </tr>
</tfoot>
</tbody>
</table>
</div> </div>

62
app/Views/stock/bagStockDetails.php
View File

@ -235,6 +235,9 @@
} */ } */
tfoot tr {
background-color:rgb(235, 236, 203);
}
@ -304,7 +307,7 @@
<div class="col-3"> <div class="col-3">
<input type="text" name="month" id="month" value="<?php echo "$month" ?>" <input type="text" name="month" id="month" value="<?php echo "$month" ?>"
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> data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -419,7 +422,7 @@
</div> </div>
<!-- hidden fields --> <!-- hidden fields -->
<input type="hidden" name="month" id="month" value="<?php echo "$month" ?>" <input type="hidden" name="month" value="<?php echo "$month" ?>"
class="form-control mt-2" data-provide="datepicker" class="form-control mt-2" data-provide="datepicker"
data-date-format="M-yyyy" data-date-min-view-mode="1"> data-date-format="M-yyyy" data-date-min-view-mode="1">
@ -585,22 +588,7 @@
<?php } ?> <?php } ?>
<tfoot>
<div class="table-responsive">
<table id="bagStockDetailsTableSummaryId" class="fht-table table-striped">
<thead >
<th class="celda_encabezado_total">Total Sum</th>
<?php foreach($summary as $each){ ?>
<th class="celda_encabezado_total">Opening Stock</th>
<th class="celda_encabezado_total">Receipt</th>
<th class="celda_encabezado_total">Used</th>
<th class="celda_encabezado_total">Balance Stock</th>
<?php } ?>
</thead>
<tbody>
<tr> <tr>
<td style="background-color:rgb(189, 9, 6); color:#ffff;"> <td style="background-color:rgb(189, 9, 6); color:#ffff;">
@ -619,12 +607,9 @@
<?php } ?> <?php } ?>
</tr> </tr>
</tfoot>
</tbody>
</table>
</div>
<!-- this else condition work if groupedBagStockDetails is empty and creating new records <!-- this else condition work if groupedBagStockDetails is empty and creating new records
with initial values 0 for entire month --> with initial values 0 for entire month -->
<?php } else { <?php } else {
@ -682,11 +667,14 @@
> >
<?php <?php
foreach($previousMonthBagStockDetails as $index => $previousMonthBagStockDetail)
{
if($previousMonthBagStockDetail['materialCode'] == $bagMaterial['MaterialCode']){
echo $previousMonthBagStockDetail['balanceStock'] ;
break;
}
echo $previousMonthBagStockDetails[$bagMaterialIndex]['balanceStock'] ?? ' '; }
?> ?>
</td> </td>
@ -704,7 +692,14 @@
data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>" data-id="<?=$dateInMonth?> <?=$bagMaterial['MaterialCode']?>"
> >
<?php <?php
echo $previousMonthBagStockDetails[$bagMaterialIndex]['balanceStock'] ?? ' '; foreach($previousMonthBagStockDetails as $index => $previousMonthBagStockDetail)
{
if($previousMonthBagStockDetail['materialCode'] == $bagMaterial['MaterialCode']){
echo $previousMonthBagStockDetail['balanceStock'] ;
break;
}
}
?> ?>
</td> </td>
<?php } ?> <?php } ?>
@ -1273,3 +1268,16 @@
}); });
</script> </script>
<script>
$(document).ready(function () {
$('#month').datepicker({
format: "M-yyyy", // Format as "Jan-2025"
minViewMode: 1, // Month-Year Picker
autoclose: true,
todayHighlight: true
}).on('focus', function() {
$(this).datepicker('show'); // Ensure it opens on focus
});
});
</script>

75
app/Views/stock/dieselStockDetails.php
View File

@ -226,8 +226,9 @@
max-width: 100px; max-width: 100px;
} }
tfoot tr{
background-color:rgb(235, 236, 203);
}
@ -683,33 +684,7 @@ foreach ($period as $day) {
} }
?> ?>
<div class="table-responsive"> <tfoot>
<table id="dieselStockDetailsTableSummaryId" class="fht-table table-striped">
<thead >
<th class="celda_encabezado_total" >Total Sum</th>
<th class="celda_encabezado_total"> Opening</th>
<th class="celda_encabezado_total"> Purchase Diesel</th>
<th class="celda_encabezado_total"> Filling Diesel</th>
<th class="celda_encabezado_total"> Balance Stock</th>
<?php foreach($summary as $each){
if(is_array($each)){
?>
<th class="celda_encabezado_total">Opening Reading</th>
<th class="celda_encabezado_total">Closing Reading</th>
<th class="celda_encabezado_total">Filling Diesel</th>
<th class="celda_encabezado_total">Consumption</th>
<th class="celda_encabezado_total">Running Hours</th>
<th class="celda_encabezado_total">Mileage</th>
<?php }
} ?>
</thead>
<tbody>
<tr> <tr>
<td style="background-color:rgb(189, 9, 6); color:#ffff;"> <td style="background-color:rgb(189, 9, 6); color:#ffff;">
@ -717,10 +692,10 @@ foreach ($period as $day) {
</td> </td>
<td><?= $summary['opening_diesel'] ?></td> <td class="celda_normal "><?= $summary['opening_diesel'] ?></td>
<td><?= $summary['totalPurchaseDiesel'] ?></td> <td class="celda_normal "><?= $summary['totalPurchaseDiesel'] ?></td>
<td><?= $summary['totalFillingDiesel'] ?></td> <td class="celda_normal "><?= $summary['totalFillingDiesel'] ?></td>
<td><?= $summary['balanceStock'] ?></td> <td class="celda_normal "><?= $summary['balanceStock'] ?></td>
<?php foreach($summary as $each){ <?php foreach($summary as $each){
if(is_array($each)){ if(is_array($each)){
@ -739,11 +714,10 @@ foreach ($period as $day) {
?> ?>
</tr> </tr>
</tfoot>
</tbody>
</table>
</div>
<!-- this else condition work if groupeddieselStockDetails is empty and creating new records <!-- this else condition work if groupeddieselStockDetails is empty and creating new records
with initial values 0 for entire month --> with initial values 0 for entire month -->
@ -839,9 +813,17 @@ foreach ($period as $day) {
><?= (!empty($previousMonthDieselMachineStockDetails) && isset($previousMonthDieselMachineStockDetails[$dieselMachineIndex]) ) >
? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading']
:" " ; <?php
foreach($previousMonthDieselMachineStockDetails as $index => $previousMonthDieselMachineStockDetail)
{
if($previousMonthDieselMachineStockDetail['machine_id'] == $dieselMachine['id']){
echo $previousMonthDieselMachineStockDetail['closing_reading'] ;
break;
}
}
?> ?>
</td> </td>
@ -850,9 +832,18 @@ foreach ($period as $day) {
oninput="closingReadingChange(this)" oninput="closingReadingChange(this)"
contenteditable="true"> contenteditable="true">
<?= !empty($previousMonthDieselMachineStockDetails) && isset($previousMonthDieselMachineStockDetails[$dieselMachineIndex]) <?php
? $previousMonthDieselMachineStockDetails[$dieselMachineIndex]['closing_reading']
:" " ;
foreach($previousMonthDieselMachineStockDetails as $index => $previousMonthDieselMachineStockDetail)
{
if($previousMonthDieselMachineStockDetail['machine_id'] == $dieselMachine['id']){
echo $previousMonthDieselMachineStockDetail['closing_reading'] ;
break;
}
}
?> ?>
</td> </td>

43
app/Views/stock/drierMachineDetails.php
View File

@ -238,6 +238,10 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
z-index: 5!important; z-index: 5!important;
} }
tfoot tr {
background-color:rgb(235, 236, 203);
}
</style> </style>
<div class="content-page"> <div class="content-page">
<div class="content"> <div class="content">
@ -503,37 +507,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
</tbody> </tbody>
<?php } ?> <tfoot>
</table>
<?php if(!empty($drierDetails)){ ?>
<table id="drierTableSummaryId" class="fht-table ">
<thead >
<tr>
<th class="celda_encabezado_total"
style="padding:5px; border:#ffffff; background-color: #ffffff;">Date value</th>
<th class="celda_encabezado_total" >Drier On Time </th>
<th class="celda_encabezado_total" >Drier Off Time</th>
<th class="celda_encabezado_total" >Running Hrs</th>
<th class="celda_encabezado_total" >Supplier Name </th>
<th class="celda_encabezado_total" >input Sand Qty (Metric Ton)</th>
<th class="celda_encabezado_total" >inputp Sand Moisture(%)</th>
<th class="celda_encabezado_total" >Sand Dried Qty (Metric Ton)</th>
<th class="celda_encabezado_total" >Total Gas Consumption</th>
<th class="celda_encabezado_total" >Gas Per Ton</th>
<th class="celda_encabezado_total" >Qty Per Hrs (Metric Ton)</th>
<th class="celda_encabezado_total" >Moisture Loss Qty (Metric Ton)</th>
<th class="celda_encabezado_total" >Dust Qty (Metric Ton)</th>
</tr>
</thead>
<tbody>
<tr> <tr>
<td style="background-color:rgb(189, 9, 6); color:#ffff;"> <td style="background-color:rgb(189, 9, 6); color:#ffff;">
@ -553,12 +527,9 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
<td class="celda_normal "><?=$summary['moisture_loss_qty']?></td> <td class="celda_normal "><?=$summary['moisture_loss_qty']?></td>
<td class="celda_normal "><?=$summary['dust_qty']?></td> <td class="celda_normal "><?=$summary['dust_qty']?></td>
</tr> </tr>
</tfoot>
</tbody>
</table>
<?php } ?> <?php } ?>
</table>
<?php if(empty($drierDetails)){ ?> <?php if(empty($drierDetails)){ ?>
<br><br> <br><br>

28
app/Views/stock/dustAndRoughStockDetails.php
View File

@ -228,6 +228,10 @@
max-width: 150px; max-width: 150px;
} }
tfoot tr {
background-color:rgb(235, 236, 203);
}
</style> </style>
@ -273,10 +277,9 @@
data-date-format="M-yyyy" data-date-min-view-mode="1" readonly> data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<button type="submit" class="btn btn-success"> Change Month </button> <button type="submit" class="btn btn-success"> Change Month </button>
</div> </div>
<div class="col-md-1"></div>
<div class="col-6"> <div class="col-6">
<div class="dropdown float-right"> <div class="dropdown float-right">
<a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown" <a href="#" class="dropdown-toggle arrow-none" data-toggle="dropdown"
@ -378,9 +381,9 @@
<tfoot> <tfoot>
<tr> <tr>
<td style="background-color:rgb(189, 9, 6); color:#ffff;"> Total </td> <td style="background-color:rgb(189, 9, 6); color:#ffff;"> Total </td>
<td class="celda_normal "><?=$summary['finalRough']?></td> <td class="celda_normal "> <b> <?=$summary['finalRough']?> </b> </td>
<td class="celda_normal "><?=$summary['dust']?></td> <td class="celda_normal "> <b> <?=$summary['dust']?> </b> </td>
<td class="celda_normal "><?=$summary['total']?></td> <td class="celda_normal "> <b> <?=$summary['total']?> </b> </td>
</tr> </tr>
</tfoot> </tfoot>
@ -680,3 +683,18 @@
</script> </script>
<script>
$(document).ready(function () {
$('#month').datepicker({
format: "M-yyyy", // Format as "Jan-2025"
minViewMode: 1, // Month-Year Picker
autoclose: true,
todayHighlight: true,
orientation: "auto" // Adjusts automatically, or use "top" / "bottom"
}).on('focus', function() {
$(this).datepicker('show'); // Ensure it opens on focus
});
});
</script>

53
app/Views/stock/gasStockDetails.php
View File

@ -217,6 +217,9 @@
max-width: 100px; max-width: 100px;
} }
tfoot tr {
background-color:rgb(235, 236, 203);
}
@ -501,49 +504,7 @@
} ?> } ?>
<div class="table-responsive"> <tfoot>
<table id="gasStockDetailsTableSummaryId" class="fht-table table-striped">
<thead class="celda_encabezado_total" style="padding: 10px;">
<tr>
<th class="celda_encabezado_total" rowspan="1" colspan="1">RIPL </th>
<th class="celda_encabezado_total" colspan="6">Gas Stock </th>
<th class="celda_encabezado_total">FBD 10 Ton Dryer</th>
<th class="celda_encabezado_total">Sand Dried</th>
<th class="celda_encabezado_total">Coating Machine</th>
<th class="celda_encabezado_total">Sand Coated</th>
<th class="celda_encabezado_total" colspan="2">TRP </th>
<th class="celda_encabezado_total">Sand TRP</th>
<th class="celda_encabezado_total">Rotary Drier </th>
</tr>
<tr>
<th class="celda_encabezado_total">Date </th>
<th class="celda_encabezado_total">Opening Stock</th>
<th class="celda_encabezado_total">Purchase(Bharath)</th>
<th class="celda_encabezado_total">Purchase(Indian)</th>
<th class="celda_encabezado_total">Total</th>
<th class="celda_encabezado_total">Consumption </th>
<th class="celda_encabezado_total">Balance Stock</th>
<th class="celda_encabezado_total">Consumption </th>
<th class="celda_encabezado_total">ton </th>
<th class="celda_encabezado_total">Consumption</th>
<th class="celda_encabezado_total">ton </th>
<th class="celda_encabezado_total">Panel Consumption</th>
<th class="celda_encabezado_total">Physical Consumption</th>
<th class="celda_encabezado_total">ton </th>
<th class="celda_encabezado_total">Consumption</th>
</tr>
</thead>
<tbody>
<tr> <tr>
<td style="background-color:rgb(189, 9, 6); color:#ffff;"> <td style="background-color:rgb(189, 9, 6); color:#ffff;">
@ -569,11 +530,7 @@
</tr> </tr>
</tfoot>
</tbody>
</table>
</div>

46
app/Views/stock/incomingSilicaSandDetails.php
View File

@ -226,6 +226,9 @@
z-index: 5!important; z-index: 5!important;
} }
tfoot tr {
background-color:rgb(235, 236, 203);
}
@ -669,45 +672,11 @@
} ?> } ?>
</tbody> </tbody>
</table>
<table id="incomingSilicaSandDetailsSummaryTable" class="fht-table table-striped " > <tfoot>
<thead>
<tr> <tr>
<th class="celda_encabezado_total" <td class="celda_normal" style="display: none;" > -</td>
style="padding: 10px; border:#ffffff; background-color:#ffffff !important;">S.NO </th>
<th class="celda_encabezado_total"
style="padding: 10px; border:#ffffff; background-color:#ffffff !important;">IGR No </th>
<th class="celda_encabezado_total" style="padding: 10px;">Invoice No</th>
<th class="celda_encabezado_total" style="padding: 10px;">Invoice Date</th>
<th class="celda_encabezado_total" style="padding: 10px;">Received Date</th>
<th class="celda_encabezado_total" style="padding: 10px; min-width : 300px; max-width:300px;">Supplier Name</th>
<th class="celda_encabezado_total" style="padding: 10px;">Grade </th>
<th class="celda_encabezado_total" style="padding: 10px; min-width : 200px; max-width:200px;">Grade Condition</th>
<th class="celda_encabezado_total" style="padding: 10px;">Vehicle No</th>
<th class="celda_encabezado_total" style="padding: 10px;">Qty</th>
<th class="celda_encabezado_total" style="padding: 10px;">Lab Report</th>
<th class="celda_encabezado_total" style="padding: 10px;">AFS Spec</th>
<th class="celda_encabezado_total" style="padding: 10px;">AFS Actual</th>
<th class="celda_encabezado_total" style="padding: 10px;">Plus 20 loss%</th>
<th class="celda_encabezado_total" style="padding: 10px;">Plus 30 Loss %</th>
<th class="celda_encabezado_total" style="padding: 10px;">Moisture % Spec</th>
<th class="celda_encabezado_total" style="padding: 10px;">Moisture Actual</th>
<th class="celda_encabezado_total" style="padding: 10px;">Moisture Loss</th>
<th class="celda_encabezado_total" style="padding: 10px;">Moisture loss Qty</th>
<th class="celda_encabezado_total" style="padding: 10px;">Sieve Loss Qty</th>
<th class="celda_encabezado_total" style="padding: 10px;">Salable Qty</th>
</tr>
</thead>
<tbody>
<tr>
<td class="celda_normal" > -</td>
<td class="celda_normal" style="background-color:rgb(189, 9, 6); color:#fff ;"> <h5 style="color:#fff;"> Total </h5> </td> <td class="celda_normal" style="background-color:rgb(189, 9, 6); color:#fff ;"> <h5 style="color:#fff;"> Total </h5> </td>
@ -718,6 +687,7 @@
<td class="celda_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_normal" > -</td> <td class="celda_normal" > -</td>
<td class="celda_normal" > -</td>
<td class="celda_normal" ><?=$summary['Qty']?></td> <td class="celda_normal" ><?=$summary['Qty']?></td>
@ -736,9 +706,7 @@
</tr> </tr>
</tfoot>
</tbody>
</table> </table>
<br> <br>

91
app/Views/stock/powerConsumptionDetails.php
View File

@ -235,6 +235,12 @@
min-width: 100px; min-width: 100px;
max-width: 100px; max-width: 100px;
} }
tfoot tr {
background-color:rgb(235, 236, 203);
}
</style> </style>
@ -685,51 +691,21 @@ foreach ($period as $day) {
} }
?> ?>
<div class="table-responsive"> <tfoot>
<table id="powerStockDetailsTableSummaryId" class="fht-table table-striped">
<thead>
<tr>
<th class="celda_encabezado_total" colspan="1">Date </th>
<th class="celda_encabezado_total">Opening Reading </th>
<th class="celda_encabezado_total">Final Reading</th>
<th class="celda_encabezado_total">Total Reading</th>
<th class="celda_encabezado_total">Total Units </th>
<th class="celda_encabezado_total">Average PF</th>
<th class="celda_encabezado_total">Present PF</th>
<th class="celda_encabezado_total">MD </th>
<th class="celda_encabezado_total">MF *60</th>
<?php foreach ($electricMachines as $powerMachine) { ?>
<!-- this will loop till machines present -->
<th class="celda_encabezado_total" style="display:none">Date</th>
<th class="celda_encabezado_total" style="display:none"> Machine Id</th>
<th class="celda_encabezado_total">Opening Units</th>
<th class="celda_encabezado_total">Final Units</th>
<th class="celda_encabezado_total">Total Units</th>
<?php } ?>
</tr>
</thead>
<tbody>
<tr> <tr>
<td style="background-color:rgb(189, 9, 6); color:#ffff;"> <td style="background-color:rgb(189, 9, 6); color:#ffff;">
<b> Total </b> <b> Total </b>
</td> </td>
<td><?= $summary['openingReading'] ?></td> <td class="celda_normal "><?= $summary['openingReading'] ?></td>
<td><?= $summary['finalReading'] ?></td> <td class="celda_normal "><?= $summary['finalReading'] ?></td>
<td><?= $summary['totalReading'] ?></td> <td class="celda_normal "><?= $summary['totalReading'] ?></td>
<td><?= $summary['totalUnits'] ?></td> <td class="celda_normal "><?= $summary['totalUnits'] ?></td>
<td><?= $summary['averagePf'] ?></td> <td class="celda_normal "><?= $summary['averagePf'] ?></td>
<td><?= $summary['presentPf'] ?></td> <td class="celda_normal "><?= $summary['presentPf'] ?></td>
<td><?= $summary['md'] ?></td> <td class="celda_normal "><?= $summary['md'] ?></td>
<td><?= $summary['mf'] ?></td> <td class="celda_normal "><?= $summary['mf'] ?></td>
<?php foreach ($summary as $each) { <?php foreach ($summary as $each) {
if (is_array($each)) { if (is_array($each)) {
@ -745,11 +721,7 @@ foreach ($period as $day) {
?> ?>
</tr> </tr>
</tfoot>
</tbody>
</table>
</div>
<!-- this else condition work if groupedpowerStockDetails is empty and creating new records <!-- this else condition work if groupedpowerStockDetails is empty and creating new records
with initial values 0 for entire month --> with initial values 0 for entire month -->
@ -786,7 +758,8 @@ foreach ($period as $day) {
oninput="openingTPStockChange(this)" oninput="openingTPStockChange(this)"
contenteditable="true" contenteditable="true"
<?php } ?>><?php <?php } ?>>
<?php
if (empty($previousMonthTotalPowerMachineStockDetails)) { if (empty($previousMonthTotalPowerMachineStockDetails)) {
echo " "; echo " ";
} else { } else {
@ -794,6 +767,8 @@ foreach ($period as $day) {
} }
?> ?>
</td> </td>
@ -859,11 +834,19 @@ foreach ($period as $day) {
<?php } ?> <?php } ?>
data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>"> data-id="<?= $dateInMonth ?> <?= $powerMachine['id'] ?>">
<?= (!empty($previousMonthPowerConsumptionStockDetails) && isset($previousMonthPowerConsumptionStockDetails[$powerMachineIndex]))
? $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units']
: " ";
<?php
foreach($previousMonthPowerConsumptionStockDetails as $index => $previousMonthPowerConsumptionStockDetail)
{
if($previousMonthPowerConsumptionStockDetail['machine_id'] == $powerMachine['id']){
echo $previousMonthPowerConsumptionStockDetail['closing_units'] ;
break;
}
}
?> ?>
</td> </td>
<td class="celda_normal closingUnits" <td class="celda_normal closingUnits"
@ -871,11 +854,17 @@ foreach ($period as $day) {
oninput="closingUnitsChange(this)" oninput="closingUnitsChange(this)"
contenteditable="true"> contenteditable="true">
<?= (!empty($previousMonthPowerConsumptionStockDetails) && isset($previousMonthPowerConsumptionStockDetails[$powerMachineIndex])) <?php
? $previousMonthPowerConsumptionStockDetails[$powerMachineIndex]['closing_units'] foreach($previousMonthPowerConsumptionStockDetails as $index => $previousMonthPowerConsumptionStockDetail)
: " "; {
if($previousMonthPowerConsumptionStockDetail['machine_id'] == $powerMachine['id']){
echo $previousMonthPowerConsumptionStockDetail['closing_units'] ;
break;
}
}
?> ?>
</td> </td>
<td class="celda_normal totalUnits" <td class="celda_normal totalUnits"

55
app/Views/stock/resinStockDetails.php
View File

@ -235,6 +235,10 @@
min-width: 100px; min-width: 100px;
max-width: 100px; max-width: 100px;
} }
tfoot tr {
background-color:rgb(235, 236, 203);
}
</style> </style>
@ -569,21 +573,7 @@ foreach ($period as $day) {
<?php } ?> <?php } ?>
<div class="table-responsive"> <tfoot>
<table id="resinStockDetailsTableSummaryId" class="fht-table table-striped">
<thead>
<th class="celda_encabezado_total">Total Sum</th>
<?php foreach ($summary as $each) { ?>
<th class="celda_encabezado_total">Opening Stock</th>
<th class="celda_encabezado_total">Receipt</th>
<th class="celda_encabezado_total">Used</th>
<th class="celda_encabezado_total">Balance Stock</th>
<?php } ?>
</thead>
<tbody>
<tr> <tr>
<td style="background-color:rgb(189, 9, 6); color:#ffff;"> <td style="background-color:rgb(189, 9, 6); color:#ffff;">
@ -601,12 +591,9 @@ foreach ($period as $day) {
<?php } ?> <?php } ?>
</tr> </tr>
</tfoot>
</tbody>
</table>
</div>
<!-- this else condition work if groupedBagStockDetails is empty and creating new records <!-- this else condition work if groupedBagStockDetails is empty and creating new records
with initial values 0 for entire month --> with initial values 0 for entire month -->
<?php } else { ?> <?php } else { ?>
@ -659,7 +646,20 @@ foreach ($period as $day) {
oninput="openingStockChange(this)" oninput="openingStockChange(this)"
contenteditable="true" contenteditable="true"
<?php } ?>><?= $previousMonthResinStockDetails[$resinMaterialIndex]['balanceStock'] ?? ' ' ?></td> <?php } ?>>
<?php
foreach($previousMonthResinStockDetails as $index => $previousMonthResinStockDetail)
{
if($previousMonthResinStockDetail['materialCode'] == $resinMaterial['MaterialCode']){
echo $previousMonthResinStockDetail['balanceStock'] ;
break;
}
}
?>
</td>
<td class="celda_normal receiptStock" <td class="celda_normal receiptStock"
data-id="<?= $dateInMonth ?> <?= $resinMaterial['MaterialCode'] ?>" data-id="<?= $dateInMonth ?> <?= $resinMaterial['MaterialCode'] ?>"
@ -672,7 +672,20 @@ foreach ($period as $day) {
contenteditable="true"> <?= ' ' ?> </td> contenteditable="true"> <?= ' ' ?> </td>
<td class="celda_normal balanceStock" <td class="celda_normal balanceStock"
data-id="<?= $dateInMonth ?> <?= $resinMaterial['MaterialCode'] ?>"><?= $previousMonthResinStockDetails[$resinMaterialIndex]['balanceStock'] ?? ' ' ?></td> data-id="<?= $dateInMonth ?> <?= $resinMaterial['MaterialCode'] ?>">
<?php
foreach($previousMonthResinStockDetails as $index => $previousMonthResinStockDetail)
{
if($previousMonthResinStockDetail['materialCode'] == $resinMaterial['MaterialCode']){
echo $previousMonthResinStockDetail['balanceStock'] ;
break;
}
}
?>
</td>
<?php } ?> <?php } ?>
</tr> </tr>
<?php } ?> <?php } ?>

155
app/Views/stock/trpProductionStockDetails.php
View File

@ -230,6 +230,10 @@
min-height: 200px; min-height: 200px;
} }
tfoot tr {
background-color:rgb(235, 236, 203);
}
</style> </style>
@ -1004,151 +1008,7 @@ $timeOtions[] = "12:00 AM";
<table id="trpProductionStockSummaryTableId" class="fht-table table-striped"> <tfoot>
<thead class="celda_encabezado_general" style="padding: 10px;">
<tr>
<!-- th:eq(0) -->
<th class="celda_encabezado_total" rowspan="2">Date </th>
<!-- th:eq(1) -->
<th class="celda_encabezado_total" rowspan="2">Opening Time </th>
<!-- th:eq(2) -->
<th class="celda_encabezado_total" rowspan="2">Closing Time </th>
<!-- th:eq(3) -->
<th class="celda_encabezado_total" rowspan="2">Total Hours </th>
<!-- th:eq(4) -->
<th class="celda_encabezado_total" rowspan="2">Cold Start </th>
<!-- th:eq(5) -->
<th class="celda_encabezado_total" rowspan="2">Break Down Hours </th>
<!-- th:eq(6) -->
<th class="celda_encabezado_total" rowspan="2">Burner Firing Hours </th>
<!-- th:eq(7) -->
<th class="celda_encabezado_total" rowspan="2">Sand Feeding Hours </th>
<!-- th:eq(8) -->
<th class="celda_encabezado_total" colspan="2">Gas Receipt </th>
<!-- th:eq(9) -->
<th class="celda_encabezado_total" rowspan="2">Physical Gas Consumption </th>
<!-- th:eq(10) -->
<th class="celda_encabezado_total" rowspan="2">Drier Gas Consumption </th>
<!-- th:eq(11) -->
<th class="celda_encabezado_total" rowspan="2">Coating Gas Consumption </th>
<!-- th:eq(12) -->
<th class="celda_encabezado_total" rowspan="2">TRP plus Drier Gas Consumption </th>
<!-- th:eq(13) -->
<th class="celda_encabezado_total" rowspan="2">TRP Physical Gas Per Ton </th>
<!-- th:eq(14) -->
<th class="celda_encabezado_total" rowspan="2">Panel Gas Consumption </th>
<!-- th:eq(15) -->
<th class="celda_encabezado_total" rowspan="2">Panel Gas Per Ton </th>
<!-- th:eq(16) -->
<?php if(count($wcsSupplierList)>0){?>
<th class="celda_encabezado_total" colspan="<?=count($wcsSupplierList)?>">Incoming Sand/ Lump details </th>
<?php } ?>
<!-- th:eq(17) -->
<th class="celda_encabezado_total" colspan="3">ED details </th>
<!-- th:eq(18) -->
<th class="celda_encabezado_total" colspan="2">TRP Sand </th>
<th class="celda_encabezado_total" rowspan="2">Coating </th>
<!-- th:eq(19) -->
<?php if(count($crsClientList)>0){?>
<th class="celda_encabezado_total" colspan="<?=count($crsClientList)?>">Usage </th>
<?php } ?>
<!-- th:eq(20) -->
<th class="celda_encabezado_total" colspan="2">Water </th>
<!-- th:eq(21) -->
<th class="celda_encabezado_total" rowspan="2">EB Reading </th>
<!-- th:eq(22) -->
<th class="celda_encabezado_total" rowspan="2">EB Unit Per Ton </th>
<!-- th:eq(23) -->
<th class="celda_encabezado_total" colspan="4">Working Persons </th>
<!-- th:eq(24) -->
<th class="celda_encabezado_total" colspan="2"> Maintanence Details </th>
<!-- th:eq(25) -->
<th class="celda_encabezado_total" rowspan="2">Description </th>
<!-- th:eq(26) -->
<th class="celda_encabezado_total" rowspan="2">MS Seperation </th>
<!-- th:eq(27) -->
<th class="celda_encabezado_total" rowspan="2">ED Waste </th>
<!-- th:eq(28) -->
<th class="celda_encabezado_total" rowspan="2">Cooler Bags </th>
<!-- th:eq(29) -->
<th class="celda_encabezado_total" rowspan="2">ED +20 Waste </th>
<!-- th:eq(30) -->
<th class="celda_encabezado_total" rowspan="2">Cyclone Waste </th>
</tr>
<tr>
<!-- th:eq(0) -->
<th class="celda_encabezado_total" style="z-index:11;">BG</th>
<!-- th:eq(1) -->
<th class="celda_encabezado_total">PG </th>
<?php foreach($wcsSupplierList as $supplier){ ?>
<th class="celda_encabezado_total"><?=$supplier?> </th>
<?php } ?>
<!-- th:eq(10) -->
<th class="celda_encabezado_total">Running Hours </th>
<!-- th:eq(11) -->
<th class="celda_encabezado_total">Production </th>
<!-- th:eq(12) -->
<th class="celda_encabezado_total">Usage </th>
<!-- th:eq(13) -->
<th class="celda_encabezado_total">Production </th>
<!-- th:eq(14) -->
<th class="celda_encabezado_total">Production Per Hour </th>
<!-- th:eq(15) -->
<!-- th:eq(16) -->
<?php foreach($crsClientList as $client){ ?>
<th class="celda_encabezado_total"><?=$client?> </th>
<?php } ?>
<!-- th:eq(21) -->
<th class="celda_encabezado_total">Receipt </th>
<!-- th:eq(22) -->
<th class="celda_encabezado_total">Consumption </th>
<!-- th:eq(23) -->
<th class="celda_encabezado_total">Engineers </th>
<!-- th:eq(24) -->
<th class="celda_encabezado_total">Supervisors</th>
<!-- th:eq(25) -->
<th class="celda_encabezado_total">Operators </th>
<!-- th:eq(26) -->
<th class="celda_encabezado_total">Roller Drivers </th>
<!-- th:eq(27) -->
<th class="celda_encabezado_total">Nature Of Maintenance </th>
<!-- th:eq(28) -->
<th class="celda_encabezado_total">Location </th>
</tr>
</thead>
<tbody style="background-color: #fff;">
<tr> <tr>
<!-- Total --> <!-- Total -->
@ -1415,10 +1275,7 @@ $timeOtions[] = "12:00 AM";
</td> </td>
</tr> </tr>
</tfoot>
</tbody>
</table>
<br><br><br> <br><br><br>

33
app/Views/stock/trpSandUseStockDetails.php
View File

@ -222,6 +222,11 @@
min-width: 150px; min-width: 150px;
max-width: 150px; max-width: 150px;
} }
tfoot tr {
background-color:rgb(235, 236, 203);
}
</style> </style>
@ -378,38 +383,30 @@
} ?> } ?>
<div class="table-responsive" > <tfoot>
<table id="trpSandUseStockDetailsTableSummaryId" class="fht-table table-striped"> <tr class="total_row">
<thead >
<th class="celda_encabezado_total" >Total </th>
<th class="celda_encabezado_total" >Rough Kgs </th>
<th class="celda_encabezado_total" >Fine Kgs </th>
<th class="celda_encabezado_total" >Total Kgs </th>
</thead>
<tbody>
<tr>
<td style="background-color:rgb(189, 9, 6); color:#ffff;"> <td style="background-color:rgb(189, 9, 6); color:#ffff;">
<b> Total </b> <b> Total </b>
</td> </td>
<td class="celda_normal "><?=$summary['rough_kgs']?></td> <td class="celda_normal "><b><?=$summary['rough_kgs']?></b></td>
<td class="celda_normal "><?=$summary['fine_kgs']?></td> <td class="celda_normal "><b><?=$summary['fine_kgs']?></b></td>
<td class="celda_normal "><?=$summary['total_kgs']?></td> <td class="celda_normal "><b><?=$summary['total_kgs']?></b></td>
<td class="celda_normal "> </td>
</tr> </tr>
</tbody> </tfoot>
</table>
</div> </div>
<?php }else{ <?php }else{
$date = DateTime::createFromFormat('M-Y', $month); $date = DateTime::createFromFormat('M-Y', $month);

49
public/assets/js/CreatePOValidation.js
View File

@ -43,7 +43,7 @@ function enableButtons() {
function revenueValidate(){ function revenueValidate(){
var radioValue = parseInt($("input[name='DateRange']:checked").val()); var radioValue = parseInt($("input[name='DateRange']:checked").val());
var scheduleBy = $('#Scheduleby').val(); // Get the value
if ($('#drpSupplier').val() == "0") { if ($('#drpSupplier').val() == "0") {
alert('Please Select the Supplier details'); alert('Please Select the Supplier details');
$('#drpSupplier').focus(); $('#drpSupplier').focus();
@ -60,13 +60,10 @@ function revenueValidate(){
alert('Please Select the Delivery Date'); alert('Please Select the Delivery Date');
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
}else if (radioValue == 1) { }else if (radioValue == 1 && (!scheduleBy || scheduleBy.trim() == '')) {
var scheduleBy = $('#Scheduleby').val(); // Get the value
if (!scheduleBy || scheduleBy.trim() == '') { // Check if it's empty or undefined
alert('Please Enter the Schedule By'); alert('Please Enter the Schedule By');
$('#Scheduleby').focus(); $('#Scheduleby').focus();
return false; return false;
}
}else if($('#PODate').val() == ''){ }else if($('#PODate').val() == ''){
alert('Please Enter the Purchase Order date'); alert('Please Enter the Purchase Order date');
$('#PODate').focus(); $('#PODate').focus();
@ -97,54 +94,68 @@ function revenueValidate(){
function serviceValidate(){ function serviceValidate(){
var radioValue = parseInt($("input[name='DateRange']:checked").val()); var radioValue = parseInt($("input[name='DateRange']:checked").val());
var scheduleBy = $('#Scheduleby').val(); // Get the value
if ($('#drpSupplier').val() == "0") { if ($('#drpSupplier').val() == "0") {
console.log('Please Select the Supplier details');
alert('Please Select the Supplier details'); alert('Please Select the Supplier details');
$('#drpSupplier').focus(); $('#drpSupplier').focus();
return false; return false;
}else if ($('#workstatus').val() == "0") { }else if ($('#workstatus').val() == "0") {
console.log('Please Select the Work Status');
alert('Please Select the Work Status'); alert('Please Select the Work Status');
$('#workstatus').focus(); $('#workstatus').focus();
return false; return false;
}else if ($('#PODate').val().trim() == '') { }else if ($('#PODate').val().trim() == '') {
console.log('Please Enter the Purchase Order date');
alert('Please Enter the Purchase Order date'); alert('Please Enter the Purchase Order date');
$('#PODate').focus(); $('#PODate').focus();
return false; return false;
}else if ($('#DeliveryAddr').val().trim() == '') { }else if ($('#DeliveryAddr').val().trim() == '') {
console.log('Please Enter the Delivery Address');
alert('Please Enter the Delivery Address'); alert('Please Enter the Delivery Address');
$('#DeliveryAddr').focus(); $('#DeliveryAddr').focus();
return false; return false;
}else if (radioValue === 0 && $('#Deliverydt').val() == '') { }else if (radioValue === 0 && $('#Deliverydt').val() == '') {
console.log('Please Select the Delivery Date');
alert('Please Select the Delivery Date'); alert('Please Select the Delivery Date');
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
}else if (radioValue == 1) { }else if (radioValue == 1 && (!scheduleBy || scheduleBy.trim() == '')) {
var scheduleBy = $('#Scheduleby').val(); // Get the value console.log('Please Enter the Schedule By');
if (!scheduleBy || scheduleBy.trim() == '') { // Check if it's empty or undefined
alert('Please Enter the Schedule By'); alert('Please Enter the Schedule By');
$('#Scheduleby').focus(); $('#Scheduleby').focus();
return false; return false;
}
}else if($('#PODate').val() == ''){ }else if($('#PODate').val() == ''){
console.log('Please Enter the Purchase Order date');
alert('Please Enter the Purchase Order date'); alert('Please Enter the Purchase Order date');
$('#PODate').focus(); $('#PODate').focus();
return false; return false;
}else if ($('#PoTypeOptions').val() == "0") { }else if ($('#PoTypeOptions').val() == "0") {
console.log('Please Select Service Type');
alert('Please Select Service Type'); alert('Please Select Service Type');
$('#PoTypeOptions').focus(); $('#PoTypeOptions').focus();
return false; return false;
}else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') { }else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') {
console.log('Please Enter Payable Terms Description');
alert('Please Enter Payable Terms Description'); alert('Please Enter Payable Terms Description');
$('#Otherpayment').focus(); $('#Otherpayment').focus();
return false; return false;
}else if($('#insuranceStatus').val() == "1" && $('#InsuranceNumber').val().trim() == ''){ }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'); alert('Please Enter the Insurance No / Insurance Details');
$('#InsuranceNumber').focus(); $('#InsuranceNumber').focus();
return false; return false;
}else if ($('#BudgetType').val() == "0") { }else if ($('#BudgetType').val() == "0") {
console.log('Please Select Budget Type');
alert('Please Select Budget Type'); alert('Please Select Budget Type');
$('#BudgetType').focus(); $('#BudgetType').focus();
return false; return false;
}
else {
console.log("JS else part");
return true;
} }
// else if ($('#ServiceTable tbody tr').length < 1) { // else if ($('#ServiceTable tbody tr').length < 1) {
// alert('Atleast One Line needed'); // alert('Atleast One Line needed');
@ -154,9 +165,7 @@ function serviceValidate(){
// $('#descofpo').focus(); // $('#descofpo').focus();
// return false; // return false;
// } // }
else {
return true;
}
} }
function capitalValidate(){ function capitalValidate(){
@ -332,21 +341,21 @@ function importValidate(){
function validate() function validate()
{ {
var radioValue = $("input[name='DateRange']:checked").val(); var radioValue = $("input[name='DateRange']:checked").val();
var PoType = $('#POType').val(); var PoType = $('#POType').val();
var currencyType = $('#currencytype').val(); var currencyType = $('#currencytype').val();
if($('#PODate').val() == '')
{ if($('#drpSupplier').val() == "0")
alert('Please Enter the Purchase Order date');
$('#PODate').focus();
return false;
}
else if($('#drpSupplier').val() == "0")
{ {
alert('Please Select the Supplier details'); alert('Please Select the Supplier details');
$('#drpSupplier').focus(); $('#drpSupplier').focus();
return false; return false;
} }
else if($('#PODate').val() == '')
{
alert('Please Enter the Purchase Order date');
$('#PODate').focus();
return false;
}
else if(radioValue==0 && $('#Deliverydate').val()==''){ else if(radioValue==0 && $('#Deliverydate').val()==''){
alert('Please Select the Delivery Date'); alert('Please Select the Delivery Date');
$('#Deliverydate').focus(); $('#Deliverydate').focus();