Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme
This commit is contained in:
commit
9f369c2f60
@ -1448,14 +1448,15 @@ class Purchaseorder extends BaseController
|
|||||||
|
|
||||||
$IGRDs = array('QuantityAsPerInvoice' => $Quantity, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt);
|
$IGRDs = array('QuantityAsPerInvoice' => $Quantity, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt);
|
||||||
|
|
||||||
|
$itemNo = isset($IGRD[$j]['IGRItemNo']) ? $IGRD[$j]['IGRItemNo'] : null;
|
||||||
|
|
||||||
$this->purchaseorder_model->updateIGR($IGRD[$j]['IGRItemNo'], $IGRDs);
|
$this->purchaseorder_model->updateIGR($itemNo, $IGRDs);
|
||||||
|
|
||||||
|
|
||||||
$MaterialstockHistoryupdate = array('SupplierID' => $SupplierID, 'Quantity' => $Quantity, 'ItemValue' => $itemRate, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt);
|
$MaterialstockHistoryupdate = array('SupplierID' => $SupplierID, 'Quantity' => $Quantity, 'ItemValue' => $itemRate, 'UpdatedBY' => $updatedBy, 'UpdatedOn' => $updateddt);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$itemNo = $IGRD[$j]['IGRItemNo'];
|
|
||||||
|
|
||||||
|
|
||||||
$this->purchaseorder_model->updateMatStock(
|
$this->purchaseorder_model->updateMatStock(
|
||||||
@ -4312,8 +4313,13 @@ class Purchaseorder extends BaseController
|
|||||||
}
|
}
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
echo " File already Uploaded with this name..!!";
|
$response = [
|
||||||
return false;
|
'message' => 'File already uploaded with this name.!!',
|
||||||
|
'data' => false
|
||||||
|
];
|
||||||
|
|
||||||
|
// Return the response as JSON
|
||||||
|
return $this->response->setJSON($response);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1092,7 +1092,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="form-row">
|
<div class="form-row">
|
||||||
<div class="table-responsive" style="padding-bottom: 30px;">
|
<div class="table-responsive table-bordered" style="padding-bottom: 30px;">
|
||||||
<table id="ServiceTable" class="table table-striped table-hover mb-0" style="font-size:12px;">
|
<table id="ServiceTable" class="table table-striped table-hover mb-0" style="font-size:12px;">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
@ -1106,9 +1106,6 @@ if (!empty($getlogpodtl)) {
|
|||||||
<th style="text-align: right;">Basic Amount <?php echo "($INRSYM)" ?></th>
|
<th style="text-align: right;">Basic Amount <?php echo "($INRSYM)" ?></th>
|
||||||
<th style="text-align: right;">Tax Amount <?php echo "($INRSYM)" ?></th>
|
<th style="text-align: right;">Tax Amount <?php echo "($INRSYM)" ?></th>
|
||||||
<th style="text-align: right;">Total Order Amount <?php echo "($INRSYM)" ?></th>
|
<th style="text-align: right;">Total Order Amount <?php echo "($INRSYM)" ?></th>
|
||||||
<!-- <th>Actual Quantity</th>
|
|
||||||
<th>Received Quantity</th>
|
|
||||||
<th>Pending Quantity</th> -->
|
|
||||||
<th>Action</th>
|
<th>Action</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|||||||
@ -59,6 +59,9 @@ if (!empty($INRSYMBOL)) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.text-right {
|
||||||
|
text-align: right !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1870,7 +1873,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
if($('#purpose').val()=="REVENUE"){
|
if($('#purpose').val()=="REVENUE"){
|
||||||
|
|
||||||
alert('Please Revenue Service Type Options');
|
alert('Please Select Revenue Type Options');
|
||||||
$('#PoTypeOptions').focus();
|
$('#PoTypeOptions').focus();
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
@ -2799,10 +2802,10 @@ if (!empty($INRSYMBOL)) {
|
|||||||
<th>Item Description</th>
|
<th>Item Description</th>
|
||||||
<th>Quantity</th>
|
<th>Quantity</th>
|
||||||
<th>UOM</th>
|
<th>UOM</th>
|
||||||
<th>Rate<?php echo "($INRSYM)" ?></th>
|
<th class="text-right">Rate<?php echo "($INRSYM)" ?></th>
|
||||||
<th>Basic Amount<?php echo "($INRSYM)" ?></th>
|
<th class="text-right">Basic Amount<?php echo "($INRSYM)" ?></th>
|
||||||
<th>Tax Amount<?php echo "($INRSYM)" ?></th>
|
<th class="text-right">Tax Amount<?php echo "($INRSYM)" ?></th>
|
||||||
<th>Total Order Amount<?php echo "($INRSYM)" ?></th>
|
<th class="text-right">Total Order Amount<?php echo "($INRSYM)" ?></th>
|
||||||
<th>Action</th>
|
<th>Action</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@ -4727,7 +4730,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
<div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog"
|
<div id="packagingcalmodel" class="modal fade" tabindex="-1" role="dialog"
|
||||||
aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false"
|
aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false"
|
||||||
style="display: none;">
|
style="display: none;">
|
||||||
<div class="modal-dialog modal-sm">
|
<div class="modal-dialog modal-sm" style="width: 1060px;">
|
||||||
<div class="modal-content"
|
<div class="modal-content"
|
||||||
>
|
>
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
@ -4763,7 +4766,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
<div id="submitmodel" class="modal fade" role="dialog"
|
<div id="submitmodel" class="modal fade" role="dialog"
|
||||||
aria-labelledby="myModalLabel">
|
aria-labelledby="myModalLabel">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog" style="width:1060px;">
|
||||||
|
|
||||||
<!-- Modal content-->
|
<!-- Modal content-->
|
||||||
<div class="modal-content" style="">
|
<div class="modal-content" style="">
|
||||||
@ -4801,7 +4804,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
|
|
||||||
<div id="filemodel" class="modal fade " tabindex="-1" data-backdrop="true" role="dialog" aria-labelledby="myModalLabel">
|
<div id="filemodel" class="modal fade " tabindex="-1" data-backdrop="true" role="dialog" aria-labelledby="myModalLabel">
|
||||||
<div class="modal-dialog modal-dialog-scrollable " role="document">
|
<div class="modal-dialog modal-dialog-scrollable " style="width: 1060px;" role="document">
|
||||||
<!-- Modal content-->
|
<!-- Modal content-->
|
||||||
<div class="modal-content" >
|
<div class="modal-content" >
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
@ -4859,8 +4862,8 @@ if (!empty($INRSYMBOL)) {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-md-12 " align="right">
|
<div class="col-md-12 " align="right">
|
||||||
<a class="btn btn-danger" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
|
<a class="btn btn-secondary" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
|
||||||
<a class="btn btn-success ok" ID="ExciseOption12" onclick="rfilealert();"> <span class="bold">Submit</span></a>
|
<a class="btn btn-info ok" ID="ExciseOption12" onclick="rfilealert();"> <span class="bold">Submit</span></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
@ -4881,32 +4884,20 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<div align="center">
|
||||||
<div id="servicemodel" class="modal fade" data-backdrop-limit="1" role="dialog"
|
<div id="servicemodel" class="modal fade" data-backdrop-limit="1" role="dialog"
|
||||||
aria-labelledby="myModalLabel">
|
aria-labelledby="myModalLabel">
|
||||||
<div class="modal-dialog">
|
<div class="modal-dialog">
|
||||||
|
|
||||||
<!-- Modal content-->
|
<!-- Modal content-->
|
||||||
<div class="modal-content" style="width:950px;">
|
<div class="modal-content" style="width:1060px;">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<h4 class="modal-title">SERVICE Bill Details</h4>
|
<h4 class="modal-title">SERVICE Bill Details</h4>
|
||||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-body" style="padding:0px;">
|
<div class="modal-body" style="padding:0px;">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12" align="left">
|
||||||
|
|
||||||
|
|
||||||
<!-- <div class="col-md-4">
|
|
||||||
<input type = "file" size = "20" input accept=".docx,.pdx,.doc.JPG,.PNG,.jpg" id="images1" name="images1" onChange="sfilecheck();"/>
|
|
||||||
<label for="images">Select Company file<br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div> -->
|
|
||||||
|
|
||||||
|
|
||||||
<!-- <div class="col-md-10"> -->
|
|
||||||
|
|
||||||
<!-- <legend>Multiple File</legend> -->
|
|
||||||
<div class="col-md-offset-0 col-md-1">
|
<div class="col-md-offset-0 col-md-1">
|
||||||
<input type="button" class="btn btn-success" id="addemorebutton"
|
<input type="button" class="btn btn-success" id="addemorebutton"
|
||||||
value=" + ADD FILES..">
|
value=" + ADD FILES..">
|
||||||
@ -4930,7 +4921,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
<div class="col-md-12 text-right">
|
<div class="col-md-12 text-right">
|
||||||
<a class="btn btn-secondary waves-effect" data-dismiss="modal"
|
<a class="btn btn-secondary waves-effect" data-dismiss="modal"
|
||||||
onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
|
onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
|
||||||
<a class="btn btn-success ok" ID="ExciseOption12"
|
<a class="btn btn-info ok" ID="ExciseOption12"
|
||||||
onclick="sfilealert();"> <span class="bold">Submit</span></a>
|
onclick="sfilealert();"> <span class="bold">Submit</span></a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -4939,6 +4930,9 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -4946,7 +4940,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
<div id="freightmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog"
|
<div id="freightmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog"
|
||||||
aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
|
aria-labelledby="myModalLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
|
||||||
<div class="modal-dialog modal-sm">
|
<div class="modal-dialog modal-sm" style="width: 1060px;">
|
||||||
|
|
||||||
<!-- Modal content-->
|
<!-- Modal content-->
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
@ -4969,9 +4963,9 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
<a class="btn btn-danger" data-dismiss="modal"
|
<a class="btn btn-secondary" data-dismiss="modal"
|
||||||
value="Cancel">Cancel</a>
|
value="Cancel">Cancel</a>
|
||||||
<a class="btn btn-success" ID="freightOption"
|
<a class="btn btn-info" ID="freightOption"
|
||||||
data-bs-target="#REVENUE" data-bs-toggle="modal" data-bs-dismiss="modal"
|
data-bs-target="#REVENUE" data-bs-toggle="modal" data-bs-dismiss="modal"
|
||||||
onclick="setfreightOption();"
|
onclick="setfreightOption();"
|
||||||
><span class="bold">Ok</span></a>
|
><span class="bold">Ok</span></a>
|
||||||
@ -5992,12 +5986,12 @@ if (!empty($INRSYMBOL)) {
|
|||||||
<td>${Reqnumber}</td>
|
<td>${Reqnumber}</td>
|
||||||
<td>${materialCode}</td>
|
<td>${materialCode}</td>
|
||||||
<td>${materialName}</td>
|
<td>${materialName}</td>
|
||||||
<td>${quantity}</td>
|
<td align="center">${quantity}</td>
|
||||||
<td>${uom}</td>
|
<td>${uom}</td>
|
||||||
<td>${itemRate}</td>
|
<td align="right">${itemRate}</td>
|
||||||
<td>${basicval}</td>
|
<td align="right">${basicval}</td>
|
||||||
<td>${TotalTaxValue}</td>
|
<td align="right">${TotalTaxValue}</td>
|
||||||
<td>${TotalOrderValue}</td>
|
<td align="right">${TotalOrderValue}</td>
|
||||||
<td>
|
<td>
|
||||||
<a data-target='#EDITREVENUE' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
|
<a data-target='#EDITREVENUE' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
|
||||||
<i class="ri-pencil-fill"></i>
|
<i class="ri-pencil-fill"></i>
|
||||||
@ -6682,12 +6676,12 @@ if (!empty($INRSYMBOL)) {
|
|||||||
<td>${Reqnumber}</td>
|
<td>${Reqnumber}</td>
|
||||||
<td>${materialCode}</td>
|
<td>${materialCode}</td>
|
||||||
<td>${materialName}</td>
|
<td>${materialName}</td>
|
||||||
<td>${quantity}</td>
|
<td align="center">${quantity}</td>
|
||||||
<td>${uom}</td>
|
<td>${uom}</td>
|
||||||
<td>${itemRate}</td>
|
<td align="right">${itemRate}</td>
|
||||||
<td>${basicval}</td>
|
<td align="right">${basicval}</td>
|
||||||
<td>${TotalTaxValue}</td>
|
<td align="right">${TotalTaxValue}</td>
|
||||||
<td>${TotalOrderValue}</td>
|
<td align="right">${TotalOrderValue}</td>
|
||||||
<td>
|
<td>
|
||||||
<a data-target='#EDITSERVICE' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#EDITSERVICE">
|
<a data-target='#EDITSERVICE' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#EDITSERVICE">
|
||||||
<i class="ri-pencil-fill"></i>
|
<i class="ri-pencil-fill"></i>
|
||||||
@ -8506,7 +8500,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
$("#addemorebutton").click(function () {
|
$("#addemorebutton").click(function () {
|
||||||
|
|
||||||
//alert('sda');
|
|
||||||
|
|
||||||
if (counters > 4) {
|
if (counters > 4) {
|
||||||
alert("You have to upload five files only"); //this allows only 5 files;
|
alert("You have to upload five files only"); //this allows only 5 files;
|
||||||
@ -8518,22 +8512,21 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
var div = document.createElement('div');
|
var div = document.createElement('div');
|
||||||
div.id = "divid" + counters;
|
div.id = "divid" + counters;
|
||||||
div.className = "row";
|
div.className = "row p-2";
|
||||||
div.innerHTML = '<div class="col-md-12">' +
|
div.innerHTML =
|
||||||
|
|
||||||
'<div class="col-md-4" >' +
|
'<div class="col-md-4" >' +
|
||||||
'<label><br></label>' +
|
'<label>Select Service Bill</label>' +
|
||||||
'<input type="file" id="images1" name="browseFiles' + counterConstants + '" onchange="Copyfilenames(this.name);"><br>' +
|
'<input type="file" id="images1" name="browseFiles' + counterConstants + '" onchange="Copyfilenames(this.name);"><br>' +
|
||||||
'</div>' +
|
'</div>' +
|
||||||
|
|
||||||
|
|
||||||
'<div class="col-md-1 " >' +
|
'<div class="col-md-1 " >' +
|
||||||
'<label><br><br></label>' +
|
'<label><br><br></label>' +
|
||||||
'<button class="btn btn-success" type="button" onclick="addRows(' + counters + ')"id="addbtns1" ><i class="fa fa-plus-square"></i></button></div>' +
|
'<button class="btn btn-success btn-sm" type="button" onclick="addRows(' + counters + ')"id="addbtns1" ><i class="fa fa-plus-square"></i></button></div>' +
|
||||||
|
|
||||||
'<div class="col-md-1" >' +
|
'<div class="col-md-1" >' +
|
||||||
'<label><br><br></label>' +
|
'<label><br><br></label>' +
|
||||||
'<button class="btn btn-danger remove remove_this" id="removebtns' + counters + '" onclick="removeRows(this.id)"><i class="fa fa-minus-square"></i></button></div>' +
|
'<button class="btn btn-danger btn-sm remove remove_this" id="removebtns' + counters + '" onclick="removeRows(this.id)"><i class="fa fa-minus-square"></i></button></div>' +
|
||||||
|
|
||||||
'</div>';
|
'</div>';
|
||||||
$('#newsdiv').append(div);
|
$('#newsdiv').append(div);
|
||||||
@ -8585,26 +8578,21 @@ if (!empty($INRSYMBOL)) {
|
|||||||
//alert("count"+counterConstants);
|
//alert("count"+counterConstants);
|
||||||
var div = document.createElement('div');
|
var div = document.createElement('div');
|
||||||
div.id = "divid" + counters;
|
div.id = "divid" + counters;
|
||||||
div.className = "row";
|
div.className = "row p-2" ;
|
||||||
div.innerHTML = '<div class="col-md-12">' +
|
div.innerHTML =
|
||||||
|
|
||||||
'<div class="col-md-4">' +
|
'<div class="col-md-4">' +
|
||||||
'<label><br></label>' +
|
'<label>Select Service Bill</label>' +
|
||||||
'<input type="file" name="browseFiles' + counterConstants + '" id="images1" onchange="Copyfilename(this.name); "><br>' +
|
'<input type="file" name="browseFiles' + counterConstants + '" id="images1" onchange="Copyfilename(this.name); "><br>' +
|
||||||
'</div>' +
|
'</div>' +
|
||||||
// '<div class="col-md-2">'+
|
|
||||||
// '<label><br><br></label>'+
|
|
||||||
// '<button class="btn btn-danger remove remove_this" id="removebtns'+counters+'" onclick="removeRows(this.id)"><i class="fa fa-"></i>-</button></div>'+
|
|
||||||
// '</div>'+
|
|
||||||
|
|
||||||
|
|
||||||
'<div class="col-md-1" >' +
|
'<div class="col-md-1" >' +
|
||||||
'<label><br><br></label>' +
|
'<label><br><br></label>' +
|
||||||
'<button class="btn btn-success" type="button" id="addbtns' + counters + '" onclick="addRows(' + counters + ')"><i class="fa fa-plus-square"></i></button></div>' +
|
'<button class="btn btn-success btn-sm" type="button" id="addbtns' + counters + '" onclick="addRows(' + counters + ')"><i class="fa fa-plus-square"></i></button></div>' +
|
||||||
|
|
||||||
'<div class="col-md-1" >' +
|
'<div class="col-md-1" >' +
|
||||||
'<label><br><br></label>' +
|
'<label><br><br></label>' +
|
||||||
'<button class="btn btn-danger remove remove_this" id="removebtns' + counters + '" onclick="removeRows(this.id)"><i class="fa fa-minus-square"></i></button></div>' +
|
'<button class="btn btn-danger btn-sm remove remove_this" id="removebtns' + counters + '" onclick="removeRows(this.id)"><i class="fa fa-minus-square"></i></button></div>' +
|
||||||
'</div>' +
|
'</div>' +
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -132,6 +132,13 @@ if (!empty($INRSYMBOL)) {
|
|||||||
|
|
||||||
<style>
|
<style>
|
||||||
.modal { overflow: auto !important; }
|
.modal { overflow: auto !important; }
|
||||||
|
.text-right {
|
||||||
|
text-align: right !important;
|
||||||
|
}
|
||||||
|
.text-center {
|
||||||
|
text-align: center !important;
|
||||||
|
}
|
||||||
|
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script>
|
<script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script>
|
||||||
@ -1214,12 +1221,12 @@ if (!empty($INRSYMBOL)) {
|
|||||||
<th>SNo</th>
|
<th>SNo</th>
|
||||||
<th>Requisition No</th>
|
<th>Requisition No</th>
|
||||||
<th>Item Name</th>
|
<th>Item Name</th>
|
||||||
<th>Quantity</th>
|
<th class="text-center">Quantity</th>
|
||||||
<th>UOM</th>
|
<th>UOM</th>
|
||||||
<th>Rate<?php echo "($INRSYM)" ?></th>
|
<th class="text-right">Rate<?php echo "($INRSYM)" ?></th>
|
||||||
<th>Basic Amount<?php echo "($INRSYM)" ?></th>
|
<th class="text-right">Basic Amount<?php echo "($INRSYM)" ?></th>
|
||||||
<th>Tax Amount<?php echo "($INRSYM)" ?></th>
|
<th class="text-right">Tax Amount<?php echo "($INRSYM)" ?></th>
|
||||||
<th>Total Order Amount<?php echo "($INRSYM)" ?></th>
|
<th class="text-right">Total Order Amount<?php echo "($INRSYM)" ?></th>
|
||||||
<th>Action</th>
|
<th>Action</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
@ -1237,7 +1244,7 @@ if (!empty($INRSYMBOL)) {
|
|||||||
<td align="left"><?php echo $index; ?></td>
|
<td align="left"><?php echo $index; ?></td>
|
||||||
<td><?php echo $record->ReqNo ?></td>
|
<td><?php echo $record->ReqNo ?></td>
|
||||||
<td><?php echo $record->MaterialName ?></td>
|
<td><?php echo $record->MaterialName ?></td>
|
||||||
<td align="right"><?php echo $record->Quantity ?></td>
|
<td align="center"><?php echo $record->Quantity ?></td>
|
||||||
<td><?php echo $record->UOM ?></td>
|
<td><?php echo $record->UOM ?></td>
|
||||||
<td align="right"><?php echo $record->Rate ?></td>
|
<td align="right"><?php echo $record->Rate ?></td>
|
||||||
|
|
||||||
@ -1505,13 +1512,16 @@ if (!empty($INRSYMBOL)) {
|
|||||||
</div>
|
</div>
|
||||||
<div class="modal-body p-4">
|
<div class="modal-body p-4">
|
||||||
<form>
|
<form>
|
||||||
<div class="radio">
|
<div >
|
||||||
<label><input type="radio" name="optPackaging" checked="checked" value='0' id="optPackaging"> Basic Amount</label>
|
<input type="radio" name="optPackaging" checked="checked" value="0" id="optPackagingBasicAmount">
|
||||||
|
<label for="optPackagingBasicAmount">Basic Amount</label>
|
||||||
</div>
|
</div>
|
||||||
<br>
|
|
||||||
<div class="radio">
|
<div >
|
||||||
<label><input type="radio" name="optPackaging" id="optPackaging" value='1'> After Discount Amount</label>
|
<input type="radio" name="optPackaging" id="optPackagingAfterDiscountAmount" value="1">
|
||||||
|
<label for="optPackagingAfterDiscountAmount">After Discount Amount</label>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
|
|||||||
@ -5097,11 +5097,11 @@ if (!empty($getlogpodtl)) {
|
|||||||
|
|
||||||
},
|
},
|
||||||
|
|
||||||
complete: function() {
|
// complete: function() {
|
||||||
// Actions that should always happen regardless of success or error
|
// // Actions that should always happen regardless of success or error
|
||||||
console.log("AJAX request completed.");
|
// console.log("AJAX request completed.");
|
||||||
$('#loader').hide(); // Hide the loader in any case
|
// $('#loader').hide(); // Hide the loader in any case
|
||||||
}
|
// }
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -5428,13 +5428,17 @@ if (!empty($getlogpodtl)) {
|
|||||||
contentType: false,
|
contentType: false,
|
||||||
processData: false,
|
processData: false,
|
||||||
success: function(response) {
|
success: function(response) {
|
||||||
if (response) {
|
if (response.data) {
|
||||||
$('#loader').hide();
|
$('#loader').hide();
|
||||||
alert(response.message);
|
alert(response.message);
|
||||||
|
console.log(response);
|
||||||
console.log(response.data.BillNo);
|
console.log(response.data.BillNo);
|
||||||
console.log(response.data.FilePath);
|
console.log(response.data.FilePath);
|
||||||
addRowToTable(response.data);
|
addRowToTable(response.data);
|
||||||
$('#billModel').modal('hide');
|
$('#billModel').modal('hide');
|
||||||
|
}else{
|
||||||
|
alert(response.message);
|
||||||
|
$('#billModel').modal('hide');
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
error: function(jqXHR, textStatus, errorThrown) {
|
error: function(jqXHR, textStatus, errorThrown) {
|
||||||
@ -5463,12 +5467,20 @@ if (!empty($getlogpodtl)) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
var counter = 0;
|
let counter = 0;
|
||||||
|
let uploadCounter = 0; // Tracks actual uploads
|
||||||
|
|
||||||
//var counterConstant = 0;
|
//var counterConstant = 0;
|
||||||
|
|
||||||
$("#addmorebutton").click(function() {
|
$("#addmorebutton").click(function() {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if (uploadCounter >= 5) {
|
||||||
|
alert("You can upload only five files.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
counter++;
|
counter++;
|
||||||
|
|
||||||
|
|
||||||
@ -5476,7 +5488,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
//alert(bill.length);
|
//alert(bill.length);
|
||||||
if (bill.length >= 5) {
|
if (bill.length >= 5) {
|
||||||
|
|
||||||
alert("You have to upload five files only"); //this allows only 5 files;
|
alert("You have already uploaded maximum files "); //this allows only 5 files;
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
var div = document.createElement('div');
|
var div = document.createElement('div');
|
||||||
@ -5487,7 +5499,7 @@ if (!empty($getlogpodtl)) {
|
|||||||
<br>
|
<br>
|
||||||
<input type="file" name="browseFiles" id="images${counter}" onchange="Copyfilename(${this.name}); ">
|
<input type="file" name="browseFiles" id="images${counter}" onchange="Copyfilename(${this.name}); ">
|
||||||
<br>
|
<br>
|
||||||
<button class="btn btn-success btn-sm add add_this" id="addbtn" onclick="addRow(${counter})">ADD</button>
|
<button class="btn btn-success btn-sm add add_this" id="addbtn" onclick="addRow(${counter},${bill.length})">ADD</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@ -5506,21 +5518,33 @@ if (!empty($getlogpodtl)) {
|
|||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
function addRow(counter) {
|
function addRow(counter,billLength) {
|
||||||
|
|
||||||
|
console.log("counter");
|
||||||
|
console.log(counter); //1
|
||||||
|
console.log("billLength");
|
||||||
|
console.log(billLength);
|
||||||
var file = $(`#images${counter}`).val();
|
var file = $(`#images${counter}`).val();
|
||||||
|
|
||||||
if (file == '' ) {
|
if (file == '' ) {
|
||||||
alert('Please Select File..!!');
|
alert('Please Select File..!!');
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
}
|
||||||
|
else if (billLength >= 5) { // Check upload limit here
|
||||||
|
alert('You can only upload a maximum of five files!');
|
||||||
|
return false;
|
||||||
} else {
|
} else {
|
||||||
|
// Increment uploadCounter and call file upload function
|
||||||
|
billLength++;
|
||||||
fileupload(counter);
|
fileupload(counter);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function Copyfilename(id) {
|
function Copyfilename(id) {
|
||||||
var size = $('input[name=' + id + ']')[0].files[0].size;
|
var size = $('input[name=' + id + ']')[0].files[0].size;
|
||||||
|
|
||||||
|
|||||||
@ -185,7 +185,11 @@ if (empty($Status)) {
|
|||||||
<?php if ($record->StatusCode == PO_APPROVER_ONHOLD or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED) { ?>
|
<?php if ($record->StatusCode == PO_APPROVER_ONHOLD or $record->StatusCode == PO_CREATED or $record->StatusCode == REQITEM_Emergency_PO_CREATED) { ?>
|
||||||
|
|
||||||
|
|
||||||
<select name="selectId" id="selectId" onchange="showvalue('<?php echo $record->PONO ?>','<?php echo $index; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Remarks ?>');" style="width: 193px;">
|
<select
|
||||||
|
class="form-control"
|
||||||
|
name="selectId" id="selectId"
|
||||||
|
onchange="showvalue('<?php echo $record->PONO ?>','<?php echo $index; ?>',this.options[this.selectedIndex].value,'<?php echo $record->Remarks ?>');"
|
||||||
|
style="width: 193px;">
|
||||||
<option value="-1">Select Action</option>
|
<option value="-1">Select Action</option>
|
||||||
<!-- <option value="1">Release</option> -->
|
<!-- <option value="1">Release</option> -->
|
||||||
<option value="1">Approve And Release</option>
|
<option value="1">Approve And Release</option>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user