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

Merge : GWM

Browse Source
This commit is contained in:
Smart 2024-09-20 15:15:40 +05:30
commit d98da7c253
10 changed files with 5006 additions and 5055 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Controllers/Purchaseorder.php
View File

@ -554,6 +554,8 @@ class Purchaseorder extends BaseController
foreach ($Req as $SID) : foreach ($Req as $SID) :
$ReqArray[] = $SID->ReqNo; $ReqArray[] = $SID->ReqNo;
$result[] = $this->purchaseorder_model->getRawPOMaterialList($SID->ReqNo); $result[] = $this->purchaseorder_model->getRawPOMaterialList($SID->ReqNo);
// echo "<pre>";
// print_r($result);die;
endforeach; endforeach;
$data['MaterialList'] = $result; //$this->purchaseorder_model->getRawMaterialList($ReqType,$ReqArray); $data['MaterialList'] = $result; //$this->purchaseorder_model->getRawMaterialList($ReqType,$ReqArray);
@ -1213,8 +1215,6 @@ class Purchaseorder extends BaseController
//This used to Edit the Revenue Purchase Order //This used to Edit the Revenue Purchase Order
function EditRevenuePurchaseOrder() function EditRevenuePurchaseOrder()
{ {
$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);
@ -2030,9 +2030,8 @@ class Purchaseorder extends BaseController
function EditImportPurchaseOrder() function EditImportPurchaseOrder()
{ {
// print_r($this->request->getPost());die;
//echo "dfds";
//die();
$PONO = $this->request->getPost('txtPONO'); $PONO = $this->request->getPost('txtPONO');
$POdt = ''; $POdt = '';
$createddt = ''; $createddt = '';
@ -2161,8 +2160,7 @@ class Purchaseorder extends BaseController
// echo $PONO; // echo $PONO;
// echo $TotalOrder; // echo $TotalOrder;
//print_r($POList);
//die();
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO, $POList); $POMaster = $this->purchaseorder_model->updatePOMaster($PONO, $POList);
//echo "sdasds"; //echo "sdasds";
@ -2193,6 +2191,7 @@ class Purchaseorder extends BaseController
// echo $RowCount; // echo $RowCount;
// 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);
@ -2364,10 +2363,10 @@ class Purchaseorder extends BaseController
$POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO, $POLineItemNo, $POLineItemList); $POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO, $POLineItemNo, $POLineItemList);
} }
$isExists = $this->purchaseorder_model->LineItemExistsinImportTax($LineItemNo); $isExists = $this->purchaseorder_model->LineItemExistsinImportTax($LineItemNo);
//echo $isExists; // print_r($isExists);
// die(); // die();
if (count($isExists) == 0) { if (is_array($isExists) && count($isExists) == 0) {
// print_r(count($isExists)); // print_r(count($isExists));
// echo $isExists; // echo $isExists;
// die(); // die();

3
app/Controllers/Servicepurchaseorder.php
View File

@ -560,8 +560,7 @@ class Servicepurchaseorder extends BaseController
if (trim((string)$POType) == SERVICE) { if (trim((string)$POType) == SERVICE) {
$isExists = $this->purchaseorder_model->LineItemExists($LineItemNo); $isExists = $this->purchaseorder_model->LineItemExists($LineItemNo);
if (is_array($isExists) && count($isExists) == 0) {
if (count($isExists) == 0) {
$ServiceTaxList = array('LineItemNo' => $LineItemNo, 'CGST' => $Cgst, 'After_CGST' => $AfterCgst, 'SGST' => $Sgst, 'After_SGST' => $AfterSgst, 'IGST' => $Igst, 'After_IGST' => $AfterIgst, 'TotalValue' => $TotalOrderValue, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'otherallowance' => $OtherAmt); $ServiceTaxList = array('LineItemNo' => $LineItemNo, 'CGST' => $Cgst, 'After_CGST' => $AfterCgst, 'SGST' => $Sgst, 'After_SGST' => $AfterSgst, 'IGST' => $Igst, 'After_IGST' => $AfterIgst, 'TotalValue' => $TotalOrderValue, 'CreatedBy' => $updatedBy, 'CreatedDate' => $updateddt, 'otherallowance' => $OtherAmt);
$this->purchaseorder_model->addServiceTax($ServiceTaxList); $this->purchaseorder_model->addServiceTax($ServiceTaxList);

49
app/Models/Purchaseorder_model.php
View File

@ -1239,26 +1239,31 @@ where LineItem.PONO =?';
function GetImportPurchaseOrderDetails($PONO = '') function GetImportPurchaseOrderDetails($PONO = '')
{ {
$subQuery = 'SELECT DISTINCT LineItem.LineItemNo, Req.ReqNo, Mat.MaterialCode, Mat.MaterialName,
Mat.UOM, Quantity, Rate, Req.Status, ROUND((Quantity * Rate), 2) AS BasicValue,
ReceivedQuantity, QuantityRejected, ROUND(Quantity - ReceivedQuantity) AS PendingQty, Per,
ROUND((RMCIncludingCustomersPerKG * Quantity), 2) AS Taxamount, LandingCharge, HighSeasSalesCharge,
CustomDuty, ExciseDuty, ExciseDutyEdCess, CustomEdCess, POMast.ExchangeRate, AfterLandingCharge,
AfterHighSeasSalesCharge, AfterCustomDuty, AfterExciseDuty, AfterExciseDutyEdCess, AddlExciseDuty,
AfterAddlExciseDuty, Grossdutypayable, AvailableModvat, Grossexpensesduetocustomduty,
purchaseratePerKG, CustomDutyExpensesPerKG, RMCIncludingCustomersPerKG, QuantityKG,
BasicPriceInMTon, ProductPrice, CustomSHCess, AfterCustomSHCess, AfterExciseDutySHCess,
ExciseDutySHCess, AfterCustomEdCess, ROUND((Quantity * Rate), 2) AS TotalOrderValue,
ROUND((POMast.ExchangeRate * BasicPriceInMTon), 2) AS BasicINRValue, TotalValue, CurrencyType,
ReceivedQuantity, Tax.*, LineItem.ServiceMaterialDescription, Req.CostCenterCode,
Dept.DepartmentName
$subQuery = 'SELECT distinct LineItem.LineItemNo,Req.ReqNo,Mat.MaterialCode,Mat.MaterialName, FROM t_purchaseorder_lineitem LineItem
Mat.UOM,Quantity,Rate,Req.Status,ROUND((Quantity *Rate),2 ) as BasicValue,ReceivedQuantity, LEFT JOIN t_purchaseorder_master POMast ON POMast.PONO = LineItem.PONO
QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per, LEFT JOIN t_materialmaster Mat ON Mat.MaterialCode = LineItem.MaterialCode
ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount,LandingCharge,HighSeasSalesCharge,CustomDuty,ExciseDuty,ExciseDutyEdCess,CustomEdCess,POMast.ExchangeRate,AfterLandingCharge,AfterHighSeasSalesCharge,AfterCustomDuty,AfterExciseDuty,AfterExciseDutyEdCess,AddlExciseDuty,AfterAddlExciseDuty,Grossdutypayable,AvailableModvat,Grossexpensesduetocustomduty,purchaseratePerKG,CustomDutyExpensesPerKG,RMCIncludingCustomersPerKG,QuantityKG,BasicPriceInMTon,ProductPrice,CustomSHCess,AfterCustomSHCess,AfterExciseDutySHCess,ExciseDutySHCess, LEFT JOIN t_import_tax Tax ON Tax.LineItemNo = LineItem.LineItemNo
AfterCustomEdCess,ROUND((Quantity *Rate),2)as TotalOrderValue,ROUND((POMast.ExchangeRate*BasicPriceInMTon),2) as BasicINRValue,TotalValue,CurrencyType,ReceivedQuantity,Tax.*,LineItem.ServiceMaterialDescription, LEFT JOIN t_requestion_master Req ON Req.ReqNo = LineItem.ReqNo
LEFT JOIN t_employee_details emp ON Req.Requestedby = emp.EmpID
LEFT JOIN t_mrir_master Mast ON POMast.PONO = Mast.PONO
LEFT JOIN t_mrir_details Det ON Det.MaterialCode = LineItem.MaterialCode AND Mast.MRIRNO = Det.MRIRNO
LEFT JOIN t_departmentdetails Dept ON Req.RequestedDept = Dept.DEPCode
Req.CostCenterCode,Dept.DepartmentName FROM t_purchaseorder_lineitem LineItem WHERE LineItem.PONO = ?';
join t_purchaseorder_master POMast on POMast.PONO = LineItem.PONO
join t_materialmaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join t_import_tax Tax on Tax.LineItemNo = LineItem.LineItemNo
join t_requestion_master Req on Req.ReqNo = LineItem.ReqNo
left join t_employee_details emp on Req.Requestedby = emp.EmpID
left join t_mrir_master Mast on POMast.PONO=Mast.PONO
left join t_mrir_details Det on Det.MaterialCode=LineItem.MaterialCode and Mast.MRIRNO=Det.MRIRNO
join t_departmentdetails Dept on Req.RequestedDept = Dept.DEPCode where LineItem.PONO =?';
//print_r($subQuery);
$query = $this->db->query($subQuery, array($PONO)); $query = $this->db->query($subQuery, array($PONO));
@ -1269,6 +1274,7 @@ QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
function GetCurrencytype() function GetCurrencytype()
{ {
@ -2470,7 +2476,8 @@ st.CGST,st.SGST,st.IGST,st.otherallowance FROM t_service_tax st
return $query->getResultArray(); return $query->getResultArray();
} }
function VerifyWithSupplierForPendingPO($supplierid,$materialcode){ function VerifyWithSupplierForPendingPO($supplierid, $materialcode)
{
$subQuery = 'SELECT COUNT(t_purchaseorder_master.PONO) AS PO_count,GROUP_CONCAT(t_purchaseorder_master.PONO) AS PONO,t_purchaseorder_lineitem.MaterialCode $subQuery = 'SELECT COUNT(t_purchaseorder_master.PONO) AS PO_count,GROUP_CONCAT(t_purchaseorder_master.PONO) AS PONO,t_purchaseorder_lineitem.MaterialCode
FROM t_purchaseorder_lineitem FROM t_purchaseorder_lineitem
@ -2481,10 +2488,10 @@ st.CGST,st.SGST,st.IGST,st.otherallowance FROM t_service_tax st
$query = $this->db->query($subQuery, array($supplierid, $materialcode)); $query = $this->db->query($subQuery, array($supplierid, $materialcode));
return $query->getResultArray(); return $query->getResultArray();
} }
function lastPONO(){ function lastPONO()
{
$query = $this->db->table('t_purchaseorder_master')->select('PONO')->orderBy('PONO', 'DESC')->limit(1)->get(); $query = $this->db->table('t_purchaseorder_master')->select('PONO')->orderBy('PONO', 'DESC')->limit(1)->get();
$lastPONO = $query->getRow()->PONO; $lastPONO = $query->getRow()->PONO;
return $lastPONO; return $lastPONO;

2250
app/Views/alterpurchaseorder.php
View File

File diff suppressed because it is too large Load Diff

3
app/Views/editCapitalAmendPO.php
View File

@ -2145,7 +2145,6 @@
var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>; var capital = <?php echo json_encode($CapitalRange, JSON_PRETTY_PRINT) ?>;
//alert(capital);
if (capital == 0) { if (capital == 0) {
$('#CAPdiv').hide(); $('#CAPdiv').hide();
$('#ADDCAPdiv').hide(); $('#ADDCAPdiv').hide();
@ -2904,14 +2903,12 @@
$('#isEdit').val(1); $('#isEdit').val(1);
//alert(userid);
var tr = document.getElementById(userid); var tr = document.getElementById(userid);
var cellval = tr.cells; var cellval = tr.cells;
var id = $('#Reqnumber' + userid).val(); var id = $('#Reqnumber' + userid).val();
var disc = $('#DisType' + userid).val(); var disc = $('#DisType' + userid).val();
//alert(disc);
if (disc != 'NIL') { if (disc != 'NIL') {
//alert('removed'); //alert('removed');
$('#txtEditDiscount').removeAttr('readonly'); $('#txtEditDiscount').removeAttr('readonly');

21
app/Views/editCapitalPo.php
View File

@ -2238,11 +2238,9 @@
<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-2">
<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>
<?php <?php
$RL = array("0" => 'Select Req No'); $RL = array("0" => 'Select Req No');
if (!empty($RequistionDetails)) { if (!empty($RequistionDetails)) {
@ -2259,7 +2257,7 @@
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-2">
<label>Department Name</label> <label>Department Name</label>
<div> <div>
<?php <?php
@ -2269,7 +2267,7 @@
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-2">
<label>Cost Center Code</label> <label>Cost Center Code</label>
<div> <div>
<?php <?php
@ -2280,7 +2278,7 @@
?> ?>
</div> </div>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-2">
<label>Avail Bud Amount<?php echo "($INR)" ?></label> <label>Avail Bud Amount<?php echo "($INR)" ?></label>
<div class="form-group"> <div class="form-group">
<?php <?php
@ -2289,8 +2287,6 @@
?> ?>
</div> </div>
</div> </div>
</div>
<div class="form-row">
<div class="form-group col-md-2" id="ExchangeRateModalEditDiv" style="display:none;"> <div class="form-group col-md-2" id="ExchangeRateModalEditDiv" style="display:none;">
<label> Exchange Rate</label> <label> Exchange Rate</label>
<div class="form-group"> <div class="form-group">
@ -2303,7 +2299,6 @@
</div> </div>
<div class="form-row" style="padding: 0px;"> <div class="form-row" style="padding: 0px;">
<div class="form-group col-md-2"> <div class="form-group col-md-2">
<label>Item Code<span class="text-danger">*</span></label> <label>Item Code<span class="text-danger">*</span></label>
<div> <div>
@ -2364,11 +2359,9 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="form-row" style="padding:0px;" id="EDITCAPdiv"> <div class="form-row" style="padding:0px;" id="EDITCAPdiv">
</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>
@ -2408,10 +2401,6 @@
?> ?>
</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 class="form-group col-md-3">
<label>Freight Type </label> <label>Freight Type </label>

1
app/Views/editImportAmendPO.php
View File

@ -2943,7 +2943,6 @@ if (!empty($RequistionDetails)) {
type: "POST", type: "POST",
url: "<?php echo base_url() ?>amendmentpurchaseorder/EditAmendImportPO", url: "<?php echo base_url() ?>amendmentpurchaseorder/EditAmendImportPO",
success: function(data) { success: function(data) {
//console.log(data);
if (data) { if (data) {
// $('#content').loader('hide'); // $('#content').loader('hide');
alert(data); alert(data);

52
app/Views/editRevenueAmendPO.php
View File

@ -2032,7 +2032,6 @@ if (!empty($INRSYMBOL)) {
userid = $(e.relatedTarget).data('userid'); userid = $(e.relatedTarget).data('userid');
$('#isEdit').val(1); $('#isEdit').val(1);
$('#isEdit').val(1); $('#isEdit').val(1);
alert(tempUserId);
if (tempUserId == 0) { if (tempUserId == 0) {
var tr = document.getElementById(userid); var tr = document.getElementById(userid);
var cellval = tr.cells; var cellval = tr.cells;
@ -2119,28 +2118,22 @@ if (!empty($INRSYMBOL)) {
$('#BudgetType').attr("style", "pointer-events: none;"); $('#BudgetType').attr("style", "pointer-events: none;");
$('#EditRevenue').click(function() { $('#EditRevenue').click(function() {
// alert('inside Functioon');
tinyMCE.triggerSave(); tinyMCE.triggerSave();
if (validateEditRevenueTax() && validateEditExceedLimit()) { if (validateEditRevenueTax() && validateEditExceedLimit()) {
// alert('inside 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();
var editDescription = $("#EditItemName").val(); var editDescription = $("#EditItemName").val();
var editUOM = $('#EditUOM').val(); var editUOM = $('#EditUOM').val();
var editQuantity = $('#EditQuantity').val(); var editQuantity = $('#EditQuantity').val();
var itemRate = $("#EditRate").val(); var itemRate = $("#EditRate").val();
var per = $("#EditAmendPer").val(); var per = $("#EditAmendPer").val();
if (per == '') { if (per == '') {
per = $('#EditUOM').val(); per = $('#EditUOM').val();
} }
var DisType = $("#EditDiscountType").val(); var DisType = $("#EditDiscountType").val();
var DisVal = $("#txtEditDiscount").val(); var DisVal = $("#txtEditDiscount").val();
var AfterDisVal = $("#txtEditAfterDiscount").val(); var AfterDisVal = $("#txtEditAfterDiscount").val();
var PackOption = PackagingCalculation; var PackOption = PackagingCalculation;
var PackType = $("#EditPackagingType").val(); var PackType = $("#EditPackagingType").val();
var PackVal = $("#txtEditPackaging").val(); var PackVal = $("#txtEditPackaging").val();
@ -2160,30 +2153,21 @@ if (!empty($INRSYMBOL)) {
var GSTVal = $("#txtEditGST").val(); //CGST var GSTVal = $("#txtEditGST").val(); //CGST
var AfterGSTVal = $("#txtEditAfterGST").val(); var AfterGSTVal = $("#txtEditAfterGST").val();
var OtherTaxVal = $("#txtEditOtherTax").val(); //IGST var OtherTaxVal = $("#txtEditOtherTax").val(); //IGST
var AfterOtherTaxVal = $("#txtEditAfterOtherTax").val(); var AfterOtherTaxVal = $("#txtEditAfterOtherTax").val();
var Trips = $('#EditNOOfTrips').val(); var Trips = $('#EditNOOfTrips').val();
// var FreightOption = FreightCalculation ; // var FreightOption = FreightCalculation ;
var FreightType = $("#drpEditFreight").val(); var FreightType = $("#drpEditFreight").val();
var FreightVal = $("#txtEditFreight").val(); var FreightVal = $("#txtEditFreight").val();
var AfterFreightVal = $("#txtEditAfterFreight").val(); var AfterFreightVal = $("#txtEditAfterFreight").val();
var basicval = $("#txtEditBasicValue").val(); var basicval = $("#txtEditBasicValue").val();
var Insval = $("#txtEditInsurance").val(); var Insval = $("#txtEditInsurance").val();
var TotalOrderValue = $("#txtEditTotalOrderValue").val(); var TotalOrderValue = $("#txtEditTotalOrderValue").val();
var Service_Description = $("#Edit_Service_Description").val(); var Service_Description = $("#Edit_Service_Description").val();
var TotalTaxValue = calculateEditTaxValue(); var TotalTaxValue = calculateEditTaxValue();
//alert(TotalTaxValue);
// console.log(userid);
var tr = document.getElementById(userid); var tr = document.getElementById(userid);
var cellval = tr.cells; var cellval = tr.cells;
// console.log(tr);
cellval[2].innerHTML = editDescription; cellval[2].innerHTML = editDescription;
cellval[3].innerHTML = parseFloat(editQuantity).toFixed(2); cellval[3].innerHTML = parseFloat(editQuantity).toFixed(2);
@ -2193,7 +2177,6 @@ if (!empty($INRSYMBOL)) {
cellval[7].innerHTML = parseFloat(TotalTaxValue).toFixed(2); cellval[7].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[8].innerHTML = parseFloat(TotalOrderValue).toFixed(2); cellval[8].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
// alert("late");
$('#materialCode' + userid).val(editMaterialCode); $('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(editDescription); $('#materialName' + userid).val(editDescription);
$('#uom' + userid).val(editUOM); $('#uom' + userid).val(editUOM);
@ -2237,14 +2220,11 @@ if (!empty($INRSYMBOL)) {
}, 1000); }, 1000);
} }
// alert('outside IF'); // alert('outside IF');
}); });
function populateValueMainFormForRevenue() { function populateValueMainFormForRevenue() {
var Packaging = $('#txtAfterPackaging').val() == '' ? '0.00' : $('#txtAfterPackaging').val(); var Packaging = $('#txtAfterPackaging').val() == '' ? '0.00' : $('#txtAfterPackaging').val();
var Vat = $('#txtAfterVat').val() == '' ? '0.00' : $('#txtAfterVat').val(); //SGST var Vat = $('#txtAfterVat').val() == '' ? '0.00' : $('#txtAfterVat').val(); //SGST
var GST = $('#txtAfterGST').val() == '' ? '0.00' : $('#txtAfterGST').val(); //CGST var GST = $('#txtAfterGST').val() == '' ? '0.00' : $('#txtAfterGST').val(); //CGST
var OtherTax = $('#txtAfterOtherTax').val() == '' ? '0.00' : $('#txtAfterOtherTax').val(); //IGST var OtherTax = $('#txtAfterOtherTax').val() == '' ? '0.00' : $('#txtAfterOtherTax').val(); //IGST
var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val(); var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val();
@ -2252,16 +2232,11 @@ if (!empty($INRSYMBOL)) {
var Discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val(); var Discount = $('#txtAfterDiscount').val() == '' ? '0.00' : $('#txtAfterDiscount').val();
var BasicVal = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val(); var BasicVal = $('#txtBasicValue').val() == '' ? '0.00' : $('#txtBasicValue').val();
var TotalVal = $('#txtTotalOrderValue').val() == '' ? '0.00' : $('#txtTotalOrderValue').val(); var TotalVal = $('#txtTotalOrderValue').val() == '' ? '0.00' : $('#txtTotalOrderValue').val();
var TotalOrderValueSummary = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val(); var TotalOrderValueSummary = $('#txtTotalOrderValueSummary').val() == '' ? '0.00' : $('#txtTotalOrderValueSummary').val();
var totBasicAmt = $('#txtTotBasicAmount').val() == '' ? '0.00' : $('#txtTotBasicAmount').val(); var totBasicAmt = $('#txtTotBasicAmount').val() == '' ? '0.00' : $('#txtTotBasicAmount').val();
alert(totBasicAmt);
var totDiscountAmt = $('#txtTotalDiscount').val() == '' ? '0.00' : $('#txtTotalDiscount').val(); var totDiscountAmt = $('#txtTotalDiscount').val() == '' ? '0.00' : $('#txtTotalDiscount').val();
var totPackagingAmt = $('#txtTotalPackaing').val() == '' ? '0.00' : $('#txtTotalPackaing').val(); var totPackagingAmt = $('#txtTotalPackaing').val() == '' ? '0.00' : $('#txtTotalPackaing').val();
var totVATAmt = $('#txtTotalVat').val() == '' ? '0.00' : $('#txtTotalVat').val(); //SGST var totVATAmt = $('#txtTotalVat').val() == '' ? '0.00' : $('#txtTotalVat').val(); //SGST
var totGSTAmt = $('#txtTotalGST').val() == '' ? '0.00' : $('#txtTotalGST').val(); //CGST var totGSTAmt = $('#txtTotalGST').val() == '' ? '0.00' : $('#txtTotalGST').val(); //CGST
var totOtherTaxAmt = $('#txtTotalOtherTaxes').val() == '' ? '0.00' : $('#txtTotalOtherTaxes').val(); //IGST var totOtherTaxAmt = $('#txtTotalOtherTaxes').val() == '' ? '0.00' : $('#txtTotalOtherTaxes').val(); //IGST
var totFreightAmt = $('#txtTotalFreight').val() == '' ? '0.00' : $('#txtTotalFreight').val(); var totFreightAmt = $('#txtTotalFreight').val() == '' ? '0.00' : $('#txtTotalFreight').val();
@ -2271,27 +2246,20 @@ if (!empty($INRSYMBOL)) {
$('#txtTotBasicAmount').val(parseFloat(totBasicAmt) + parseFloat(BasicVal)); $('#txtTotBasicAmount').val(parseFloat(totBasicAmt) + parseFloat(BasicVal));
$('#txtTotalDiscount').val(parseFloat(totDiscountAmt) + parseFloat(Discount)); $('#txtTotalDiscount').val(parseFloat(totDiscountAmt) + parseFloat(Discount));
$('#txtTotalPackaing').val(parseFloat(totPackagingAmt) + parseFloat(Packaging)); $('#txtTotalPackaing').val(parseFloat(totPackagingAmt) + parseFloat(Packaging));
$('#txtTotalVat').val(parseFloat(totVATAmt) + parseFloat(Vat)); //SGST $('#txtTotalVat').val(parseFloat(totVATAmt) + parseFloat(Vat)); //SGST
$('#txtTotalGST').val(parseFloat(totGSTAmt) + parseFloat(GST)); //CGST $('#txtTotalGST').val(parseFloat(totGSTAmt) + parseFloat(GST)); //CGST
$('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt) + parseFloat(OtherTax)); //IGST $('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt) + parseFloat(OtherTax)); //IGST
$('#txtTotalFreight').val(parseFloat(totFreightAmt) + parseFloat(Freight)); $('#txtTotalFreight').val(parseFloat(totFreightAmt) + parseFloat(Freight));
$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt) + parseFloat(Insurance)); $('#txtTotalInsurance').val(parseFloat(totInsuranceAmt) + parseFloat(Insurance));
$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt) + parseFloat(TotalVal)); $('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt) + parseFloat(TotalVal));
} }
function populateValueMainFormForEditRevenueTax() { function populateValueMainFormForEditRevenueTax() {
var rows = document.getElementById('revenueTax').rows.length; var rows = document.getElementById('revenueTax').rows.length;
// alert(rows);
var totBasicAmt = 0; var totBasicAmt = 0;
var totDiscountAmt = 0; var totDiscountAmt = 0;
var totPackagingAmt = 0; var totPackagingAmt = 0;
var totVATAmt = 0; //SGST var totVATAmt = 0; //SGST
var totGSTAmt = 0; //CGST var totGSTAmt = 0; //CGST
var totOtherTaxAmt = 0; //IGST var totOtherTaxAmt = 0; //IGST
var totFreightAmt = 0; var totFreightAmt = 0;
@ -2300,20 +2268,12 @@ if (!empty($INRSYMBOL)) {
var i = 0; var i = 0;
do { do {
i += 1; i += 1;
var tr = document.getElementById(i); var tr = document.getElementById(i);
//alert(tr);
if (tr != null) { if (tr != null) {
cells = tr.getElementsByTagName('td'); cells = tr.getElementsByTagName('td');
var rowid = cells[0].innerHTML; var rowid = cells[0].innerHTML;
// alert(rowid);
var Packaging = $('#AfterPackVal' + rowid).val() == '' ? '0.00' : $('#AfterPackVal' + rowid).val(); var Packaging = $('#AfterPackVal' + rowid).val() == '' ? '0.00' : $('#AfterPackVal' + rowid).val();
var Vat = $('#AfterVatVal' + rowid).val() == '' ? '0.00' : $('#AfterVatVal' + rowid).val(); //SGST var Vat = $('#AfterVatVal' + rowid).val() == '' ? '0.00' : $('#AfterVatVal' + rowid).val(); //SGST
var GST = $('#AfterGSTVal' + rowid).val() == '' ? '0.00' : $('#AfterGSTVal' + rowid).val(); //CGST var GST = $('#AfterGSTVal' + rowid).val() == '' ? '0.00' : $('#AfterGSTVal' + rowid).val(); //CGST
var OtherTax = $('#AfterOtherTaxVal' + rowid).val() == '' ? '0.00' : $('#AfterOtherTaxVal' + rowid).val(); //IGST var OtherTax = $('#AfterOtherTaxVal' + rowid).val() == '' ? '0.00' : $('#AfterOtherTaxVal' + rowid).val(); //IGST
var Freight = $('#AfterFreightVal' + rowid).val() == '' ? '0.00' : $('#AfterFreightVal' + rowid).val(); var Freight = $('#AfterFreightVal' + rowid).val() == '' ? '0.00' : $('#AfterFreightVal' + rowid).val();
@ -2321,15 +2281,11 @@ if (!empty($INRSYMBOL)) {
var Discount = $('#AfterDisVal' + rowid).val() == '' ? '0.00' : $('#AfterDisVal' + rowid).val(); var Discount = $('#AfterDisVal' + rowid).val() == '' ? '0.00' : $('#AfterDisVal' + rowid).val();
var BasicVal = $('#basicval' + rowid).val() == '' ? '0.00' : $('#basicval' + rowid).val(); var BasicVal = $('#basicval' + rowid).val() == '' ? '0.00' : $('#basicval' + rowid).val();
var TotalVal = $('#TotalOrderValue' + rowid).val() == '' ? '0.00' : $('#TotalOrderValue' + rowid).val(); var TotalVal = $('#TotalOrderValue' + rowid).val() == '' ? '0.00' : $('#TotalOrderValue' + rowid).val();
//alert(TotalVal);
totBasicAmt = parseFloat(totBasicAmt) + parseFloat(BasicVal); totBasicAmt = parseFloat(totBasicAmt) + parseFloat(BasicVal);
totDiscountAmt = parseFloat(totDiscountAmt) + parseFloat(Discount); totDiscountAmt = parseFloat(totDiscountAmt) + parseFloat(Discount);
totPackagingAmt = parseFloat(totPackagingAmt) + parseFloat(Packaging); totPackagingAmt = parseFloat(totPackagingAmt) + parseFloat(Packaging);
totVATAmt = parseFloat(totVATAmt) + parseFloat(Vat); //SGST totVATAmt = parseFloat(totVATAmt) + parseFloat(Vat); //SGST
totGSTAmt = parseFloat(totGSTAmt) + parseFloat(GST); //CGST totGSTAmt = parseFloat(totGSTAmt) + parseFloat(GST); //CGST
totOtherTaxAmt = parseFloat(totOtherTaxAmt) + parseFloat(OtherTax); //IGST totOtherTaxAmt = parseFloat(totOtherTaxAmt) + parseFloat(OtherTax); //IGST
totFreightAmt = parseFloat(totFreightAmt) + parseFloat(Freight); totFreightAmt = parseFloat(totFreightAmt) + parseFloat(Freight);
@ -2338,20 +2294,15 @@ if (!empty($INRSYMBOL)) {
} }
} while (i < rows); } while (i < rows);
// alert(totOrderSummaryAmt);
$('#txtTotBasicAmount').val(parseFloat(totBasicAmt).toFixed(2)); $('#txtTotBasicAmount').val(parseFloat(totBasicAmt).toFixed(2));
$('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2)); $('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2));
$('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2)); $('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2));
$('#txtTotalVat').val(parseFloat(totVATAmt).toFixed(2)); //SGST $('#txtTotalVat').val(parseFloat(totVATAmt).toFixed(2)); //SGST
$('#txtTotalGST').val(parseFloat(totGSTAmt).toFixed(2)); //CGST $('#txtTotalGST').val(parseFloat(totGSTAmt).toFixed(2)); //CGST
$('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt).toFixed(2)); //IGST $('#txtTotalOtherTaxes').val(parseFloat(totOtherTaxAmt).toFixed(2)); //IGST
$('#txtTotalFreight').val(parseFloat(totFreightAmt).toFixed(2)); $('#txtTotalFreight').val(parseFloat(totFreightAmt).toFixed(2));
$('#txtTotalInsurance').val(parseFloat(totInsuranceAmt).toFixed(2)); $('#txtTotalInsurance').val(parseFloat(totInsuranceAmt).toFixed(2));
$('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt).toFixed(2)); $('#txtTotalOrderValueSummary').val(parseFloat(totOrderSummaryAmt).toFixed(2));
} }
function validateEditRevenueTax() { function validateEditRevenueTax() {
@ -2382,7 +2333,6 @@ if (!empty($INRSYMBOL)) {
//alert('inside validateBudgetExceedLimit function'); //alert('inside validateBudgetExceedLimit function');
var rows = document.getElementById('revenueTax').rows.length; var rows = document.getElementById('revenueTax').rows.length;
var ReqType = '<?php echo REVENUE ?>'; var ReqType = '<?php echo REVENUE ?>';
//alert(rows);
for (i = 1; i < rows; i++) { for (i = 1; i < rows; i++) {
var costcode = $('#costCode' + i).val(); var costcode = $('#costCode' + i).val();
var basicAmountRate = parseFloat($('#basicval' + i).val()); var basicAmountRate = parseFloat($('#basicval' + i).val());
@ -2398,7 +2348,6 @@ if (!empty($INRSYMBOL)) {
url: "<?php echo base_url() ?>serviceAvilBudgetAmount", url: "<?php echo base_url() ?>serviceAvilBudgetAmount",
success: function(data) { success: function(data) {
if (data) { if (data) {
//alert(data);
avalbudAmt = parseFloat(data); avalbudAmt = parseFloat(data);
// if(basicAmountRate > avalbudAmt || totalAmount > avalbudAmt) // if(basicAmountRate > avalbudAmt || totalAmount > avalbudAmt)
// { // {
@ -2474,7 +2423,6 @@ if (!empty($INRSYMBOL)) {
// console.log(data); // console.log(data);
if (data) { if (data) {
// $('.content').loader('hide'); // $('.content').loader('hide');
alert(data);
$('#txtRowCount').val(''); $('#txtRowCount').val('');
$('#txtDeletedRow').val(''); $('#txtDeletedRow').val('');
$('#txtStatus').val(''); $('#txtStatus').val('');

4
app/Views/editServiceAmendPO.php
View File

@ -2040,7 +2040,7 @@ foreach ($PaymentTerms as $TER) {
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails", url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
success: function(data) { success: function(data) {
if (data) { if (data) {
$('#content').loader('hide'); // $('#content').loader('hide');
alert(data); alert(data);
} else { } else {
alert("Error"); alert("Error");
@ -2227,7 +2227,7 @@ foreach ($PaymentTerms as $TER) {
$('#txtDeliveryAddress').val('') $('#txtDeliveryAddress').val('')
window.location = "amendmentpurchaseorder"; window.location = "amendmentpurchaseorder";
} else { } else {
$('#content').loader('hide'); // $('#content').loader('hide');
alert("Error"); alert("Error");
} }
} }

79
app/Views/editimportpo.php
View File

@ -755,7 +755,6 @@ if (!empty($getlogpodtl)) {
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;
@ -1114,7 +1113,7 @@ if (!empty($getlogpodtl)) {
<td><?php echo $oldpo->PONO ?></td> <td><?php echo $oldpo->PONO ?></td>
<!-- <!--
<?php if ($oldpo->logDate != '-') { <?php if (isset($oldpo->logDate) && $oldpo->logDate != '-') {
$logdate = date('d-m-Y', strtotime($oldpo->logDate)); $logdate = date('d-m-Y', strtotime($oldpo->logDate));
} else { } else {
$logdate = '-'; $logdate = '-';
@ -1165,31 +1164,15 @@ if (!empty($getlogpodtl)) {
</div> </div>
<div class="form-group col-md-12">
<div align="right"><br>
<div class="form-row p-3">
<div> <div>
<label class="form">
Select Purchase Order File
</label>
</div>
<input type="file" class="form-control" name="POFile" id="POFile"> <input type="file" class="form-control" 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> <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br><br>
</div>
<div align="right" style="padding-right:10px">
<div class="col-md-5 col-md-offset-7" align="right"><br />
<div>
</div> </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" />
@ -1224,11 +1207,14 @@ if (!empty($getlogpodtl)) {
<?php } ?> <?php } ?>
</div>
</div>
<div class="form-row p-3" align="left" style="padding-right:10px">
<div class="col-md-5 col-md-offset-7" align="right"><br />
<br><br> <br><br>
<label>Request On :</label><?php echo $Reqon; ?><br /> <label>Request On :</label><?php echo $Reqon; ?><br />
<label>Request By :</label><?php echo $RequesterName; ?><br /> <label>Request By :</label><?php echo $RequesterName; ?><br />
<label>Status : </label><?php <label>Status : </label><?php
@ -2057,9 +2043,9 @@ if (!empty($getlogpodtl)) {
</div>--> </div>-->
</div> </div>
<div class="form-row" style="padding:0px;"> <div class="form-row" style="border:1px solid black;">
<br /> <br />
<div class="form-group col-md-6" style="padding:0px;"> <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<!-- Basic Price: --> <!-- Basic Price: -->
@ -2199,7 +2185,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
</div> </div>
<div class="form-group col-md-6" style="padding:0px;"> <div class="form-group col-md-6 p-2 mt-1" style="padding:0px;">
<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) -->
@ -2442,7 +2428,7 @@ if (!empty($getlogpodtl)) {
</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 EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a> <a class="btn btn-success font EditImport" ID="EditImport"> &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
</div> </div>
</form> </form>
@ -3313,7 +3299,6 @@ if (!empty($getlogpodtl)) {
var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>; var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>; var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
// console.log(Material);
//var AvlBudAmt = '<?php echo $AvlAmount ?>'; //var AvlBudAmt = '<?php echo $AvlAmount ?>';
var AvlBudAmt = '<?php echo $AvilableBudget ?>'; var AvlBudAmt = '<?php echo $AvilableBudget ?>';
// alert(JSON.stringify(Material)); // alert(JSON.stringify(Material));
@ -3390,7 +3375,7 @@ if (!empty($getlogpodtl)) {
if (obj.MaterialCode === id) { if (obj.MaterialCode === id) {
$("#ItemName").val(obj.MaterialName); $("#ItemName").val(obj.MaterialName);
$("#UOM").val(obj.UOM); $("#UOM").val(obj.UOM);
$("#Quantity").val(obj.Quantity); $("#Quantity").val(obj.Quantity).trigger('change');
RequistQuantity = obj.Quantity; RequistQuantity = obj.Quantity;
reqq = RequistQuantity; reqq = RequistQuantity;
//RequistQuantity=parseFloat($('#Quantity').val()); //RequistQuantity=parseFloat($('#Quantity').val());
@ -4309,9 +4294,6 @@ if (!empty($getlogpodtl)) {
<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" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i> <i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the ${Reqnumber} Requisition details"></i>
@ -4322,7 +4304,9 @@ if (!empty($getlogpodtl)) {
</td> </td>
</tr> </tr>
`; `;
setTimeout(() => {
$('#importpomodel').modal('hide');
}, 1000);
// Append the generated row HTML to the target element // Append the generated row HTML to the target element
$('#ImportAppend').append(rowHtml); $('#ImportAppend').append(rowHtml);
@ -4917,6 +4901,7 @@ 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();
@ -5046,6 +5031,9 @@ if (!empty($getlogpodtl)) {
populateValueMainFormForEditImportTax(); populateValueMainFormForEditImportTax();
setTimeout(() => {
$('#editimportpomodel').modal('hide');
}, 1000);
} }
@ -5529,18 +5517,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) {
if (data) { console.log(data);
// $('#content').loader('hide'); // if (data) {
alert(data); // // $('#content').loader('hide');
$('#txtRowCount').val(''); // alert(data);
$('#txtDeletedRow').val(''); // $('#txtRowCount').val('');
//$('#SpcialInstruction').val(''); // $('#txtDeletedRow').val('');
//$('#txtDeliveryAddress').val(''); // //$('#SpcialInstruction').val('');
window.location = "purchaseorderListing"; // //$('#txtDeliveryAddress').val('');
// window.location = "purchaseorderListing";
} else { // } else {
alert("Error"); // alert("Error");
} // }
} }