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

CHANGE_PURCHASE_ORDER_SERVICE_REVENUE__CAPITAL_IMPORT_ADD_EDIT_CHECK_MODAL

Browse Source
This commit is contained in:
aadhavan valli 2024-09-21 13:30:51 +05:30
parent 71f2de282d
commit 65aa4fb078
8 changed files with 958 additions and 791 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
app/Controllers/Purchaseorder.php
View File

@ -1330,6 +1330,7 @@ class Purchaseorder extends BaseController
} }
//echo "OUT"; //echo "OUT";
// print_r($this->request->getPost());die;
for ($i = 1; $i <= $RowCount; $i++) { for ($i = 1; $i <= $RowCount; $i++) {
//echo "IN"; //echo "IN";
$MaterialCode = $this->request->getPost('materialCode' . $i); $MaterialCode = $this->request->getPost('materialCode' . $i);
@ -1444,7 +1445,20 @@ class Purchaseorder extends BaseController
if ($SkipInsert == "False") { if ($SkipInsert == "False") {
if (strlen((string)$POLineItemNo) == 0) { if (strlen((string)$POLineItemNo) == 0) {
$this->requistion_model = new requistion_model();
$RetItemNo = $this->requistion_model->getItemNumber($Reqnumber, $MaterialCode);
$ItemNo = '';
if (count($RetItemNo) > 0) {
$ItemNo = $RetItemNo[0]['ItemNo'];
}
$POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'ReceivedQuantity' => $recqty, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'CostCenterCode' => $CostCenter);
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
if (count($POLineItem) > 0) {
$LineItemNo = $POLineItem[0]['LineItemNo'];
}
} else { } else {
$LineItemNo = $POLineItemNo; $LineItemNo = $POLineItemNo;
@ -1456,10 +1470,60 @@ class Purchaseorder extends BaseController
$isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo); $isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo);
if (is_array($isExists) && count($isExists) == 0) { // Ensure $isExists is an array, or initialize it as an empty array
if (!is_array($isExists)) {
$isExists = [];
}
if (count($isExists) == 0) {
$RevenueTaxList = array(
'LineItemNo' => $LineItemNo,
'DiscountType' => $DiscountType,
'DiscountValue' => $DiscountValue,
'AfterDiscount' => $AfterDiscount,
'PackagingType' => $PackagingType,
'PackagingValue' => $PackagingValue,
'PackagingCalulatedOn' => $PackagingOption,
'AfterPackagingValue' => $AfterPackagingValue,
'FreightType' => $FreightType,
'FreightValue' => $FreightValue,
'AfterFreightValue' => $AfterFreightValue,
'Insurance' => $InsuranceValue,
'TotalValue' => $TotalOrderValue,
'CGST' => $Cgst,
'AfterCGST' => $AfterCgst,
'SGST' => $Sgst,
'AfterSGST' => $AfterSgst,
'IGST' => $Igst,
'AfterIGST' => $AfterIgst,
'NoOfTrip' => $NOOfTrip
);
$RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
} else { } else {
$RevenueTaxList = array('DiscountType' => $DiscountType, 'DiscountValue' => $DiscountValue, 'AfterDiscount' => $AfterDiscount, 'PackagingType' => $PackagingType, 'PackagingValue' => $PackagingValue, 'PackagingCalulatedOn' => $PackagingOption, 'AfterPackagingValue' => $AfterPackagingValue, 'FreightType' => $FreightType, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'Insurance' => $InsuranceValue, 'TotalValue' => $TotalOrderValue, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt, 'CGST' => $Cgst, 'AfterCGST' => $AfterCgst, 'SGST' => $Sgst, 'AfterSGST' => $AfterSgst, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'CreatedBy' => $updatedBy, 'NoOfTrip' => $NOOfTrip); $RevenueTaxList = array(
'DiscountType' => $DiscountType,
'DiscountValue' => $DiscountValue,
'AfterDiscount' => $AfterDiscount,
'PackagingType' => $PackagingType,
'PackagingValue' => $PackagingValue,
'PackagingCalulatedOn' => $PackagingOption,
'AfterPackagingValue' => $AfterPackagingValue,
'FreightType' => $FreightType,
'FreightValue' => $FreightValue,
'AfterFreightValue' => $AfterFreightValue,
'Insurance' => $InsuranceValue,
'TotalValue' => $TotalOrderValue,
'UpdateBY' => $updatedBy,
'UpdatedOn' => $updateddt,
'CGST' => $Cgst,
'AfterCGST' => $AfterCgst,
'SGST' => $Sgst,
'AfterSGST' => $AfterSgst,
'IGST' => $Igst,
'AfterIGST' => $AfterIgst,
'CreatedBy' => $updatedBy,
'NoOfTrip' => $NOOfTrip
);
$this->purchaseorder_model->updateRevenueTax($LineItemNo, $RevenueTaxList); $this->purchaseorder_model->updateRevenueTax($LineItemNo, $RevenueTaxList);
} }
} }
@ -2366,7 +2430,10 @@ class Purchaseorder extends BaseController
// print_r($isExists); // print_r($isExists);
// die(); // die();
if (is_array($isExists) && count($isExists) == 0) { if (!is_array($isExists)) {
$isExists = [];
}
if (count($isExists) == 0) {
// print_r(count($isExists)); // print_r(count($isExists));
// echo $isExists; // echo $isExists;
// die(); // die();
@ -2751,8 +2818,6 @@ class Purchaseorder extends BaseController
/*Edit Capital po*/ /*Edit Capital po*/
function EditCapitalPurchaseOrder() function EditCapitalPurchaseOrder()
{ {
$PONO = $this->request->getPost('txtPONO'); $PONO = $this->request->getPost('txtPONO');
$POdt = $this->request->getPost('PODate'); $POdt = $this->request->getPost('PODate');
$PODate = get_date_time_format($POdt); $PODate = get_date_time_format($POdt);
@ -2879,7 +2944,6 @@ class Purchaseorder extends BaseController
} }
} }
} }
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO, $POList); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO, $POList);
$LineItemStatus = REQITEM_NEW; $LineItemStatus = REQITEM_NEW;
@ -2901,7 +2965,7 @@ class Purchaseorder extends BaseController
$this->purchaseorder_model->insertlogpo($logpo); $this->purchaseorder_model->insertlogpo($logpo);
} }
} }
// print_r($this->request->getPost());die;
for ($i = 1; $i <= $RowCount; $i++) { for ($i = 1; $i <= $RowCount; $i++) {
$MaterialCode = $this->request->getPost('materialCode' . $i); $MaterialCode = $this->request->getPost('materialCode' . $i);
@ -3056,7 +3120,7 @@ class Purchaseorder extends BaseController
// print_r(strlen((string)$POLineItemNo));die;
if ($SkipInsert == "False") { if ($SkipInsert == "False") {
@ -3064,6 +3128,11 @@ class Purchaseorder extends BaseController
$POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter, 'ServiceMaterialDescription' => $CapitalItemDescription, 'Per' => $Per); $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter, 'ServiceMaterialDescription' => $CapitalItemDescription, 'Per' => $Per);
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
// if($i != 1){
// print_r(value:$POLineItem);
// die;
// }
$LineItemNo = ''; $LineItemNo = '';
if (count($POLineItem) > 0) { if (count($POLineItem) > 0) {

86
app/Views/editCapitalPo.php
View File

@ -617,7 +617,7 @@
<label>PO Date</label> <label>PO Date</label>
<?php <?php
$data = array('type' => 'date', 'name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;'); $data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate', 'class' => 'form-control num form-date-search', 'required' => 'true', 'onkeypress' => 'return false;');
echo form_input($data); echo form_input($data);
?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>"> ?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
@ -1384,11 +1384,14 @@
<td><?php echo $oldpo->PONO ?></td> <td><?php echo $oldpo->PONO ?></td>
<!-- <!--
<?php if ($oldpo->logDate != '-') { <?php
if (isset($oldpo->logDate) && $oldpo->logDate != '-' && !empty($oldpo->logDate)) {
$logdate = date('d-m-Y', strtotime($oldpo->logDate)); $logdate = date('d-m-Y', strtotime($oldpo->logDate));
} else { } else {
$logdate = '-'; $logdate = '-';
} ?> }
?>
<td><?= $logdate; ?></td> --> <td><?= $logdate; ?></td> -->
<td><?php echo $oldpo->LineItemNos; ?></td> <td><?php echo $oldpo->LineItemNos; ?></td>
@ -1640,29 +1643,20 @@
</div> </div>
</div> </div>
<div class="form-row" style="padding:2%">
<div class="form-row" id="ADDCAPdiv" style="padding:0px;"> <div class="form-row" id="ADDCAPdiv" style="padding:0px;">
<div class="form-row" style="border:1px solid #000;"> <div class="form-group col-md-3">
<div class="form-row"> <!--<div class="form-group col-md-4"> </div>
</div>-->
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Discount Type </label> <label>Discount Type </label>
<div> <div>
<?php <?php
$options = array("0" => 'Select Discount Type'); $options = array("0" => 'Select Discount Type');
//print_r( $options);
if (!empty($TaxType)) { if (!empty($TaxType)) {
foreach ($TaxType as $SID) : foreach ($TaxType as $SID) :
$options[$SID->ConfigValue] = $SID->ConfigValue; $options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach; endforeach;
} }
echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType"', 'class="form-control"'); echo form_dropdown('DiscountType', $options, set_value('DiscountType'), 'id="DiscountType"', 'class="form-control"');
?> ?>
</div> </div>
</div> </div>
@ -1684,9 +1678,12 @@
?> ?>
</div> </div>
</div> </div>
</div>
<div class="form-row" style="padding:2px"> <div class="form-row" style="padding:2px">
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Freight Type </label> <label>Freight Type </label>
<div class="form-group"> <div class="form-group">
@ -1740,22 +1737,13 @@
</div> </div>
<div class="form-row" style="padding:2px">
</div>
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
CGST In % CGST In %
</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' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'Ratechange();ChangeSgst();', 'onkeypress' => 'return isNumberKey(event);'); $data = array('name' => 'Cgst', 'value' => set_value('Cgst', 0), 'id' => 'Cgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'Ratechange();ChangeSgst();', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data); echo form_input($data);
@ -1765,7 +1753,6 @@
</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' => 'AfterCgst', 'value' => set_value('AfterCgst', 0), 'id' => 'AfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true'); $data = array('name' => 'AfterCgst', 'value' => set_value('AfterCgst', 0), 'id' => 'AfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -1773,7 +1760,7 @@
</div> </div>
</div> </div>
</div>
<div class="form-row" id="ADDCAPdiv3" style="padding:0px"> <div class="form-row" id="ADDCAPdiv3" style="padding:0px">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
@ -1806,7 +1793,6 @@
<div class="form-row" id="ADDCAPdiv2" style="padding:0px"> <div class="form-row" id="ADDCAPdiv2" style="padding:0px">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
IGST In % IGST In %
</div> </div>
@ -1833,7 +1819,7 @@
</div> </div>
<div class="form-row" id="ADDCAPdiv1" style="padding:0px"> <div class="form-row" id="ADDCAPdiv1" style="padding:0px">
<div class="col-md-5 col-md-offset-4" align="right"> <div class="col-md-9 col-md-offset-4" align="right">
<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">
@ -1844,7 +1830,7 @@
?> ?>
</div> </div>
</div> </div>
<div class="col-md-5 col-md-offset-4" align="right"> <div class="col-md-9 col-md-offset-4" align="right">
<label>Total Amount <?php echo "($INR)" ?></label> <label>Total Amount <?php echo "($INR)" ?></label>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -1858,9 +1844,6 @@
</div> </div>
</div>
</div>
</div>
<div class="form-row" style="padding:1%;"></div> <div class="form-row" style="padding:1%;"></div>
<div class="form-row" style="border:1px solid #000;padding:0px;" id="ModalImportTaxHide" style="display:none;"> <div class="form-row" style="border:1px solid #000;padding:0px;" id="ModalImportTaxHide" style="display:none;">
@ -2361,6 +2344,7 @@
</div> </div>
<div class="form-row" style="padding:0px;" id="EDITCAPdiv"> <div class="form-row" style="padding:0px;" id="EDITCAPdiv">
<div class="form-group col-md-3">
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Discount Type </label> <label>Discount Type </label>
@ -2401,7 +2385,10 @@
?> ?>
</div> </div>
</div> </div>
</div>
<div class="form-row" style="padding:0px"> <div class="form-row" style="padding:0px">
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Freight Type </label> <label>Freight Type </label>
<div> <div>
@ -2450,17 +2437,14 @@
?> ?>
</div> </div>
</div> </div>
</div> </div>
<div class="form-row" style="padding:0px">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
CGST In % CGST In %
</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' => 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);'); $data = array('name' => 'EditCgst', 'value' => set_value('EditCgst'), 'id' => 'EditCgst', 'class' => 'form-control num', 'placeholder' => 'CGST TAX PERCENTAGE', 'onchange' => 'EditRatechange();ChangeEditSgst();', 'onkeypress' => 'return isNumberKey(event);');
echo form_input($data); echo form_input($data);
@ -2470,7 +2454,6 @@
</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' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true'); $data = array('name' => 'EditAfterCgst', 'value' => set_value('EditAfterCgst'), 'id' => 'EditAfterCgst', 'class' => 'form-control num', 'placeholder' => 'After CGST', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -2478,14 +2461,11 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-row" id="EDITCAPdiv1"> <div class="form-row" id="EDITCAPdiv1">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
SGST In % SGST In %
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<div class="form-group"> <div class="form-group">
@ -2498,7 +2478,6 @@
</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' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true'); $data = array('name' => 'EditAfterSgst', 'value' => set_value('EditAfterSgst'), 'id' => 'EditAfterSgst', 'class' => 'form-control num', 'placeholder' => 'After SGST', 'readonly' => 'true');
echo form_input($data); echo form_input($data);
@ -2506,12 +2485,10 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-row" id="EDITCAPdiv2"> <div class="form-row" id="EDITCAPdiv2">
<div class="form-group col-md-6" align="right"> <div class="form-group col-md-6" align="right">
IGST In % IGST In %
</div> </div>
@ -2538,7 +2515,7 @@
</div> </div>
<div class="form-row" id="EDITCAPdiv3"> <div class="form-row" id="EDITCAPdiv3">
<div class="col-md-5 col-md-offset-4" align="right"> <div class="col-md-9 col-md-offset-4" align="right">
<label>Other Allowances <?php echo "($INR)" ?></label> <label>Other Allowances <?php echo "($INR)" ?></label>
</div> </div>
@ -2550,7 +2527,7 @@
?> ?>
</div> </div>
</div> </div>
<div class="col-md-5 col-md-offset-4" align="right"> <div class="col-md-9 col-md-offset-4" align="right">
<label>Total Amount <?php echo "($INR)" ?></label> <label>Total Amount <?php echo "($INR)" ?></label>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -2908,8 +2885,9 @@
$data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); $data = array('name' => 'EditItemDescription', 'value' => set_value('EditItemDescription'), 'id' => 'EditItemDescription', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?> echo form_textarea($data); ?>
</div> </div>
</div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a> <a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right: 10px;">Cancel</a>
<a class="btn btn-success font EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a> <a class="btn btn-success font EditCapital" ID="UpdateCapital">&nbsp;&nbsp;<span class="bold">Update Capital</span></a>
</div> </div>
</form> </form>
@ -5981,6 +5959,15 @@
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);
formData.append('txtRowCount', $('#txtRowCount').val());
formData.append('txtPONO', $('#txtPONO').val());
formData.append('capitalType', $('#capitalType').val());
$('input, select, textarea').each(function() {
var input = $(this);
var inputID = input.attr('id'); // Get the ID of the input field
formData.append(inputID, input.val());
});
$.ajax({ $.ajax({
data: formData, data: formData,
processData: false, processData: false,
@ -5991,6 +5978,7 @@
success: function(data) { success: function(data) {
if (data) { if (data) {
// console.log(data);
alert(data); alert(data);
// $('#content').loader('hide'); // $('#content').loader('hide');
@ -6001,7 +5989,6 @@
clearAfterAddLineItemAdd(); clearAfterAddLineItemAdd();
window.location = "purchaseorderListing"; window.location = "purchaseorderListing";
} else { } else {
// $('#content').loader('hide'); // $('#content').loader('hide');
alert("Error"); alert("Error");
@ -6497,7 +6484,8 @@
populateValueMainFormForEditCapitalTax(); populateValueMainFormForEditCapitalTax();
clearTaxField();
$('#EDITCAPITAL').modal('hide');
} }
}); });

124
app/Views/editRevenuepurchaseorder.php
View File

@ -510,11 +510,14 @@ if (!empty($getlogpodtl)) {
Editchange(); Editchange();
}); });
var edit = '';
$('#PackagingType').change(function() { $('#PackagingType').change(function() {
$('#txtPackaging').val(''); $('#txtPackaging').val('');
$('#txtAfterPackaging').val(''); $('#txtAfterPackaging').val('');
selValue = $("#PackagingType").val(); selValue = $("#PackagingType").val();
if (selValue == PercentageType) { if (selValue == PercentageType) {
$('#REVENUE').modal('hide');
edit = 'PackingCalculationOn';
var PackagingCalculation = ''; var PackagingCalculation = '';
$('#packagingcalmodel').modal('show'); $('#packagingcalmodel').modal('show');
$('#txtPackaging').removeAttr('readonly', 'true'); $('#txtPackaging').removeAttr('readonly', 'true');
@ -531,12 +534,22 @@ if (!empty($getlogpodtl)) {
calculatePackaging(0); calculatePackaging(0);
}); });
$('#packagingcalmodel').on('hidden.bs.modal', function() {
// Reopen the first modal when the second modal is closed
if (edit == 'PackingCalculationOn') {
$('#REVENUE').modal('show');
} else if (edit == 'EditPackingCalculationOn') {
$('#EDITREVENUE').modal('show');
}
});
$('#EditPackagingType').change(function() { $('#EditPackagingType').change(function() {
$('#txtEditPackaging').val(''); $('#txtEditPackaging').val('');
$('#txtEditAfterPackaging').val(''); $('#txtEditAfterPackaging').val('');
selValue = $("#EditPackagingType").val(); selValue = $("#EditPackagingType").val();
if (selValue == PercentageType) { if (selValue == PercentageType) {
$('#EDITREVENUE').modal('hide');
var PackagingCalculation = ''; var PackagingCalculation = '';
edit = 'EditPackingCalculationOn';
$('#packagingcalmodel').modal('show'); $('#packagingcalmodel').modal('show');
$('#txtEditPackaging').removeAttr('readonly', 'true'); $('#txtEditPackaging').removeAttr('readonly', 'true');
} else { } else {
@ -588,6 +601,7 @@ if (!empty($getlogpodtl)) {
$('#CSTCalModel').modal('show'); $('#CSTCalModel').modal('show');
}); });
var freight = '';
$('#drpFreight').change(function() { $('#drpFreight').change(function() {
var FreightType = $("#drpFreight").val(); var FreightType = $("#drpFreight").val();
@ -603,6 +617,8 @@ if (!empty($getlogpodtl)) {
$('#txtFreight').val(''); $('#txtFreight').val('');
$('#txtAfterFreight').val(''); $('#txtAfterFreight').val('');
if (selValue == PercentageType) { if (selValue == PercentageType) {
$('#REVENUE').modal('hide');
freight = 'FreightCalculationOn';
var FreightCalculation = ''; var FreightCalculation = '';
$('#freightcalmodel').modal('show'); $('#freightcalmodel').modal('show');
$('#txtFreight').removeAttr('readonly', 'true'); $('#txtFreight').removeAttr('readonly', 'true');
@ -632,6 +648,14 @@ if (!empty($getlogpodtl)) {
$('#ViewTripsValue').hide(); $('#ViewTripsValue').hide();
} }
}); */ }); */
$('#freightcalmodel').on('hidden.bs.modal', function() {
// Reopen the first modal when the second modal is closed
if (freight == 'FreightCalculationOn') {
$('#REVENUE').modal('show');
} else if (freight == 'EditFreightCalculationOn') {
$('#EDITREVENUE').modal('show');
}
});
$('#drpEditFreight').change(function() { $('#drpEditFreight').change(function() {
var FreightType = $("#drpEditFreight").val(); var FreightType = $("#drpEditFreight").val();
@ -647,6 +671,7 @@ if (!empty($getlogpodtl)) {
$('#txtEditFreight').val(''); $('#txtEditFreight').val('');
$('#txtEditAfterFreight').val(''); $('#txtEditAfterFreight').val('');
if (selValue == PercentageType) { if (selValue == PercentageType) {
freight = 'EditFreightCalculationOn';
var FreightCalculation = ''; var FreightCalculation = '';
$('#freightcalmodel').modal('show'); $('#freightcalmodel').modal('show');
$('#txtEditFreight').removeAttr('readonly', 'true'); $('#txtEditFreight').removeAttr('readonly', 'true');
@ -663,6 +688,7 @@ if (!empty($getlogpodtl)) {
calculateFreight(1); calculateFreight(1);
}); });
$('#drpViewFreight').change(function() { $('#drpViewFreight').change(function() {
var FreightType = $("#drpViewFreight").val(); var FreightType = $("#drpViewFreight").val();
@ -2185,12 +2211,12 @@ if (!empty($getlogpodtl)) {
<td><?php echo $record->MaterialName ?></td> <td><?php echo $record->MaterialName ?></td>
<td align="left"><?php echo $record->Quantity ?></td> <td align="left"><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td> <td><?php echo $record->UOM ?></td>
<td align="left"><?php echo $record->Rate ?></td> <td align="right"><?php echo $record->Rate ?></td>
<td align="left"><?php echo number_format($record->BasicValue, 2, '.', ''); ?></td> <td align="right"><?php echo number_format($record->BasicValue, 2, '.', ''); ?></td>
<td align="left"><?php echo $record->Taxamount ?></td> <td align="right"><?php echo $record->Taxamount ?></td>
<td align="left"><?php echo $record->TotalValue ?></td> <td align="right"><?php echo $record->TotalValue ?></td>
<!-- <td align="right"><?php echo $record->Quantity ?></td> <!-- <td align="right"><?php echo $record->Quantity ?></td>
<td align="right"><?php echo $record->ReceivedQuantity ?></td> <td align="right"><?php echo $record->ReceivedQuantity ?></td>
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> --> <td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->
@ -2556,7 +2582,7 @@ if (!empty($getlogpodtl)) {
<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" value="<?php echo $index; ?>"> <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if(isset($index)){ echo $index; } ?>">
<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="txttaxcheck" id="txttaxcheck" value="" /> <input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
@ -3812,6 +3838,66 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
</div><!-- /.modal --> </div><!-- /.modal -->
<!-- Modal for freight Calculation-->
<div id="freightcalmodel" class="modal fade" tabindex="-1" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Freight Calculation On</h4>
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×</button>
</div>
<div class="modal-body p-4">
<form>
<div>
<label><input type="radio" name="optFreight" checked="checked" value='0' id="optFreight"> Basic Amount</label>
</div>
<div>
<label><input type="radio" name="optFreight" id="optFreight" value='1'> After Discount Amount</label>
</div>
</form>
</div>
<div class="modal-footer" style="border:none;">
<a class="btn btn-secondary waves-effect" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-info waves-effect waves-light" ID="FreightOption" onclick="SetfreightOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
</div>
</div>
</div>
</div><!-- /.modal -->
<div id="packagingcalmodel" class="modal fade" role="dialog"
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Packing Calculation On</h4>
<button type="button" class="close" data-dismiss="modal"
aria-hidden="true">×</button>
</div>
<div class="modal-body p-4">
<form>
<div>
<label>
<input type="radio" name="optPackaging" checked="checked" value='0' id="optPackaging"> Basic Amount
</label>
</div>
<div>
<label>
<input type="radio" name="optPackaging" id="optPackaging" value='1'> After Discount Amount
</label>
</div>
</form>
</div>
<div class="modal-footer" style="border:none;">
<a class="btn btn-secondary waves-effect" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
<a class="btn btn-info waves-effect waves-light" ID="PackagingOption" onclick="SetPackagingOption();" style="margin-top: -24px;">&nbsp;&nbsp;<span class="bold">Ok</span></a>
</div>
</div>
</div>
</div><!-- /.modal -->
<!-- Revenue Special PO Modal Ends Here --> <!-- Revenue Special PO Modal Ends Here -->
<!-- Revenue bill Modal Starts Here --> <!-- Revenue bill Modal Starts Here -->
<div id="billModel" class="modal fade" tabindex="-1" role="dialog" <div id="billModel" class="modal fade" tabindex="-1" role="dialog"
@ -3876,7 +3962,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</script> </script>
<script> <script>
var index = <?php echo $index; ?>; var index = <?php if(isset($index)){ echo $index; } ?>;
var userid = ''; var userid = '';
var taxcheck = 0; var taxcheck = 0;
$("#BudgetType").change(function() { $("#BudgetType").change(function() {
@ -4002,10 +4088,10 @@ if (!empty($getlogpodtl)) {
<td align="left">${materialName}</td> <td align="left">${materialName}</td>
<td align="left">${quantity}</td> <td align="left">${quantity}</td>
<td align="left">${uom}</td> <td align="left">${uom}</td>
<td align="left">${itemRate}</td> <td align="right">${itemRate}</td>
<td align="left">${basicval}</td> <td align="right">${basicval}</td>
<td align="left">${TotalTaxValue}</td> <td align="right">${TotalTaxValue}</td>
<td align="left">${TotalOrderValue}</td> <td align="right">${TotalOrderValue}</td>
<td> <td>
<a data-target='#EDITREVENUE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE"> <a data-target='#EDITREVENUE' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#EDITREVENUE">
<i class="ri-pencil-fill"></i> <i class="ri-pencil-fill"></i>
@ -4742,7 +4828,7 @@ if (!empty($getlogpodtl)) {
var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val(); var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val();
var Insurance = $('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val(); var Insurance = $('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val();
var Discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val(); var Discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
var txtEditAfterPackaging = $('#txtEditAfterPackaging').val() == '' ? '0.00' : $('#txtEditAfterPackaging').val();
var totvalue = parseFloat(AfterCgst) + parseFloat(AfterSgst) + parseFloat(AfterIgst) ; var totvalue = parseFloat(AfterCgst) + parseFloat(AfterSgst) + parseFloat(AfterIgst) ;
@ -4885,15 +4971,15 @@ if (!empty($getlogpodtl)) {
processData: false, processData: false,
contentType: false, contentType: false,
success: function(data) { success: function(data) {
console.log(data); // console.log(data);
if (data) { if (data) {
// alert(data); alert(data);
// $('#txtRowCount').val(''); $('#txtRowCount').val('');
// $('#txtDeletedRow').val(''); $('#txtDeletedRow').val('');
// $('#txtStatus').val(''); $('#txtStatus').val('');
// $('#SpcialInstruction').val(''); $('#SpcialInstruction').val('');
// $('#txtDeliveryAddress').val('') $('#txtDeliveryAddress').val('')
// window.location = "purchaseorderListing"; window.location = "purchaseorderListing";
} else { } else {
alert("Something went wrong"); alert("Something went wrong");

104
app/Views/editimportpo.php
View File

@ -754,7 +754,6 @@ if (!empty($getlogpodtl)) {
<?php <?php
if (!empty($POItem)) { if (!empty($POItem)) {
foreach ($POItem as $record) { foreach ($POItem as $record) {
$index = $index + 1; $index = $index + 1;
//echo $record->Rate; //echo $record->Rate;
@ -1390,6 +1389,42 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row">
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3">
<!-- <P id=labelRate> --> <label id=labelRate><?php echo "Rate in"; ?> <span class="text-danger">*</span></label><!-- </P> -->
<div>
<?php
$data = array('name' => 'Rate', 'value' => set_value('Rate'), 'id' => 'Rate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'onchange' => 'Ratechange(),validateExceedLimit(),calculateFreight(0)');
echo form_input($data);
?>
</div>
</div>
<div class="form-group col-md-3">
<label>Per</label> <?php
$data = array('name' => 'AddPer', 'value' => set_value('AddPer'), 'id' => 'AddPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="form-group col-md-3">
<!--<label>Basic Amount </label>-->
<!-- <p id=label2> --> <label id=label2><?php echo "Basic Value In"; ?></label><!-- </p> -->
<div>
<?php
//$data = array('name' => 'imTotalAmount','value' => set_value('imTotalAmount'),'id'=>'imTotalAmount', 'class' => 'form-control' ,'readonly' => 'true');
$data = array('name' => 'txtBasicValue', 'value' => set_value('txtBasicValue'), 'id' => 'txtBasicValue', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
<div class="form-row "> <div class="form-row ">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -1902,7 +1937,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label> <label>Item Code<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
<!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div--> <!--In this item code the value should come from DB , so it getting error , so i am disabling this div , once get the data from DB uncommand this div-->
@ -1933,7 +1968,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Item Name</label> <label>Item Name</label>
<div> <div>
<?php <?php
@ -1942,7 +1977,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-3">
<label>UOM</label> <label>UOM</label>
<div> <div>
<?php <?php
@ -1951,7 +1986,7 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-3">
<label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label> <label>Quantity<span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
<div> <div>
<?php <?php
@ -1961,7 +1996,12 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-2"> </div>
<div class="form-row">
<div class="form-group col-md-3">
</div>
<div class="form-group col-md-3">
<!-- <label>Rate </label> --> <!-- <label>Rate </label> -->
<!-- <P id=labelEditRate> --> <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?> <span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label> <!-- <P id=labelEditRate> --> <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?> <span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span></label>
@ -1972,12 +2012,12 @@ if (!empty($getlogpodtl)) {
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-1"> <div class="form-group col-md-3">
<label>Per</label> <?php <label>Per</label> <?php
$data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control'); $data = array('name' => 'EditPer', 'value' => set_value('EditPer'), 'id' => 'EditPer', 'class' => 'form-control');
echo form_input($data); ?> echo form_input($data); ?>
</div> </div>
<div class="form-group col-md-2" style="padding: 0px;"> <div class="form-group col-md-3" style="padding: 0px;">
<!-- <label><?php echo "Basic Value In"; ?></label>--> <!-- <label><?php echo "Basic Value In"; ?></label>-->
<!-- <p id=label3> --><label id=label3><?php echo "Basic Value In $Currencycode ($Value)"; ?></label><!-- </p> --> <!-- <p id=label3> --><label id=label3><?php echo "Basic Value In $Currencycode ($Value)"; ?></label><!-- </p> -->
<div> <div>
@ -1991,6 +2031,8 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </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 class="form-group col-md-3">
@ -2550,9 +2592,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<!-- <label>Rate </label> --> <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span> </label>
<!-- <P id=labelEditRate> --> <label id=labelEditRate><?php echo "Rate in $Currencycode ($Value)"; ?><span class="text-danger" style="color:red;text-align:right;background-color: #fff;">*</span> </label>
<div> <div>
<?php <?php
$data = array('name' => 'ViewRate', 'value' => set_value('ViewRate'), 'id' => 'ViewRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => true, 'onchange' => 'EditRatechange()'); $data = array('name' => 'ViewRate', 'value' => set_value('ViewRate'), 'id' => 'ViewRate', 'class' => 'form-control num', 'onkeypress' => 'return isNumberKey(event);', 'readonly' => true, 'onchange' => 'EditRatechange()');
@ -4899,7 +4939,6 @@ if (!empty($getlogpodtl)) {
$('.EditImport').click(function() { $('.EditImport').click(function() {
// alert('inside edit'); // alert('inside edit');
if (validateEditExceedLimit() && ExceedEditQuantityCheck() && EditQtyZerocheck()) { if (validateEditExceedLimit() && ExceedEditQuantityCheck() && EditQtyZerocheck()) {
alert('inside edit if');
var CostCode = $("#EditCostCenter").val(); var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val(); var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val(); var editMaterialCode = $("#EditMaterialCode").val();
@ -5463,7 +5502,6 @@ if (!empty($getlogpodtl)) {
function Save(status) { function Save(status) {
//alert();
if (status == '0') { if (status == '0') {
@ -5477,30 +5515,24 @@ if (!empty($getlogpodtl)) {
$('#txtStatus').val(stat); $('#txtStatus').val(stat);
//var txtRowCount = $('#txtRowCount').val(); //var txtRowCount = $('#txtRowCount').val();
//var Row=$('#txtRow').val(); //var Row=$('#txtRow').val();
//alert(Row);
//exit(); //exit();
tinyMCE.triggerSave(); tinyMCE.triggerSave();
var Row = $('#txtRow').val(); var Row = $('#txtRow').val();
//alert(Row);
var txtDeletedRow = $('#txtDeletedRow').val(); var txtDeletedRow = $('#txtDeletedRow').val();
//alert(Row);
//alert(txtRowCount);
//exit(); //exit();
//var TotalOrder=$('#txtToatlOrder').val(); //var TotalOrder=$('#txtToatlOrder').val();
//alert(TotalOrder);
//exit(); //exit();
if (validate() && Budgetcheck()) { //alert(); if (validate() && Budgetcheck()) {
if (document.getElementById('ImportTax').rows.length <= 0) { if (document.getElementById('ImportTax').rows.length <= 0) {
alert('Please Select Line item to Create PO'); alert('Please Select Line item to Create PO');
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
} else { } else {
//alert();
// $('#content').loader('show'); // $('#content').loader('show');
var formData = new FormData($('.ImportPO')[0]); var formData = new FormData($('.ImportPO')[0]);
formData.append('txtRowCount', Row); formData.append('txtRowCount', Row);
@ -5515,19 +5547,19 @@ if (!empty($getlogpodtl)) {
type: "POST", type: "POST",
url: "<?php echo base_url() ?>purchaseorder/EditImportPurchaseOrder", url: "<?php echo base_url() ?>purchaseorder/EditImportPurchaseOrder",
success: function(data) { success: function(data) {
console.log(data); // console.log(data);
// if (data) { if (data) {
// // $('#content').loader('hide'); // // $('#content').loader('hide');
// alert(data); alert(data);
// $('#txtRowCount').val(''); $('#txtRowCount').val('');
// $('#txtDeletedRow').val(''); $('#txtDeletedRow').val('');
// //$('#SpcialInstruction').val(''); //$('#SpcialInstruction').val('');
// //$('#txtDeliveryAddress').val(''); //$('#txtDeliveryAddress').val('');
// window.location = "purchaseorderListing"; window.location = "purchaseorderListing";
// } else { } else {
// alert("Error"); alert("Error");
// } }
} }
@ -5685,10 +5717,7 @@ if (!empty($getlogpodtl)) {
function calculateFreight(isEdit) { function calculateFreight(isEdit) {
if (isEdit == '0') {
//alert();
if (isEdit == '0') { //alert();
if ($('#MaterialCode').val() == "0") { if ($('#MaterialCode').val() == "0") {
alert('Please Select the Material Code'); alert('Please Select the Material Code');
$('#MaterialCode').focus(); $('#MaterialCode').focus();
@ -5711,7 +5740,6 @@ if (!empty($getlogpodtl)) {
var FreightValue = parseFloat($('#addtxtFreight').val()); var FreightValue = parseFloat($('#addtxtFreight').val());
var UOM = parseFloat($('#UOM').val()); var UOM = parseFloat($('#UOM').val());
var Quantity = parseFloat($('#Quantity').val()); var Quantity = parseFloat($('#Quantity').val());
//alert(FreightType);
var AfterFreight = 0.0; var AfterFreight = 0.0;
if (FreightType == PercentageType) { if (FreightType == PercentageType) {
AfterFreight = <?php echo FREIGHT_PERCENTAGE; ?>; AfterFreight = <?php echo FREIGHT_PERCENTAGE; ?>;
@ -5754,7 +5782,6 @@ if (!empty($getlogpodtl)) {
// alert('af');
if ($('#EditMaterialCode').val() == '') { if ($('#EditMaterialCode').val() == '') {
alert('Please Select the Material Code'); alert('Please Select the Material Code');
$('#EditMaterialCode').focus(); $('#EditMaterialCode').focus();
@ -5776,7 +5803,6 @@ if (!empty($getlogpodtl)) {
var FreightValue = parseFloat($('#edittxtFreight').val()); var FreightValue = parseFloat($('#edittxtFreight').val());
var UOM = parseFloat($('#EditUOM').val()); var UOM = parseFloat($('#EditUOM').val());
var Quantity = parseFloat($('#EditQuantity').val()); var Quantity = parseFloat($('#EditQuantity').val());
//alert(FreightType);
var AfterFreight = 0.0; var AfterFreight = 0.0;
if (FreightType == PercentageType) { if (FreightType == PercentageType) {
AfterFreight = <?php echo FREIGHT_PERCENTAGE; ?>; AfterFreight = <?php echo FREIGHT_PERCENTAGE; ?>;
@ -5814,7 +5840,6 @@ if (!empty($getlogpodtl)) {
// calculateEditTotalValue(); // calculateEditTotalValue();
} else { } else {
//alert();
var basicValue = parseFloat($('#ViewINRBasicvalue').val()); var basicValue = parseFloat($('#ViewINRBasicvalue').val());
///console.log(basicValue); ///console.log(basicValue);
@ -5827,7 +5852,6 @@ if (!empty($getlogpodtl)) {
var FreightValue = parseFloat($('#viewtxtFreight').val()); var FreightValue = parseFloat($('#viewtxtFreight').val());
var UOM = parseFloat($('#ViewUOM').val()); var UOM = parseFloat($('#ViewUOM').val());
var Quantity = parseFloat($('#ViewQuantity').val()); var Quantity = parseFloat($('#ViewQuantity').val());
//alert(FreightType);
var AfterFreight = 0.0; var AfterFreight = 0.0;
if (FreightType == PercentageType) { if (FreightType == PercentageType) {
AfterFreight = <?php echo FREIGHT_PERCENTAGE; ?>; AfterFreight = <?php echo FREIGHT_PERCENTAGE; ?>;

12
app/Views/importpo.php
View File

@ -732,9 +732,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<th>UOM</th> <th>UOM</th>
<th>Rate<?php echo $INR ?></th> <th>Rate<?php echo $INR ?></th>
<th>Basic Amount<?php echo $INR ?></th> <th>Basic Amount<?php echo $INR ?></th>
<th>Received Qty</th> <!-- <th>Received Qty</th> -->
<th>Rejected Qty</th> <!-- <th>Rejected Qty</th> -->
<th>Pending Qty</th> <!-- <th>Pending Qty</th> -->
<!-- <th>Tax Amount</th> <!-- <th>Tax Amount</th>
<th>Total Order Amount</th> --> <th>Total Order Amount</th> -->
<th>Action</th> <th>Action</th>
@ -3461,9 +3461,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<td align="left">${uom}</td> <td align="left">${uom}</td>
<td align="left">${itemRate}</td> <td align="left">${itemRate}</td>
<td align="left">${BasicAmt}</td> <td align="left">${BasicAmt}</td>
<td align="left">${receivedqty}</td>
<td align="left">${rejectedqty}</td>
<td align="left">${pendingqty}</td>
<td> <td>
<a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel"> <a data-target='#editimportpomodel' data-id="${temp}" data-userid="${temp}" data-toggle="modal" href="#editimportpomodel">
<i class="ri-pencil-fill" data-toggle="tooltip"></i> <i class="ri-pencil-fill" data-toggle="tooltip"></i>
@ -3475,6 +3472,9 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</tr> </tr>
`; `;
// <td align="left">${receivedqty}</td>
// <td align="left">${rejectedqty}</td>
// <td align="left">${pendingqty}</td>
// Append the generated row HTML to the target element // Append the generated row HTML to the target element
$('#ImportAppend').append(rowHtml); $('#ImportAppend').append(rowHtml);

1
app/Views/includes/new_footer.php
View File

@ -59,6 +59,7 @@
<script src="<?php echo base_url(); ?>public/new_assets/js/pages/form-wizard.init.js"></script> <script src="<?php echo base_url(); ?>public/new_assets/js/pages/form-wizard.init.js"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('select').addClass('form-control');
form = $(".form-date-search") form = $(".form-date-search")
.datepicker({ .datepicker({
autoclose: true, autoclose: true,

11
app/Views/purchaseorder.php
View File

@ -633,7 +633,7 @@ if (!empty($INRSYMBOL)) {
if (selValue == PercentageType) { if (selValue == PercentageType) {
var freightCalculation = ''; var freightCalculation = '';
$('#REVENUE').modal('hide'); $('#REVENUE').modal('hide');
edit = 'FreightCalculationOn'; freight = 'FreightCalculationOn';
$('#freightcalmodel').modal('show'); $('#freightcalmodel').modal('show');
//$('#freightcalmodel').modal('blur'); //$('#freightcalmodel').modal('blur');
$('#txtFreight').removeAttr('readonly', 'true'); $('#txtFreight').removeAttr('readonly', 'true');
@ -656,9 +656,9 @@ if (!empty($INRSYMBOL)) {
$('#freightcalmodel').on('hidden.bs.modal', function() { $('#freightcalmodel').on('hidden.bs.modal', function() {
// Reopen the first modal when the second modal is closed // Reopen the first modal when the second modal is closed
if(edit == 'FreightCalculationOn'){ if (freight == 'FreightCalculationOn') {
$('#REVENUE').modal('show'); $('#REVENUE').modal('show');
}else if(edit == 'EditFreightCalculationOn'){ } else if (freight == 'EditFreightCalculationOn') {
$('#EDITREVENUE').modal('show'); $('#EDITREVENUE').modal('show');
} }
}); });
@ -677,7 +677,7 @@ if (!empty($INRSYMBOL)) {
if (selValue == PercentageType) { if (selValue == PercentageType) {
var FreightCalculation = ''; var FreightCalculation = '';
// $('#freight').modal('show'); // $('#freight').modal('show');
edit = 'EditFreightCalculationOn'; freight = 'EditFreightCalculationOn';
$('#EDITREVENUE').modal('hide'); $('#EDITREVENUE').modal('hide');
$('#freightcalmodel').modal('show'); $('#freightcalmodel').modal('show');
$('#txtEditFreight').removeAttr('readonly', 'true'); $('#txtEditFreight').removeAttr('readonly', 'true');
@ -4036,8 +4036,7 @@ if (!empty($INRSYMBOL)) {
var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val(); var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val();
var Insurance = $('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val(); var Insurance = $('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val();
var Discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val(); var Discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
var txtEditAfterPackaging = $('#txtEditAfterPackaging').val() == '' ? '0.00' : $('#txtEditAfterPackaging').val();
var totvalue = parseFloat(AfterCgst) + parseFloat(AfterSgst) + parseFloat(AfterIgst); var totvalue = parseFloat(AfterCgst) + parseFloat(AfterSgst) + parseFloat(AfterIgst);
var tot = parseFloat(totvalue).toFixed(2); var tot = parseFloat(totvalue).toFixed(2);