From cc531612c08e31cd146f3115e5d6a119bedea944 Mon Sep 17 00:00:00 2001 From: VE10-Sanjeev Date: Sat, 19 Apr 2025 09:17:40 +0000 Subject: [PATCH] tracker issues --- app/Views/inwardgateregister.php | 9 +++-- app/Views/stock/CoatingMachineDetail.php | 14 ++++---- app/Views/stock/bagStockDetails.php | 2 +- app/Views/stock/dieselStockDetails.php | 2 +- app/Views/stock/drierMachineDetails.php | 4 +-- app/Views/stock/dustAndRoughStockDetails.php | 2 +- app/Views/stock/gasStockDetails.php | 2 +- app/Views/stock/incomingSilicaSandDetails.php | 2 +- app/Views/stock/powerConsumptionDetails.php | 2 +- app/Views/stock/resinStockDetails.php | 2 +- app/Views/stock/trpProductionStockDetails.php | 4 +-- app/Views/stock/trpSandUseStockDetails.php | 2 +- app/Views/viewinwardgateregister.php | 35 ++++++++++--------- 13 files changed, 45 insertions(+), 37 deletions(-) diff --git a/app/Views/inwardgateregister.php b/app/Views/inwardgateregister.php index ea89ce2c..e4ce954d 100755 --- a/app/Views/inwardgateregister.php +++ b/app/Views/inwardgateregister.php @@ -167,7 +167,7 @@ Received Quantity Balance Quantity Invoice Quantity* - Remarks + Remarks* @@ -645,6 +645,11 @@ var RecQty = parseFloat($('#txtReceivedQuantity' + Rowid).val() == '' ? '0.00' : $('#txtReceivedQuantity' + Rowid).val()); var OrderedQty = parseFloat($("#Quantity_1" + Rowid).text()); var r = $("#Remark" + Rowid).val(); + if (r == '') { + alert("Please Enter the Remark") + $("#Remark" + Rowid).focus(); + return false; + } var isOpenOrder = parseInt($("#hiddenIsOpenOrder").val(), 2); var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? 0 : 1; if (formatted_IsOpenOrder == 0) { @@ -897,7 +902,7 @@ isOpenOrder = parseInt(obj.IsOpenOrder ? obj.IsOpenOrder : "0", 2); var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "" : "Open"; $('.help-block').text(formatted_IsOpenOrder); - var button_text_for_IGRDraftLink = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "Save as Draft IGR" : "Save as Open IGR"; + var button_text_for_IGRDraftLink = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "Save as Draft IGR" : "Save as Draft IGR"; $('#IGRDraftLink').text(button_text_for_IGRDraftLink); //$("#Add").val(obj.Address); $("#del").val(obj.DeliveryDate); diff --git a/app/Views/stock/CoatingMachineDetail.php b/app/Views/stock/CoatingMachineDetail.php index bd4d1c46..ae106fe5 100644 --- a/app/Views/stock/CoatingMachineDetail.php +++ b/app/Views/stock/CoatingMachineDetail.php @@ -402,7 +402,7 @@ -
- +
@@ -844,7 +844,7 @@
-
+

@@ -861,7 +861,7 @@
- +
@@ -1367,10 +1367,10 @@

( Previously Uploaded File ${element.client_given_name} )

- +
`; - $('#editBatchCardRowId').append(string) + $('#editBatchCardRowId').append(string); }); @@ -1958,7 +1958,7 @@ $(document).ready(function() { }); // Initialize Select2 when the modal is shown inside full screen - $('#filterModalId,').on('shown.bs.modal', function () { + $('#filterModalId').on('shown.bs.modal', function () { $('.select2').select2({ dropdownParent: $(this) // This ensures Select2 works in the modal }); diff --git a/app/Views/stock/bagStockDetails.php b/app/Views/stock/bagStockDetails.php index 7e13766f..177bcd5c 100644 --- a/app/Views/stock/bagStockDetails.php +++ b/app/Views/stock/bagStockDetails.php @@ -405,7 +405,7 @@ foreach ($period as $day) { - diff --git a/app/Views/stock/dieselStockDetails.php b/app/Views/stock/dieselStockDetails.php index 29cbd873..b7109bf5 100644 --- a/app/Views/stock/dieselStockDetails.php +++ b/app/Views/stock/dieselStockDetails.php @@ -398,7 +398,7 @@ foreach ($period as $day) { - diff --git a/app/Views/stock/drierMachineDetails.php b/app/Views/stock/drierMachineDetails.php index 9119fd81..1e958eec 100644 --- a/app/Views/stock/drierMachineDetails.php +++ b/app/Views/stock/drierMachineDetails.php @@ -364,7 +364,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); - - + diff --git a/app/Views/stock/dustAndRoughStockDetails.php b/app/Views/stock/dustAndRoughStockDetails.php index c8a2789b..24e1633f 100644 --- a/app/Views/stock/dustAndRoughStockDetails.php +++ b/app/Views/stock/dustAndRoughStockDetails.php @@ -400,7 +400,7 @@ - diff --git a/app/Views/stock/gasStockDetails.php b/app/Views/stock/gasStockDetails.php index 62317672..a0d59999 100644 --- a/app/Views/stock/gasStockDetails.php +++ b/app/Views/stock/gasStockDetails.php @@ -378,7 +378,7 @@ - diff --git a/app/Views/stock/incomingSilicaSandDetails.php b/app/Views/stock/incomingSilicaSandDetails.php index 943a8e09..b2b64690 100644 --- a/app/Views/stock/incomingSilicaSandDetails.php +++ b/app/Views/stock/incomingSilicaSandDetails.php @@ -355,7 +355,7 @@ - diff --git a/app/Views/stock/powerConsumptionDetails.php b/app/Views/stock/powerConsumptionDetails.php index 8707adf8..94a80327 100644 --- a/app/Views/stock/powerConsumptionDetails.php +++ b/app/Views/stock/powerConsumptionDetails.php @@ -404,7 +404,7 @@ foreach ($period as $day) { - diff --git a/app/Views/stock/resinStockDetails.php b/app/Views/stock/resinStockDetails.php index a13a4a7c..1158d28f 100644 --- a/app/Views/stock/resinStockDetails.php +++ b/app/Views/stock/resinStockDetails.php @@ -405,7 +405,7 @@ foreach ($period as $day) { - diff --git a/app/Views/stock/trpProductionStockDetails.php b/app/Views/stock/trpProductionStockDetails.php index 6dcf00ac..c191d751 100644 --- a/app/Views/stock/trpProductionStockDetails.php +++ b/app/Views/stock/trpProductionStockDetails.php @@ -459,7 +459,7 @@ $timeOtions[] = "12:00 AM"; - @@ -1576,7 +1576,7 @@ $timeOtions[] = "12:00 AM"; id="trpAbstractDetailsExport"> - diff --git a/app/Views/stock/trpSandUseStockDetails.php b/app/Views/stock/trpSandUseStockDetails.php index 6cf79f5d..0f6ae02a 100644 --- a/app/Views/stock/trpSandUseStockDetails.php +++ b/app/Views/stock/trpSandUseStockDetails.php @@ -391,7 +391,7 @@ - diff --git a/app/Views/viewinwardgateregister.php b/app/Views/viewinwardgateregister.php index ca208bfd..edea47f4 100755 --- a/app/Views/viewinwardgateregister.php +++ b/app/Views/viewinwardgateregister.php @@ -282,9 +282,13 @@ NetWeight ?> taxable_value ?> - gst_amount, 2, '.', ''); ?> - taxable_value + (int)$record->gst_amount); - echo number_format((float)$total_amt, 2, '.', ''); ?> + gst_amount, 2, '.', ''); ?> + + taxable_value + (float)$record->gst_amount; + echo number_format($total_amt, 2, '.', ''); + ?> + VehicleNo ?> DriverName ?> TransporterName ?> @@ -562,7 +566,7 @@
Close - Generate IGR + Generate IGR Save as Draft IGR
@@ -1262,8 +1266,8 @@ '' + Number(item.Rate).toFixed(2) + '' + '' + tax_percentage + '' + '' + Number(amount).toFixed(2) + '' + - '' + Number(grand_total_amount).toFixed(2) + ''; - ' ' + + '' + Number(grand_total_amount).toFixed(2) + '' + + ''+ ' ' + '' + '' + @@ -1321,15 +1325,15 @@ '' + Number(item.Rate).toFixed(2) + '' + '' + tax_percentage + '' + '' + Number(amount).toFixed(2) + '' + - '' + Number(grand_total_amount).toFixed(2) + ''; - if (userRole == 5) { - trIGRHTML += ' ' + item.Remarks + ' '; - } else { - trIGRHTML += '' + - '' + - ''; - } + '' + Number(grand_total_amount).toFixed(2) + '' ; + if (userRole == 5) { + trIGRHTML += '' + item.Remarks + ''; + } else { + trIGRHTML += '' + + '' + + ''; + } trIGRHTML += '' + '' + '' + '' + '' + '' + @@ -2871,4 +2875,3 @@ $("#gasShortageCalculator, #editGasShortageCalculator").submit(function (event) -