0001447 : ps
This commit is contained in:
parent
ef042f8637
commit
bd977f5cb6
@ -464,7 +464,7 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
|
||||
if ($forwhat == 'amendment') {
|
||||
$builder->where('POMast.Status', PO_RELEASED);
|
||||
} else {
|
||||
$builder->where('POMast.Status !=', PO_AMENDED);
|
||||
// $builder->where('POMast.Status !=', PO_AMENDED);
|
||||
// $builder->orderBy('POMast.Status !=',PO_AMENDED);
|
||||
}
|
||||
|
||||
|
||||
@ -904,11 +904,14 @@ if (!empty($getlogpodtl)) {
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="page-title-box page-title-box-alt">
|
||||
<?php if ($parentPO == '') { ?>
|
||||
<h4><?= "Edit Service Purchase Order - $PONO "; ?></h4>
|
||||
<?php } else { ?>
|
||||
<h4><?= "Amended Service Purchase Order - $PONO "; ?></h4>
|
||||
<?php } ?>
|
||||
<?php
|
||||
if ($PONOStatus != 'ST030') {
|
||||
$title = ($parentPO == '') ? "Edit Service Purchase Order - $PONO" : "Amended Service Purchase Order - $PONO";
|
||||
} else {
|
||||
$title = "View Amended Service Purchase Order - $PONO";
|
||||
}
|
||||
?>
|
||||
<h4><?= $title; ?></h4>
|
||||
<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-secondary" id="back" value="Back">Back</a>
|
||||
</div>
|
||||
</div>
|
||||
@ -2515,6 +2518,19 @@ if (!empty($getlogpodtl)) {
|
||||
</td>
|
||||
</tr>
|
||||
</script> -->
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
var PONOStatus = "<?= $PONOStatus ?>";
|
||||
console.log(PONOStatus);
|
||||
|
||||
if (PONOStatus === 'ST030') {
|
||||
$('input, textarea, select').attr('readonly', true);
|
||||
$('input[type="file"], input[type="radio"], input[type="checkbox"]').attr('disabled', true);
|
||||
$("#PaymentTerms,#drpSupplier,#insuranceStatus,#PoTypeOptions,#workstatus").prop("disabled", true);
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<script>
|
||||
var index = <?php if (isset($index)) {
|
||||
echo $index;
|
||||
|
||||
@ -202,9 +202,14 @@
|
||||
<?php } ?>
|
||||
</td>
|
||||
<?php
|
||||
} else {
|
||||
|
||||
?>
|
||||
} else if ($statusCode == PO_AMENDED ) { ?>
|
||||
<td>
|
||||
<a data-toggle="tooltip" href="<?php echo base_url() . 'EditPO?PONO=' . $record->PONO . '&ReqType=' . $record->ReqType. '&CapitalRange=' . $record->CapitalRange; ?>">
|
||||
<i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->PONO; ?> - Click here to Amendment Purchase Order details"></i>
|
||||
|
||||
</a>
|
||||
</td>
|
||||
<?php } else { ?>
|
||||
<td>
|
||||
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2036,11 +2036,14 @@ if (!empty($getlogpodtl)) {
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="page-title-box page-title-box-alt">
|
||||
<?php if ($parentPO == '') { ?>
|
||||
<h4><?= "Edit Revenue Purchase Order - $PONO "; ?></h4>
|
||||
<?php } else { ?>
|
||||
<h4><?= "Amended Revenue Purchase Order - $PONO "; ?></h4>
|
||||
<?php } ?>
|
||||
<?php
|
||||
if ($PONOStatus != 'ST030') {
|
||||
$title = ($parentPO == '') ? "Edit Revenue Purchase Order - $PONO" : "Amended Revenue Purchase Order - $PONO";
|
||||
} else {
|
||||
$title = "View Amended Revenue Purchase Order - $PONO";
|
||||
}
|
||||
?>
|
||||
<h4><?= $title; ?></h4>
|
||||
<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-secondary" id="back"
|
||||
value="Back">Back</a>
|
||||
</div>
|
||||
@ -4381,6 +4384,18 @@ if (!empty($getlogpodtl)) {
|
||||
</section>
|
||||
</div>
|
||||
</script>
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
var PONOStatus = "<?= $PONOStatus ?>";
|
||||
console.log(PONOStatus);
|
||||
|
||||
if (PONOStatus === 'ST030') {
|
||||
$('input, textarea, select').attr('readonly', true);
|
||||
$('input[type="file"], input[type="radio"], input[type="checkbox"]').attr('disabled', true);
|
||||
$("#PaymentTerms,#drpSupplier").prop("disabled", true);
|
||||
}
|
||||
});
|
||||
</script>
|
||||
<script>
|
||||
var index = <?php if (isset($index)) {
|
||||
echo $index;
|
||||
|
||||
@ -348,9 +348,7 @@ if (!empty($getlogpodtl)) {
|
||||
</style>
|
||||
|
||||
<script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script>
|
||||
<script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript">
|
||||
|
||||
</script>
|
||||
<script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script>
|
||||
|
||||
|
||||
<script>
|
||||
@ -461,16 +459,19 @@ if (!empty($getlogpodtl)) {
|
||||
<div class="col-12">
|
||||
<!-- start page title -->
|
||||
<div class="page-title-box page-title-box-alt">
|
||||
<?php if ($parentPO == '') { ?>
|
||||
<h4><?= "Edit Import Purchase Order - $PONO "; ?></h4>
|
||||
<?php } else { ?>
|
||||
<h4><?= "Amended Import Purchase Order - $PONO "; ?></h4>
|
||||
<?php } ?>
|
||||
<?php
|
||||
if ($PONOStatus != 'ST030') {
|
||||
$title = ($parentPO == '') ? "Edit Import Purchase Order - $PONO" : "Amended Import Purchase Order - $PONO";
|
||||
} else {
|
||||
$title = "View Amended Import Purchase Order - $PONO";
|
||||
}
|
||||
?>
|
||||
<h4><?= $title; ?></h4>
|
||||
<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-secondary" id="back" value="Back">Back</a>
|
||||
</div><!-- end page title -->
|
||||
</div><!-- end col-->
|
||||
</div><!-- end first row -->
|
||||
|
||||
|
||||
<!-- second row -->
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
@ -887,7 +888,10 @@ if (!empty($getlogpodtl)) {
|
||||
<input type="hidden" name="<?php echo 'Reqnumber' . $index ?>" id="<?php echo 'Reqnumber' . $index ?>" value="<?php echo $record->ReqNo; ?>" />
|
||||
<input type="hidden" name="<?php echo 'departmentName' . $index ?>" id="<?php echo 'departmentName' . $index ?>" value="<?php echo $record->DepartmentName; ?>" />
|
||||
|
||||
<!--<input type="hidden" name="<?php //echo 'AvlBudAmt'.$index ?>" id="<?php //echo 'AvlBudAmt'.$index ?>" value="<?php //echo $record->AvlBudAmt ; ?>" /> -->
|
||||
<!--<input type="hidden" name="<?php //echo 'AvlBudAmt'.$index
|
||||
?>" id="<?php //echo 'AvlBudAmt'.$index
|
||||
?>" value="<?php //echo $record->AvlBudAmt ;
|
||||
?>" /> -->
|
||||
<input type="hidden" name="<?php echo 'AvlBudAmt' . $index ?>" id="<?php echo 'AvlBudAmt' . $index ?>" value="<?php echo "$AvlAmount"; ?>" />
|
||||
|
||||
<input type="hidden" name="<?php echo 'LineItemNo' . $index ?>" id="<?php echo 'LineItemNo' . $index ?>" value="<?php echo $record->LineItemNo; ?>" />
|
||||
@ -927,8 +931,14 @@ if (!empty($getlogpodtl)) {
|
||||
<input type="hidden" name="<?php echo 'CustomSHCess' . $index ?>" id="<?php echo 'CustomSHCess' . $index ?>" value="<?php echo $record->CustomSHCess; ?>" />
|
||||
<input type="hidden" name="<?php echo 'AfterCustomSHCess' . $index ?>" id="<?php echo 'AfterCustomSHCess' . $index ?>" value="<?php echo $record->AfterCustomSHCess; ?>" />
|
||||
|
||||
<!-- <input type="hidden" name="<?php // echo 'Grossdutypayable' . $index ?>" id="<?php // echo 'Grossdutypayable' . $index ?>" value="<?php // echo $record->Grossdutypayable; ?>" /> -->
|
||||
<!-- <input type="hidden" name="<?php // echo 'QuantityKG' . $index ?>" id="<?php // echo 'QuantityKG' . $index ?>" value="<?php // echo $record->QuantityKG; ?>" />-->
|
||||
<!-- <input type="hidden" name="<?php // echo 'Grossdutypayable' . $index
|
||||
?>" id="<?php // echo 'Grossdutypayable' . $index
|
||||
?>" value="<?php // echo $record->Grossdutypayable;
|
||||
?>" /> -->
|
||||
<!-- <input type="hidden" name="<?php // echo 'QuantityKG' . $index
|
||||
?>" id="<?php // echo 'QuantityKG' . $index
|
||||
?>" value="<?php // echo $record->QuantityKG;
|
||||
?>" />-->
|
||||
|
||||
|
||||
<input type="hidden" name="<?php echo 'BasicPriceInMTon' . $index ?>" id="<?php echo 'BasicPriceInMTonG' . $index ?>" value="<?php echo $record->BasicPriceInMTon; ?>" />
|
||||
@ -938,7 +948,10 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
|
||||
|
||||
<!-- <input type="hidden" name="<?php // echo 'Grossdutypayable' . $index ?>" id="<?php // echo 'Grossdutypayable' . $index ?>" value="<?php // echo $record->Grossdutypayable; ?>" />-->
|
||||
<!-- <input type="hidden" name="<?php // echo 'Grossdutypayable' . $index
|
||||
?>" id="<?php // echo 'Grossdutypayable' . $index
|
||||
?>" value="<?php // echo $record->Grossdutypayable;
|
||||
?>" />-->
|
||||
|
||||
<input type="hidden" name="<?php echo 'BasicINRValue' . $index ?>" id="<?php echo 'BasicINRValue' . $index ?>" value="<?php echo $record->BasicINRValue; ?>" />
|
||||
|
||||
@ -946,10 +959,16 @@ if (!empty($getlogpodtl)) {
|
||||
<input type="hidden" name="<?php echo 'ExchangeRate' . $index ?>" id="<?php echo 'ExchangeRate' . $index ?>" value="<?php echo $record->ExchangeRate; ?>" />
|
||||
|
||||
|
||||
<!-- <input type="hidden" name="<?php // echo 'AfterCustomEDcess' . $index ?>" id="<?php // echo 'AfterCustomEDcess' . $index ?>" value="<?php // echo $record->AfterCustomEdCess; ?>" /> -->
|
||||
<!-- <input type="hidden" name="<?php // echo 'AfterCustomEDcess' . $index
|
||||
?>" id="<?php // echo 'AfterCustomEDcess' . $index
|
||||
?>" value="<?php // echo $record->AfterCustomEdCess;
|
||||
?>" /> -->
|
||||
|
||||
|
||||
<!-- <input type="hidden" name="<?php // echo 'CustomEDcess' . $index ?>" id="<?php // echo 'CustomEDcess' . $index ?>" value="<?php // echo $record->CustomEdCess; ?>" /> -->
|
||||
<!-- <input type="hidden" name="<?php // echo 'CustomEDcess' . $index
|
||||
?>" id="<?php // echo 'CustomEDcess' . $index
|
||||
?>" value="<?php // echo $record->CustomEdCess;
|
||||
?>" /> -->
|
||||
|
||||
|
||||
<input type="hidden" name="<?php echo 'FreightType' . $index ?>" id="<?php echo 'FreightType' . $index ?>" value="<?php echo $record->FreightType; ?>" />
|
||||
@ -964,7 +983,10 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
<input type="hidden" name="<?php echo 'Addinstruction' . $index ?>" id="<?php echo 'Addinstruction' . $index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
|
||||
|
||||
<!-- <input type="hidden" name="<?php // echo 'AfterFreightValue' . $index ?>" id="<?php // echo 'AfterFreightValue' . $index ?>" value="<?php // echo $record->AfterFreightValue; ?>" /> -->
|
||||
<!-- <input type="hidden" name="<?php // echo 'AfterFreightValue' . $index
|
||||
?>" id="<?php // echo 'AfterFreightValue' . $index
|
||||
?>" value="<?php // echo $record->AfterFreightValue;
|
||||
?>" /> -->
|
||||
|
||||
|
||||
<input type="hidden" name="<?php echo 'AssessableValue' . $index ?>" id="<?php echo 'AssessableValue' . $index ?>" value="<?php echo $record->AssessableValue; ?>" />
|
||||
@ -989,10 +1011,14 @@ if (!empty($getlogpodtl)) {
|
||||
<?php
|
||||
|
||||
if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED) { ?>
|
||||
<td> <a data-target='#editimportpomodel' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#editimportpomodel"><i class="ri-pencil-fill" data-toggle="tooltip"></i> </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='#editimportpomodel' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#editimportpomodel"><i class="ri-pencil-fill" data-toggle="tooltip"></i> </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>
|
||||
<?php
|
||||
} else { ?>
|
||||
<td> <a data-target='#viewimportmodal' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#viewimportmodal"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the <?php echo $record->ReqNo; ?>Click here to view Requisition details"></i> </a> </td>
|
||||
<!-- <td> <a data-target='#viewimportmodal' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#viewimportmodal"><i class="fa fa-eye" data-toggle="tooltip" title="Click here to view the <?php echo $record->ReqNo; ?> Requisition details"></i></a> </td> -->
|
||||
<td> <a data-target='#viewimportmodal' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#viewimportmodal"><i class=" ri-eye-fill" data-toggle="tooltip"></i> </a>
|
||||
</td>
|
||||
<?php
|
||||
} ?>
|
||||
</tr> <?php
|
||||
@ -1313,20 +1339,17 @@ if (!empty($getlogpodtl)) {
|
||||
|
||||
<a class="btn btn-success Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>"> <span class="bold">Cancel</span></a>
|
||||
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) {
|
||||
if ($PONOStatus == PO_DRAFT) { ?>
|
||||
<a class="btn btn-success Save" ID="Save" onclick="Save(0)"> <span class="bold">Save as Draft</span></a>
|
||||
<?php } ?>
|
||||
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)"> <span class="bold">Submit</span></a>
|
||||
<a class="btn btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)"> <span class="bold">Approve</span></a>
|
||||
<!-- <input type="reset" class="btn btn-success" value="Reset"> -->
|
||||
if ($PONOStatus == PO_DRAFT) { ?>
|
||||
<a class="btn btn-success Save" ID="Save" onclick="Save(0)"> <span class="bold">Save as Draft</span></a>
|
||||
<?php } ?>
|
||||
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)"> <span class="bold">Submit</span></a>
|
||||
<a class="btn btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)"> <span class="bold">Approve</span></a>
|
||||
<?php } else if($PONOStatus == PO_AMENDED){ ?>
|
||||
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
|
||||
<?php } else { ?>
|
||||
|
||||
|
||||
<?php if ($DEPCode == FINANCE) { ?>
|
||||
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
|
||||
|
||||
<?php } else { ?>
|
||||
<!-- <input type="reset" class="btn btn-success" value = "OK"> -->
|
||||
<a class="btn btn-success Submit" ID="Submit" onclick="Save(2)"> <span class="bold">Submit</span></a>
|
||||
<a class="btn btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)"> <span class="bold">Approve</span></a>
|
||||
<a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorderListing">OK</a>
|
||||
@ -1529,7 +1552,7 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<!-- <P id=labelRate> -->
|
||||
<!-- <P id=labelRate> -->
|
||||
<label id=labelRate><?php echo "Rate in"; ?> <span class="text-danger">*</span></label><!-- </P> -->
|
||||
<div>
|
||||
<?php
|
||||
@ -1867,10 +1890,10 @@ if (!empty($getlogpodtl)) {
|
||||
</div>
|
||||
<!--End of Adding of freight in edit model -->
|
||||
|
||||
<br>
|
||||
<p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
|
||||
<hr>
|
||||
<br>
|
||||
<br>
|
||||
<p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p>
|
||||
<hr>
|
||||
<br>
|
||||
|
||||
<div class="form-row mt-3">
|
||||
<div class="form-group col-md-6">
|
||||
@ -2996,13 +3019,25 @@ if (!empty($getlogpodtl)) {
|
||||
<!-- <a class="btn btn-success font UpdateImport" ID="UpdateImport"> <span class="bold">Update</span></a> -->
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div><!-- /. modal-content -->
|
||||
</div>
|
||||
</div><!-- /.modal -->
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
var PONOStatus = "<?= $PONOStatus ?>";
|
||||
console.log(PONOStatus);
|
||||
|
||||
if (PONOStatus === 'ST030') {
|
||||
$('input, textarea, select').attr('readonly', true);
|
||||
$('input[type="file"], input[type="radio"], input[type="checkbox"]').attr('disabled', true);
|
||||
$("#drpSupplier,#currencytype,#PaymentTerms").prop("disabled", true);
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function() {
|
||||
$('#Date').click(function() {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user