From bcb894769316c5eac53a748894a0200c83eaa60d Mon Sep 17 00:00:00 2001
From: gandhimathi <bitbucket@venbainfotech.com>
Date: Thu, 21 Dec 2017 11:45:43 +0000
Subject: [PATCH] allowance issues fixed

---
 application/controllers/user.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/controllers/user.php b/application/controllers/user.php
index bae3f096..0e6a54ae 100755
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -202,9 +202,9 @@ class user extends BaseController
                 $Basic_Pay = $totalEmployeePersent[0]->Basic_Pay;
                 $totalsalary = $totalEmployeePersent[0]->TotalSalary;
                 $dayFoodAmt = $totalEmployeePersent[0]->Food_Allowances;
-                $allowances =$totalEmployeePersent[0]->Allowances;
+                //$allowances =$totalEmployeePersent[0]->Allowances;
 
-                $Allowances = $allowances * $values;
+                //$Allowances = $allowances * $values;
                 $Food_Allowances = $dayFoodAmt * $values;
 
                 $daySalary = $Basic_Pay / $CUR_month;
@@ -242,7 +242,7 @@ class user extends BaseController
                 /** pf amount per day**/
 
                 //echo $totalothour;die;
-                $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances+ $Allowances;
+                $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances;
                 $salaryInCurrentday =  $salaryInCurrentdays - ($esiAmount + $pfAmount);
                 $employeeSalary += round($salaryInCurrentday);
 
@@ -318,9 +318,9 @@ class user extends BaseController
                     $Basic_Pay = $totalEmployeePersent[0]->Basic_Pay;
                     $totalsalary = $totalEmployeePersent[0]->TotalSalary;
                     $dayFoodAmt = $totalEmployeePersent[0]->Food_Allowances;
-                    $allowances =$totalEmployeePersent[0]->Allowances;
+                    //$allowances =$totalEmployeePersent[0]->Allowances;
 
-                    $Allowances = $allowances * $values;
+                   // $Allowances = $allowances * $values;
                
 
                     $Food_Allowances = $dayFoodAmt * $values;
@@ -359,7 +359,7 @@ class user extends BaseController
                     /** pf amount per day**/
 
                     //echo $totalothour;die;
-                    $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances + $Allowances;
+                    $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances ;
 
                       $salaryInCurrentday = $salaryInCurrentdays -($esiAmount+$pfAmount);
                     $totalSalarys = $totalSalary + $salaryInCurrentday;