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

alterpurchaseorder changes by vadive J

Browse Source
This commit is contained in:
vadivel J 2024-09-19 17:54:36 +05:30
commit 84ce0d0fd7
12 changed files with 3567 additions and 3552 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Controllers/Payslip.php
View File

@ -75,6 +75,7 @@ class Payslip extends BaseController
$loan = []; $loan = [];
$loanHistory = []; $loanHistory = [];
$loan_id = 0; $loan_id = 0;
$BalanceAdvance = 0;
if(is_null($result->Loan_ID)){ if(is_null($result->Loan_ID)){
}else{ }else{
@ -95,6 +96,7 @@ class Payslip extends BaseController
'Due_Date' => $PayOn, 'Due_Date' => $PayOn,
]; ];
$BalanceAdvance = $result->Loan_Amount - ($result->Paid_Amount + $result->Loan_Recovered);
} }
@ -121,14 +123,18 @@ class Payslip extends BaseController
'Festival_Bonus' => $result->Festival_Bonus, 'Festival_Bonus' => $result->Festival_Bonus,
'TotalSalary' => $result->Estimate, 'TotalSalary' => $result->Estimate,
'Advance' => $result->Loan_Recovered, 'Advance' => $result->Loan_Recovered,
'BalanceAdvance' => 0, 'BalanceAdvance' => $BalanceAdvance,
'LessAdvance' => 0, 'LessAdvance' => 0,
'BankAccountNumber' => $result->BankAccountNo, 'BankAccountNumber' => $result->BankAccountNo,
'PFNumber' => $result->PFNO, 'PFNumber' => $result->PFNO,
'ESINumber' => $result->ESINO, 'ESINumber' => $result->ESINO,
'UANNO' => $result->PFNO, 'UANNO' => $result->PFNO,
]; ];
// print_r($result);
// print_r($loan);
// print_r($loanHistory);
// print_r($data);
// die;
$insert = $this->payroll_model->insertPayroll($data); $insert = $this->payroll_model->insertPayroll($data);
if($insert){ if($insert){
if(count($loan)){ if(count($loan)){

66
app/Views/EditservicePurchaseorder.php
View File

@ -1085,7 +1085,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="table-responsive"> <div class="table-responsive" 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>
@ -1437,7 +1437,9 @@ if (!empty($getlogpodtl)) {
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br> <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" /> </div> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if(isset($index)){ echo $index; }?>"> <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if (isset($index)) {
echo $index;
} ?>">
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" /> <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
@ -1461,11 +1463,15 @@ if (!empty($getlogpodtl)) {
</div> </div>
<label>Request On : </label><?php if(isset($Reqon)){ echo $Reqon; } ?><br /> <label>Request On : </label><?php if (isset($Reqon)) {
<?php if(isset($RequesterName)){ if ($RequesterName != '' || $RequesterName != null) { ?> echo $Reqon;
} ?><br />
<?php if (isset($RequesterName)) {
if ($RequesterName != '' || $RequesterName != null) { ?>
<label>Request By : </label><?php echo $RequesterName; ?><br /> <label>Request By : </label><?php echo $RequesterName; ?><br />
<?php <?php
}} ?> }
} ?>
<!-- <label>Status : </label><?php echo $StatusName; ?> --> <!-- <label>Status : </label><?php echo $StatusName; ?> -->
<label>Status : </label><?php <label>Status : </label><?php
$statusMappings = [ $statusMappings = [
@ -1729,7 +1735,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
<a class="btn btn-success font AddService" ID="AddService"><span class="bold">Add Service</span></a> <a class="btn btn-success font AddService" ID="AddService"><span class="bold">Add Service</span></a>
</div> </div>
</form> </form>
@ -2337,7 +2343,9 @@ if (!empty($getlogpodtl)) {
</tr> </tr>
</script> --> </script> -->
<script> <script>
var index = <?php if(isset($index)){ echo $index; } ?>; var index = <?php if (isset($index)) {
echo $index;
} ?>;
var userid = ''; var userid = '';
var SelectedMaterialCode = []; var SelectedMaterialCode = [];
var CollIndex = 0; var CollIndex = 0;
@ -2442,17 +2450,16 @@ if (!empty($getlogpodtl)) {
<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="right">${quantity}</td>
<td align="left">${uom}</td> <td align="left">${uom}</td>
<td align="left">${itemRate}</td> <td align="right">${itemRate}</td>
<td align="left">${basicval}</td> <td align="right">${basicval}</td>
<td align="left">${TotalTaxValue}</td> <td align="right">${TotalTaxValue}</td>
<td align="left">${TotalOrderValue}</td> <td align="right">${TotalOrderValue}</td>
<td> <td>
<a data-target='#EDITSERVICE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITSERVICE"> <a data-target='#EDITSERVICE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITSERVICE">
<i class="ri-pencil-fill" data-toggle="tooltip" ></i> <i class="ri-pencil-fill" data-toggle="tooltip" ></i>
</a> </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>
@ -2495,6 +2502,9 @@ $('#ServiceAppend').append(rowHtml);
$('#txtRowCount').val(temp); $('#txtRowCount').val(temp);
clearServiceModalFields(); clearServiceModalFields();
setTimeout(() => {
$('#SERVICE').modal('hide');
}, 1000);
} }
}); });
@ -3009,20 +3019,21 @@ $('#ServiceAppend').append(rowHtml);
processData: false, processData: false,
contentType: false, contentType: false,
success: function(data) { success: function(data) {
if (data) { console.log(data);
// $('#content').loader('hide'); // if (data) {
alert(data); // // $('#content').loader('hide');
$('#txtRowCount').val(''); // alert(data);
$('#txtDeletedRow').val(''); // $('#txtRowCount').val('');
$('#txtStatus').val(''); // $('#txtDeletedRow').val('');
$('#SpcialInstruction').val(''); // $('#txtStatus').val('');
$('#txtDeliveryAddress').val('') // $('#SpcialInstruction').val('');
window.location = "purchaseorderListing"; // $('#txtDeliveryAddress').val('')
// window.location = "purchaseorderListing";
} else { // } else {
// $('#content').loader('hide'); // // $('#content').loader('hide');
alert("Error"); // alert("Error");
} // }
} }
@ -3420,7 +3431,8 @@ $('#ServiceAppend').append(rowHtml);
}); });
} }
});}); });
});
$("#insuranceStatus").change(function() { $("#insuranceStatus").change(function() {
var InsNo = '<?php echo $InsuranceNumber; ?>'; var InsNo = '<?php echo $InsuranceNumber; ?>';

3
app/Views/alterpurchaseorder.php
View File

@ -2682,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');
@ -6838,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...");

19
app/Views/attendance.php
View File

@ -244,12 +244,9 @@ $currentday = date('d');
<tr> <tr>
<th class="celda_encabezado_general" rowspan="2">S.NO</th> <th class="celda_encabezado_general">S.NO</th>
<th class="celda_encabezado_general" rowspan="2">Employee ID</th> <th class="celda_encabezado_general" >Employee ID</th>
<th style="background-color: #00a65a;color:#fff;border:5px" <th style="background-color: #00a65a;color:#fff;border:5px">Employee Name</th>
rowspan="2">Employee Name</th>
<?php <?php
for ($col = 1; $col <= $monthdays; $col++) { for ($col = 1; $col <= $monthdays; $col++) {
@ -332,6 +329,7 @@ $currentday = date('d');
</thead> </thead>
<tbody style="background-color: #fff;"> <tbody style="background-color: #fff;">
<?php $index = 0; <?php $index = 0;
$row = 0; $row = 0;
foreach ($finalarray as $a) { foreach ($finalarray as $a) {
@ -504,6 +502,7 @@ $currentday = date('d');
resetFinalValues(); resetFinalValues();
var Totalnoofdays = <?php echo $monthdays ?>; var Totalnoofdays = <?php echo $monthdays ?>;
var alldata = $("#attendance").tableToJSON(); var alldata = $("#attendance").tableToJSON();
alldata = JSON.stringify(alldata); alldata = JSON.stringify(alldata);
@ -544,7 +543,7 @@ $currentday = date('d');
} }
}); });
//alert(totaldata+"-Employees attendance saved sucessfully..!");
} else { } else {
alert('Plesae Provide Working Hrs and OT Hrs Correctly..!'); alert('Plesae Provide Working Hrs and OT Hrs Correctly..!');
} }
@ -897,7 +896,6 @@ $currentday = date('d');
var totaldays = <?php echo $monthdays ?>; var totaldays = <?php echo $monthdays ?>;
console.log(totalrowcount); console.log(totalrowcount);
for (i = 1; i <= totalrowcount; i++) { for (i = 1; i <= totalrowcount; i++) {
//alert('inside for'); //alert('inside for');
// var a = parseFloat(document.getElementById(i+'PL').textContent); // var a = parseFloat(document.getElementById(i+'PL').textContent);
var b = parseFloat(document.getElementById(i + 'AB').textContent); var b = parseFloat(document.getElementById(i + 'AB').textContent);
@ -906,10 +904,7 @@ $currentday = date('d');
//document.getElementById(i+'PL').textContent = '0.00'; //document.getElementById(i+'PL').textContent = '0.00';
document.getElementById(i + 'AB').textContent = '0.00'; document.getElementById(i + 'AB').textContent = '0.00';
} }
} }
} }
</script> </script>

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]);

127
app/Views/editCapitalPo.php
View File

@ -174,8 +174,6 @@
?> ?>
<style> <style>
.dataTables_paginate { .dataTables_paginate {
margin-top: -5%; margin-top: -5%;
} }
@ -870,10 +868,10 @@
<div class="form-row"> <div class="form-row">
<div class="col-md-9" align="right" style="padding:10px"> <!-- <div class="col-md-9" align="right" style="padding:10px"> -->
<!-- <input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT --> <!-- <input type="checkbox" id="IsOpenOrder" name="IsOpenOrder" value="1"> IS THIS OPEN ORDER FORMAT -->
</div> <!-- </div> -->
<div class="form-group col-md-1" align=" right"> <div class="form-group col-md-12" align=" right">
<?php if ($POStatus == PO_DRAFT || $POStatus == PO_CREATED) { ?> <?php if ($POStatus == PO_DRAFT || $POStatus == PO_CREATED) { ?>
<a data-toggle="modal"><button type="submit" onclick="myFunction();" class="btn btn-success" 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 } ?>
@ -920,19 +918,19 @@
<td><?php echo $record->ReqNo ?></td> <td><?php echo $record->ReqNo ?></td>
<td><?php echo $record->MaterialCode ?></td> <td><?php echo $record->MaterialCode ?></td>
<td><?php echo $record->MaterialName ?></td> <td><?php echo $record->MaterialName ?></td>
<td><?php echo $record->Quantity ?></td> <td align="right"><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td> <td align="right"><?php echo $record->UOM ?></td>
<td><?php echo $record->Rate ?></td> <td align="right"><?php echo $record->Rate ?></td>
<td><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td> <td align="right"><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
<?php if ($CapitalRange == '1') { ?> <?php if ($CapitalRange == '1') { ?>
<td><?php echo $record->ServiceTaxamount; ?></td> <td align="right"><?php echo $record->ServiceTaxamount; ?></td>
<td><?php echo number_format($record->Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?></td> <td align="right"><?php echo number_format($record->Rate * $record->Quantity + $record->ServiceTaxamount + $record->otherallowance + $record->Afvalue - $record->Afterdiscountval, 2, '.', '') ?></td>
<?php } ?> <?php } ?>
<?php if ($CapitalRange == '0') { ?> <?php if ($CapitalRange == '0') { ?>
<td><?php echo '0'; ?></td> <td align="right"><?php echo '0'; ?></td>
<td><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td> <td align="right"><?php echo number_format($record->Rate * $record->Quantity, 2, '.', '') ?></td>
<?php } ?> <?php } ?>
@ -1520,8 +1518,7 @@
<form> <form>
<div class="modal-body p-4"> <div class="modal-body p-4">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-5" style="padding:0px;"> <div class="form-group col-md-2" style="padding:0px">
<div class="form-group col-md-6" style="padding:0px">
<label>Req No<span class="text-danger">*</span></label> <label>Req No<span class="text-danger">*</span></label>
<div> <div>
@ -1541,7 +1538,7 @@
</div> </div>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-2">
<label>Department Name</label> <label>Department Name</label>
<div> <div>
<?php <?php
@ -1550,9 +1547,7 @@
?> ?>
</div> </div>
</div> </div>
</div> <div class="form-group col-md-2">
<div class="form-group col-md-5">
<div class="form-group col-md-6">
<label>Cost Center Code</label> <label>Cost Center Code</label>
<div> <div>
<?php <?php
@ -1563,7 +1558,7 @@
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-2">
<label>Avail Bud Amount<?php echo "($INR)" ?></label> <label>Avail Bud Amount<?php echo "($INR)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1572,7 +1567,6 @@
?> ?>
</div> </div>
</div> </div>
</div>
<div class="form-group col-md-2" id="ExchangeRateModalDiv" style="display:none;padding-right: 0px;"> <div class="form-group col-md-2" id="ExchangeRateModalDiv" style="display:none;padding-right: 0px;">
<label> Exchange Rate</label> <label> Exchange Rate</label>
<div class="form-group"> <div class="form-group">
@ -1585,8 +1579,7 @@
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-6" style="padding:0px"> <div class="form-group col-md-2">
<div class="form-group col-md-3">
<label>Item Code<span class="text-danger">*</span></label> <label>Item Code<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
@ -1595,7 +1588,7 @@
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-2">
<label>Item Name</label> <label>Item Name</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1604,8 +1597,7 @@
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-1">
<div class="form-group col-md-3">
<label>UOM</label> <label>UOM</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1614,7 +1606,7 @@
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-2">
<label>Quantity<span class="text-danger">*</span></label> <label>Quantity<span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1623,10 +1615,7 @@
?> ?>
</div> </div>
</div> </div>
</div> <div class="form-group col-md-2" style="padding: 0px;">
<div class="form-group col-md-6" style="padding: 0px;">
<div class="form-group col-md-4" style="padding: 0px;">
<label id="RateIn">Rate(In INR /UOM)</label><span class="text-danger">*</span> <label id="RateIn">Rate(In INR /UOM)</label><span class="text-danger">*</span>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1635,12 +1624,12 @@
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-1">
<label>Per</label> <?php <label>Per</label> <?php
$data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer', 'class' => 'form-control'); $data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer', 'class' => 'form-control');
echo form_input($data); ?> echo form_input($data); ?>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-2">
<label id="TotalAmount">Basic value <?php echo "($INR)" ?></label> <label id="TotalAmount">Basic value <?php echo "($INR)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -1650,7 +1639,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="form-row" style="padding:2%"> <div class="form-row" style="padding:2%">
<div class="form-row" id="ADDCAPdiv" style="padding:0px;"> <div class="form-row" id="ADDCAPdiv" style="padding:0px;">
@ -1877,7 +1865,7 @@
<div class="form-row" style="padding:1%;"></div> <div class="form-row" style="padding:1%;"></div>
<div class="form-row" style="border:1px solid #000;padding:0px;" id="ModalImportTaxHide" style="display:none;"> <div class="form-row" style="border:1px solid #000;padding:0px;" id="ModalImportTaxHide" style="display:none;">
<br /> <br />
<div class="form-group col-md-6" style="padding:0px;"> <div class="form-group col-md-6" style="padding:10px;">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Basic Price <?php echo "($INR)" ?> Basic Price <?php echo "($INR)" ?>
@ -2008,7 +1996,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-6" style="padding:0px;"> <div class="form-group col-md-6" style="padding:10px;">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<!-- Subtotal (E)<?php echo "($INR)" ?> --> <!-- Subtotal (E)<?php echo "($INR)" ?> -->
@ -2202,8 +2190,6 @@
<div class="form-group col-md-4" style="margin-top: -25px;"> <div class="form-group col-md-4" style="margin-top: -25px;">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<span><?php echo "Nett per UOM($INR)"; ?></span> <span><?php echo "Nett per UOM($INR)"; ?></span>
</div>
<div class="form-group col-md-4">
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'Nett', 'value' => set_value('Nett', 0), 'id' => 'Nett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -2211,6 +2197,9 @@
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-4">
</div>
</div> </div>
@ -2219,19 +2208,18 @@
</div> </div>
</div> </div>
<div class="form-row" style="padding: 0px 30px 10px 30px;text-align: left;">
<div class="form-row" style="padding: 20px 30px 10px 30px;text-align: left;">
<div class="form-group col-md-12">
<label>Capital Description </label> <label>Capital Description </label>
<?php <?php
$data = array('name' => 'ItemDescription', 'value' => set_value('ItemDescription'), 'id' => 'ItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); $data = array('name' => 'ItemDescription', 'value' => set_value('ItemDescription'), 'id' => 'ItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?> echo form_textarea($data); ?>
</div> </div>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:20px;">Cancel</a>
<a class="btn btn-success font AddCapital" ID="AddCapital"> &nbsp;&nbsp;<span class="bold">Add Capital</span></a> <a class="btn btn-success font AddCapital" ID="AddCapital"> &nbsp;&nbsp;<span class="bold">Add Capital</span></a>
</div> </div>
</form> </form>
@ -2585,11 +2573,10 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="form-row" style="padding:1%;"></div> <div class="form-row" style="padding:1%;"></div>
<div class="form-row" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide" style="display:none;"> <div class="form-row" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide" style="display:none;">
<br /> <br />
<div class="form-group col-md-6" style="padding:0px;"> <div class="form-group col-md-6" style="padding:10px;">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Basic Price <?php echo "($INR)" ?> Basic Price <?php echo "($INR)" ?>
@ -2720,7 +2707,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-6" style="padding:0px;"> <div class="form-group col-md-6" style="padding:10px;">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Subtotal (E) <?php echo "($INR) (A+B+C+D)" ?> Subtotal (E) <?php echo "($INR) (A+B+C+D)" ?>
@ -2908,8 +2895,6 @@
<div class="form-group col-md-4" style="margin-top: -25px;"> <div class="form-group col-md-4" style="margin-top: -25px;">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<span><?php echo "Nett per UOM($INR)"; ?></span> <span><?php echo "Nett per UOM($INR)"; ?></span>
</div>
<div class="form-group col-md-4">
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'EditNett', 'value' => set_value('EditNett'), 'id' => 'EditNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -2917,6 +2902,9 @@
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-4">
</div>
@ -2924,17 +2912,12 @@
</div> </div>
</div> </div>
<div class="form-row" style="padding: 0px 30px 10px 30px;text-align: left;"> <div class="form-row" style="padding: 0px 30px 10px 30px;text-align: left;">
<label>Capital Description </label> <label>Capital Description </label>
<?php <?php
$data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); $data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?> echo form_textarea($data); ?>
</div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
@ -3627,8 +3610,6 @@
<div class="form-group col-md-4" style="margin-top: -25px;"> <div class="form-group col-md-4" style="margin-top: -25px;">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<span><?php echo "Nett per UOM($INR)"; ?></span> <span><?php echo "Nett per UOM($INR)"; ?></span>
</div>
<div class="form-group col-md-4">
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'ViewNett', 'value' => set_value('ViewNett'), 'id' => 'ViewNett', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
@ -3636,6 +3617,9 @@
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-4">
</div>
@ -4784,15 +4768,12 @@
<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="right">${quantity}</td>
<td align="left">${uom}</td> <td align="right">${uom}</td>
<td align="left">${itemRate}</td> <td align="right">${itemRate}</td>
<td align="left">${basicval}</td> <td align="right">${basicval}</td>
<td align="left">${TotalTaxValue}</td> <td align="right">${TotalTaxValue}</td>
<td align="left">${Total}</td> <td align="right">${Total}</td>
<td align="left">${quantity}</td>
<td align="left">0</td>
<td align="left">${quantity}</td>
<td> <td>
<a data-target='#EDITCAPITAL' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE"> <a data-target='#EDITCAPITAL' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
<i class="ri-pencil-fill" data-toggle="tooltip" ></i> <i class="ri-pencil-fill" data-toggle="tooltip" ></i>
@ -4886,6 +4867,7 @@
clearCapitalModalFields(); clearCapitalModalFields();
$('#CAPITAL').modal('hide');
} }
}); });
@ -5352,7 +5334,7 @@
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails", url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
success: function(data) { success: function(data) {
if (data) { if (data) {
$('#content').loader('hide'); // $('#content').loader('hide');
alert(data); alert(data);
} else { } else {
alert("Error"); alert("Error");
@ -5579,6 +5561,10 @@
} }
$(document).ready(function() { $(document).ready(function() {
setTimeout(() => {
$('#drpFreight').addClass('form-control');
}, 1000);
/* get Edit Capital Po Modal*/ /* get Edit Capital Po Modal*/
$("#EDITCAPITAL").on("shown.bs.modal", function(e) { $("#EDITCAPITAL").on("shown.bs.modal", function(e) {
@ -5859,7 +5845,8 @@
tinyMCE.get('ViewItemDescription').setContent($('#CapitalItemDescrition' + userid).val()); tinyMCE.get('ViewItemDescription').setContent($('#CapitalItemDescrition' + userid).val());
});}); });
});
/*get edit material list*/ /*get edit material list*/
$('#EditMaterialCode').change(function() { $('#EditMaterialCode').change(function() {
@ -6000,7 +5987,7 @@
//alert('else'); //alert('else');
$('#content').loader('show'); // $('#content').loader('show');
//alert('ss'); //alert('ss');
var formData = new FormData($('.CapitalPO')[0]); var formData = new FormData($('.CapitalPO')[0]);
formData.append('ExchangeRateOn', ExchangeRateOn); formData.append('ExchangeRateOn', ExchangeRateOn);
@ -6016,7 +6003,7 @@
success: function(data) { success: function(data) {
if (data) { if (data) {
alert(data); alert(data);
$('#content').loader('hide'); // $('#content').loader('hide');
$('#txtRowCount').val(''); $('#txtRowCount').val('');
$('#txtDeletedRow').val(''); $('#txtDeletedRow').val('');
@ -6027,7 +6014,7 @@
window.location = "purchaseorderListing"; window.location = "purchaseorderListing";
} else { } else {
$('#content').loader('hide'); // $('#content').loader('hide');
alert("Error"); alert("Error");
} }

42
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 {
} ?> } ?>
@ -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) {

10
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;">

69
app/Views/monthlypayinputs.php
View File

@ -1,15 +1,21 @@
<?php <?php
$sample = array_merge($month, $fresh); // $sample = array_merge($month, $fresh);
$show_hide_column_value = true; // $show_hide_column_value = true;
//print_r($sample);die(); // echo '<pre>';
foreach ($sample as $s) { // print_r($month);
if (!empty($s->Key)) { // print_r($fresh);
$show_hide_column_value = false; // print_r($sample);
} else { // echo '<pre>';
$show_hide_column_value = true;
} // foreach ($sample as $s) {
break; // if (!empty($s->Key)) {
} // $show_hide_column_value = false;
// } else {
// $show_hide_column_value = true;
// }
// break;
// }
$sample = $fresh;
$ex = explode('-', $dropdownvalue); $ex = explode('-', $dropdownvalue);
@ -219,6 +225,7 @@
$index = 0; $index = 0;
$i = 0; $i = 0;
foreach ($sample as $i => $record) { foreach ($sample as $i => $record) {
$index++; $index++;
if (in_array($record->EmpID, $testarray)) { if (in_array($record->EmpID, $testarray)) {
$index--; $index--;
@ -233,9 +240,10 @@
<td style="max-width:80px"><?php echo $record->FirstName; ?></td> <td style="max-width:80px"><?php echo $record->FirstName; ?></td>
<td style="max-width:80px"> <td style="max-width:80px">
<?php <?php
$date = DateTime::createFromFormat('Y-m-d H:i:s', $record->DateofJoining); echo $record->DateofJoining;
$newDateFormat = $date->format('d-m-Y'); // $date = DateTime::createFromFormat('Y-m-d H:i:s', $record->DateofJoining);
echo $newDateFormat; // $newDateFormat = $date->format('d-m-Y');
// echo $newDateFormat;
?> ?>
</td> </td>
<td style="max-width:80px"><?php echo $record->Designation; ?></td> <td style="max-width:80px"><?php echo $record->Designation; ?></td>
@ -325,13 +333,32 @@
<td id="monthDue<?php echo $index ?>" <!-- <td id="monthDue<?php echo $index ?>" onkeypress="return isNumber(event);" onkeyup="changeInput(event);"
<?php if (empty($record->Key)) { <?php if (empty($record->Key)) {
echo "contenteditable='false';"; echo "contenteditable='false';";
} ?> } ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated" <?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;" style="text-align:right;color:blue;"
<?php } else { ?>style="text-align:right;" <?php } ?>> <?php } else { ?>style="text-align:right;" <?php } ?>>
<?php if (!empty($record->Monthly_Due)) {
echo $record->Monthly_Due;
$totalmonthloan[] = $record->Monthly_Due;
} else {
echo number_format(0.00, 2, '.', '');
} ?>
</td> -->
<td id="monthDue<?php echo $index ?>" onkeypress="return isNumber(event);" onkeyup="changeInput(event);"
<?php if (empty($record->Key)) {
echo "contenteditable='true';";
} ?>
<?php if (!empty($record->Key)) { ?> title="Payslip Calculated"
style="text-align:right;color:blue;"
<?php } else { ?>style="text-align:right;" <?php } ?>>
<?php if (!empty($record->Monthly_Due)) { <?php if (!empty($record->Monthly_Due)) {
echo $record->Monthly_Due; echo $record->Monthly_Due;
$totalmonthloan[] = $record->Monthly_Due; $totalmonthloan[] = $record->Monthly_Due;
@ -342,16 +369,6 @@
<?php ?>
<!-- else{ echo number_format(0.00,2,'.','');;} -->
<td id="otherDet<?php echo $index ?>" onkeypress="return isNumber(event);" onkeyup="changeInput(event);" <td id="otherDet<?php echo $index ?>" onkeypress="return isNumber(event);" onkeyup="changeInput(event);"
<?php if (empty($record->Key)) { <?php if (empty($record->Key)) {
echo "contenteditable='true';"; echo "contenteditable='true';";
@ -589,7 +606,7 @@
alldata = JSON.stringify(alldata) alldata = JSON.stringify(alldata)
// Parse the JSON string back into an array of objects // Parse the JSON string back into an array of objects
alldata = JSON.parse(alldata); alldata = JSON.parse(alldata);
console.log(alldata);
// Filter out objects where "Emp ID" is empty // Filter out objects where "Emp ID" is empty
alldata = alldata.filter(function(item) { alldata = alldata.filter(function(item) {
return item["Emp ID"].trim() !== ""; return item["Emp ID"].trim() !== "";

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">

2
app/Views/servicePurchaseorder.php
View File

@ -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>