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:
vadivelJ96 2025-03-24 18:03:09 +05:30
commit ae178e477a
8 changed files with 504 additions and 590 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/Emergencypurchaseorder.php
View File

@ -208,7 +208,9 @@ class Emergencypurchaseorder extends BaseController
$newPONO = generate_po_number($lastPONO); $newPONO = generate_po_number($lastPONO);
// PO Master // PO Master
$POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'ServiceWorkStatus' => $ServiceWorkStatus, 'POType' => $POType, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder); $POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'Status' => $POStatus, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'ServiceWorkStatus' => $ServiceWorkStatus, 'POType' => $POType, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'Description_Of_Service' => $DescriptionOfPo, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder);
$file = $this->request->getFile('POFile'); $file = null;
if($POType == "SERVICE"){ $file = $this->request->getFile('ServiceFile');}
if($POType == "REVENUE"){ $file = $this->request->getFile('RevenueFile');}
if($file !== null){ if($file !== null){
$requestfilename = $file->getName(); $requestfilename = $file->getName();
if (!empty($requestfilename)) { if (!empty($requestfilename)) {

2
app/Controllers/Inwardgateregister.php
View File

@ -1442,6 +1442,8 @@ function updateIGRWeight(){
if ($value1 != $value && $key1 == $key) { if ($value1 != $value && $key1 == $key) {
$value = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value) : $value; $value = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value) : $value;
$value1 = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value1) : $value1; $value1 = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value1) : $value1;
$value = ($key1 == "TransporterId") ? $this->inwardgateregister_model->get_TransporterId($value) : $value;
$value1 = ($key1 == "TransporterId") ? $this->inwardgateregister_model->get_TransporterId($value1) : $value1;
// Store each changed field in an array // Store each changed field in an array
$history_entries[] = [ $history_entries[] = [
'field' => $key1, 'field' => $key1,

11
app/Models/Inwardgateregister_model.php
View File

@ -1361,5 +1361,16 @@ $builder = $this->db->table('t_igr_history')
return $StatusName; return $StatusName;
} }
public function get_TransporterId($value){
$builder = $this->db->table('t_transporter')
->select('id,name')
->where('id', $value);
$query = $builder->get()->getRow();
$transportername = $query ? $query->name : null;
return $transportername;
}
} }

26
app/Views/EditservicePurchaseorder.php
View File

@ -1619,31 +1619,17 @@ if (!empty($getlogpodtl)) {
<label>Select Purchase Order File</label><br> <label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile"> <input type="file" name="POFile" id="POFile">
</div> </div>
</div> <?php if ($PrePOFile) { ?>
<div id="deletePreviousPurchaseOrderFileDiv">
<?php if (!empty($PrePOFile)) { <div class="form-group col-md-12 px-4">
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile; <label for="deletePreviousPurchaseOrderFile"><a title="previously uploaded PO File"
if (file_exists($PrePOFilePath)) { ?> href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded purchase order file- </span><small><?= $PrePOFile; ?></small></a></label>
<div class="form-row">
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
<br />
<label><a title="previously uploaded PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>previously uploaded purchase order file- </span>
<small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button> <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div> </div>
</div> </div>
<?php } ?>
<?php } ?> <?php } ?>
</div>
<!-- ends here --> <!-- ends here -->

118
app/Views/alterpurchaseorder.php
View File

@ -3049,7 +3049,7 @@ if (!empty($INRSYMBOL)) {
<label> <label>
Select Purchase Order File Select Purchase Order File
</label><br> </label><br>
<input type="file" name="POFiles" id="POFiles"><br> <input type="file" name="RevenueFile" id="RevenueFile"><br>
</div> </div>
</div> </div>
@ -3155,7 +3155,7 @@ if (!empty($INRSYMBOL)) {
<label> <label>
Select Purchase Order File Select Purchase Order File
</label><br> </label><br>
<input type="file" name="POFile" id="POFile"><br> <input type="file" name="ServiceFile" id="ServiceFile"><br>
</div> </div>
</div> </div>
@ -5208,6 +5208,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<!-- Modal for CST Calculation --> <!-- Modal for CST Calculation -->
<div class="modal fade" id="CSTCalModel" role="dialog"> <div class="modal fade" id="CSTCalModel" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
@ -5240,19 +5241,25 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<!-- Edit Service Modal content--> <!-- Edit Service Modal content-->
<div class="modal fade" id="EDITSERVICE" role="dialog" style="overflow-y:scroll !important"> <div align="center">
<div class="modal fade" id="EDITSERVICE" role="dialog">
<div class="modal-dialog"> <div class="modal-dialog">
<!-- Modal content--> <!-- Modal content-->
<form> <form>
<div class="modal-content" style="width:1000px;"> <div class="modal-content" style="width:1060px;">
<div class="modal-header"> <div class="modal-header">
<center> <center>
<h4>Edit Service Purchase Order Item </h4> <h4>Edit Service Purchase Order Item </h4>
</center> </center>
<button type="button" class="close" data-dismiss="modal"
aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div> </div>
<div class="modal-body p-4">
<div align="left" style="padding: 31px;">
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
@ -5266,7 +5273,6 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Department Name</label> <label>Department Name</label>
<div class="form-group"> <div class="form-group">
@ -5296,7 +5302,6 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
@ -5311,7 +5316,6 @@ if (!empty($INRSYMBOL)) {
?> ?>
</div> </div>
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label>Item Name</label> <label>Item Name</label>
<div class="form-group"> <div class="form-group">
@ -5341,62 +5345,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<!-- <div class="col-md-12">
<div class="col-md-4" id="EditDisplayScheduleDiv" style="display:none;">
<label>Select Service Schedule Type</label>
<div class="form-group">
<?php
$Schdule = array("One Time", "Recurring");
if (!empty($Schdule)) {
foreach ($Schdule as $Sch):
$SchType[$Sch] = $Sch;
endforeach;
}
echo form_dropdown('EditScheduleType', $SchType, set_value('EditScheduleType'), 'id="EditScheduleType"', 'class = "form-control"');
?>
</div>
</div>
<div class="col-md-4" id="EditServicePeriodOption" style="display:none;">
<label>Select Service Period Option</label>
<div class="form-group">
<?php
if (!empty($ServiceOption)) {
foreach ($ServiceOption as $SerOption):
$ServiceOptions[$SerOption->ConfigValue] = $SerOption->ConfigValue;
endforeach;
}
echo form_dropdown('EditServiceOptions', $ServiceOptions, set_value('EditServiceOptions'), 'id="EditServiceOptions"', 'class = "form-control"');
?>
</div>
</div>
<div class="col-md-4" id="EditNoServices" style="display:none;">
<label>Number of Services</label>
<div class="form-group">
<?php
$data = array('name' => 'EditServiceNo', 'value' => set_value('EditServiceNo'), 'id' => 'EditServiceNo', 'class' => 'form-control', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
echo form_input($data);
?>
</div>
</div>
</div> -->
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">
<label>Quantity<span class="badge mandatory">*</span></label> <label>Quantity<span class="badge mandatory">*</span></label>
<div class="form-group"> <div class="form-group">
@ -5552,15 +5502,10 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<input type="hidden" id="hiddenServiceuserid" name="hiddenServiceuserid" /> <input type="hidden" id="hiddenServiceuserid" name="hiddenServiceuserid" />
<div class="modal-footer"> <div class="modal-footer">
<div class="col-md-12 text-right"> <a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a> &nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span <a class="btn btn-success font EditService" ID="Edit"> &nbsp;&nbsp;<span class="bold">Update Service</span></a>
class="bold">Update Service</span></a>
</div> </div>
</div> </div>
</div> </div>
@ -5569,6 +5514,8 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div>
<!-- Edit Revenue Modal --> <!-- Edit Revenue Modal -->
<div align="center"> <div align="center">
<div id="EDITREVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" <div id="EDITREVENUE" class="modal fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
@ -5584,7 +5531,7 @@ if (!empty($INRSYMBOL)) {
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div><!-- modal header -->
<div class="modal-body p-4" align="left"> <div class="modal-body p-4" align="left">
<!-- first row --> <!-- first row -->
<div class="row"> <div class="row">
@ -5975,7 +5922,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
</div> </div><!-- /.modal-body -->
<input type="hidden" id="hiddenRevenueuserid" name="hiddenRevenueuserid" /> <input type="hidden" id="hiddenRevenueuserid" name="hiddenRevenueuserid" />
<!-- footer for revenue po --> <!-- footer for revenue po -->
@ -5985,27 +5932,18 @@ if (!empty($INRSYMBOL)) {
<a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit <a class="btn btn-success EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit
Revenue</span></a> Revenue</span></a>
</div> </div>
</div> </div><!-- /.modal-footer -->
</div>
</div> </div>
</div> </form><!-- /.modal-content -->
</div> </div><!-- /.dialogModal -->
</div>
</form>
</div>
</form>
</div> </div>
</div> </div>
</div> <!-- </div>
</form> </form>
@ -6016,7 +5954,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div> -->
<!-- </section> --> <!-- </section> -->
<!-- <script type="text/html" id="RevenueList"> <!-- <script type="text/html" id="RevenueList">
@ -7392,6 +7330,7 @@ if (!empty($INRSYMBOL)) {
$('#PoTypeOptions').focus(); $('#PoTypeOptions').focus();
return false; return false;
} else { } else {
// console.log("Data :", Object.fromEntries(formData));return;
// Submit the form using AJAX // Submit the form using AJAX
$('#loader').show(); $('#loader').show();
// disableButtons(); // disableButtons();
@ -7485,7 +7424,8 @@ if (!empty($INRSYMBOL)) {
formData.append(inputName, file); // Append the file to FormData formData.append(inputName, file); // Append the file to FormData
} }
}); });
console.log("Data before AJAX call:", Object.fromEntries(formData));
return;
// Perform form validation // Perform form validation
if (validate()) { if (validate()) {
@ -7503,7 +7443,7 @@ if (!empty($INRSYMBOL)) {
return false; return false;
} else { } else {
// Submit the form using AJAX // Submit the form using AJAX
// console.log("Data :", Object.fromEntries(formData));return;
$('#loader').show(); $('#loader').show();
$.ajax({ $.ajax({
url: "<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder", url: "<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder",

101
app/Views/editCapitalAmendPO.php
View File

@ -4,7 +4,7 @@
align-items: center; align-items: center;
gap: 10px; gap: 10px;
} }
$CapitalRange
.edit-input-field { .edit-input-field {
padding: 2px; padding: 2px;
font-size: 14px; font-size: 14px;
@ -131,7 +131,7 @@ $PayableAT = '';
$ExchangeDate = ''; $ExchangeDate = '';
$ExchangeRateOn = ''; $ExchangeRateOn = '';
$UpdatedOn; $UpdatedOn;
$CapitalRange = '';
$PoStatusName = ''; $PoStatusName = '';
$ModeOfShipment = ''; $ModeOfShipment = '';
$SupplierReference = ''; $SupplierReference = '';
@ -196,14 +196,14 @@ if (!empty($POMaster)) {
$PONO = $Req->PONO; $PONO = $Req->PONO;
$scopeofwork = $Req->ServiceDescription; $scopeofwork = $Req->ServiceDescription;
//$PayableAT=$Req->PayableAT; //$PayableAT=$Req->PayableAT;
$ExchangeRateOn1 = new DateTime($Req->ExchangeRateCalculatedon); $Exchangedt = new DateTime($Req->ExchangeRateCalculatedon);
$ExchangeRateOn = $ExchangeRateOn1->format('d-m-Y'); $ExchangeRateOn = $Exchangedt->format('d-m-Y');
// $PaymentDays=$Req->PaymentDays; // $PaymentDays=$Req->PaymentDays;
$PaymentOtherDescription = $Req->PaymentOtherDescription; $PaymentOtherDescription = $Req->PaymentOtherDescription;
$PaymentTerms = $Req->PaymentTerms; $PaymentTerms = $Req->PaymentTerms;
//echo $PaymentTerms; //echo $PaymentTerms;
$UpdatedOn = $Req->UpdatedOn; $UpdatedOn = $Req->UpdatedOn;
$CapitalRange = $Req->CapitalRange;
$Import_DispatchDetails = $Req->Import_DispatchDetails; $Import_DispatchDetails = $Req->Import_DispatchDetails;
$Import_PlaceofOrgin = $Req->Import_PlaceofOrgin; $Import_PlaceofOrgin = $Req->Import_PlaceofOrgin;
$CapitalRange = $Req->CapitalRange; $CapitalRange = $Req->CapitalRange;
@ -377,6 +377,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
var capitalType = ''; var capitalType = '';
window.onload = function () { window.onload = function () {
var CapRan = '<?php echo $CapitalRange; ?>'; var CapRan = '<?php echo $CapitalRange; ?>';
if (CapRan == '1') { if (CapRan == '1') {
document.getElementById('FromOnline').style.display = 'none'; document.getElementById('FromOnline').style.display = 'none';
@ -401,6 +402,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
capitalType = 'Domestic'; capitalType = 'Domestic';
} else { } else {
document.getElementById('FromOnline').style.display = 'block'; document.getElementById('FromOnline').style.display = 'block';
document.getElementById('ExchangeRateOnDiv').style.display = 'block'; document.getElementById('ExchangeRateOnDiv').style.display = 'block';
document.getElementById('ExchangeRateDiv').style.display = 'block'; document.getElementById('ExchangeRateDiv').style.display = 'block';
@ -648,11 +650,14 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-group col-md-3" id="ExchangeRateOnDiv" style="display:none;"> <div class="form-group col-md-3" id="ExchangeRateOnDiv" style="display:none;">
<label>Exchange Rate On</label><span class="text-danger"> * </span> <label>Exchange Rate On</label><span class="text-danger"> * </span>
<?php <?php
$data = array('type' => 'date', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num date-picker-common', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> ?>
<!-- <?php
// $data = array('type' => 'date', 'name' => 'Exchangerateon', 'value' => set_value('Exchangerateon', $ExchangeRateOn), 'id' => 'Exchangerateon', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
// echo form_input($data);
?> -->
</div> </div>
<div class="form-group col-md-3" id="ExchangeRateDiv" style="display:none;"> <div class="form-group col-md-3" id="ExchangeRateDiv" style="display:none;">
@ -1461,7 +1466,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" /> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<br> <br>
<div class="form-row" id="CAPdiv"> <div id="CAPdiv">
<div class="form-row">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Total Basic Amount <?php echo "($INR)" ?></label> <label>Total Basic Amount <?php echo "($INR)" ?></label>
@ -1535,12 +1541,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
?> ?>
</div></br> </div></br>
</div> </div>
</div><!-- /.Domestic total section -->
<div class="form-row" style="padding:1% 0%;" id="HideImportTaxTotal" style="display:none;"> <div class="form-row" style="padding:1% 0%;" id="HideImportTaxTotal" style="display:none;">
@ -1552,6 +1553,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Total Landing Charge <?php echo "($INR)" ?></label> <label>Total Landing Charge <?php echo "($INR)" ?></label>
@ -1606,7 +1608,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
?> ?>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Total IGST <?php echo "($INR)" ?></label> <label>Total IGST <?php echo "($INR)" ?></label>
@ -1616,8 +1617,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
?> ?>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Total Gross duty payable Charge <?php echo "($INR)" ?></label> <label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
@ -1627,14 +1626,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
?> ?>
</div> </div>
<!-- <div align="right" style="padding-right:10px"> <!-- <div align="right" style="padding-right:10px">
<div class="col-md-3 col-md-offset-9"><br/> <div class="col-md-3 col-md-offset-9"><br/>
@ -1661,9 +1652,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div><!-- /.Internation total section -->
</div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label>Special Instructions </label> <?php <label>Special Instructions </label> <?php
@ -1671,7 +1661,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
echo form_textarea($data); echo form_textarea($data);
?> ?>
</div> </div>
</div> </div><!-- /.Special Instructions section -->
<!-- Start po file changes as per edit page --> <!-- Start po file changes as per edit page -->
<div class="form-row"> <div class="form-row">
@ -1705,7 +1695,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
<?php } ?> <?php } ?>
<!-- ends here --> <!-- /.file section -->
<!-- for button --> <!-- for button -->
<div class="form-row"> <div class="form-row">
@ -1729,7 +1719,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
<!-- end button --> <!-- /.button section -->
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
@ -1762,19 +1752,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
<!-- /.Status details section -->
<div class="form-row">
<div align="right">
<!-- <a data-toggle="modal" ><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a> -->
</div>
<br>
</div>
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
@ -2044,9 +2022,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
</div> <div class="form-row">
<div class="form-row" id="EDITCAPdiv1"><!--EDITCAPdiv1 -->
@ -2096,7 +2072,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
<div class="form-row" id="EDITCAPdiv2"><!--EDITCAPdiv2 -->
<div class="form-row">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
<label for=""> IGST In %</label> <label for=""> IGST In %</label>
@ -2120,7 +2097,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
<div class="form-row" id="EDITCAPdiv3"><!--EDITCAPdiv3 -->
<div class="form-row">
<div class="form-group col-md-9" align="right"> <div class="form-group col-md-9" align="right">
<label>Other Allowances <?php echo "($INR)" ?></label> <label>Other Allowances <?php echo "($INR)" ?></label>
</div> </div>
@ -2132,7 +2110,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
?> ?>
</div> </div>
</div> </div>
<div class="form-row" id="EDITCAPdiv4" style="display:flex;"><!--EDITCAPdiv4 -->
<div class="form-row" style="display:flex;">
<div class="form-group col-md-9" align="right"> <div class="form-group col-md-9" align="right">
<label>Total Order Value <?php echo "($INR)" ?></label> <label>Total Order Value <?php echo "($INR)" ?></label>
</div> </div>
@ -2144,10 +2123,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
?> ?>
</div> </div>
</div> </div>
<div id="EditModalImportTaxHide" style="display:none;"> </div><!-- /.Domestic Modal Editable-->
<div class="form-row" style="border:solid black 1px; padding:1%;"> <div class="form-row" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide" style="display:none;">
<div class="form-row" style="padding:1%;">
<br/> <br/>
<div class="form-group col-md-6" style="padding:15px;"> <div class="form-group col-md-6" style="padding:15px;">
@ -2265,8 +2242,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-6" style="padding:15px;"> <div class="form-group col-md-6" style="padding:15px;">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
@ -2442,9 +2417,8 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div> </div>
</div> </div><!-- /.Internation Modal Editable -->
</div>
</div>
<br> <br>
<div class="form-row" style="text-align: left;"> <div class="form-row" style="text-align: left;">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
@ -2568,18 +2542,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>; var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
if (capital == 0) { if (capital == 0) {
$('#CAPdiv').hide(); $('#CAPdiv').hide();
$('#ADDCAPdiv').hide();
$('#ADDCAPdiv1').hide();
$('#ADDCAPdiv2').hide();
$('#ADDCAPdiv3').hide();
$('#EDITCAPdiv').hide(); $('#EDITCAPdiv').hide();
// $('#EDITCAPdiv1').hide();
// $('#EDITCAPdiv2').hide();
// $('#EDITCAPdiv3').hide();
// $('#VIEWCAPdiv').hide();
// $('#VIEWCAPdiv1').hide();
// $('#VIEWCAPdiv2').hide();
// $('#VIEWCAPdiv3').hide();
//$('#DOMdiv').hide(); //$('#DOMdiv').hide();
} }

26
app/Views/editCapitalPo.php
View File

@ -1569,8 +1569,7 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<?php if ($PrePOFile) { ?> <?php if ($PrePOFile) { ?>
<label for="deletePreviousPurchaseOrderFile"><a title="previously uploaded PO File" <label for="deletePreviousPurchaseOrderFile"><a title="previously uploaded PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded purchase order file- </span><small><?= $PrePOFile; ?></small></a></label>
- </span><small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button> <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
<?php } ?> <?php } ?>
@ -1680,7 +1679,7 @@ if (!empty($getlogpodtl)) {
</form> </form>
</div> </div>
<div class="modal-footer" style="border:none;"> <div class="modal-footer" style="border:none;">
<a class="btn btn-success" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a> <a class="btn btn-secondary" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="PackagingOption" onclick="calculateFreightlocaddper();">&nbsp;&nbsp;<span <a class="btn btn-success" ID="PackagingOption" onclick="calculateFreightlocaddper();">&nbsp;&nbsp;<span
class="bold">Ok</span></a> class="bold">Ok</span></a>
@ -1712,7 +1711,7 @@ if (!empty($getlogpodtl)) {
</form> </form>
</div> </div>
<div class="modal-footer" style="border:none;"> <div class="modal-footer" style="border:none;">
<a class="btn btn-success" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a> <a class="btn btn-secondary" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="editPackagingOption" onclick="calculateFreightloceditper();">&nbsp;&nbsp;<span <a class="btn btn-success" ID="editPackagingOption" onclick="calculateFreightloceditper();">&nbsp;&nbsp;<span
class="bold">Ok</span></a> class="bold">Ok</span></a>
</div> </div>
@ -1742,7 +1741,7 @@ if (!empty($getlogpodtl)) {
</form> </form>
</div> </div>
<div class="modal-footer" style="border:none;"> <div class="modal-footer" style="border:none;">
<a class="btn btn-success" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a> <a class="btn btn-secondary" data-dismiss="modal" style="margin: 10px;" value="Cancel">Cancel</a>
<a class="btn btn-success" ID="viewPackagingOption" onclick="calculateFreightlocviewper();">&nbsp;&nbsp;<span <a class="btn btn-success" ID="viewPackagingOption" onclick="calculateFreightlocviewper();">&nbsp;&nbsp;<span
class="bold">Ok</span></a> class="bold">Ok</span></a>
@ -2421,7 +2420,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" style="margin-right:20px;">Cancel</a> <a class="btn btn-secondary" 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 <a class="btn btn-success font AddCapital" ID="AddCapital"> &nbsp;&nbsp;<span class="bold">Add
Capital</span></a> Capital</span></a>
</div> </div>
@ -2758,7 +2757,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div><!-- /.C.D3--> </div><!-- /.C.D3-->
<div class="form-row" style="padding:1%;"></div><!-- /.layer--> <div class="form-row" style="padding:1%;"></div><!-- /.layer-->
<div class="form-row" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide" <div class="form-row" style="border:1px solid #000;padding:0px;" id="ViewModalImportTaxHide"
style="display:none;"> style="display:none;">
<br /> <br />
<div class="form-group col-md-6" style="padding:10px;"> <div class="form-group col-md-6" style="padding:10px;">
@ -3072,7 +3071,7 @@ if (!empty($getlogpodtl)) {
</div><!-- C.Desc --> </div><!-- C.Desc -->
</div><!-- /.body --> </div><!-- /.body -->
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right: 10px;">Cancel</a> <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right: 10px;">Cancel</a>
<a class="btn btn-success font EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update <a class="btn btn-success font EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update
Capital</span></a> Capital</span></a>
</div><!-- /.footer --> </div><!-- /.footer -->
@ -3669,7 +3668,7 @@ if (!empty($getlogpodtl)) {
</div><!-- form-row capitial Description --> </div><!-- form-row capitial Description -->
</div><!-- modal-body --> </div><!-- modal-body -->
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a> <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
<?php if ($CapitalRange == 1 || $CapitalRange == 0) { ?> <?php if ($CapitalRange == 1 || $CapitalRange == 0) { ?>
<!-- <a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a> --> <!-- <a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a> -->
<?php } ?> <?php } ?>
@ -4254,7 +4253,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" style="margin-right:10px">Cancel</a> <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px">Cancel</a>
<?php if ($CapitalRange == 1 || $CapitalRange == 0) { ?> <?php if ($CapitalRange == 1 || $CapitalRange == 0) { ?>
<!-- <a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a> --> <!-- <a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a> -->
<?php } ?> <?php } ?>
@ -4548,7 +4547,7 @@ if (!empty($getlogpodtl)) {
$("#CPRate").val(obj.material_rate); $("#CPRate").val(obj.material_rate);
RequistQuantity = obj.Quantity; RequistQuantity = obj.Quantity;
var CPUOMDisplay = obj.UOM; var CPUOMDisplay = obj.UOM ? obj.UOM : '';
$('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')'); $('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
$('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')'); $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
@ -4608,7 +4607,7 @@ if (!empty($getlogpodtl)) {
$("#EditUOM").val(obj.UOM); $("#EditUOM").val(obj.UOM);
$("#EditQuantity").val(obj.Quantity); $("#EditQuantity").val(obj.Quantity);
RequistQuantity = obj.Quantity; RequistQuantity = obj.Quantity;
var CPUOMDisplay = obj.UOM; var CPUOMDisplay = obj.UOM ? obj.UOM : '';
$('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')'); $('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
$('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')'); $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
@ -6508,7 +6507,8 @@ if (!empty($getlogpodtl)) {
if (obj.MaterialCode === id) { if (obj.MaterialCode === id) {
$("#EditCapitalItemName").val(obj.MaterialName); $("#EditCapitalItemName").val(obj.MaterialName);
$("#EditCPUOM").val(obj.UOM); $("#EditCPUOM").val(obj.UOM);
var EDITUOMDisplay = obj.UOM; var EDITUOMDisplay = obj.UOM ? obj.UOM : '';
$("#EditCPQuantity").val(obj.Quantity); $("#EditCPQuantity").val(obj.Quantity);
RequistQuantity = obj.Quantity; RequistQuantity = obj.Quantity;
$('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EDITUOMDisplay + ')'); $('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EDITUOMDisplay + ')');

10
app/Views/editOldemppay.php
View File

@ -48,6 +48,7 @@ $Remaining_Due = '';
$Paid_Due = ''; $Paid_Due = '';
$Paid_Amount = 0; $Paid_Amount = 0;
$loanid = ''; $loanid = '';
$pending_due_amount = 0;
if (!empty($emppay)) { if (!empty($emppay)) {
@ -115,6 +116,7 @@ if (!empty($emppay)) {
$loanid = $ep->Loan_ID; $loanid = $ep->Loan_ID;
$request_letter = $ep->request_letter; $request_letter = $ep->request_letter;
$payment_statement = $ep->payment_statement; $payment_statement = $ep->payment_statement;
$pending_due_amount = $Remaining_Due * $Monthly_due;
} }
} }
@ -236,6 +238,12 @@ if (!empty($emppay)) {
<input type="text" class="form-control requried num" id="remaining_due" name="remaining_due" value="<?php echo $Remaining_Due; ?>" readonly> <input type="text" class="form-control requried num" id="remaining_due" name="remaining_due" value="<?php echo $Remaining_Due; ?>" readonly>
</div> </div>
</div> </div>
<div class="col-md-3">
<div class="form-group">
<label for="">Balance Amount</label>
<input type="text" class="form-control requried num" id="balance_due_amount" value="<?php echo $pending_due_amount; ?>" readonly>
</div>
</div>
</div> </div>
@ -434,12 +442,14 @@ if (!empty($emppay)) {
Paid_Amount = document.getElementById('Paid_Amount').value; Paid_Amount = document.getElementById('Paid_Amount').value;
loan = loan - Paid_Amount loan = loan - Paid_Amount
totalDueAmt = loan / no_of_due; totalDueAmt = loan / no_of_due;
balanceDueAmount = no_of_due * totalDueAmt;
document.getElementById('monthly_due').value = Math.ceil(totalDueAmt); document.getElementById('monthly_due').value = Math.ceil(totalDueAmt);
document.getElementById('remaining_due').value = Math.ceil(no_of_due); document.getElementById('remaining_due').value = Math.ceil(no_of_due);
document.getElementById('balance_due_amount').value = Math.ceil(balanceDueAmount);
} }