fix imbang duga

2021-04-15 08:58:19 +08:00
parent f8079b193a
commit 94f8e8f32d
3 changed files with 56 additions and 18 deletions
@@ -255,13 +255,19 @@ class VaultController extends Controller

      $tunai = Tunai::on($cawangan['mysql'])
               ->where('kodcaw','=',$kodcaw)
-               ->where('tarikh','<=', $request->tarikh)
-               ->orderby('tarikh','desc')->first();
+               ->where('tarikh','=', $request->tarikh)
+               ->get();

-
-      if($tunai['baki'] != 0)
+      $total = 0;
+      foreach($tunai as $index=>$money)
      {
-         $totalbakiakhirtunai = $vault['bakiakhir'] + $tunai['baki'];
+         $total+=$money['baki'];
+      }
+
+
+      if($total != 0)
+      {
+         $totalbakiakhirtunai = $vault['bakiakhir'] + $total;
      }else
      {
         $totalbakiakhirtunai = $vault['bakiakhir'];