Live Issue Fixes : ps
This commit is contained in:
parent
3b8a6af038
commit
30d5fd0714
@ -409,6 +409,7 @@ class Inwardgateregister extends BaseController
|
||||
$DriverMobileNumber = $this->request->getPost('DriverMobileNumber');
|
||||
$CreatedBy = $this->session->get('userId');
|
||||
$RowCount = $this->request->getPost('txtRowCount');
|
||||
$MasterRemarks = $this->request->getPost('MasterRemarks');
|
||||
$createddt = get_current_date_time();
|
||||
//$IGRStatus = IGR_CREATED;//old
|
||||
$PreIGRStatus = (int)$this->request->getPost('hideIGRStatus') == 1 ? IGR_CREATED : IGR_DRAFT;
|
||||
@ -441,13 +442,11 @@ class Inwardgateregister extends BaseController
|
||||
}
|
||||
}
|
||||
#Step 3 Master Details Gathering to Save In DB
|
||||
$igr = array('PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'TransporterId'=>$TransporterId,'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus);
|
||||
$igr = array('PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'TransporterId'=>$TransporterId,'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus, 'Remarks'=>$MasterRemarks);
|
||||
$igr['MasterFile'] = $requestMasterFileName;
|
||||
#Step 4 Calling DB to Save IGR Master
|
||||
$IGRNO = $this->inwardgateregister_model->addigrM($igr);
|
||||
// echo "master - no problem";
|
||||
// $IGRNO = "IGRNO02767";
|
||||
// print_r($this->request->getPost());die;
|
||||
|
||||
if($IGRNO){
|
||||
$files = $this->request->getFiles();
|
||||
$fileNames = $this->request->getPost('file_name'); // Get user-entered file names
|
||||
@ -720,10 +719,42 @@ function viewIGRDetails()
|
||||
$IGRNO = $this->request->getPost('id');
|
||||
|
||||
$data['details'] = $this->inwardgateregister_model->viewigr($IGRNO);
|
||||
$data['files'] = $this->inwardgateregister_model->viewIGRFile($IGRNO);
|
||||
$TaxInPercentage = 0;
|
||||
for ($i = 0; $i < count($data['details']); $i++) {
|
||||
$details = $data['details'][$i];
|
||||
|
||||
// echo $IGRNO;
|
||||
// print_r($data);die;
|
||||
if ($details->POType == 'IMPORT') {
|
||||
$TaxInPercentage = isset($details->import_igst) ? $details->import_igst : 0;
|
||||
}
|
||||
|
||||
if ($details->POType == 'CAPITAL' && $details->CapitalRange == 0) {
|
||||
$TaxInPercentage = isset($details->import_igst) ? $details->import_igst : 0;
|
||||
}
|
||||
|
||||
if ($details->POType == 'CAPITAL' && $details->CapitalRange == 1) {
|
||||
$TaxInPercentage =
|
||||
(isset($details->service_cgst) ? $details->service_cgst : 0) +
|
||||
(isset($details->service_sgst) ? $details->service_sgst : 0) +
|
||||
(isset($details->service_igst) ? $details->service_igst : 0);
|
||||
}
|
||||
|
||||
if ($details->POType == 'REVENUE') {
|
||||
$TaxInPercentage =
|
||||
(isset($details->revenue_cgst) ? $details->revenue_cgst : 0) +
|
||||
(isset($details->revenue_sgst) ? $details->revenue_sgst : 0) +
|
||||
(isset($details->revenue_igst) ? $details->revenue_igst : 0);
|
||||
}
|
||||
|
||||
if ($details->POType == 'SERVICE') {
|
||||
$TaxInPercentage =
|
||||
(isset($details->service_cgst) ? $details->service_cgst : 0) +
|
||||
(isset($details->service_sgst) ? $details->service_sgst : 0) +
|
||||
(isset($details->service_igst) ? $details->service_igst : 0);
|
||||
}
|
||||
|
||||
$data['details'][$i]->TaxInPercentage = $TaxInPercentage;
|
||||
}
|
||||
$data['files'] = $this->inwardgateregister_model->viewIGRFile($IGRNO);
|
||||
|
||||
echo json_encode($data);
|
||||
}
|
||||
@ -768,7 +799,7 @@ function viewIGRDetails()
|
||||
$TransporterId = $this->request->getPost('Transporter_Id');
|
||||
$DriverName = $this->request->getPost('driver');
|
||||
$DriverMobileNumber = $this->request->getPost('driver_mobile');
|
||||
|
||||
|
||||
$IGRStatus = (int)$this->request->getPost('status') == 1 ? IGR_CREATED : IGR_DRAFT;
|
||||
|
||||
$tableData = $this->request->getPost('tableData');
|
||||
@ -780,7 +811,8 @@ function viewIGRDetails()
|
||||
$path = ROOTPATH.'public/uploads/Igrfiles/';
|
||||
if(!is_dir($path)) { mkdir($path, 0777, true); }
|
||||
|
||||
$igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'TransporterId'=>$TransporterId,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo);
|
||||
$MasterRemarks = $this->request->getPost('MasterRemarks');
|
||||
$igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'TransporterId'=>$TransporterId,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo,'Remarks'=>$MasterRemarks);
|
||||
|
||||
$MasterFile = $this->request->getfile('MasterFile');
|
||||
|
||||
|
||||
@ -520,21 +520,7 @@ class Inwardgateregister_model extends Model
|
||||
$builder = $this->db->table('t_igr_master igr')
|
||||
->distinct()
|
||||
->select("igr.IGRNO,igr.*,igrd.*,MM.MaterialName,MM.UOM,sup.Address,sup.SupplierName,POM.ServiceDescription,POL.Quantity,POL.Rate,POM.POType,POM.IsOpenOrder,
|
||||
SUM(
|
||||
CASE
|
||||
WHEN POM.POType = 'IMPORT'
|
||||
THEN COALESCE(it.IGST, 0)
|
||||
WHEN POM.POType = 'CAPITAL' AND POM.CapitalRange = 0
|
||||
THEN COALESCE(it.IGST, 0)
|
||||
WHEN POM.POType = 'CAPITAL' AND POM.CapitalRange = 1
|
||||
THEN COALESCE(st.CGST, 0) + COALESCE(st.SGST, 0) + COALESCE(st.IGST, 0)
|
||||
WHEN POM.POType = 'REVENUE'
|
||||
THEN COALESCE(rt.CGST, 0) + COALESCE(rt.SGST, 0) + COALESCE(rt.IGST, 0)
|
||||
WHEN POM.POType = 'SERVICE'
|
||||
THEN COALESCE(st.CGST, 0) + COALESCE(st.SGST, 0) + COALESCE(st.IGST, 0)
|
||||
ELSE 0
|
||||
END
|
||||
) AS TaxInPercentage", false)
|
||||
POM.CapitalRange,POM.CapitalRange,st.CGST as service_cgst,st.SGST as service_sgst,st.IGST as service_igst,it.IGST as import_igst,rt.CGST as revenue_cgst,rt.SGST as revenue_sgst,rt.IGST as revenue_igst")
|
||||
->join('t_igr_details igrd', 'igrd.IGRNO = igr.IGRNO')
|
||||
->join('t_purchaseorder_master POM', 'igr.PONO = POM.PONO')
|
||||
->join('t_purchaseorder_lineitem POL', 'igr.PONO = POL.PONO and POL.MaterialCode=igrd.MaterialCode ')
|
||||
|
||||
@ -144,6 +144,13 @@
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label class="col-form-label">Remarks</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 class="form-row">
|
||||
<div class="table-responsive">
|
||||
@ -152,7 +159,7 @@
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Item Code</th>
|
||||
<th>Material</th>
|
||||
<th>Item Description</th>
|
||||
<th>Rate</th>
|
||||
<th>UOM</th>
|
||||
<th>Ordered Quantity</th>
|
||||
|
||||
@ -309,8 +309,8 @@
|
||||
<!-- box closed here -->
|
||||
|
||||
|
||||
<!-- Right modal content -->
|
||||
<div id="right-modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
|
||||
<!-- modal1 - IGR Remarks modal -->
|
||||
<div id="right-modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
|
||||
<div class="modal-dialog modal-sm modal-right">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header border-0">
|
||||
@ -329,9 +329,10 @@
|
||||
</div>
|
||||
</div><!-- /.modal-content -->
|
||||
</div><!-- /.modal-dialog -->
|
||||
</div><!-- /.modal -->
|
||||
</div>
|
||||
<!-- /.modal fade closed (IGR Remarks)-->
|
||||
|
||||
<!-- Igr modal fade -->
|
||||
<!-- modal2 - Edit Igr modal -->
|
||||
<div id="Igrshow" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
|
||||
@ -449,6 +450,15 @@
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label class="col-form-label">Remarks</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">
|
||||
@ -457,15 +467,15 @@
|
||||
<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: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">Item Description</th>
|
||||
<th style="width: 50px;">Rate</th>
|
||||
<th style="width: 50px;">Tax (%)</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>
|
||||
@ -535,10 +545,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.modal Igr modal fade closed-->
|
||||
<!-- /.modal fade closed (Edit Igr)-->
|
||||
|
||||
|
||||
<!-- WeightCalculator modal fade -->
|
||||
<!-- modal3 - Weight Calculator modal -->
|
||||
<div id="WeightCalculator" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
@ -614,10 +623,10 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- /.modal -->
|
||||
</div>
|
||||
<!-- /.modal fade closed (Weight Calculator)-->
|
||||
|
||||
|
||||
<!-- WeightCalculator modal fade closed-->
|
||||
<!-- modal4 - IGR history modal -->
|
||||
<div id="Historyshow" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog">
|
||||
@ -640,10 +649,10 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- /.modal -->
|
||||
</div>
|
||||
<!-- /.modal fade closed (IGR history)-->
|
||||
|
||||
|
||||
<!-- History modal fade closed-->
|
||||
<!-- modal5 - Cost Center modal -->
|
||||
<div id="CostCentershow" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog">
|
||||
@ -667,9 +676,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- /.modal -->
|
||||
<!-- History modal fade closed-->
|
||||
|
||||
|
||||
<!-- /.modal fade closed (Cost Center)-->
|
||||
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
@ -868,6 +875,7 @@
|
||||
$("#Invoice_No").val('');
|
||||
$("#InvoiceDate").val('');
|
||||
$("#MaterialRcvdDate").val('');
|
||||
$("#MasterRemarks").val('');
|
||||
$("#ser").val('');
|
||||
$("#tbleIGRAppend").empty(); // Clear the table
|
||||
// Hide the MasterFileLabel if no data
|
||||
@ -943,12 +951,15 @@
|
||||
'<td style="width: 50px;" >' + i + '</td>' +
|
||||
'<td style="width: 100px;" name="MaterialName" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
|
||||
'<td style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
|
||||
'<td style="width: 50px;" name="Rate" id="Rate" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" name="tax">' + tax_percentage + '</td>' +
|
||||
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
|
||||
'<td style="width: 100px;" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>' +
|
||||
'<td style="width: 100px;" 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;" name="Rate" id="Rate" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" name="tax">' + tax_percentage + '</td>' +
|
||||
|
||||
|
||||
|
||||
'<td style="width: 50px;" name="amount">' + amount + '</td>' +
|
||||
'<td style="width: 50px;" name="tax_amount">' + total_with_tax + '</td>' +
|
||||
'<td style="width: 100px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" onchange="SetRemarks(' + i + ')" style="width: 75px;"> </td>' +
|
||||
@ -986,12 +997,15 @@
|
||||
'<td style="width: 50px;" >' + i + '</td>' +
|
||||
'<td style="width: 100px;" name="MaterialName" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
|
||||
'<td style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
|
||||
'<td style="width: 50px;" name="Rate" id="Rate" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" name="tax">' + tax_percentage + '</td>' +
|
||||
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
|
||||
'<td style="width: 100px;" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>' +
|
||||
'<td style="width: 100px;" 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;" name="Rate" id="Rate" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" name="tax">' + tax_percentage + '</td>' +
|
||||
|
||||
|
||||
|
||||
'<td style="width: 50px;" name="amount">' + amount + '</td>' +
|
||||
'<td style="width: 50px;" name="tax_amount">' + total_with_tax + '</td>' +
|
||||
'<td style="width: 100px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" onchange="SetRemarks(' + i + ')" style="width: 75px;"> </td>' +
|
||||
@ -1026,11 +1040,13 @@
|
||||
'<td style="width: 50px;" >' + i + '</td>' +
|
||||
'<td style="width: 100px;" name="MaterialName" id="MaterialCode" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
|
||||
'<td style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
|
||||
'<td style="width: 50px;" name="Rate" id="Rate" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" name="tax">' + tax_percentage + '</td>' +
|
||||
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
|
||||
'<td style="width: 100px;" name="Quantity">' + item.Quantity + '</td>' +
|
||||
'<td style="width: 100px;" data-name="sel" >' + item.QuantityAsPerInvoice + '</td>' +
|
||||
'<td style="width: 50px;" name="Rate" id="Rate" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" name="tax">' + tax_percentage + '</td>' +
|
||||
|
||||
|
||||
'<td style="width: 50px;" name="tax_amount">' + total_with_tax + '</td>' +
|
||||
'<td style="width: 50px;" name="amount">' + amount + '</td>' +
|
||||
'<td style="width: 50px;" name="tax_amount">' + total_with_tax + '</td>' +
|
||||
@ -1215,6 +1231,8 @@
|
||||
formData.append('tableData', JSON.stringify(tableData));
|
||||
formData.append('isOpenOrder', $("#hiddenIsOpenOrder").val());
|
||||
formData.append('MasterFile', $('#MasterFile')[0].files[0]);
|
||||
formData.append('MasterRemarks', $("#MasterRemarks").val());
|
||||
|
||||
|
||||
$('input[name="file_name[]"]').each(function() {
|
||||
formData.append('file_name[]', $(this).val());
|
||||
|
||||
Loading…
Reference in New Issue
Block a user