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);
// 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);
$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){
$requestfilename = $file->getName();
if (!empty($requestfilename)) {

2
app/Controllers/Inwardgateregister.php
View File

@ -1442,6 +1442,8 @@ function updateIGRWeight(){
if ($value1 != $value && $key1 == $key) {
$value = ($key1 == "IGRStatus") ? $this->inwardgateregister_model->get_status($value) : $value;
$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
$history_entries[] = [
'field' => $key1,

11
app/Models/Inwardgateregister_model.php
View File

@ -1361,5 +1361,16 @@ $builder = $this->db->table('t_igr_history')
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;
}
}

32
app/Views/EditservicePurchaseorder.php
View File

@ -1619,31 +1619,17 @@ if (!empty($getlogpodtl)) {
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile">
</div>
</div>
<?php if (!empty($PrePOFile)) {
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
if (file_exists($PrePOFilePath)) { ?>
<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;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
<?php if ($PrePOFile) { ?>
<div id="deletePreviousPurchaseOrderFileDiv">
<div class="form-group col-md-12 px-4">
<label for="deletePreviousPurchaseOrderFile"><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;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
</div>
</div>
<?php } ?>
<?php } ?>
<?php } ?>
</div>
<!-- ends here -->

612
app/Views/alterpurchaseorder.php
View File

@ -3049,7 +3049,7 @@ if (!empty($INRSYMBOL)) {
<label>
Select Purchase Order File
</label><br>
<input type="file" name="POFiles" id="POFiles"><br>
<input type="file" name="RevenueFile" id="RevenueFile"><br>
</div>
</div>
@ -3155,7 +3155,7 @@ if (!empty($INRSYMBOL)) {
<label>
Select Purchase Order File
</label><br>
<input type="file" name="POFile" id="POFile"><br>
<input type="file" name="ServiceFile" id="ServiceFile"><br>
</div>
</div>
@ -5208,6 +5208,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<!-- Modal for CST Calculation -->
<div class="modal fade" id="CSTCalModel" role="dialog">
<div class="modal-dialog">
@ -5240,335 +5241,281 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<!-- Edit Service Modal content-->
<div class="modal fade" id="EDITSERVICE" role="dialog" style="overflow-y:scroll !important">
<div class="modal-dialog">
<!-- Modal content-->
<form>
<div class="modal-content" style="width:1000px;">
<div class="modal-header">
<center>
<h4>Edit Service Purchase Order Item </h4>
</center>
</div>
<div class="modal-body p-4">
<!-- Edit Service Modal content-->
<div align="center">
<div class="modal fade" id="EDITSERVICE" role="dialog">
<div class="modal-dialog">
<!-- Modal content-->
<form>
<div class="modal-content" style="width:1060px;">
<div class="modal-header">
<center>
<h4>Edit Service Purchase Order Item </h4>
</center>
<button type="button" class="close" data-dismiss="modal"
aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="row">
<div class="col-md-3">
<label>Req No<span class="badge mandatory">*</span></label>
<div>
<?php
<div align="left" style="padding: 31px;">
$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
<div class="row">
<div class="col-md-3">
<label>Req No<span class="badge mandatory">*</span></label>
<div>
<?php
</div>
</div>
$data = array('name' => 'EditReqNo', 'value' => set_value('EditReqNo'), 'id' => 'EditReqNo', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
<div class="col-md-3">
<label>Department Name</label>
<div class="form-group">
<?php
$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<label>Cost Center Code</label>
<div class="form-group">
<?php
$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3" style="display:none;">
<label>Available Budget Amount</label><img id="AlertImg"
src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image"
width="25px" style="display:none;" />
<div class="form-group">
<?php
$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true');
echo form_hidden($data);
?>
</div>
</div>
</div>
<div class="row">
<div class="col-md-3">
<label>Item Code<span class="badge mandatory">*</span></label>
<div>
<?php
$options = array("0" => 'Item Code');
//print_r( $options);
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
?>
</div>
</div>
<div class="col-md-3">
<label>Item Name</label>
<div class="form-group">
<?php
$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<label>UOM</label>
<div class="form-group">
<?php
$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<label>Frequency</label>
<div class="form-group">
<?php
$data = array('name' => 'EditFrequencyChange', 'value' => set_value('EditFrequencyChange'), 'id' => 'EditFrequencyChange', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</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>
<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 class="col-md-3">
<label>Department Name</label>
<div class="form-group">
<?php
$data = array('name' => 'EditdeptName', 'value' => set_value('EditdeptName'), 'id' => 'EditdeptName', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</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 class="col-md-3">
<label>Cost Center Code</label>
<div class="form-group">
<?php
$data = array('name' => 'EditCostCenter', 'value' => set_value('EditCostCenter'), 'id' => 'EditCostCenter', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
</div> -->
<div class="row">
<div class="col-md-3" style="display:none;">
<label>Available Budget Amount</label><img id="AlertImg"
src="<?php echo base_url(); ?>public/assets/dist/img/red.png" alt="your image"
width="25px" style="display:none;" />
<div class="form-group">
<?php
$data = array('name' => 'EditAvlBudAmt', 'value' => set_value('EditAvlBudAmt'), 'id' => 'EditAvlBudAmt', 'class' => 'form-control num', 'readonly' => 'true');
echo form_hidden($data);
?>
</div>
</div>
</div>
<div class="row">
<div class="col-md-3">
<label>Item Code<span class="badge mandatory">*</span></label>
<div>
<?php
$options = array("0" => 'Item Code');
//print_r( $options);
echo form_dropdown('EditMaterialCode', $options, set_value('EditMaterialCode'), 'id="EditMaterialCode"', 'class="form-control"');
?>
</div>
</div>
<div class="col-md-3">
<label>Item Name</label>
<div class="form-group">
<?php
$data = array('name' => 'EditItemName', 'value' => set_value('EditItemName'), 'id' => 'EditItemName', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<label>UOM</label>
<div class="form-group">
<?php
$data = array('name' => 'EditUOM', 'value' => set_value('EditUOM'), 'id' => 'EditUOM', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<label>Frequency</label>
<div class="form-group">
<div class="col-md-3">
<label>Quantity<span class="badge mandatory">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
echo form_input($data);
?>
<?php
$data = array('name' => 'EditFrequencyChange', 'value' => set_value('EditFrequencyChange'), 'id' => 'EditFrequencyChange', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="row">
<div class="col-md-3">
<label>Quantity<span class="badge mandatory">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'EditQuantity', 'value' => set_value('EditQuantity'), 'id' => 'EditQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<label>Per</label> <?php
$data = array('name' => 'EditEmergPer', 'value' => set_value('EditEmergPer'), 'id' => 'EditEmergPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="col-md-3">
<label><?php echo "Basic Amount In ($INRSYM)"; ?></label>
<div class="form-group">
<?php
$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6" align="right">
CGST In %
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6" align="right">
SGST In %
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6" align="right">
IGST In %
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
echo form_input($data);
?>
<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo"
value="EditFrequencyNo" />
</div>
</div>
</div>
<div class="row">
<div class="col-md-9" align="right">
<label>Other Allowances <?php echo "($INRSYM)" ?></label>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances', 0), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="row">
<div class="col-md-9" align="right">
<label> <?php echo "Total Order Amount In ($INRSYM)"; ?></label>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="row" style="padding: 0px 30px 10px 30px;">
<div class="col-md-12">
<label>Service Description<span class="badge mandatory">*</span></label>
<?php
$data = array('name' => 'EdittxtSpcialInstructionSingle', 'value' => set_value('EdittxtSpcialInstructionSingle'), 'id' => 'EdittxtSpcialInstructionSingle', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?>
</div>
</div>
<input type="hidden" id="hiddenServiceuserid" name="hiddenServiceuserid" />
<div class="modal-footer">
<a class="btn btn-secondary" data-dismiss="modal" value="Cancel">Cancel</a>
&nbsp;&nbsp;&nbsp;&nbsp;
<a class="btn btn-success font EditService" ID="Edit"> &nbsp;&nbsp;<span class="bold">Update Service</span></a>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
<div class="col-md-3">
<label><?php echo "Rate ($INRSYM)"; ?><span class="badge mandatory">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'EditRate', 'value' => set_value('EditRate'), 'id' => 'EditRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange()');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<label>Per</label> <?php
$data = array('name' => 'EditEmergPer', 'value' => set_value('EditEmergPer'), 'id' => 'EditEmergPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="col-md-3">
<label><?php echo "Basic Amount In ($INRSYM)"; ?></label>
<div class="form-group">
<?php
$data = array('name' => 'txtEditBasicValue', 'value' => set_value('txtEditBasicValue'), 'id' => 'txtEditBasicValue', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6" align="right">
CGST In %
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst', 0), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst', 0), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6" align="right">
SGST In %
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst', 0), 'id' => 'EditSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst', 0), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6" align="right">
IGST In %
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst', 0), 'id' => 'EditIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst', 0), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
echo form_input($data);
?>
<input type="hidden" name="EditFrequencyNo" id="EditFrequencyNo"
value="EditFrequencyNo" />
</div>
</div>
</div>
<div class="row">
<div class="col-md-9" align="right">
<label>Other Allowances <?php echo "($INRSYM)" ?></label>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances', 0), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="row">
<div class="col-md-9" align="right">
<label> <?php echo "Total Order Amount In ($INRSYM)"; ?></label>
</div>
<div class="col-md-3">
<div class="form-group">
<?php
$data = array('name' => 'EditTotalOrderValue', 'value' => set_value('EditTotalOrderValue'), 'id' => 'EditTotalOrderValue', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="row" style="padding: 0px 30px 10px 30px;">
<div class="col-md-12">
<label>Service Description<span class="badge mandatory">*</span></label>
<?php
$data = array('name' => 'EdittxtSpcialInstructionSingle', 'value' => set_value('EdittxtSpcialInstructionSingle'), 'id' => 'EdittxtSpcialInstructionSingle', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?>
</div>
</div>
<input type="hidden" id="hiddenServiceuserid" name="hiddenServiceuserid" />
<div class="modal-footer">
<div class="col-md-12 text-right">
<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span
class="bold">Update Service</span></a>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
<!-- Edit Revenue Modal -->
<div align="center">
<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">
<span aria-hidden="true">&times;</span>
</button>
</div>
</div><!-- modal header -->
<div class="modal-body p-4" align="left">
<!-- first row -->
<div class="row">
@ -5975,7 +5922,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
</div>
</div><!-- /.modal-body -->
<input type="hidden" id="hiddenRevenueuserid" name="hiddenRevenueuserid" />
<!-- 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
Revenue</span></a>
</div>
</div>
</div><!-- /.modal-footer -->
</div>
</div>
</form><!-- /.modal-content -->
</div><!-- /.dialogModal -->
</div>
</div>
</div>
</form>
</div>
</form>
</div>
</div>
</div>
<!-- </div>
</form>
@ -6016,7 +5954,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
</div> -->
<!-- </section> -->
<!-- <script type="text/html" id="RevenueList">
@ -7392,6 +7330,7 @@ if (!empty($INRSYMBOL)) {
$('#PoTypeOptions').focus();
return false;
} else {
// console.log("Data :", Object.fromEntries(formData));return;
// Submit the form using AJAX
$('#loader').show();
// disableButtons();
@ -7485,7 +7424,8 @@ if (!empty($INRSYMBOL)) {
formData.append(inputName, file); // Append the file to FormData
}
});
console.log("Data before AJAX call:", Object.fromEntries(formData));
return;
// Perform form validation
if (validate()) {
@ -7503,7 +7443,7 @@ if (!empty($INRSYMBOL)) {
return false;
} else {
// Submit the form using AJAX
// console.log("Data :", Object.fromEntries(formData));return;
$('#loader').show();
$.ajax({
url: "<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder",

397
app/Views/editCapitalAmendPO.php
View File

@ -4,7 +4,7 @@
align-items: center;
gap: 10px;
}
$CapitalRange
.edit-input-field {
padding: 2px;
font-size: 14px;
@ -131,7 +131,7 @@ $PayableAT = '';
$ExchangeDate = '';
$ExchangeRateOn = '';
$UpdatedOn;
$CapitalRange = '';
$PoStatusName = '';
$ModeOfShipment = '';
$SupplierReference = '';
@ -196,14 +196,14 @@ if (!empty($POMaster)) {
$PONO = $Req->PONO;
$scopeofwork = $Req->ServiceDescription;
//$PayableAT=$Req->PayableAT;
$ExchangeRateOn1 = new DateTime($Req->ExchangeRateCalculatedon);
$ExchangeRateOn = $ExchangeRateOn1->format('d-m-Y');
$Exchangedt = new DateTime($Req->ExchangeRateCalculatedon);
$ExchangeRateOn = $Exchangedt->format('d-m-Y');
// $PaymentDays=$Req->PaymentDays;
$PaymentOtherDescription = $Req->PaymentOtherDescription;
$PaymentTerms = $Req->PaymentTerms;
//echo $PaymentTerms;
$UpdatedOn = $Req->UpdatedOn;
$CapitalRange = $Req->CapitalRange;
$Import_DispatchDetails = $Req->Import_DispatchDetails;
$Import_PlaceofOrgin = $Req->Import_PlaceofOrgin;
$CapitalRange = $Req->CapitalRange;
@ -377,6 +377,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
var capitalType = '';
window.onload = function () {
var CapRan = '<?php echo $CapitalRange; ?>';
if (CapRan == '1') {
document.getElementById('FromOnline').style.display = 'none';
@ -401,6 +402,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
capitalType = 'Domestic';
} else {
document.getElementById('FromOnline').style.display = 'block';
document.getElementById('ExchangeRateOnDiv').style.display = 'block';
document.getElementById('ExchangeRateDiv').style.display = 'block';
@ -648,11 +650,14 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div>
<div class="form-group col-md-3" id="ExchangeRateOnDiv" style="display:none;">
<label>Exchange Rate On</label><span class="text-danger"> * </span>
<?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);
?>
<!-- <?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 class="form-group col-md-3" id="ExchangeRateDiv" style="display:none;">
@ -1461,86 +1466,82 @@ if (!empty($POItem) && $CapitalRange == '1') {
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<br>
<div class="form-row" id="CAPdiv">
<div class="form-group col-md-3">
<label>Total Basic Amount <?php echo "($INR)" ?></label>
<?php
$data = array('name' => 'txtTotalBasic', 'value' => set_value('txtTotalBasic', number_format($FinalTotalBasic, 2, '.', '')), 'id' => 'txtTotalBasic', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<label>Total Discount Amount <?php echo "($INR)" ?></label>
<?php
$data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($TotalDiscountedAmt, 2, '.', '')), 'id' => 'txtTotalDiscount', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<label>CGST <?php echo "($INR)" ?></label>
<?php
$data = array('name' => 'txtTotCgst', 'value' => set_value('txtTotCgst', number_format($TotalCGST, 2, '.', '')), 'id' => 'txtTotCgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<label>SGST <?php echo "($INR)" ?></label>
<?php
$data = array('name' => 'txtTotSgst', 'value' => set_value('txtTotSgst', number_format($TotalSGST, 2, '.', '')), 'id' => 'txtTotSgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-3">
<label>IGST <?php echo "($INR)" ?></label>
<?php
$data = array('name' => 'txtTotIgst', 'value' => set_value('txtTotIgst', number_format($TotalIGST, 2, '.', '')), 'id' => 'txtTotIgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3" style="padding: 0px;">
<label>Other Allowances <?php echo "($INR)" ?> </label>
<?php
$data = array('name' => 'TotalOtherAllowances', 'value' => set_value('TotalOtherAllowances', number_format($Totalotherallowances, 2, '.', '')), 'id' => 'TotalOtherAllowances', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
<div id="CAPdiv">
<div class="form-row">
<div class="form-group col-md-3">
<label>Total Basic Amount <?php echo "($INR)" ?></label>
<?php
$data = array('name' => 'txtTotalBasic', 'value' => set_value('txtTotalBasic', number_format($FinalTotalBasic, 2, '.', '')), 'id' => 'txtTotalBasic', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<label>Total Discount Amount <?php echo "($INR)" ?></label>
<?php
$data = array('name' => 'txtTotalDiscount', 'value' => set_value('txtTotalDiscount', number_format($TotalDiscountedAmt, 2, '.', '')), 'id' => 'txtTotalDiscount', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<label>CGST <?php echo "($INR)" ?></label>
<?php
$data = array('name' => 'txtTotCgst', 'value' => set_value('txtTotCgst', number_format($TotalCGST, 2, '.', '')), 'id' => 'txtTotCgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<label>SGST <?php echo "($INR)" ?></label>
<?php
$data = array('name' => 'txtTotSgst', 'value' => set_value('txtTotSgst', number_format($TotalSGST, 2, '.', '')), 'id' => 'txtTotSgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-3">
<label>IGST <?php echo "($INR)" ?></label>
<?php
$data = array('name' => 'txtTotIgst', 'value' => set_value('txtTotIgst', number_format($TotalIGST, 2, '.', '')), 'id' => 'txtTotIgst', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3" style="padding: 0px;">
<label>Other Allowances <?php echo "($INR)" ?> </label>
<?php
$data = array('name' => 'TotalOtherAllowances', 'value' => set_value('TotalOtherAllowances', number_format($Totalotherallowances, 2, '.', '')), 'id' => 'TotalOtherAllowances', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
<div class="form-group col-md-3">
<label>Total Freight <?php echo "($INR)" ?> </label>
<?php
$data = array('name' => 'TotalFreight', 'value' => set_value('TotalFreight', number_format($TotalFreightvalue, 2, '.', '')), 'id' => 'TotalFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<label>Total Freight <?php echo "($INR)" ?> </label>
<?php
$data = array('name' => 'TotalFreight', 'value' => set_value('TotalFreight', number_format($TotalFreightvalue, 2, '.', '')), 'id' => 'TotalFreight', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<label>Total Order Value <?php echo "($INR)" ?> </label>
<input type="hidden" name="preServiceTotalorderValue"
value="<?php echo $totalCapitalOrder ?>">
<?php
$data = array('name' => 'Totalservicesummary', 'value' => set_value('Totalservicesummary', number_format($totalCapitalOrder, 2, '.', '')), 'id' => 'Totalservicesummary', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div></br>
</div>
<div class="form-group col-md-3">
<label>Total Order Value <?php echo "($INR)" ?> </label>
<input type="hidden" name="preServiceTotalorderValue"
value="<?php echo $totalCapitalOrder ?>">
<?php
$data = array('name' => 'Totalservicesummary', 'value' => set_value('Totalservicesummary', number_format($totalCapitalOrder, 2, '.', '')), 'id' => 'Totalservicesummary', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div></br>
</div>
</div><!-- /.Domestic total section -->
<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);
?>
</div>
<div class="form-group col-md-3">
<label>Total Landing Charge <?php echo "($INR)" ?></label>
@ -1606,7 +1608,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
?>
</div>
<div class="form-group col-md-3">
<label>Total IGST <?php echo "($INR)" ?></label>
@ -1616,8 +1617,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
?>
</div>
<div class="form-group col-md-3">
<label>Total Gross duty payable Charge <?php echo "($INR)" ?></label>
@ -1627,14 +1626,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
?>
</div>
<!-- <div align="right" style="padding-right:10px">
<div class="col-md-3 col-md-offset-9"><br/>
@ -1660,10 +1651,9 @@ if (!empty($POItem) && $CapitalRange == '1') {
?>
</div>
</div><!-- /.Internation total section -->
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label>Special Instructions </label> <?php
@ -1671,7 +1661,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
echo form_textarea($data);
?>
</div>
</div>
</div><!-- /.Special Instructions section -->
<!-- Start po file changes as per edit page -->
<div class="form-row">
@ -1705,7 +1695,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
<?php } ?>
<!-- ends here -->
<!-- /.file section -->
<!-- for button -->
<div class="form-row">
@ -1729,7 +1719,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div>
</div>
<!-- end button -->
<!-- /.button section -->
<div class="form-row">
<div class="form-group col-md-12">
@ -1762,19 +1752,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div>
</div>
<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>
<!-- /.Status details section -->
</div> <!-- end card body-->
</div> <!-- end card -->
@ -2044,111 +2022,110 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div>
</div>
</div>
<div class="form-row" id="EDITCAPdiv1"><!--EDITCAPdiv1 -->
<div class="form-row">
<div class="form-group col-md-6" align="right">
<label for=""> CGST In % </label>
</div>
<div class="form-group col-md-6" align="right">
<label for=""> CGST In % </label>
</div>
<div class="form-group col-md-3">
<div class="form-group col-md-3">
<?php
$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'ChangeEditSgst();EditRatechange();', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
<?php
$data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'ChangeEditSgst();EditRatechange();', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<?php
$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-6" align="right">
<label for=""> SGST In % </label>
</div>
<div class="form-group col-md-3">
<?php
$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<?php
$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6" align="right">
<label for=""> IGST In %</label>
</div>
<div class="form-group col-md-3">
<div class="form-group col-md-3">
<?php
$data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
echo form_input($data);
?>
<?php
$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<?php
$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-9" align="right">
<label>Other Allowances <?php echo "($INR)" ?></label>
</div>
<div class="form-group col-md-6" align="right">
<label for=""> SGST In % </label>
</div>
<div class="form-group col-md-3">
<?php
$data = array('name' => 'EditSgst', 'value' => set_value('EditSgst'), 'id' => 'EditSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<?php
$data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
echo form_input($data);
?>
<div class="form-group col-md-3">
<?php
$data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row" id="EDITCAPdiv2"><!--EDITCAPdiv2 -->
<div class="form-group col-md-6" align="right">
<label for=""> IGST In %</label>
<div class="form-row" style="display:flex;">
<div class="form-group col-md-9" align="right">
<label>Total Order Value <?php echo "($INR)" ?></label>
</div>
<div class="form-group col-md-3">
<?php
$data = array('name' => 'Editservicetotalordervaue', 'value' => set_value('Editservicetotalordervaue'), 'id' => 'Editservicetotalordervaue', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-3">
<?php
$data = array('name' => 'EditIgst', 'value' => set_value('EditIgst'), 'id' => 'EditIgst', 'class' => 'form-control num', 'placeholder' => 'IGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3">
<?php
$data = array('name' => 'EditAfterIgst', 'value' => set_value('EditAfterIgst'), 'id' => 'EditAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="form-row" id="EDITCAPdiv3"><!--EDITCAPdiv3 -->
<div class="form-group col-md-9" align="right">
<label>Other Allowances <?php echo "($INR)" ?></label>
</div>
<div class="form-group col-md-3">
<?php
$data = array('name' => 'EditOtherAllowances', 'value' => set_value('EditOtherAllowances'), 'id' => 'EditOtherAllowances', 'class' => 'form-control num', 'placeholder' => 'Other Allowances', 'onchange' => 'EditRatechange()', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data);
?>
</div>
</div>
<div class="form-row" id="EDITCAPdiv4" style="display:flex;"><!--EDITCAPdiv4 -->
<div class="form-group col-md-9" align="right">
<label>Total Order Value <?php echo "($INR)" ?></label>
</div>
<div class="form-group col-md-3">
<?php
$data = array('name' => 'Editservicetotalordervaue', 'value' => set_value('Editservicetotalordervaue'), 'id' => 'Editservicetotalordervaue', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div id="EditModalImportTaxHide" style="display:none;">
<div class="form-row" style="border:solid black 1px; padding:1%;">
<div class="form-row" style="padding:1%;">
<br/>
</div><!-- /.Domestic Modal Editable-->
<div class="form-row" style="border:1px solid #000;padding:0px;" id="EditModalImportTaxHide" style="display:none;">
<br/>
<div class="form-group col-md-6" style="padding:15px;">
<div class="form-row">
@ -2265,8 +2242,6 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div>
</div>
</div>
<div class="form-group col-md-6" style="padding:15px;">
<div class="form-row">
<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 -->
<br>
<div class="form-row" style="text-align: left;">
<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) ?>;
if (capital == 0) {
$('#CAPdiv').hide();
$('#ADDCAPdiv').hide();
$('#ADDCAPdiv1').hide();
$('#ADDCAPdiv2').hide();
$('#ADDCAPdiv3').hide();
$('#EDITCAPdiv').hide();
// $('#EDITCAPdiv1').hide();
// $('#EDITCAPdiv2').hide();
// $('#EDITCAPdiv3').hide();
// $('#VIEWCAPdiv').hide();
// $('#VIEWCAPdiv1').hide();
// $('#VIEWCAPdiv2').hide();
// $('#VIEWCAPdiv3').hide();
//$('#DOMdiv').hide();
}

26
app/Views/editCapitalPo.php
View File

@ -1569,8 +1569,7 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-12">
<?php if ($PrePOFile) { ?>
<label for="deletePreviousPurchaseOrderFile"><a title="previously uploaded PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded
- </span><small><?= $PrePOFile; ?></small></a></label>
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;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button>
<?php } ?>
@ -1680,7 +1679,7 @@ if (!empty($getlogpodtl)) {
</form>
</div>
<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
class="bold">Ok</span></a>
@ -1712,7 +1711,7 @@ if (!empty($getlogpodtl)) {
</form>
</div>
<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
class="bold">Ok</span></a>
</div>
@ -1742,7 +1741,7 @@ if (!empty($getlogpodtl)) {
</form>
</div>
<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
class="bold">Ok</span></a>
@ -2421,7 +2420,7 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<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
Capital</span></a>
</div>
@ -2758,7 +2757,7 @@ if (!empty($getlogpodtl)) {
</div>
</div><!-- /.C.D3-->
<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;">
<br />
<div class="form-group col-md-6" style="padding:10px;">
@ -3072,7 +3071,7 @@ if (!empty($getlogpodtl)) {
</div><!-- C.Desc -->
</div><!-- /.body -->
<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
Capital</span></a>
</div><!-- /.footer -->
@ -3669,7 +3668,7 @@ if (!empty($getlogpodtl)) {
</div><!-- form-row capitial Description -->
</div><!-- modal-body -->
<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) { ?>
<!-- <a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a> -->
<?php } ?>
@ -4254,7 +4253,7 @@ if (!empty($getlogpodtl)) {
</div>
</div>
<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) { ?>
<!-- <a class="btn btn-success font ViewCapital" ID="ViewUpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a> -->
<?php } ?>
@ -4548,7 +4547,7 @@ if (!empty($getlogpodtl)) {
$("#CPRate").val(obj.material_rate);
RequistQuantity = obj.Quantity;
var CPUOMDisplay = obj.UOM;
var CPUOMDisplay = obj.UOM ? obj.UOM : '';
$('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
$('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
@ -4608,7 +4607,7 @@ if (!empty($getlogpodtl)) {
$("#EditUOM").val(obj.UOM);
$("#EditQuantity").val(obj.Quantity);
RequistQuantity = obj.Quantity;
var CPUOMDisplay = obj.UOM;
var CPUOMDisplay = obj.UOM ? obj.UOM : '';
$('#RateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
$('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + CPUOMDisplay + ')');
@ -6508,7 +6507,8 @@ if (!empty($getlogpodtl)) {
if (obj.MaterialCode === id) {
$("#EditCapitalItemName").val(obj.MaterialName);
$("#EditCPUOM").val(obj.UOM);
var EDITUOMDisplay = obj.UOM;
var EDITUOMDisplay = obj.UOM ? obj.UOM : '';
$("#EditCPQuantity").val(obj.Quantity);
RequistQuantity = obj.Quantity;
$('#EditRateIn').html('Rate(in' + " " + DisplayCurrencySymbol + '/' + EDITUOMDisplay + ')');

10
app/Views/editOldemppay.php
View File

@ -48,6 +48,7 @@ $Remaining_Due = '';
$Paid_Due = '';
$Paid_Amount = 0;
$loanid = '';
$pending_due_amount = 0;
if (!empty($emppay)) {
@ -115,6 +116,7 @@ if (!empty($emppay)) {
$loanid = $ep->Loan_ID;
$request_letter = $ep->request_letter;
$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>
</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>
@ -434,12 +442,14 @@ if (!empty($emppay)) {
Paid_Amount = document.getElementById('Paid_Amount').value;
loan = loan - Paid_Amount
totalDueAmt = loan / no_of_due;
balanceDueAmount = no_of_due * totalDueAmt;
document.getElementById('monthly_due').value = Math.ceil(totalDueAmt);
document.getElementById('remaining_due').value = Math.ceil(no_of_due);
document.getElementById('balance_due_amount').value = Math.ceil(balanceDueAmount);
}