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

po reopened issues solved

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-03-29 07:28:32 +00:00
parent a8ccd0137f
commit b2b6e788b2
9 changed files with 575 additions and 554 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Views/EditservicePurchaseorder.php
View File

@ -1631,6 +1631,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
<?php } ?> <?php } ?>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div> </div>
</div> </div>
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div> <div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>

1
app/Views/alterpurchaseorder.php
View File

@ -7424,7 +7424,6 @@ if (!empty($INRSYMBOL)) {
} }
}); });
console.log("Data before AJAX call:", Object.fromEntries(formData)); console.log("Data before AJAX call:", Object.fromEntries(formData));
return;
// Perform form validation // Perform form validation
if (validate()) { if (validate()) {

30
app/Views/capitalpurchaseorder.php
View File

@ -977,16 +977,18 @@ if (!empty($INRSYMBOL)) {
<br> <br>
<div class="form-row"> <!-- f i l e c h o o s e n -->
<div class="form-group"> <div class="col-md-12">
<div class="row">
<div class="col-md-12">
<label>Select Purchase Order File</label><br> <label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile"><br> <input type="file" name="POFile" id="POFile"><br>
</div> </div>
</div><!-- form-row PO file --> </div>
</div>
<div align="right" style="padding:1% 0%;"> <!-- /. f i l e c h o o s e n -->
<!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
@ -994,14 +996,21 @@ if (!empty($INRSYMBOL)) {
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" /> <input type="hidden" name="Budget" id="Budget" />
<!--<input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder" /> --> <!--<input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder" /> -->
</div>
<!--/.h i d d e n f i e l d s -->
<!-- f o o t e r b u t t o n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-12 text-right">
<!-- <a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Cancel</span></a> --> <!-- <a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Cancel</span></a> -->
<a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a> <a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a> <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>
</div>
</div>
<!--/. f o o t e r b u t t o n -->
</div><!-- hiden and button -->
<br /> <br />
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
@ -4504,6 +4513,7 @@ if (!empty($INRSYMBOL)) {
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);
// console.log("Data before AJAX call:", Object.fromEntries(formData));
$('#loader').show(); $('#loader').show();
// disableButtons(); // disableButtons();
$.ajax({ $.ajax({

81
app/Views/editCapitalAmendPO.php
View File

@ -4,7 +4,6 @@
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;
@ -1663,66 +1662,47 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div><!-- /.Special Instructions section --> </div><!-- /.Special Instructions section -->
<!-- Start po file changes as per edit page -->
<div class="form-row"> <!-- f i l e c h o o s e n -->
<div class="form-group col-md-12"> <div class="col-md-12">
<div class="row">
<div class="col-md-12">
<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) {
<?php if (!empty($PrePOFile)) {
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile; $PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
if (file_exists($PrePOFilePath)) { ?> if (file_exists($PrePOFilePath)) {
?>
<div class="form-row"> <div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
<br />
<label><a title="Previous Upload PO File" <label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"> href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>Previous Upload - </span> <span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label> <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"><i class="mdi mdi-close"></i></button>
<input type="hidden" id="PrePOFile" name="PrePOFile" </div>
value="<?php echo $PrePOFile; ?>" /><br> <?php }} ?>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div> </div>
</div> </div>
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
<!-- /. f i l e c h o o s e n -->
<?php } ?> <br/>
<!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
<?php } ?>
<!-- /.file section -->
<!-- for button -->
<div class="form-row">
<div class="form-group col-md-12" align="right"><br>
<div class="btn-container" style="text-align: right;">
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="button" class="btn btn-secondary" value="Cancel"
onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-success Save" onclick="Save(0)">&nbsp;&nbsp;<span
class="bold">Save as Draft</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Approve</span></a>
</div> </div>
<!--/.h i d d e n f i e l d s -->
<!-- f o o t e r b u t t o n -->
</div> <div class="col-md-12">
</div> <div class="row">
<!-- /.button section --> <div class="col-md-5 text-left">
<div class="form-row">
<div class="form-group col-md-12">
<?php $UpdatedOn = new DateTime($UpdatedOn, new DateTimeZone('Asia/Kolkata')); <?php $UpdatedOn = new DateTime($UpdatedOn, new DateTimeZone('Asia/Kolkata'));
$UpdatedOn = $UpdatedOn->format('d-m-Y'); ?> $UpdatedOn = $UpdatedOn->format('d-m-Y'); ?>
<label>Request On :</label><?php echo $UpdatedOn; ?><br /> <label>Request On :</label><?php echo $UpdatedOn; ?><br />
@ -1748,11 +1728,20 @@ if (!empty($POItem) && $CapitalRange == '1') {
echo "Status not provided"; echo "Status not provided";
} }
?> ?>
<br /> </div>
<div class="col-md-7 text-right">
<input type="button" class="btn btn-secondary" value="Cancel"
onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-success Save" onclick="Save(0)">&nbsp;&nbsp;<span
class="bold">Save as Draft</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Approve</span></a>
</div>
</div>
</div> </div>
</div> <!--/. f o o t e r b u t t o n -->
<!-- /.Status details section -->
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->

362
app/Views/editCapitalPo.php
View File

@ -301,10 +301,6 @@ if (!empty($getlogpodtl)) {
text-align: right; text-align: right;
} }
.centered { .centered {
display: flex; display: flex;
/* justify-content: center; */ /* justify-content: center; */
@ -886,7 +882,7 @@ if (!empty($getlogpodtl)) {
<?php } ?> <?php } ?>
</div> </div>
<br> <br>
</div> </div><!--/. f o r m - r o w 874-->
<div class="box-body"> <div class="box-body">
<div class="form-row"> <div class="form-row">
@ -1230,7 +1226,8 @@ if (!empty($getlogpodtl)) {
<td> <td>
<a data-target='#VIEWCAPITAL' data-id="<?php echo $index; ?>" <a data-target='#VIEWCAPITAL' data-id="<?php echo $index; ?>"
data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWCAPITAL"><i data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWCAPITAL"><i
class="fa fa-eye" data-toggle="tooltip"></i>&nbsp;&nbsp;&nbsp;</a> </td> class="fa fa-eye" data-toggle="tooltip"></i>&nbsp;&nbsp;&nbsp;</a>
</td>
<?php <?php
} ?> } ?>
</tr> <?php </tr> <?php
@ -1298,15 +1295,9 @@ if (!empty($getlogpodtl)) {
?> ?>
</tbody> </tbody>
</table> </table>
</div> </div><!--/. t a b l e - r e s p o n s i v e -->
</div> </div><!--/. f o r m - r o w 888-->
</div> </div><!--/. b o x - b o d y 887-->
<div class="form-row" id="CAPdiv"> <div class="form-row" id="CAPdiv">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -1363,7 +1354,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div><!-- C A P d i v grandtotal 1302-->
<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;">
@ -1451,7 +1442,7 @@ if (!empty($getlogpodtl)) {
</div> </div><!-- H i d e I m p o r t T a x T o t a l grandtotal 1359-->
<div class="form-row"> <!-- style="padding:1% 1%;" --> <div class="form-row"> <!-- style="padding:1% 1%;" -->
<div class="form-group col-md-4"> <div class="form-group col-md-4">
@ -1462,9 +1453,7 @@ if (!empty($getlogpodtl)) {
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div><!-- H i d e I m p o r t T a x T o t a l 1447 -->
<!--################################################################## --> <!--################################################################## -->
<?php if (!empty($update)) { ?> <?php if (!empty($update)) { ?>
@ -1546,6 +1535,7 @@ if (!empty($getlogpodtl)) {
<?php } else { <?php } else {
} ?> } ?>
<!-- S p e c i a l I n s t r u c t i o n s r o w -->
<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
@ -1553,43 +1543,71 @@ if (!empty($getlogpodtl)) {
echo form_textarea($data); echo form_textarea($data);
?> ?>
</div> </div>
</div> </div><!-- S p e c i a l I n s t r u c t i o n s r o w 1539-->
<br> <br />
<label> Select Purchase Order File </label> <!-- f i l e c h o o s e n -->
<div class="form-row" align="left"> <div class="col-md-12">
<div class="form-group col-md-12"> <div class="row">
<div class="col-md-12">
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile"> <input type="file" name="POFile" id="POFile">
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div> </div>
</div>
<br>
<div class="form-row" id="deletePreviousPurchaseOrderFileDiv" align="left">
<div class="form-group col-md-12">
<?php if ($PrePOFile) { ?> <?php if ($PrePOFile) { ?>
<div class="col-md-12">
<label for="deletePreviousPurchaseOrderFile"><a title="Previous Upload PO File" <label for="deletePreviousPurchaseOrderFile"><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previous Upload - </span><small><?= $PrePOFile; ?></small></a></label> href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previous Upload - </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"><i class="mdi mdi-close"></i></button>
</div>
<?php } ?> <?php } ?>
</div> </div>
</div> </div>
<!-- /. f i l e c h o o s e n 1550-->
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
<div style="text-align:right !important" style="padding:3% 2%;"> <br />
<div> <!-- h i d d e n f i e l d s -->
<div class="col-md-12">
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div>
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<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; ?>" />
</div>
<!--/.h i d d e n f i e l d s 1575-->
<!-- f o o t e r b u t t o n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-5 text-left">
<label>Request On :</label><?php echo $UpdatedOn; ?><br />
<label>Request By :</label><?php echo $requestedBy; ?><br />
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
'RELEASER ONHOLD' => 'APPROVER ONHOLD',
'PO RELEASED' => 'PO APPROVED',
];
if (isset($PoStatusName) && !empty($PoStatusName)) {
if (isset($statusMappings[$PoStatusName])) {
echo $statusMappings[$PoStatusName];
} else {
echo $PoStatusName;
}
} else {
echo "Status not provided";
}
?>
</div>
<div class="col-md-7 text-right">
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) { ?> <?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) { ?>
<a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a> <a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT) { ?> <?php if ($PONOStatus == PO_DRAFT) { ?>
@ -1619,42 +1637,17 @@ if (!empty($getlogpodtl)) {
<?php } ?> <?php } ?>
</div> </div>
<label>Request On :</label><?php echo $UpdatedOn; ?><br />
<label>Request By :</label><?php echo $requestedBy; ?><br />
<!--<label>Status :</label><?php echo $PoStatusName; ?> -->
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
'RELEASER ONHOLD' => 'APPROVER ONHOLD',
'PO RELEASED' => 'PO APPROVED',
];
if (isset($PoStatusName) && !empty($PoStatusName)) {
if (isset($statusMappings[$PoStatusName])) {
echo $statusMappings[$PoStatusName];
} else {
echo $PoStatusName;
}
} else {
echo "Status not provided";
}
?>
</div> <!-- end card body-->
</div> <!-- end card -->
</div><!-- end col-->
</div><!-- row -->
</div> <!-- container -->
</div> <!-- content -->
</div> </div>
</div>
<!--/. f o o t e r b u t t o n 1585-->
</div> <!-- end card body 534-->
</div> <!-- end card 533-->
</div><!-- end col 532-->
</div><!-- row 531 -->
</div> <!-- container 511-->
</div> <!-- content 509-->
</div><!--/.content-page 508-->
<div id="packagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog" <div id="packagingcalmodel" class="modal fade" data-backdrop-limit="1" tabindex="-1" role="dialog"
@ -1811,10 +1804,9 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
</div> </div>
<div id="ExchangeRateModalDiv" style="display:none;">
<div class="form-row">
<div class="form-group col-md-9"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-3" id="ExchangeRateModalDiv" style="display:none;padding-right: 0px;"> <div class="form-group col-md-3">
<label> Exchange Rate</label> <label> Exchange Rate</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2429,8 +2421,6 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div><!-- /.modal --> </div><!-- /.modal -->
<!-- 2nd modal --> <!-- 2nd modal -->
<div id="EDITCAPITAL" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" <div id="EDITCAPITAL" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
style="display: none;"> style="display: none;">
@ -2495,9 +2485,9 @@ if (!empty($getlogpodtl)) {
</div><!-- /.1strow--> </div><!-- /.1strow-->
<div class="form-row"> <div id="ExchangeRateModalEditDiv" style="display:none;">
<div class="form-group col-md-9"></div> <div class="form-group col-md-9"></div>
<div class="form-group col-md-3" id="ExchangeRateModalEditDiv" style="display:none;"> <div class="form-group col-md-3">
<label> Exchange Rate</label> <label> Exchange Rate</label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2506,7 +2496,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div><!-- /.2ndrow--> </div>
<div class="form-row" style="padding: 0px;"> <div class="form-row" style="padding: 0px;">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -3083,24 +3073,30 @@ if (!empty($getlogpodtl)) {
</div><!-- /.content --> </div><!-- /.content -->
</div> </div>
</div><!-- /.modal --> </div><!-- /.modal -->
<!-- 3rd modal new view--> <!-- 3rd modal new view-->
<div id="VIEWCAPITAL" class="modal fade " tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;"> <div id="VIEWCAPITAL" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"
style="display: none;">
<div class="modal-dialog modal-full-width" style="width :1060px !important ;"> <div class="modal-dialog modal-full-width" style="width :1060px !important ;">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h4 class="modal-title">View Capital Purchase Order Item</h4> <h4 class="modal-title">View Capital Purchase Order Item</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
</div><!-- /. h e a d e r --> </div><!--/. m o d a l - h e a d e r -->
<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-3"> <div class="form-group col-md-3" style="padding:0px">
<label>Req No<span class="text-danger">*</span></label> <label>Req No<span class="text-danger">*</span></label>
<div> <div>
<?php <?php
$data = array('name' => 'ViewReqnumber', 'value' => set_value('ViewReqnumber'), 'id' => 'ViewReqnumber', 'class' => 'form-control', 'readonly' => 'true'); $data = array('name' => 'ViewReqnumber', 'value' => set_value('ViewReqnumber'), 'id' => 'ViewReqnumber', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -3112,7 +3108,6 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Cost Center Code</label> <label>Cost Center Code</label>
<div> <div>
@ -3131,23 +3126,10 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div>
</div><!-- /.1strow--> <div id="ExchangeRateModalViewDiv"></div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-9"></div>
<div class="form-group col-md-3" id="ExchangeRateModalViewDiv" style="display:none;">
<label> Exchange Rate</label>
<div class="form-group">
<?php
$data = array('name' => 'ViewExchangeRtModal', 'value' => set_value('ViewExchangeRtModal'), 'id' => 'ViewExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div><!-- /.2ndrow-->
<div class="form-row" style="padding: 0px;">
<div class="form-group col-md-3"> <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>
@ -3184,13 +3166,13 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div><!-- /.3rdrow-->
</div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"></div> <div class="form-group col-md-3"></div>
<div class="form-group col-md-3" style="padding: 0px;"> <div class="form-group col-md-3" style="padding: 0px;">
<label id="ViewRateIn">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
$data = array('name' => 'ViewCPRate', 'value' => set_value('ViewCPRate'), 'id' => 'ViewCPRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); $data = array('name' => 'ViewCPRate', 'value' => set_value('ViewCPRate'), 'id' => 'ViewCPRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
@ -3198,15 +3180,13 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Per</label> <label>Per</label> <?php
<?php $data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer', 'class' => 'form-control', 'readonly' => 'true'); $data = array('name' => 'ViewPer', 'value' => set_value('ViewPer'), 'id' => 'ViewPer', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); ?> echo form_input($data); ?>
</div> </div>
<div class="form-group col-md-3">
<div class="form-group col-md-3" style="padding-right: 0px;"> <label id="TotalAmount">Basic value <?php echo "($INR)" ?></label>
<label id="ViewTotalAmount">Basic value <?php echo "($INR)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ViewCPTotalAmount', 'value' => set_value('ViewCPTotalAmount'), 'id' => 'ViewCPTotalAmount', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'ViewCPTotalAmount', 'value' => set_value('ViewCPTotalAmount'), 'id' => 'ViewCPTotalAmount', 'class' => 'form-control num', 'readonly' => 'true');
@ -3215,9 +3195,10 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
</div><!-- /.4throw-->
<div class="form-row" style="padding:0px;" id="VIEWCAPdiv"> </div>
<div class="form-row" id="VIEWCAPdiv" style="padding:0px;">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -3238,7 +3219,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-3" style="padding:0px;"> <div class="form-group col-md-3"> <!--style="padding:0px"> -->
<label>Discounted Amt <?php echo "($INR)" ?></label> <label>Discounted Amt <?php echo "($INR)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3253,7 +3234,6 @@ if (!empty($getlogpodtl)) {
<label>Freight Type </label> <label>Freight Type </label>
<?php <?php
$options = array("0" => 'Select Freight Type'); $options = array("0" => 'Select Freight Type');
//print_r( $options);
if (!empty($FreightType)) { if (!empty($FreightType)) {
foreach ($FreightType as $SID): foreach ($FreightType as $SID):
$options[$SID->ConfigValue] = $SID->ConfigValue; $options[$SID->ConfigValue] = $SID->ConfigValue;
@ -3262,7 +3242,8 @@ if (!empty($getlogpodtl)) {
echo form_dropdown('drpFreightviewloc', $options, set_value(field: 'drpFreightviewloc'), 'id="drpFreightviewloc" disabled class="form-control "'); echo form_dropdown('drpFreightviewloc', $options, set_value(field: 'drpFreightviewloc'), 'id="drpFreightviewloc" disabled class="form-control "');
?> ?>
</div> </div>
<div class="form-group col-md-3" id="TripsValuelocedit" style="display:none;">
<div class="form-group col-md-3" id="TripsValuelocview" style="display:none;">
<label>NO Of Trips</label> <label>NO Of Trips</label>
<?php <?php
$data = array('name' => 'NOOfTripslocview', 'value' => set_value('NOOfTripslocview'), 'id' => 'NOOfTripslocview', 'class' => 'form-control num', 'onchange' => 'calculateFreightlocviewper();', 'disabled' => 'disabled'); $data = array('name' => 'NOOfTripslocview', 'value' => set_value('NOOfTripslocview'), 'id' => 'NOOfTripslocview', 'class' => 'form-control num', 'onchange' => 'calculateFreightlocviewper();', 'disabled' => 'disabled');
@ -3276,16 +3257,16 @@ if (!empty($getlogpodtl)) {
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-3" style="padding: 1px;">
<div class="form-group col-md-3" style="padding-left: -2px;">
<label>Freight Amt <?php echo "($INR)"; ?></label> <label>Freight Amt <?php echo "($INR)"; ?></label>
<?php <?php
$data = array('name' => 'txtAfterFreightlocview', 'value' => set_value('txtAfterFreightlocview'), 'id' => 'txtAfterFreightlocview', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'txtAfterFreightlocview', 'value' => set_value('txtAfterFreightlocview'), 'id' => 'txtAfterFreightlocview', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-6" style="text-align:right !important"> <div class="form-group col-md-6" style="text-align:right !important">
<label> CGST In % <label> <label> CGST In % </label>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -3306,31 +3287,28 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
</div><!-- /.5throw--> </div>
<div class="form-row" id="VIEWCAPdiv1">
<div class="form-row" id="VIEWCAPdiv3" style="padding:0px">
<div class="form-group col-md-6" style="text-align:right !important"> <div class="form-group col-md-6" style="text-align:right !important">
<label> SGST In % </label> <label> SGST In % </label>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ViewSgst', 'value' => set_value('ViewSgst'), 'id' => 'ViewSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'readonly' => 'true'); $data = array('name' => 'ViewSgst', 'value' => set_value('ViewSgst'), 'id' => 'ViewSgst', 'class' => 'form-control num', 'placeholder' => 'SGST TAX PERCENTAGE', 'onchange' => 'EditRatechange()', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
</div>
</div><!-- SGST1 -->
</div>
</div><!-- SGST1 -->
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ViewAfterSgst', 'value' => set_value('ViewAfterSgst'), 'id' => 'ViewAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true'); $data = array('name' => 'ViewAfterSgst', 'value' => set_value('ViewAfterSgst'), 'id' => 'ViewAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -3338,9 +3316,10 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
</div><!-- /.C.D1-->
<div class="form-row" id="VIEWCAPdiv2"> </div>
<div class="form-row" id="VIEWCAPdiv2" style="padding:0px">
<div class="form-group col-md-6" style="text-align:right !important"> <div class="form-group col-md-6" style="text-align:right !important">
<label> IGST In % </label> <label> IGST In % </label>
</div> </div>
@ -3359,20 +3338,20 @@ if (!empty($getlogpodtl)) {
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst'), 'id' => 'ViewAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true'); $data = array('name' => 'ViewAfterIgst', 'value' => set_value('ViewAfterIgst'), 'id' => 'ViewAfterIgst', 'class' => 'form-control num', 'placeholder' => 'After IGST', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
</div><!-- /.C.D2--> </div>
<div class="form-row" id="VIEWCAPdiv1" style="padding:0px">
<div class="form-row" id="VIEWCAPdiv3">
<div class="col-md-9 col-md-offset-4" style="text-align:right !important"> <div class="col-md-9 col-md-offset-4" style="text-align:right !important">
<label>Other Allowances <?php echo "($INR)" ?></label> <label>Other Allowances <?php echo "($INR)" ?></label>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3392,10 +3371,11 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div><!-- /.C.D3-->
<div class="form-row" style="padding:1%;"></div><!-- /.layer-->
</div>
<div class="form-row" style="padding:1%;"></div>
<div class="form-row" style="border:1px solid #000;padding:0px;" id="ViewModalImportTaxHide" <div class="form-row" style="border:1px solid #000;padding:0px;" id="ViewModalImportTaxHide"
style="display:none;"> style="display:none;">
<br /> <br />
@ -3405,13 +3385,15 @@ if (!empty($getlogpodtl)) {
Basic Price <?php echo "($INR)" ?> Basic Price <?php echo "($INR)" ?>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<div class="form-group" style="display:none;"> <div style="display:none;">
<div class="form-group">
<?php <?php
$data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true'); $data = array('name' => 'ViewBasicPriceTax', 'value' => set_value('ViewBasicPriceTax'), 'id' => 'ViewBasicPriceTax', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
</div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<div class="form-group"> <div class="form-group">
<?php <?php
@ -3420,7 +3402,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div><!-- f1strow --> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Landing charge <?php echo "($INR)" ?> Landing charge <?php echo "($INR)" ?>
@ -3439,13 +3421,9 @@ if (!empty($getlogpodtl)) {
$data = array('name' => 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true'); $data = array('name' => 'ViewAfterLandingCharge', 'value' => set_value('ViewAfterLandingCharge'), 'id' => 'ViewAfterLandingCharge', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
?>
?>
</div> </div>
</div> </div>
</div><!-- 2ndrow --> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Assessable Value (A) <?php echo "($INR)" ?> Assessable Value (A) <?php echo "($INR)" ?>
@ -3454,6 +3432,8 @@ if (!empty($getlogpodtl)) {
<div class="form-group" style="display: none;"> <div class="form-group" style="display: none;">
<?php <?php
$data = array('name' => 'ViewHighseas ', 'value' => set_value('ViewHighseas'), 'id' => 'ViewHighseas', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); $data = array('name' => 'ViewHighseas ', 'value' => set_value('ViewHighseas'), 'id' => 'ViewHighseas', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -3466,7 +3446,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div><!-- 3rdrow --> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Custom duty (B)<?php echo "($INR)" ?> Custom duty (B)<?php echo "($INR)" ?>
@ -3477,21 +3457,20 @@ if (!empty($getlogpodtl)) {
$data = array('name' => 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); $data = array('name' => 'ViewCustomduty', 'value' => set_value('ViewCustomduty'), 'id' => 'ViewCustomduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
?>
?>
</div> </div>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'EditAfterCustomduty', 'value' => set_value('EditAfterCustomduty'), 'id' => 'EditAfterCustomduty', 'class' => 'form-control', 'readonly' => 'true'); $data = array('name' => 'ViewAfterCustomduty', 'value' => set_value('ViewAfterCustomduty'), 'id' => 'ViewAfterCustomduty', 'class' => 'form-control', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
</div><!-- 4throw --> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Custom ED_cess (C)<?php echo "($INR)" ?> Custom ED_cess (C)<?php echo "($INR)" ?>
@ -3512,7 +3491,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div><!-- 5throw --> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Custom S & H cess (D)<?php echo "($INR)" ?> Custom S & H cess (D)<?php echo "($INR)" ?>
@ -3521,6 +3500,7 @@ if (!empty($getlogpodtl)) {
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); $data = array('name' => 'ViewCustomSHcess', 'value' => set_value('ViewCustomSHcess'), 'id' => 'ViewCustomSHcess', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -3533,15 +3513,17 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div><!-- 6throw --> </div>
</div><!-- 1st 6th--> </div><!--/. f o r m - g r o u p c o l - m d -6-->
<div class="form-group col-md-6" style="padding:10px;"> <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)" ?> -->
Subtotal (E)
<?php echo "($INR) (A+B+C+D)" ?>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<div class="form-group" style="display: none;"> <div class="form-group" style="display: none">
<?php <?php
$data = array('name' => 'ViewAdditionalExciseduty ', 'value' => set_value('ViewAdditionalExciseduty'), 'id' => 'ViewAdditionalExciseduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); $data = array('name' => 'ViewAdditionalExciseduty ', 'value' => set_value('ViewAdditionalExciseduty'), 'id' => 'ViewAdditionalExciseduty', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -3556,7 +3538,12 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div><!-- 7throw --> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<!-- Additional Excise duty : (g) --> <!-- Additional Excise duty : (g) -->
@ -3578,10 +3565,23 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div><!-- 8throw --> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-8"> <div class="form-group col-md-8">
Total Duty (G) <?php echo "($INR)" ?> <!-- Total Duty (G)<?php echo "($INR)" ?> -->
Total Duty (G)
<?php echo "($INR) (B+C+D+F)" ?>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<div class="form-group"> <div class="form-group">
@ -3591,7 +3591,9 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
</div><!-- 9throw --> </div>
<!--Start of Adding of Frieght model--> <!--Start of Adding of Frieght model-->
<div class="form-row" style="padding:0px;"> <div class="form-row" style="padding:0px;">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
@ -3604,9 +3606,10 @@ if (!empty($getlogpodtl)) {
endforeach; endforeach;
} }
echo form_dropdown('drpViewFreight', $options, set_value('drpViewFreight'), 'id="drpViewFreight"', 'class="form-control "'); echo form_dropdown('drpViewFreight', $options, set_value('drpViewFreight'), 'id="drpViewFreight"', 'class="form-control "');
?> ?>
</div> </div>
<div class="form-group col-md-4" id="EditTripsValue" style="display:none;"> <div class="form-group col-md-4" id="ViewTripsValue" style="display:none;">
<span>NO Of Trips</span> <span>NO Of Trips</span>
<?php <?php
$data = array('name' => 'ViewNOOfTrips', 'value' => set_value('ViewNOOfTrips'), 'id' => 'ViewNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(2);'); $data = array('name' => 'ViewNOOfTrips', 'value' => set_value('ViewNOOfTrips'), 'id' => 'ViewNOOfTrips', 'class' => 'form-control num', 'onchange' => 'calculateFreight(2);');
@ -3617,9 +3620,11 @@ if (!empty($getlogpodtl)) {
<span>Freight Rate </span> <span>Freight Rate </span>
<?php <?php
$data = array('name' => 'txtViewFreight', 'value' => set_value('txtViewFreight'), 'id' => 'txtViewFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(2);'); $data = array('name' => 'txtViewFreight', 'value' => set_value('txtViewFreight'), 'id' => 'txtViewFreight', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'calculateFreight(2);');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
<div class="form-group col-md-4" style="padding-left: 0px;"> <div class="form-group col-md-4" style="padding-left: 0px;">
<span>Freight Amt <?php echo "($INR)" ?></span> <span>Freight Amt <?php echo "($INR)" ?></span>
<?php <?php
@ -3627,8 +3632,11 @@ if (!empty($getlogpodtl)) {
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div><!-- 10throw -->
</div>
<!--End of Adding of freight in edit model --> <!--End of Adding of freight in edit model -->
<br> <br>
<p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p> <p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
<hr> <hr>
@ -3649,13 +3657,14 @@ if (!empty($getlogpodtl)) {
<span>Quantity</span> <span>Quantity</span>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ViewPurQuantity', 'value' => set_value('ViewPurQuantity'), 'id' => 'ViewPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); $data = array('name' => 'ViewPurQuantity', 'value' => set_value('ViewPurQuantity'), 'id' => 'ViewPurQuantity', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
</div><!-- 11throw --> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
@ -3665,12 +3674,13 @@ if (!empty($getlogpodtl)) {
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ViewCustomDutyExpenses ', 'value' => set_value('ViewCustomDutyExpenses'), 'id' => 'ViewCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); $data = array('name' => 'ViewCustomDutyExpenses ', 'value' => set_value('ViewCustomDutyExpenses'), 'id' => 'ViewCustomDutyExpenses', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
</div> </div>
</div><!-- 12throw --> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
Clearing Charges <?php echo "($INR)" ?> Clearing Charges <?php echo "($INR)" ?>
@ -3679,6 +3689,7 @@ if (!empty($getlogpodtl)) {
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'ViewClearingCharges', 'value' => set_value('ViewClearingCharges'), 'id' => 'ViewClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true'); $data = array('name' => 'ViewClearingCharges', 'value' => set_value('ViewClearingCharges'), 'id' => 'ViewClearingCharges', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'EditRatechange();', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -3687,12 +3698,13 @@ if (!empty($getlogpodtl)) {
<div class="form-group col-md-4" style="margin-top: -19px;"> <div class="form-group col-md-4" style="margin-top: -25px;">
<!-- RMC Including Customers --> <!-- RMC Including Customers -->
<span><?php echo "Net per UOM($INR)"; ?></span> <span><?php echo "Net per Uom($INR)"; ?></span>
<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');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -3702,8 +3714,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div>
</div><!-- 13throw -->
<div class="form-row"> <div class="form-row">
<!-- <div class="form-group col-md-6" style="text-align:right !important" style="display:none;"> <label>Total Order Amount :</label></div> --> <!-- <div class="form-group col-md-6" style="text-align:right !important" style="display:none;"> <label>Total Order Amount :</label></div> -->
<div class="form-group col-md-6" style="display:none;"> <div class="form-group col-md-6" style="display:none;">
@ -3717,8 +3728,10 @@ if (!empty($getlogpodtl)) {
</div><!-- 14throw row hidden --> </div><!-- 14throw row hidden -->
</div><!-- 2nd 6th--> </div>
</div><!-- Import.Tax.Hide -->
</div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label>Capital Description </label> <label>Capital Description </label>
@ -3726,18 +3739,15 @@ if (!empty($getlogpodtl)) {
$data = array('name' => 'ViewItemDescription', 'value' => set_value('ViewItemDescription'), 'id' => 'ViewItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); $data = array('name' => 'ViewItemDescription', 'value' => set_value('ViewItemDescription'), 'id' => 'ViewItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?> echo form_textarea($data); ?>
</div> </div>
</div><!-- C.Desc --> </div>
</div><!-- /.body --> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-secondary" 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 } ?>
</div><!-- /.footer -->
</form>
</div><!-- /.content -->
</div> </div>
</div><!-- /.modal --> </form>
</div>
</div>
</div><!-- /. view modal -->
<!--/. 3rd modal new view--> <!--/. 3rd modal new view-->
@ -6118,6 +6128,7 @@ if (!empty($getlogpodtl)) {
console.log(fileInput.vlaue); console.log(fileInput.vlaue);
console.log(prePOFileInput.value); console.log(prePOFileInput.value);
// console.log("Data before AJAX call:", Object.fromEntries(formData));
if (fileInput && fileInput.vlaue && fileInput.files.length > 0) { if (fileInput && fileInput.vlaue && fileInput.files.length > 0) {
formData.append('POFile', fileInput.files[0]); formData.append('POFile', fileInput.files[0]);
@ -6134,6 +6145,7 @@ if (!empty($getlogpodtl)) {
formData.append(inputID, input.val()); formData.append(inputID, input.val());
}); });
// console.log("Data before AJAX call:", Object.fromEntries(formData));
$.ajax({ $.ajax({
data: formData, data: formData,
processData: false, processData: false,

69
app/Views/editRevenueAmendPO.php
View File

@ -1657,11 +1657,37 @@ if (!empty($INRSYMBOL)) {
<?php } ?> <?php } ?>
<!-- ends here --> <!-- ends here -->
<!-- for Button --> <!-- f i l e c h o o s e n -->
<div class="form-row"> <div class="col-md-12">
<div class="form-group col-md-12" align="right"><br /> <div class="row">
<div class="btn-container" style="text-align: right;"> <div class="col-md-12">
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile">
</div>
<?php if ($PrePOFile) {
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
if (file_exists($PrePOFilePath)) {
?>
<div class="col-md-12">
<label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div>
<?php }} ?>
</div>
</div>
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
<!-- /. f i l e c h o o s e n -->
<br/>
<!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
@ -1670,23 +1696,12 @@ if (!empty($INRSYMBOL)) {
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" /> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" /> <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<input type="button" class="btn btn-secondary" value="Cancel"
onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-success Save" onclick="Save(0)">&nbsp;&nbsp;<span
class="bold">Save as Draft</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Approve</span></a>
<!-- <input type="reset" class="btn btn-success" value = "OK"> -->
</div> </div>
</div> <!--/.h i d d e n f i e l d s -->
</div> <!-- f o o t e r b u t t o n -->
<!-- ends button --> <div class="col-md-12">
<div class="row">
<!-- for Status details --> <div class="col-md-5 text-left">
<div class="form-row">
<div class="form-group col-md-12">
<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata')); <?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
$Reqon = $Reqon->format('d-m-Y'); ?> $Reqon = $Reqon->format('d-m-Y'); ?>
<label>Request On :</label><?php echo $Reqon; ?><br> <label>Request On :</label><?php echo $Reqon; ?><br>
@ -1712,9 +1727,19 @@ if (!empty($INRSYMBOL)) {
} }
?> ?>
</div> </div>
</div>
<!-- ends Status -->
<div class="col-md-7 text-right">
<input type="button" class="btn btn-secondary" value="Cancel"
onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-success Save" onclick="Save(0)">&nbsp;&nbsp;<span
class="bold">Save as Draft</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Approve</span></a>
</div>
</div>
</div>
<!--/. f o o t e r b u t t o n -->
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
</div><!-- end col--> </div><!-- end col-->

108
app/Views/editRevenuepurchaseorder.php
View File

@ -2898,21 +2898,17 @@ if (!empty($getlogpodtl)) {
<?php } else { <?php } else {
} ?> } ?>
<div class="form-row">
<div class="form-group col-md-12"> <!-- f i l e c h o o s e n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-12">
<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 class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
<?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="Previous Upload PO File" <label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"> href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>Previous Upload - </span> <span>Previous Upload - </span>
@ -2920,23 +2916,17 @@ if (!empty($getlogpodtl)) {
&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>
<?php } ?> <?php } ?>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
<?php } ?>
<div class="form-row">
<div class="form-group col-md-12" align="left"><br />
<div>
</div> </div>
</div>
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
<!-- /. f i l e c h o o s e n -->
<br/>
<!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
@ -2947,42 +2937,12 @@ if (!empty($getlogpodtl)) {
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" /> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" /> <input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" /> <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<div class="btn-container" style="text-align: right;">
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<a class="btn btn-secondary Save" ID="Cancel"
href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span
class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span
class="bold">Save as Draft</span></a>
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Submit"
onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
<?php } else { ?>
<a class="btn btn-success" ID="OK"
href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span
class="bold">OK</span></a>
<?php } ?>
</div> </div>
<!--/.h i d d e n f i e l d s -->
<!-- f o o t e r b u t t o n -->
<div class="col-md-12">
</div><br /> <div class="row">
</div> <div class="col-md-5 text-left">
<div class="form-row">
<div class="form-group col-md-12">
<label>Request On : </label><?php echo $Reqon; ?><br /> <label>Request On : </label><?php echo $Reqon; ?><br />
<?php if ($RequesterName != '' || $RequesterName != null) { ?> <?php if ($RequesterName != '' || $RequesterName != null) { ?>
<label>Request By : </label><?php echo $RequesterName; ?><br /> <label>Request By : </label><?php echo $RequesterName; ?><br />
@ -3006,7 +2966,33 @@ if (!empty($getlogpodtl)) {
} }
?> ?>
</div> </div>
<div class="col-md-7 text-right">
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<a class="btn btn-secondary Save" ID="Cancel"
href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span
class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span
class="bold">Save as Draft</span></a>
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Submit"
onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
<?php } else { ?>
<a class="btn btn-success" ID="OK"
href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span
class="bold">OK</span></a>
<?php } ?>
</div> </div>
</div>
</div>
<!--/. f o o t e r b u t t o n -->
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->

6
app/Views/editServiceAmendPO.php
View File

@ -1373,10 +1373,9 @@ foreach ($PaymentTerms as $TER) {
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button> <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div> </div>
<?php }} ?> <?php }} ?>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div> </div>
</div> </div>
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div> <div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
@ -1426,9 +1425,6 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
</div> </div>
</div>
</div>
<!--/. f o o t e r b u t t o n --> <!--/. f o o t e r b u t t o n -->
</div> </div>
</div> </div>

31
app/Views/purchaseorder.php
View File

@ -2291,35 +2291,38 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<label>Select Purchase Order File</label> <!-- f i l e c h o o s e n -->
<div class="form-row"> <div class="col-md-12">
<div class="row">
<div class="form-group col-md-12"> <div class="col-md-12">
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile"><br> <input type="file" name="POFile" id="POFile"><br>
</div> </div>
</div> </div>
</div>
<div class="form-row"> <!-- /. f i l e c h o o s e n -->
<div class="form-group col-md-12"> <!-- h i d d e n f i e l d s -->
<div align="right" style="padding-right:10px"> <div class= "col-md-12">
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" /> <input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" /> <input type="hidden" name="Budget" id="Budget" />
<div class="btn-container" style="text-align: right;"> </div>
<!--/.h i d d e n f i e l d s -->
<!-- f o o t e r b u t t o n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-12 text-right">
<a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Cancel</span></a> <a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a> <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div> </div>
</div> </div>
</div><br />
</div> </div>
<!--/. f o o t e r b u t t o n -->
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
</div><!-- end col--> </div><!-- end col-->