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

tracker issues

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-04-19 09:17:40 +00:00
parent 7984c18133
commit cc531612c0
13 changed files with 45 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Views/inwardgateregister.php
View File

@ -167,7 +167,7 @@
<th>Received Quantity</th> <th>Received Quantity</th>
<th>Balance Quantity</th> <th>Balance Quantity</th>
<th>Invoice Quantity<span class="text-danger">*</span></th> <th>Invoice Quantity<span class="text-danger">*</span></th>
<th>Remarks</th> <th>Remarks<span class="text-danger">*</span></th>
<th> </th> <th> </th>
</tr> </tr>
</thead> </thead>
@ -645,6 +645,11 @@
var RecQty = parseFloat($('#txtReceivedQuantity' + Rowid).val() == '' ? '0.00' : $('#txtReceivedQuantity' + Rowid).val()); var RecQty = parseFloat($('#txtReceivedQuantity' + Rowid).val() == '' ? '0.00' : $('#txtReceivedQuantity' + Rowid).val());
var OrderedQty = parseFloat($("#Quantity_1" + Rowid).text()); var OrderedQty = parseFloat($("#Quantity_1" + Rowid).text());
var r = $("#Remark" + Rowid).val(); var r = $("#Remark" + Rowid).val();
if (r == '') {
alert("Please Enter the Remark")
$("#Remark" + Rowid).focus();
return false;
}
var isOpenOrder = parseInt($("#hiddenIsOpenOrder").val(), 2); var isOpenOrder = parseInt($("#hiddenIsOpenOrder").val(), 2);
var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? 0 : 1; var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? 0 : 1;
if (formatted_IsOpenOrder == 0) { if (formatted_IsOpenOrder == 0) {
@ -897,7 +902,7 @@
isOpenOrder = parseInt(obj.IsOpenOrder ? obj.IsOpenOrder : "0", 2); isOpenOrder = parseInt(obj.IsOpenOrder ? obj.IsOpenOrder : "0", 2);
var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "" : "Open"; var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "" : "Open";
$('.help-block').text(formatted_IsOpenOrder); $('.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); $('#IGRDraftLink').text(button_text_for_IGRDraftLink);
//$("#Add").val(obj.Address); //$("#Add").val(obj.Address);
$("#del").val(obj.DeliveryDate); $("#del").val(obj.DeliveryDate);

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

@ -402,7 +402,7 @@
</i> </i>
<i class="fa fa-plus-circle btn-lg mt-2" <i class="fa fa-plus-circle btn-lg mt-2 auditor-restricted-btn"
title="Add Entry" title="Add Entry"
data-target="#coatingMachineDetailModal" data-target="#coatingMachineDetailModal"
data-toggle="modal" data-toggle="modal"
@ -640,7 +640,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button> <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
<button type="submit" class="btn btn-primary submit-btn">Save </button> <button type="submit" class="btn btn-primary submit-btn auditor-restricted-btn">Save </button>
</div> </div>
</form> </form>
</div> </div>
@ -844,7 +844,7 @@
<div class="form-row" id="editBatchCardRowId"> <div class="form-row" id="editBatchCardRowId">
<!-- batch card file upload --> <!-- batch card file upload -->
<div class="form-group col-md-4"> <div class="form-group auditor-restricted col-md-4">
<label for="editBatchCardId">Upload Batch Card</label> <label for="editBatchCardId">Upload Batch Card</label>
<br> <br>
@ -861,7 +861,7 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal" id="cancelBtn">Cancel</button> <button type="button" class="btn btn-secondary" data-dismiss="modal" id="cancelBtn">Cancel</button>
<button type="submit" class="btn btn-primary submit-btn">Save </button> <button type="submit" class="btn btn-primary submit-btn auditor-restricted-btn">Save </button>
</div> </div>
</form> </form>
</div> </div>
@ -1367,10 +1367,10 @@
<label for="">Change Batch Card</label> <label for="">Change Batch Card</label>
<input type="file" class="editBatchFile additionalBatchFile" name="batchCard[]" > <input type="file" class="editBatchFile additionalBatchFile" name="batchCard[]" >
<p>( Previously Uploaded File ${element.client_given_name} )</p> <p>( Previously Uploaded File ${element.client_given_name} )</p>
<button type="button" class="btn btn-danger btn-sm mt-2 removeBatch" data-id="${element.batchCardId}">Remove</button> <button type="button" class="btn btn-danger btn-sm mt-2 removeBatch auditor-restricted-btn" data-id="${element.batchCardId}" style="display: none;">Remove</button>
</div>`; </div>`;
$('#editBatchCardRowId').append(string) $('#editBatchCardRowId').append(string);
}); });
@ -1958,7 +1958,7 @@ $(document).ready(function() {
}); });
// Initialize Select2 when the modal is shown inside full screen // Initialize Select2 when the modal is shown inside full screen
$('#filterModalId,').on('shown.bs.modal', function () { $('#filterModalId').on('shown.bs.modal', function () {
$('.select2').select2({ $('.select2').select2({
dropdownParent: $(this) // This ensures Select2 works in the modal dropdownParent: $(this) // This ensures Select2 works in the modal
}); });

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

@ -405,7 +405,7 @@ foreach ($period as $day) {
</i> </i>
<i class="fas fa-save btn-lg mt-2" <i class="fas fa-save btn-lg mt-2 auditor-restricted-btn"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">

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

@ -398,7 +398,7 @@ foreach ($period as $day) {
</i> </i>
<i class="fas fa-save btn-lg mt-2" <i class="fas fa-save btn-lg mt-2 auditor-restricted-btn"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">

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

@ -364,7 +364,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
</i> </i>
<i class="fa fa-plus-circle btn-lg mt-2" <i class="fa fa-plus-circle btn-lg mt-2 auditor-restricted-btn"
title="Add Entry" title="Add Entry"
data-target="#additionalEntriesModalId" data-target="#additionalEntriesModalId"
data-toggle="modal" data-toggle="modal"
@ -778,7 +778,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
</div> </div>
</div> </div>
<button type="submit" class="btn btn-primary float-right submit-btn">Update</button> <button type="submit" class="btn btn-primary float-right submit-btn auditor-restricted-btn">Update</button>
<!-- hidden fields --> <!-- hidden fields -->

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

@ -400,7 +400,7 @@
</i> </i>
<i class="fa fa-save btn-lg mt-2" <i class="fa fa-save btn-lg mt-2 auditor-restricted-btn"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">

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

@ -378,7 +378,7 @@
</i> </i>
<i class="fa fa-save btn-lg mt-2" <i class="fa fa-save btn-lg mt-2 auditor-restricted-btn"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">

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

@ -355,7 +355,7 @@
</i> </i>
<i class="fas fa-save btn-lg mt-2" <i class="fas fa-save btn-lg mt-2 auditor-restricted-btn"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">

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

@ -404,7 +404,7 @@ foreach ($period as $day) {
</i> </i>
<i class="fas fa-save btn-lg mt-2" <i class="fas fa-save auditor-restricted-btn btn-lg mt-2"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">

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

@ -405,7 +405,7 @@ foreach ($period as $day) {
</i> </i>
<i class="fas fa-save btn-lg mt-2" <i class="fas fa-save btn-lg mt-2 auditor-restricted-btn"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">

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

@ -459,7 +459,7 @@ $timeOtions[] = "12:00 AM";
</i> </i>
<i class="fa fa-save btn-lg mt-2" <i class="fa fa-save btn-lg mt-2 auditor-restricted-btn"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">
@ -1576,7 +1576,7 @@ $timeOtions[] = "12:00 AM";
id="trpAbstractDetailsExport"> id="trpAbstractDetailsExport">
</i> </i>
<i class="fas fa-save btn-lg " <i class="fas fa-save btn-lg auditor-restricted-btn"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="abstractSaveId"> id="abstractSaveId">

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

@ -391,7 +391,7 @@
</i> </i>
<i class="fa fa-save btn-lg mt-2" <i class="fa fa-save btn-lg mt-2 auditor-restricted-btn"
title="Save" title="Save"
style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)" style="font-size: x-large; cursor:pointer; color:rgb(31, 132, 3)"
id="saveId"> id="saveId">

35
app/Views/viewinwardgateregister.php
View File

@ -282,9 +282,13 @@
<td align="right"><?php echo (int)$record->NetWeight ?></td> <td align="right"><?php echo (int)$record->NetWeight ?></td>
<td align="right"><?php echo (int)$record->taxable_value ?></td> <td align="right"><?php echo (int)$record->taxable_value ?></td>
<td align="right"><?php echo number_format((int)$record->gst_amount, 2, '.', ''); ?></td> <td align="right"><?php echo number_format((float)$record->gst_amount, 2, '.', ''); ?></td>
<td align="right"><?php $total_amt = ((int)$record->taxable_value + (int)$record->gst_amount); <td align="right">
echo number_format((float)$total_amt, 2, '.', ''); ?></td> <?php
$total_amt = (float)$record->taxable_value + (float)$record->gst_amount;
echo number_format($total_amt, 2, '.', '');
?>
</td>
<td><?php echo $record->VehicleNo ?></td> <td><?php echo $record->VehicleNo ?></td>
<td><?php echo $record->DriverName ?></td> <td><?php echo $record->DriverName ?></td>
<td><?php echo $record->TransporterName ?></td> <td><?php echo $record->TransporterName ?></td>
@ -562,7 +566,7 @@
<div class="modal-footer"> <div class="modal-footer">
<div class="buttonContainer"> <div class="buttonContainer">
<a class="btn btn-secondary" data-dismiss="modal" value="Close">Close</a> <a class="btn btn-secondary" data-dismiss="modal" value="Close">Close</a>
<a class="btn btn-primary auditor-restricted-btn" id="generateIGR" value="generateIGR">Generate IGR</a> <a class="btn btn-primary auditor-restricted" id="generateIGR" value="generateIGR">Generate IGR</a>
<a class="btn btn-primary" id="draftIGR" value="draftIGR">Save as Draft IGR</a> <a class="btn btn-primary" id="draftIGR" value="draftIGR">Save as Draft IGR</a>
</div> </div>
</div> </div>
@ -1262,8 +1266,8 @@
'<td style="width: 50px;" id="Rate' + i + '" >' + Number(item.Rate).toFixed(2) + '</td>' + '<td style="width: 50px;" id="Rate' + i + '" >' + Number(item.Rate).toFixed(2) + '</td>' +
'<td style="width: 50px;" id="tax_percentage' + i + '">' + tax_percentage + '</td>' + '<td style="width: 50px;" id="tax_percentage' + i + '">' + tax_percentage + '</td>' +
'<td style="width: 50px;" id="amount' + i + '">' + Number(amount).toFixed(2) + '</td>' + '<td style="width: 50px;" id="amount' + i + '">' + Number(amount).toFixed(2) + '</td>' +
'<td style="width: 50px;" id="grand_total_amount' + i + '">' + Number(grand_total_amount).toFixed(2) + '</td>'; '<td style="width: 50px;" id="grand_total_amount' + i + '">' + Number(grand_total_amount).toFixed(2) + '</td>' +
'<td style="width: 100px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form auditor-restricted-fieldgr" onchange="SetRemarks(' + i + ')" style="width: 75px;" value="'+item.Remarks+'"> </td>' + '<td style="width: 100px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form auditor-restricted-fieldgr" onchange="SetRemarks(' + i + ')" style="width: 75px;" value="' + item.Remarks + '"></td>'+
'<td style="width: 25px;"><a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus = "' + igrstatus + '"><i class="fa fa-solid fa-truck" style="text-align: center;"></i></a> </td>' + '<td style="width: 25px;"><a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus = "' + igrstatus + '"><i class="fa fa-solid fa-truck" style="text-align: center;"></i></a> </td>' +
'<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' + '<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' +
'<input type="hidden" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' + '<input type="hidden" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' +
@ -1321,15 +1325,15 @@
'<td style="width: 50px;" id="Rate' + i + '" >' + Number(item.Rate).toFixed(2) + '</td>' + '<td style="width: 50px;" id="Rate' + i + '" >' + Number(item.Rate).toFixed(2) + '</td>' +
'<td style="width: 50px;" id="tax_percentage' + i + '">' + tax_percentage + '</td>' + '<td style="width: 50px;" id="tax_percentage' + i + '">' + tax_percentage + '</td>' +
'<td style="width: 50px;" id="amount' + i + '">' + Number(amount).toFixed(2) + '</td>' + '<td style="width: 50px;" id="amount' + i + '">' + Number(amount).toFixed(2) + '</td>' +
'<td style="width: 50px;" id="grand_total_amount' + i + '">' + Number(grand_total_amount).toFixed(2) + '</td>'; '<td style="width: 50px;" id="grand_total_amount' + i + '">' + Number(grand_total_amount).toFixed(2) + '</td>' ;
if (userRole == 5) { if (userRole == 5) {
trIGRHTML += '<td style="width: 100px;"> ' + item.Remarks + ' </td>'; trIGRHTML += '<td style="width: 100px;">' + item.Remarks + '</td>';
} else { } else {
trIGRHTML += '<td style="width: 100px;">' + trIGRHTML += '<td style="width: 100px;">' +
'<input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form auditor-restricted-field" ' + '<input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form auditor-restricted-field" ' +
'onchange="SetRemarks(' + i + ')" style="width: 75px;" value="' + item.Remarks + '">' + 'onchange="SetRemarks(' + i + ')" style="width: 75px;" value="' + item.Remarks + '">' +
'</td>'; '</td>';
} }
trIGRHTML += '<td style="width: 25px;">' + '<a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" ' + 'data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus="' + igrstatus + '">' + '<i class="fa fa-solid fa-truck" style="text-align: center;"></i></a>' + '</td>' + trIGRHTML += '<td style="width: 25px;">' + '<a target="_blank" data-toggle="modal" data-target="#WeightCalculator" title="Weight Calculator" ' + 'data-index="' + i + '" data-material="' + item.MaterialName + '" data-igrstatus="' + igrstatus + '">' + '<i class="fa fa-solid fa-truck" style="text-align: center;"></i></a>' + '</td>' +
'<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' + '<input type="hidden" id="IGRNO' + i + '" name="IGRNO' + i + '" value="' + item.IGRNO + '">' +
'<input type="hidden" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' + '<input type="hidden" id="MaterialCode' + i + '" name="MaterialCode' + i + '" value="' + item.MaterialCode + '">' +
@ -2871,4 +2875,3 @@ $("#gasShortageCalculator, #editGasShortageCalculator").submit(function (event)
</script> </script>