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

amended service purchase order, edit service purchase order bug fix - vadivel J

Browse Source
This commit is contained in:
vadivelJ96 2024-09-12 11:11:41 +05:30
parent 696165b83d
commit 8b4c6a5404
2 changed files with 188 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

202
app/Views/editServiceAmendPO.php
View File

@ -644,9 +644,9 @@ foreach ($PaymentTerms as $TER) {
}); });
</script> </script>
<style> <style>
.modal { /* .modal {
padding-right: 25% ! important; padding-right: 25% ! important;
} } */
.num { .num {
text-align: right; text-align: right;
@ -703,7 +703,7 @@ foreach ($PaymentTerms as $TER) {
echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?> echo form_open(base_url() . '/purchaseorder/addPO/', $attributes); ?>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Requistion No</label> <label>Requistion No</label>
<?php <?php
@ -754,8 +754,10 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
</div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Work Status<span class="text-danger">*</span></label> <label>Work Status<span class="text-danger">*</span></label>
<?php <?php
@ -773,7 +775,7 @@ foreach ($PaymentTerms as $TER) {
} }
endforeach; endforeach;
} }
echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus"', 'required="true"', 'class="form-control select2'); echo form_dropdown('workstatus', $optionsWork, set_value('workstatus'), 'id="workstatus" required="true" class="form-control select2');
?> ?>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -815,10 +817,10 @@ foreach ($PaymentTerms as $TER) {
?><input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" value="<?php echo $DeliveryAddress; ?>"> ?><input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" value="<?php echo $DeliveryAddress; ?>">
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Purchase Order Date</label> <label>Purchase Order Date</label>
<div class="form-group"> <div class="form-group">
@ -859,9 +861,8 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
</div> </div>
</div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Our Reference(S)</label> <label>Our Reference(S)</label>
<div class="form-group"> <div class="form-group">
@ -892,7 +893,7 @@ foreach ($PaymentTerms as $TER) {
endforeach; endforeach;
} }
echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions"', 'required="true"', 'class="form-control select2'); echo form_dropdown('PoTypeOptions', $optionsPO, set_value('PoTypeOptions'), 'id="PoTypeOptions" required="true" class="form-control select2');
?> ?>
@ -934,11 +935,9 @@ foreach ($PaymentTerms as $TER) {
?> ?>
</div> </div>
</div> </div>
</div>
</div>
</div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Insurance Options<span class="text-danger">*</span></label> <label>Insurance Options<span class="text-danger">*</span></label>
<div class="form-group"> <div class="form-group">
@ -964,7 +963,7 @@ foreach ($PaymentTerms as $TER) {
endforeach; endforeach;
} }
echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus"', 'required="true"', 'class="form-control select2'); echo form_dropdown('insuranceStatus', $optionsInsurance, set_value('insuranceStatus'), 'id="insuranceStatus" required="true" class="form-control select2');
?> ?>
@ -981,7 +980,7 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label for="BudgetType">Budget Type<span class="text-danger">*</span></label> <label for="BudgetType">Budget Type<span class="text-danger">*</span></label>
<select id='BudgetType' name='BudgetType' required="true"> <select class="form-control" id='BudgetType' name='BudgetType' required="true">
<?php if ($BudgetType == 'CAPITAL') { <?php if ($BudgetType == 'CAPITAL') {
$opt1 = 'CAPITAL'; $opt1 = 'CAPITAL';
$opt2 = 'REVENUE'; $opt2 = 'REVENUE';
@ -994,9 +993,23 @@ foreach ($PaymentTerms as $TER) {
</select> </select>
</div> </div>
</div> </div>
<div class="form-row">
</div> </div>
<div align="right"> <div class="form-row">
</div>
<div class="form-row">
</div>
<div >
<!-- <a data-toggle="modal" ><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a> --> <!-- <a data-toggle="modal" ><button type="submit" onclick="myFunction();" class="btn btn-success" id="abcd" >Select Line Item</button> </a> -->
<!-- Model for servicepo --> <!-- Model for servicepo -->
@ -1005,15 +1018,20 @@ foreach ($PaymentTerms as $TER) {
<div class="modal-dialog modal-full-width"> <div class="modal-dialog modal-full-width">
<!-- Modal content--> <!-- Modal content-->
<form> <form>
<div class="modal-content" style="width:900px;"> <div class="modal-content" >
<div class="modal-header"> <div class="modal-header">
<center> <center>
<h4>Edit Service Purchase Order Item </h4> <h4 class="modal-title w-100">Edit Service Purchase Order Item </h4>
</center> </center>
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true"> × </button>
</div> </div>
<div align="left"> <div >
<br>
<div class="form-row px-3 ">
<div class="form-group col-md-12">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Req No<span class="text-danger">*</span></label> <label>Req No<span class="text-danger">*</span></label>
<div> <div>
@ -1054,8 +1072,10 @@ foreach ($PaymentTerms as $TER) {
?> ?>
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-12">
<div class="form-row px-3">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Item Code<span class="text-danger">*</span></label>*</span></label> <label>Item Code<span class="text-danger">*</span></label>*</span></label>
<div> <div>
@ -1118,7 +1138,7 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
<div class="form-group col-md-12"> <div class="form-row px-3">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Quantity<span class="text-danger">*</span></label>*</span></label> <label>Quantity<span class="text-danger">*</span></label>*</span></label>
@ -1155,8 +1175,8 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
<div class="form-group col-md-12"> <div class="form-row px-3">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" >
CGST In % CGST In %
</div> </div>
@ -1183,8 +1203,8 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
</div> </div>
<div class="form-group col-md-12"> <div class="form-row px-3">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" >
SGST In % SGST In %
</div> </div>
@ -1212,8 +1232,8 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
<div class="form-group col-md-12"> <div class="form-row px-3">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" >
IGST In % IGST In %
</div> </div>
@ -1240,9 +1260,12 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
</div> </div>
<div class="form-group col-md-12"> <div class="form-row px-3">
<div class="col-md-5 col-md-offset-4" align="right"> <div class="form-group col-md-3" >
<label>Other Allowances <?php echo $INRSYM ?></label> <label>Other Allowances <?php echo $INRSYM ?></label>
</div>
<div class="form-group col-md-3">
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<div class="form-group"> <div class="form-group">
@ -1253,9 +1276,13 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-12"> <div class="form-row px-3">
<div class="col-md-5 col-md-offset-4" align="right">
<div class="form-group col-md-3 " >
<label><?php echo "Total Order Value ($INRSYM)"; ?></label> <label><?php echo "Total Order Value ($INRSYM)"; ?></label>
</div>
<div class="form-group col-md-3">
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<div class="form-group"> <div class="form-group">
@ -1266,14 +1293,27 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-12" style="padding: 0px 30px 10px 30px;"> <div class="form-row pl-3" >
<label>Service Description </label> <?php $data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction', $ServiceMaterialDescription), 'id' => 'EdittxtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); <div class="form-group col-md-2">
echo form_textarea($data); <label>Service Description </label>
?> <input type="hidden" name="beforeEdittxtSpcialInstruction" id="beforeSpcialInstruction" value="<?php echo $ServiceMaterialDescription; ?>">
</div> </div>
<div class="form-group col-md-3">
<?php $data = array('name' => 'EdittxtSpcialInstruction',
'value' => set_value('EdittxtSpcialInstruction', $ServiceMaterialDescription),
'id' => 'EdittxtSpcialInstruction', 'class' => 'form-control ', 'rows' => '3', 'cols' => '40');
echo form_textarea($data);
?>
<input type="hidden" name="beforeEdittxtSpcialInstruction" id="beforeSpcialInstruction"
value="<?php echo $ServiceMaterialDescription; ?>" >
</div>
</div>
<br /> <br />
<div class="modal-footer"> <div class="modal-footer" align="right">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-success" 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> <a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
@ -1332,15 +1372,15 @@ foreach ($PaymentTerms as $TER) {
<td><?php echo $record->ReqNo ?> </td> <td><?php echo $record->ReqNo ?> </td>
<td><?php echo $record->MaterialCode ?></td> <td><?php echo $record->MaterialCode ?></td>
<td><?php echo $record->MaterialName ?></td> <td><?php echo $record->MaterialName ?></td>
<td align="right"><?php echo $record->Quantity ?></td> <td ><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td> <td><?php echo $record->UOM ?></td>
<td align="right"><?php echo $record->Rate ?></td> <td><?php echo $record->Rate ?></td>
<td align="right"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td> <td ><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
<td align="right"><?php echo $record->Taxamount ?></td> <td ><?php echo $record->Taxamount ?></td>
<td align="right"><?php echo $record->TotalValue ?></td> <td ><?php echo $record->TotalValue ?></td>
<td align="right"><?php echo $record->Quantity ?></td> <td ><?php echo $record->Quantity ?></td>
<td align="right"><?php echo $record->ReceivedQuantity ?></td> <td ><?php echo $record->ReceivedQuantity ?></td>
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> <td ><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td>
<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" /> <input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
@ -1416,7 +1456,11 @@ foreach ($PaymentTerms as $TER) {
//if($PONOStatus == PO_DRAFT) //if($PONOStatus == PO_DRAFT)
//{ //{
?> ?>
<td> <a data-target='#EDITSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;<!-- </a> <a href='#' onclick = "DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del" ><span class="ri-delete-bin-7-fill"></span></a>--> <td> <a data-target='#EDITSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>"
data-toggle="modal" href="#EDITSERVICE"><i class="ri-pencil-fill" data-toggle="tooltip"
title="Click here to view/Edit the <?php echo $record->ReqNo; ?>
Requisition details"></i>&nbsp;&nbsp;&nbsp;
<!-- </a> <a href='#' onclick = "DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del" ><span class="ri-delete-bin-7-fill"></span></a>-->
<?php <?php
//} else { //} else {
?> ?>
@ -1445,8 +1489,6 @@ foreach ($PaymentTerms as $TER) {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12" style="padding:0px;">
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Basic Amount <?php echo $INRSYM ?> </label> <label>Basic Amount <?php echo $INRSYM ?> </label>
<?php <?php
@ -1495,53 +1537,69 @@ foreach ($PaymentTerms as $TER) {
?> ?>
</div> </div>
</div> </div>
<br>
<div class="form-row">
<!--start new fields 1 sep--> <!--start new fields 1 sep-->
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label>Description Of Service<span class="text-danger">*</span></label>*</label> <label>Description Of Service </label><span class="text-danger">*</span>
<div class="form-group">
<?php <?php
$data = array('name' => 'amenddescofpo', 'value' => set_value('amenddescofpo', $DescriptionOfPo), 'id' => 'amenddescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); $data = array('name' => 'amenddescofpo', 'value' => set_value('amenddescofpo', $DescriptionOfPo), 'id' => 'amenddescofpo', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); echo form_textarea($data);
?> ?>
</div>
</div><!--end new fields 1 sep-->
<div class="form-group col-md-12" style="padding:0px;">
<div class="form-group col-md-12">
<label>Scope Of Work</label> <?php
$data = array('name' => 'ScopeofWork', 'value' => set_value('ScopeofWork', $ServiceDescription), 'id' => 'ScopeofWork', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
echo form_textarea($data);
?>
</div>
</div> </div>
<!--end new fields 1 sep-->
</div>
<br>
<div class="form-row">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div class="form-row"><br /> <label>Scope Of Work</label>
<div align="right" style="padding-right:10px"> <textarea name="ScopeofWork" id="ScopeofWork" class="form-control" rows="8" cols="40">
<div> <?php echo set_value('ScopeofWork', $ServiceDescription); ?>
</textarea>
</div>
</div>
<br>
<label>Purchase Order File</label>
<div class="form-row">
<div class="col-md-9">
<input type="file" name="POFile" id="POFile"> <input type="file" name="POFile" id="POFile">
<?php if ($PrePOFile) { ?> <?php if ($PrePOFile) { ?>
<label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label> <label><a title="previously uploaded PO File" href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>previously uploaded - </span><small><?= $PrePOFile; ?></small></a></label>
<?php } ?> <?php } ?>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div> </div>
<div class="col-md-3">
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
<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="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-success" value="Cancel" onClick="window.location ='amendmentpurchaseorder';"> <input type="button" class="btn btn-success mr-2 " value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
<!-- <a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> --> <!-- <a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
<a class="btn btn-success Save " ID="Submit" onclick="Save()">&nbsp;&nbsp;<span class="bold">Submit</span></a> <a class="btn btn-success Save " ID="Submit" onclick="Save()">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div><br />
</div> </div>
</div> </div>
<br />
</div><br />
<br>
<div class="row">
<div class="form-group col-md-9">
</div>
<div class="form-group col-md-3">
<?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 />
@ -1566,6 +1624,10 @@ foreach ($PaymentTerms as $TER) {
?> ?>
</div>
</div>
</div> <!-- end card body--> </div> <!-- end card body-->