From 198cc4099af81d8fdd3cf2e3caf6a53644195d37 Mon Sep 17 00:00:00 2001 From: velz2020 Date: Thu, 24 Aug 2017 17:55:58 +0530 Subject: [PATCH] AMEND BUDGET AND PAYROLL --- application/controllers/payslip.php | 8 ++++---- application/views/addemppaydate.php | 10 +++++----- application/views/editCapitalAmendPO.php | 9 ++++++++- application/views/editOldemppay.php | 4 ++-- application/views/editRevenueAmendPO.php | 19 +++++++++++-------- application/views/editServiceAmendPO.php | 16 +++++++++++++--- 6 files changed, 43 insertions(+), 23 deletions(-) diff --git a/application/controllers/payslip.php b/application/controllers/payslip.php index 7201d72d..f1f9d360 100755 --- a/application/controllers/payslip.php +++ b/application/controllers/payslip.php @@ -489,9 +489,9 @@ function getEmployee() $LOPDays = $sheet->getCell('B'.$x)->getValue(); $OTHoursWorked =$sheet->getCell('C'.$x)->getValue(); $loanRecovered=$sheet->getCell('D'.$x)->getValue(); - $loanBalance=$sheet->getCell('E'.$x)->getValue(); - $Incentive =$sheet->getCell('F'.$x)->getValue(); - $Other_Deductions =$sheet->getCell('G'.$x)->getValue(); + //$loanBalance=$sheet->getCell('E'.$x)->getValue(); + $Incentive =$sheet->getCell('E'.$x)->getValue(); + $Other_Deductions =$sheet->getCell('F'.$x)->getValue(); if( $EmpId != '') { @@ -502,7 +502,7 @@ function getEmployee() if($EmpId == $e->EmpID){ - $FileData = array('Month_Year'=>$PayOn,'EmpID'=>$EmpId,'LOP_Days'=>$LOPDays,'OT_Hrs_Worked'=>$OTHoursWorked,'Loan_Recovered'=>$loanRecovered,'Loan_Balance'=>$loanBalance,'Incentives'=>$Incentive,'Other_Deductions'=>$Other_Deductions,'Created_By'=>$createdby,'Created_Time'=>date("Y-m-d h:i:sa")); + $FileData = array('Month_Year'=>$PayOn,'EmpID'=>$EmpId,'LOP_Days'=>$LOPDays,'OT_Hrs_Worked'=>$OTHoursWorked,'Loan_Recovered'=>$loanRecovered,'Incentives'=>$Incentive,'Other_Deductions'=>$Other_Deductions,'Created_By'=>$createdby,'Created_Time'=>date("Y-m-d h:i:sa")); $result = $this->payroll_model->UploadFileData2($FileData); $success++; } diff --git a/application/views/addemppaydate.php b/application/views/addemppaydate.php index 45481923..57f9ba37 100755 --- a/application/views/addemppaydate.php +++ b/application/views/addemppaydate.php @@ -244,7 +244,7 @@ $("#due_started").datepicker({ Loan Amount - + @@ -266,7 +266,7 @@ $("#due_started").datepicker({
Monthly Due(s): - +
@@ -282,7 +282,7 @@ $("#due_started").datepicker({
No Of Due(s): - +
@@ -290,11 +290,11 @@ $("#due_started").datepicker({
Paid Amount: - +
- +
diff --git a/application/views/editCapitalAmendPO.php b/application/views/editCapitalAmendPO.php index 56da83aa..678d421e 100755 --- a/application/views/editCapitalAmendPO.php +++ b/application/views/editCapitalAmendPO.php @@ -131,6 +131,13 @@ if(!empty($POMaster)) $Import_DispatchDetails=$Req->Import_DispatchDetails; $Import_PlaceofOrgin=$Req->Import_PlaceofOrgin; $CapitalRange=$Req->CapitalRange; + if($CapitalRange=='0'){ + $ExitExchangeRate=$Req->ExchangeRate; + $ExitTotalOrderValue=number_format($Req->TotalOrderValue*$ExitExchangeRate, 2, '.', ''); + } + else{ + $ExitTotalOrderValue=$Req->TotalOrderValue; + } } } @@ -140,7 +147,7 @@ if(!empty($POMaster)) if(!empty($AvlBudAmt)) { - $AvlAmount = $AvlCapitalBudAmt; + $AvlAmount = number_format($AvlCapitalBudAmt+$ExitTotalOrderValue, 2, '.', ''); } ?> diff --git a/application/views/editOldemppay.php b/application/views/editOldemppay.php index b284a627..c178a43c 100755 --- a/application/views/editOldemppay.php +++ b/application/views/editOldemppay.php @@ -303,8 +303,8 @@ if(!empty($emppay))
- RD - PD + + diff --git a/application/views/editRevenueAmendPO.php b/application/views/editRevenueAmendPO.php index 04ba90ff..b4c68679 100755 --- a/application/views/editRevenueAmendPO.php +++ b/application/views/editRevenueAmendPO.php @@ -1775,7 +1775,9 @@ var userid = ''; $("#EDITREVENUE").on("shown.bs.modal", function(e) { - + var AvlBudAmt = ''; + + AvlBudAmt = ''; userid = $(e.relatedTarget).data('userid'); $('#isEdit').val(1); //alert(userid); @@ -1786,7 +1788,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) { $('#EditReqNo').val($('#Reqnumber'+userid).val()); $('#EditdeptName').val($('#departmentName'+userid).val()); $("#EditCostCenter").val($('#costCode'+userid).val()); - $('#EditAvlBudAmt').val($('#AvlAmount'+userid).val()); + $('#EditAvlBudAmt').val(AvlBudAmt); $('#EditMaterialCode').val($('#materialCode'+userid).val()); $('#EditItemName').val($('#materialName'+userid).val()); @@ -2209,7 +2211,8 @@ tinyMCE.triggerSave(); var splinstr = $('#txtSpcialInstruction').val(); $('#SpcialInstruction').val(splinstr); $('#txtDeliveryAddress').val(deladd); - +var AvlBudAmt = ''; +var txtTotalOrderValueSummary = $('#txtTotalOrderValueSummary').val(); //alert('Before Validate IF condition'); if(validate()) { @@ -2222,11 +2225,11 @@ $('#txtDeliveryAddress').val(deladd); $('#Deliverydt').focus(); return false; } - else if(validateBudgetExceedLimit()) - { - - return false; - } + else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) { + alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); + + return false; + } else { //alert('final else for store data'); diff --git a/application/views/editServiceAmendPO.php b/application/views/editServiceAmendPO.php index c1ef47f6..15d4d81c 100755 --- a/application/views/editServiceAmendPO.php +++ b/application/views/editServiceAmendPO.php @@ -1355,7 +1355,9 @@ var userid = ''; $("#EDITSERVICE").on("shown.bs.modal", function(e) { - + var AvlBudAmt = ''; + + AvlBudAmt = ''; userid = $(e.relatedTarget).data('userid'); var tr= document.getElementById(userid); @@ -1365,7 +1367,7 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) { $('#EditReqNo').val($('#Reqnumber'+userid).val()); $('#EditdeptName').val($('#departmentName'+userid).val()); $("#EditCostCenter").val($('#costCode'+userid).val()); - $('#EditAvlBudAmt').val($('#AvilBudget'+userid).val()); + $('#EditAvlBudAmt').val(AvlBudAmt); $('#EdittxtSpcialInstruction').val($('#servicematerialdescription'+userid).val()); $('#EditItemName').val($('#materialName'+userid).val()); $('#EditUOM').val($('#uom'+userid).val()); @@ -1879,10 +1881,17 @@ $('#txtStatus').val(stat); //$('#SpcialInstruction').val(splinstr); $('#txtDeliveryAddress').val(deladd); + AvlBudAmt = ''; +var txtTotalOrderValueSummary = $('#txtTotalOrderValueSummary').val(); if(validate()) { - //alert('inside if'); + if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) { + alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); + + return false; + } + else{ $('#content').loader('show'); $.ajax({ data:$('.ServicePO').serialize(), @@ -1910,6 +1919,7 @@ $('#txtDeliveryAddress').val(deladd); } }); +} }