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

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
Smart 2024-09-19 17:59:24 +05:30
commit a1acecad41
10 changed files with 3608 additions and 3638 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4622
app/Views/EditservicePurchaseorder.php
View File

File diff suppressed because it is too large Load Diff

210
app/Views/alterpurchaseorder.php
View File

@ -36,6 +36,33 @@ if (!empty($INRSYMBOL)) {
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
<style> <style>
.
.filemodal-dialog {
display: flex;
align-items: center;
justify-content: center;
min-height: 100vh; /* Ensures the modal is vertically centered */
min-width: 100%;
}
.filemodal-content {
width: 90%; /* Responsive width */
max-width: 950px; /* Maximum width */
max-height: 80vh; /* Ensures it doesn't overflow vertically */
overflow-y: auto; /* Enables scrolling inside the modal if content exceeds height */
}
.filemodal-body {
max-height: 60vh; /* Set a limit for the modal body */
overflow-y: auto; /* Make the body scrollable */
}
.txtSpcialInstruction{ .txtSpcialInstruction{
background-color: #f4f9fb; background-color: #f4f9fb;
} }
@ -2655,7 +2682,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<div class="col-md-3" id="otheroptiondiv" style="display:none;"> <div class="col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="badge mandatory">*</span></label> <label>Description of Payable Terms</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true'); $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true');
@ -2763,7 +2790,7 @@ if (!empty($INRSYMBOL)) {
<!-- Modal for Packing Calculation --> <!-- Modal for Packing Calculation -->
<div id="submitmodel" class="modal fade" data-backdrop-limit="1" role="dialog" <div id="submitmodel" class="modal fade" role="dialog"
aria-labelledby="myModalLabel"> aria-labelledby="myModalLabel">
<div class="modal-dialog"> <div class="modal-dialog">
@ -2773,7 +2800,7 @@ if (!empty($INRSYMBOL)) {
<h4 class="modal-title">Material has been Received<span id="WeightTitle"></span></h4> <h4 class="modal-title">Material has been Received<span id="WeightTitle"></span></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"> <div class="modal-body " style="padding:0px; max-height: 400px; overflow-y: auto;">
<form> <form>
<div class="modal-body p-4"> <div class="modal-body p-4">
<div class="form-group row"> <div class="form-group row">
@ -2798,147 +2825,83 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<div id="filemodel" class="modal fade" data-backdrop-limit="1" role="dialog"
aria-labelledby="myModalLabel">
<div class="modal-dialog">
<div id="filemodel" class="modal fade " tabindex="-1" data-backdrop="true" role="dialog" aria-labelledby="myModalLabel">
<div class="modal-dialog filemodal-dialog">
<!-- Modal content--> <!-- Modal content-->
<div class="modal-content" style="width:950px;"> <div class="modal-content filemodal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">Add Bill Details</h4> <h4 class="modal-title">Add Bill Details</h4>
</div> </div>
<div class="modal-body" style="padding:0px;"> <div class="modal-body filemodal-body">
<!-- <div class="col-md-4 pad"><strong>Select Item Code</strong> <form action="">
<select id="emergencyitemcode" name="emergencyitemcode" class = "form-control select2"> <div class="row">
<!-- <option value="1"> select material code</option> <div class="col-md-10 m-2 "><strong>Delivery Challan /Inv No</strong>
</select> <input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12" class="form-control" value="" required onkeypress="return isNumberKey(event)">
</div>
</div>--> <div class="col-md-10 m-2 "><strong>Delivery Challan /Inv Date</strong>
<div class="col-md-4 pad"><strong>Delivery Challan /Inv No</strong> <?php
<input type="text" name="ChallanInvNo" id="ChallanInvNo" maxlength="12" $data = array('name' => 'Date1', 'value' => set_value('Date1', $CurrentDate), 'id' => 'Date1', 'class' => 'form-control num', 'required' => 'true');
class="form-control" value="" required onkeypress="return isNumberKey(event)"> echo form_input($data); ?>
</div> </div>
<div class="col-md-4 pad"><strong>Delivery Challan /Inv Date</strong> <div class="col-md-10 m-2 "><strong>Material Received Date</strong>
<!-- <input type="Date" name="Date1" onkeypress="return onlyAlphabets(event);" maxlength="100" id="Date1" class="form-control" required value="2"> --> <?php
<?php $data = array('name' => 'MRC', 'value' => set_value('MRC', $CurrentDate), 'id' => 'MRC', 'class' => 'form-control num', 'required' => 'true');
$data = array('name' => 'Date1', 'value' => set_value('Date1', $CurrentDate), 'id' => 'Date1', 'class' => 'form-control num', 'required' => 'true'); echo form_input($data); ?>
echo form_input($data); ?> </div>
</div> <div class="col-md-10 m-2 "><strong>Vehicle No</strong>
<div class="col-md-4 pad"> <strong>Material Received Date</strong> <input type="text" name="VehicleNo" id="VehicleNo" maxlength="13" class="form-control" value="" required>
<?php </div>
$data = array('name' => 'MRC', 'value' => set_value('MRC', $CurrentDate), 'id' => 'MRC', 'class' => 'form-control num', 'required' => 'true'); <div class="col-md-10 m-2 "><strong>Courier No</strong>
echo form_input($data); ?> <input type="text" name="CourierNo" id="CourierNo" maxlength="12" class="form-control" value="" required>
</div>
<div class="col-md-10 m-2 " id="QualityChecked"><strong>Is Quality Check Required</strong>
<div class="radio m-2">
<label><input type="radio" name="Quality" checked="checked" value='0' id="Quality">Yes</label>
</div>
<div class="radio m-2">
<label><input type="radio" name="Quality" id="Quality" value='1'>No</label>
</div>
</div>
<div class="col-md-10">
<div class="col-md-offset-10 col-md-1">
<input type="button" class="btn btn-success" id="addmorebutton" value=" + ADD FILES..">
</div>
</div> <div id="newdiv"></div><!-- this div for add more section-->
<!-- <div class="col-md-4 pad"><strong>Advise Quantity</strong> <input type="hidden" name="hidecounter" id="hidecounter" value="0" />
<input type="text" name="AQuantity" id="AQuantity" maxlength="12" class="form-control" value="" required> <input type="hidden" name="hideconstant" id="hideconstant" value="0" />
</div> --> </div>
<div class="col-md-4 col-md-offset-8">
<a class="btn btn-cancel" data-dismiss="modal" onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
<a class="btn btn-success ok" ID="ExciseOption12" onclick="rfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<input type="hidden" id="tablevalues" value="sample" name="tablevalues" /> </div>
<input type="hidden" id="splrow" value="sample" name="splrow" />
<div class="col-md-4 pad"><strong>Vehicle No</strong>
<input type="text" name="VehicleNo" id="VehicleNo" maxlength="13"
class="form-control" value="" required>
</div>
<div class="col-md-4 pad"><strong>Courier No</strong>
<input type="text" name="CourierNo" id="CourierNo" maxlength="12"
class="form-control" value="" required>
</div>
<div class="col-md-4" id="QualityChecked"><strong>Is Quality Check Required</strong>
<div class="radio">
<label><input type="radio" name="Quality" checked="checked" value='0'
id="Quality">Yes</label>
</div> </div>
<div class="radio"> </form>
<label><input type="radio" name="Quality" id="Quality" value='1'>No</label>
</div>
</div>
<!-- <div class="col-md-5">
<input type = "file" size = "20" input accept=".docx,.pdf,.doc.JPG,.PNG,.jpg" id="imag" name="images" onChange="filecheck();"/>
<label for="images">Select file<br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label>
</div> -->
<div class="col-md-10">
<!-- <legend>Multiple File</legend> -->
<div class="col-md-offset-10 col-md-1">
<input type="button" class="btn btn-success" id="addmorebutton"
value=" + ADD FILES..">
</div>
<div id="newdiv"></div><!-- this div for add more section-->
<input type="hidden" name="hidecounter" id="hidecounter" value="0" />
<input type="hidden" name="hideconstant" id="hideconstant" value="0" />
</div>
<!-- Add more fields if needed -->
</div> </div>
<table id="specialtable" class="table table-hover table-bordered"
style="background-color:#fff;font-size:12px;">
<!--<thead>
<tr>
<th>MaterialCode1</th>
<th>DeliveryChallanDate</th>
<th>DeliveryChallanNo</th>
<th>VehicleNo</th>
<th>CourierNo</th>
<th>Quantity12</th>
<th>File</th>
</tr>
</thead>-->
<tbody id="specialappend">
</tbody>
</table>
<div class="modal-footer"> <div class="modal-footer">
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
<!-- <div class="col-md-4">
<a class="btn btn-success Add" onclick="addtable();"><span class="bold">Add table</span></a>
</div> -->
<div class="col-md-4 col-md-offset-8">
<a class="btn btn-cancel" data-dismiss="modal"
onclick="SetExciseCalculationCancel();" value="Cancel">Cancel</a>
<a class="btn btn-success ok" ID="ExciseOption12"
onclick="rfilealert();">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<!-- </form> -->
</div> </div>
<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">
@ -6875,6 +6838,7 @@ if (!empty($INRSYMBOL)) {
$('#OtherAmt' + userid).val(OtherAmt); $('#OtherAmt' + userid).val(OtherAmt);
populateValueMainFormForEditServiceTax(); populateValueMainFormForEditServiceTax();
$('#EDITSERVICE').modal('hide');
} else { } else {
console.log("in else part..."); console.log("in else part...");

8
app/Views/capitalpurchaseorder.php
View File

@ -541,7 +541,7 @@
?> ?>
</div> </div>
<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;"> <div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="text-danger">*</span></label> <label>Description of Payable Terms</label>
<div> <div>
<?php <?php
$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true'); $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control', 'required' => 'true');
@ -4317,7 +4317,7 @@
return false; return false;
} else { } else {
$('#content').loader('show'); // $('#content').loader('show');
var formData = new FormData($('.CapitalPO')[0]); var formData = new FormData($('.CapitalPO')[0]);
formData.append('ExchangeRateOn', ExchangeRateOn); formData.append('ExchangeRateOn', ExchangeRateOn);
formData.append('PaymentMethod', PaymentMethod); formData.append('PaymentMethod', PaymentMethod);
@ -4332,7 +4332,7 @@
success: function(data) { success: function(data) {
alert(data); alert(data);
if (data) { if (data) {
$('#content').loader('hide'); // $('#content').loader('hide');
$('#txtRowCount').val(''); $('#txtRowCount').val('');
$('#txtDeletedRow').val(''); $('#txtDeletedRow').val('');
@ -4344,7 +4344,7 @@
window.location = "purchaseorderListing"; window.location = "purchaseorderListing";
} else { } else {
$('#content').loader('hide'); // $('#content').loader('hide');
alert("Error"); alert("Error");
} }

2
app/Views/createPOfromRequistion.php
View File

@ -429,7 +429,7 @@
endDate.setHours(23, 59, 59, 999); endDate.setHours(23, 59, 59, 999);
// Get the date from the DataTable row (assuming it's in the first column in dd-mm-yyyy format) // Get the date from the DataTable row (assuming it's in the first column in dd-mm-yyyy format)
var dateStr = data[0]; var dateStr = data[1];
var dateParts = dateStr.split("-"); var dateParts = dateStr.split("-");
var rowDate = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); var rowDate = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]);

2069
app/Views/editCapitalPo.php
View File

File diff suppressed because it is too large Load Diff

96
app/Views/editRevenuepurchaseorder.php
View File

@ -2136,20 +2136,20 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div align="form-group col-md-12" align="right"> <div class="form-group col-md-12" align="right">
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?> <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?> <?php if ($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT <input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1" <?php echo $isChecked ? 'checked' : ''; ?>> IS THIS OPEN ORDER FORMAT
<?php } ?> <?php } ?>
<!-- <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a> --> <!-- <a data-toggle="modal" onclick="showmodel();" class=" btn btn-success"> Select Line Item </a> -->
<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-primary" id="abcd">Select Line Item</button> </a> <a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd">Select Line Item</button> </a>
<?php } ?> <?php } ?>
</div> </div>
</div> </div>
<br> <br>
<div class="form-row"> <div class="form-row">
<div class="table-responsive"> <div class="table-responsive" style="padding-bottom:30px;">
<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;"> <table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead> <thead>
@ -2262,7 +2262,7 @@ if (!empty($getlogpodtl)) {
} }
?> ?>
</tbody> </tbody>
</table><br> </table>
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
@ -2482,7 +2482,8 @@ if (!empty($getlogpodtl)) {
<!--################################################################## --> <!--################################################################## -->
<?php if (!empty($update)) { ?> <?php if (!empty($update)) { ?>
<div class="form-row" id="editpodiv"> <div class="form-row" id="editpodiv">
<div class="form-row"><label>Editable POScreen</label> <!-- <div class="form-row"> -->
<label>Editable POScreen</label>
<table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;"> <table id="edittable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;">
<thead style="background-color: #ddd;"> <thead style="background-color: #ddd;">
<tr> <tr>
@ -2539,7 +2540,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</tbody> </tbody>
</table> </table>
</div> <!-- </div> -->
</div> </div>
<?php } else { <?php } else {
} ?> } ?>
@ -3994,34 +3995,34 @@ if (!empty($getlogpodtl)) {
// PendingQuantity: quantity // PendingQuantity: quantity
// })); // }));
var rowHtml = ` var rowHtml = `
<tr id="${temp}"> <tr id="${temp}">
<td align="left">${temp}</td> <td align="left">${temp}</td>
<td align="left">${Reqnumber}</td> <td align="left">${Reqnumber}</td>
<td align="left">${materialCode}</td> <td align="left">${materialCode}</td>
<td align="left">${materialName}</td> <td align="left">${materialName}</td>
<td align="right">${quantity}</td> <td align="right">${quantity}</td>
<td align="left">${uom}</td> <td align="left">${uom}</td>
<td align="right">${itemRate}</td> <td align="right">${itemRate}</td>
<td align="right">${PER}</td> <td align="right">${PER}</td>
<td align="right">${service_description}</td> <td align="right">${service_description}</td>
<td align="right">${basicval}</td> <td align="right">${basicval}</td>
<td align="right">${TotalTaxValue}</td> <td align="right">${TotalTaxValue}</td>
<td align="right">${TotalOrderValue}</td> <td align="right">${TotalOrderValue}</td>
<td align="right">${quantity}</td> <td align="right">${quantity}</td>
<td align="right">0</td> <td align="right">0</td>
<td align="right">${quantity}</td> <td align="right">${quantity}</td>
<td> <td>
<a data-target='#EDITREVENUE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE"> <a data-target='#EDITREVENUE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
<i class="ri-pencil-fill"></i> <i class="ri-pencil-fill"></i>
</a> </a>
&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;
<a href='#' onclick="DeleteRow('${temp}')" class="link" data-id="${temp}" data-userid="${temp}" id="Del"> <a href='#' onclick="DeleteRow('${temp}')" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
<span class="ri-delete-bin-7-fill"></span> <span class="ri-delete-bin-7-fill"></span>
</a> </a>
</td> </td>
</tr> </tr>
`; `;
$('#RevenueAppend').append(rowHtml); $('#RevenueAppend').append(rowHtml);
@ -4062,9 +4063,9 @@ if (!empty($getlogpodtl)) {
addHidden(theForm, "per" + temp, PER); addHidden(theForm, "per" + temp, PER);
addHidden(theForm, "service_description" + temp, service_description); addHidden(theForm, "service_description" + temp, service_description);
$('#txtRowCount').val(temp); $('#txtRowCount').val(temp);
// $('#REVENUE').modal('hide');
populateValueMainFormForRevenue(); populateValueMainFormForRevenue();
clearRevenueModalFields(); clearRevenueModalFields();
$('#REVENUE').modal('hide');
} }
}); });
@ -4170,6 +4171,9 @@ if (!empty($getlogpodtl)) {
$('#service_description' + userid).val(Service_Description); $('#service_description' + userid).val(Service_Description);
populateValueMainFormForEditRevenueTax(); populateValueMainFormForEditRevenueTax();
setTimeout(() => {
$('#EDITREVENUE').modal('hide');
}, 1000);
} }
}); });
@ -4887,19 +4891,19 @@ if (!empty($getlogpodtl)) {
processData: false, processData: false,
contentType: false, contentType: false,
success: function(data) { success: function(data) {
console.log(data); // console.log(data);
// if (data) { if (data) {
// alert(data); alert(data);
// $('#txtRowCount').val(''); $('#txtRowCount').val('');
// $('#txtDeletedRow').val(''); $('#txtDeletedRow').val('');
// $('#txtStatus').val(''); $('#txtStatus').val('');
// $('#SpcialInstruction').val(''); $('#SpcialInstruction').val('');
// $('#txtDeliveryAddress').val('') $('#txtDeliveryAddress').val('')
// window.location = "purchaseorderListing"; window.location = "purchaseorderListing";
// } else { } else {
// alert("Error"); alert("Error");
// } }
}, },
error: function(jqXHR, textStatus, errorThrown) { error: function(jqXHR, textStatus, errorThrown) {

54
app/Views/editimportpo.php
View File

@ -565,7 +565,7 @@ if (!empty($getlogpodtl)) {
<label>Purchase Order Date</label> <label>Purchase Order Date</label>
<div > <div >
<?php <?php
$data = array('type' => 'date', 'name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>"> ?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
</div> </div>
@ -657,7 +657,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;"> <div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="text-danger">*</span></label> <label>Description of Payable Terms</label>
<div > <div >
<?php <?php
@ -714,10 +714,6 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-3"> <div class="form-group col-md-3">
</div> </div>
</div> </div>
<div class="form-row" align="right"> <div class="form-row" align="right">
<div class="col-md-4"> <div class="col-md-4">
@ -732,8 +728,6 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<br><br><br> <br><br><br>
<div class="box-body" style="margin-top: -3%;"> <div class="box-body" style="margin-top: -3%;">
<table id="ImportTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;"> <table id="ImportTax" class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
@ -4306,28 +4300,28 @@ if (!empty($getlogpodtl)) {
//alert('in'); //alert('in');
var rowHtml = ` var rowHtml = `
<tr id="${temp}"> <tr id="${temp}">
<td align="left">${temp}</td> <td align="left">${temp}</td>
<td align="left">${Reqnumber}</td> <td align="left">${Reqnumber}</td>
<td align="left">${materialCode}</td> <td align="left">${materialCode}</td>
<td align="left">${materialName}</td> <td align="left">${materialName}</td>
<td align="left">${quantity}</td> <td align="left">${quantity}</td>
<td align="left">${uom}</td> <td align="left">${uom}</td>
<td align="left">${itemRate}</td> <td align="left">${itemRate}</td>
<td align="left">${BasicAmt}</td> <td align="left">${BasicAmt}</td>
<td align="left">${receivedqty}</td> <td align="left">${receivedqty}</td>
<td align="left">${rejectedqty}</td> <td align="left">${rejectedqty}</td>
<td align="left">${pendingqty}</td> <td align="left">${pendingqty}</td>
<td> <td>
<a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel"> <a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel">
<i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i> <i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i>
</a>&nbsp;&nbsp;&nbsp; </a>&nbsp;&nbsp;&nbsp;
<a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del"> <a href='#' onclick="DeleteRow(${temp})" class="link" data-id="${temp}" data-userid="${temp}" id="Del">
<span class="ri-delete-bin-7-fill"></span> <span class="ri-delete-bin-7-fill"></span>
</a> </a>
</td> </td>
</tr> </tr>
`; `;
// Append the generated row HTML to the target element // Append the generated row HTML to the target element
$('#ImportAppend').append(rowHtml); $('#ImportAppend').append(rowHtml);

20
app/Views/editrequisitionform.php
View File

@ -81,7 +81,17 @@ td {
.th-Sno{ .th-Sno{
text-align:center !important; text-align:center !important;
width:15%; width:5%;
}
.th-uom{
text-align:center !important;
width:10%;
}
.th-status{
text-align:center !important;
width:10%;
} }
</style> </style>
@ -194,10 +204,10 @@ td {
<th class="th th-Sno" >SNo</th> <th class="th th-Sno" >SNo</th>
<th class="th th-materialCode">Material Code</th> <th class="th th-materialCode">Material Code</th>
<th class="th th-materialName">Material Name</th> <th class="th th-materialName">Material Name</th>
<th class="th">Uom</th> <th class="th th-uom">Uom</th>
<th class="th th-requestedQuantity">RequestedQuantity</th> <th class="th th-requestedQuantity">RequestedQuantity</th>
<th class="th th-PoQuantity">PoQuantity</th> <th class="th th-PoQuantity">PoQuantity</th>
<th class="th">Status</th> <th class="th th-status">Status</th>
<th class="th">Action</th> <th class="th">Action</th>
</tr> </tr>
</thead> </thead>
@ -216,10 +226,10 @@ td {
<input type="hidden" name="<?php echo 'te' . $index ?>" id="<?php echo 'tes' . $index ?>" value="<?php echo $record->Quantity; ?>" /> <input type="hidden" name="<?php echo 'te' . $index ?>" id="<?php echo 'tes' . $index ?>" value="<?php echo $record->Quantity; ?>" />
<td align="center"><?php echo $record->MaterialCode; ?></td> <td align="center"><?php echo $record->MaterialCode; ?></td>
<td align="left"><?php echo $record->MaterialName; ?></td> <td align="left"><?php echo $record->MaterialName; ?></td>
<td align="left"><?php echo $record->UOM; ?></td> <td align="center"><?php echo $record->UOM; ?></td>
<td align="center"><?php echo $record->Quantity; ?></td> <td align="center"><?php echo $record->Quantity; ?></td>
<td align="center"><?php echo $record->POQTY; ?></td> <td align="center"><?php echo $record->POQTY; ?></td>
<td align="left"><?php echo $record->StatusName; ?></td> <td align="center"><?php echo $record->StatusName; ?></td>
<input type="hidden" name="<?php echo 'materialdesc' . $index ?>" id="<?php echo 'materialdesc' . $index ?>" value="<?php echo isset($record->MaterialDescription) ? $record->MaterialDescription : ''; ?>" /> <input type="hidden" name="<?php echo 'materialdesc' . $index ?>" id="<?php echo 'materialdesc' . $index ?>" value="<?php echo isset($record->MaterialDescription) ? $record->MaterialDescription : ''; ?>" />
<td> <td>
<a data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-target='#edit-req-modal' data-toggle="modal" href="#edit-req-modal"><i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->MaterialCode; ?> Material details"></i>&nbsp;&nbsp;&nbsp;</a> <a onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $record->MaterialCode; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a> <a data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-target='#edit-req-modal' data-toggle="modal" href="#edit-req-modal"><i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->MaterialCode; ?> Material details"></i>&nbsp;&nbsp;&nbsp;</a> <a onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $record->MaterialCode; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>

9
app/Views/purchaseorder.php
View File

@ -1981,7 +1981,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Revenue Type Options</label> <label>Revenue Type Options<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
@ -2017,7 +2017,7 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
<div class="form-group col-md-3" id="otheroptiondiv" style="display:none;"> <div class="form-group col-md-3" id="otheroptiondiv" style="display:none;">
<label>Description of Payable Terms<span class="badge mandatory">*</span></label> <label>Description of Payable Terms</label>
<div> <div>
<?php <?php
$data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control'); $data = array('name' => 'Otherpayment', 'Otherpayment' => set_value('Otherpayment'), 'id' => 'Otherpayment', 'class' => 'form-control');
@ -2047,7 +2047,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label for="BudgetType">Budget Type</label> <label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
<?php <?php
@ -2069,7 +2069,7 @@ if (!empty($INRSYMBOL)) {
<!-- Table --> <!-- Table -->
<div class="form-row"> <div class="form-row">
<div class="table-responsive"> <div class="table-responsive" style="padding-bottom: 30px;">
<table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;"> <table id="revenueTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead> <thead>
<tr> <tr>
@ -2091,7 +2091,6 @@ if (!empty($INRSYMBOL)) {
</table> </table>
</div> </div>
</div> </div>
</br>
<!-- /.table --> <!-- /.table -->
<div class="form-row"> <div class="form-row">

156
app/Views/servicePurchaseorder.php
View File

@ -561,86 +561,86 @@ if (!empty($INRSYMBOL)) {
clearTotalItemValues(); clearTotalItemValues();
$('#Edit').click(function() { $('#Edit').click(function() {
console.log("1111111111111111111"); console.log("1111111111111111111");
// tinyMCE.triggerSave(); // tinyMCE.triggerSave();
console.log("2222222222222222"); console.log("2222222222222222");
if (validateEditServiceTax()) {
alert('inside Add');
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();
var editDescription = $("#EditItemName").val();
var editUOM = $('#EditUOM').val();
var editPer = '';
if ($("#EditPer").val().trim() == '') {
editPer = $("#EditUOM").val();
} else {
editPer = $("#EditPer").val();
}
var editQuantity = $('#EditQuantity').val();
var itemRate = $("#EditRate").val();
var Cgst = $("#EditCgst").val();
var AfterCgst = $("#EditAfterCgst").val();
var Sgst = $("#EditSgst").val();
var AfterSgst = $("#EditAfterSgst").val();
var Igst = $("#EditIgst").val();
var AfterIgst = $("#EditAfterIgst").val();
var Frequency = $("#EditFrequency").val();
var FrequencyValue = $("#EditFrequencyNo").val();
var ServiceDescription = $('#EdittxtSpcialInstruction').val();
var OtherAmt = $('#EditOtherAllowances').val();
var TotalOrderValue = $("#EditTotalOrderValue ").val();
var basicval = $("#txtEditBasicValue").val();
var TotalTaxValue = calculateEditTaxValue();
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
cellval[4].innerHTML = editQuantity;
cellval[5].innerHTML = editUOM;
cellval[6].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[7].innerHTML = parseFloat(basicval).toFixed(2);
cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[9].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(editDescription);
$('#uom' + userid).val(editUOM);
$('#per' + userid).val(editPer);
$('#quantity' + userid).val(editQuantity);
$('#itemRate' + userid).val(itemRate);
$('#Cgst' + userid).val(Cgst);
$('#AfterCgst' + userid).val(AfterCgst);
$('#Sgst' + userid).val(Sgst);
$('#AfterSgst' + userid).val(AfterSgst);
$('#Igst' + userid).val(Igst);
$('#AfterIgst' + userid).val(AfterIgst);
$('#ItemDescription' + userid).val(ServiceDescription);
$('#OtherAmt' + userid).val(OtherAmt);
$('#TotalOrderValue' + userid).val(TotalOrderValue);
populateValueMainFormForEditServiceTax();
if (validateEditServiceTax()) {
alert('inside Add');
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();
var editDescription = $("#EditItemName").val();
var editUOM = $('#EditUOM').val();
var editPer = '';
if ($("#EditPer").val().trim() == '') {
editPer = $("#EditUOM").val();
} else {
editPer = $("#EditPer").val();
} }
var editQuantity = $('#EditQuantity').val();
var itemRate = $("#EditRate").val(); });
var Cgst = $("#EditCgst").val();
var AfterCgst = $("#EditAfterCgst").val();
var Sgst = $("#EditSgst").val();
var AfterSgst = $("#EditAfterSgst").val();
var Igst = $("#EditIgst").val();
var AfterIgst = $("#EditAfterIgst").val();
var Frequency = $("#EditFrequency").val();
var FrequencyValue = $("#EditFrequencyNo").val();
var ServiceDescription = $('#EdittxtSpcialInstruction').val();
var OtherAmt = $('#EditOtherAllowances').val();
var TotalOrderValue = $("#EditTotalOrderValue ").val();
var basicval = $("#txtEditBasicValue").val();
var TotalTaxValue = calculateEditTaxValue();
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
cellval[4].innerHTML = editQuantity;
cellval[5].innerHTML = editUOM;
cellval[6].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[7].innerHTML = parseFloat(basicval).toFixed(2);
cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[9].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(editDescription);
$('#uom' + userid).val(editUOM);
$('#per' + userid).val(editPer);
$('#quantity' + userid).val(editQuantity);
$('#itemRate' + userid).val(itemRate);
$('#Cgst' + userid).val(Cgst);
$('#AfterCgst' + userid).val(AfterCgst);
$('#Sgst' + userid).val(Sgst);
$('#AfterSgst' + userid).val(AfterSgst);
$('#Igst' + userid).val(Igst);
$('#AfterIgst' + userid).val(AfterIgst);
$('#ItemDescription' + userid).val(ServiceDescription);
$('#OtherAmt' + userid).val(OtherAmt);
$('#TotalOrderValue' + userid).val(TotalOrderValue);
populateValueMainFormForEditServiceTax();
}
});
}); });
</script> </script>
@ -946,7 +946,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div><!-- 6. form-row div closed here --> </div><!-- 6. form-row div closed here -->
<div class="form-row"> <div class="form-row">
<div class="table-responsive"> <div class="table-responsive" style="padding-bottom: 30px;">
<table id="serviceTax" class="table table-striped table-hover mb-0" style="font-size:12px;"> <table id="serviceTax" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead> <thead>
<tr> <tr>
@ -2337,7 +2337,7 @@ if (!empty($INRSYMBOL)) {
$('#Otherpayment').focus(); $('#Otherpayment').focus();
return false; return false;
}else { } else {
return true; return true;
} }
} }