From 40e307693e064b35becdf5009ed81ab04ef1349b Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Mon, 10 Feb 2025 11:07:03 +0000
Subject: [PATCH] Account Igr : ps

---
 app/Views/accountsDashboard.php | 56 +++++++++++++++++++++++++++------
 1 file changed, 46 insertions(+), 10 deletions(-)

diff --git a/app/Views/accountsDashboard.php b/app/Views/accountsDashboard.php
index 0dfb22ac..be4a77cc 100644
--- a/app/Views/accountsDashboard.php
+++ b/app/Views/accountsDashboard.php
@@ -284,7 +284,7 @@
 <!-- box closed here -->
 <!-- Igr modal fade -->
 <div id="Igrshow" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	<div class="modal-dialog modal-xl">
+<div class="modal-dialog modal-full-width">
 
 		<div class="modal-content">
 			<div class="modal-header">
@@ -326,7 +326,7 @@
 					</div>
 				</div>
 				<div class="row">
-					<div class="col-md-4">
+					<div class="col-md-3">
 						<div class="form-group">
 							<label class="col-form-label">Invoice Number <span class="text-danger">*</span></label>
 							<?php $data = array('name' => 'InvoiceNO', 'value' => set_value('InvoiceNO'), 'id' => 'Invoice_No',  'class' => 'form-control', 'required=>"true"');
@@ -334,7 +334,7 @@
 							?>
 						</div>
 					</div>
-					<div class="col-md-4">
+					<div class="col-md-3">
 						<div class="form-group">
 							<label class="col-form-label">Invoice Date <span class="text-danger">*</span></label>
 							<?php
@@ -343,7 +343,7 @@
 							?>
 						</div>
 					</div>
-					<div class="col-md-4">
+					<div class="col-md-3">
 						<div class="form-group">
 							<label class="col-form-label">Material Received Date <span class="text-danger">*</span></label>
 							<?php
@@ -352,10 +352,6 @@
 							?>
 						</div>
 					</div>
-				</div>
-
-
-				<div class="row">
 					<div class="col-md-3">
 						<div class="form-group">
 							<label class="col-form-label">Vehicle Number </label>
@@ -364,6 +360,11 @@
 							?>
 						</div>
 					</div>
+				</div>
+
+
+				<div class="row">
+					
 					<div class="col-md-3">
 						<div class="form-group">
 							<label class="col-form-label">Transporter Name</label>
@@ -400,6 +401,15 @@
 							?>
 						</div>
 					</div>
+					<div class="col-md-3">
+						<div class="form-group">
+							<label class="col-form-label">Remark</label>
+								<?php
+										$data = array('name' => 'MasterRemarks', 'value' => set_value('MasterRemarks'), 'id' => 'MasterRemarks',  'class' => 'form-control', 'autocomplete' => 'off','rows' => 3);
+										echo form_textarea($data);
+								?>
+						</div>
+					</div>
 				</div>
 
 				<div class="row">
@@ -408,13 +418,17 @@
 							<table id="Inwardgateregistertable1" class="table table-striped table-hover mb-0 editabletable IGR_Line" style="font-size:12px;">
 								<thead style="background-color:#ddd !important">
 									<tr>
-										<th style="width: 50px;">SNo</th>
+									<th style="width: 50px;">#</th>
 										<th style="width: 100px;">Item Code</th>
-										<th style="width: 200px; word-wrap: break-word; word-break: break-all; white-space: normal;">Item Description</th>
+										<th style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">Item Description</th>
 										<th style="width: 50px;">UOM</th>
 										<th style="width: 100px;">Ordered Qty</th>
 										<th style="width: 100px;">Received Qty</th>
 										<th id="pendingQuantityHeader" style="display:none; width: 100px;">Pending Qty</th>
+										<th style="width: 50px;">Rate</th>
+										<th style="width: 50px;">Tax (%)</th>
+										<th style="width: 50px;">Taxable Amt</th>
+										<th style="width: 50px;">Total Amt</th>
 										<th style="width: 150px;">Remarks</th>
 										<th style="width: 50px;"></th>
 									</tr>
@@ -634,6 +648,7 @@
 			var TransporterIdInput = modal.find('#Transporter_Id');
 			var DriverInput = modal.find('#Driver_Name');
 			var DriverMobileNumberInput = modal.find('#DriverMobileNumber');
+			var MasterRemarksInput = modal.find('#MasterRemarks');
 			var MasterFileInput = modal.find('#MasterFile');
 			modal.find('#MasterFileLabel').hide();
 
@@ -648,6 +663,7 @@
 					MaterialRcvdDateInput.prop('readonly', false);
 					invoiceDateInput.prop('readonly', false);
 					invoiceNoInput.prop('readonly', false);
+					MasterRemarksInput.prop('readonly',false);
 				} else {
 					buttonContainer.find("#draftIGR, #generateIGR").css("display", "none");
 					$(".a_tag_for_mrir").css("display", "none");
@@ -657,6 +673,7 @@
 					MaterialRcvdDateInput.prop('readonly', true);
 					invoiceDateInput.prop('readonly', true);
 					invoiceNoInput.prop('readonly', true);
+					MasterRemarksInput.prop('readonly',true);
 				}
 			} else {
 				$(".a_tag_for_mrir").css("display", "none");
@@ -700,6 +717,7 @@
 						$("#Invoice_No").val('');
 						$("#Invoice_Date").val('');
 						$("#MaterialRcvdDate").val('');
+						$("#MasterRemarks").val('');
 						$("#ser").val('');
 						$("#tbleIGRAppend").empty(); // Clear the table
 						// Hide the MasterFileLabel if no data
@@ -737,6 +755,7 @@
 							$("#Supplier").val(item.SupplierName);
 							$("#Add1").val(item.Address);
 							$("#Invoice_No").val(item.DeliveryChellanOrInvoiceNo);
+							$("#MasterRemarks").val(item.Remark);
 							console.log(typeof item.MasterFile);
 							modal.find('#MasterFileLabel').hide();
 							if (typeof item.MasterFile == 'string') {
@@ -762,6 +781,11 @@
 							console.log(item.MaterialRcvdDate)
 							var gross_rcv_date = (item.GrossWeightDate == 'null') ? ' ' : formatDateTime(item.GrossWeightDate, 2);
 							$("#ser").val(item.ServiceDescription);
+									var amount = item.Rate*item.QuantityAsPerInvoice;
+									var tax_percentage = item.TaxInPercentage;
+									var tax_amount = (amount * tax_percentage) / 100;
+									var grand_total_amount = amount + tax_amount;
+									
 
 							i = i + 1;
 							// userrole is system admin also know as admin (if)
@@ -776,6 +800,10 @@
 									'<td style="width: 100px;" align="right" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>' +
 									'<td style="width: 100px;" align="right" data-name="sel" ><input type="text" onchange="validateReceivedQuantity(' + i + ',' + isOpenOrder + ')"id="QuantityAsPerInvoice' + i + '" name="QuantityAsPerInvoice' + i + '"  value="' + parseInt(item.QuantityAsPerInvoice) + '" onkeypress="return isNumberKey(event);" style="width: 75px;"></td>' +
 									'<td style="width: 100px;" name="PendingQuantity' + i + '" id="PendingQuantity' + i + '">' + ((isOpenOrder) ? 0 : parseInt(item.Quantity - item.QuantityAsPerInvoice)) + '</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="amount' + i + '">' + amount + '</td>' +
+									'<td style="width: 50px;" id="grand_total_amount' + i + '">' + grand_total_amount + '</td>' +
 									'<td style="width: 150px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" onchange="SetRemarks(' + i + ')" style="width: 75px;"> </td>' +
 									'<td style="width: 50px;"><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 + '">' +
@@ -811,6 +839,10 @@
 										'<td style="width: 100px;" align="right" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>' +
 										'<td style="width: 100px;" align="right" data-name="sel" ><input type="text" onchange="validateReceivedQuantity(' + i + ',' + isOpenOrder + ')"id="QuantityAsPerInvoice' + i + '" name="QuantityAsPerInvoice' + i + '"  value="' + parseInt(item.QuantityAsPerInvoice) + '" onkeypress="return isNumberKey(event);" style="width: 75px;"></td>' +
 										'<td style="width: 100px;" name="PendingQuantity' + i + '" id="PendingQuantity' + i + '">' + ((isOpenOrder) ? 0 : parseInt(item.Quantity - item.QuantityAsPerInvoice)) + '</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="amount' + i + '">' + amount + '</td>' +
+										'<td style="width: 50px;" id="grand_total_amount' + i + '">' + grand_total_amount + '</td>' +
 										'<td style="width: 150px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" onchange="SetRemarks(' + i + ')" style="width: 75px;"> </td>' +
 										'<td style="width: 50px;"><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 + '">' +
@@ -841,6 +873,10 @@
 										'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
 										'<td style="width: 100px;" align="right" name="Quantity">' + item.Quantity + '</td>' +
 										'<td style="width: 100px;" align="right" data-name="sel" >' + item.QuantityAsPerInvoice + '</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="amount' + i + '">' + amount + '</td>' +
+										'<td style="width: 50px;" id="grand_total_amount' + i + '">' + grand_total_amount + '</td>' +
 										'<td style="width: 150px;">' + item.Remarks + '</td>' +
 										'<td style="width: 50px;"><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 + '">' +