fix imbang duga jelawat

app/Http/Controllers/LaporanController.php

@@ -16,6 +16,7 @@ use App\Advansur;
 use App\Vault;
 use App\Tunai;
 use App\Denominasi;
+use App\Hapuskira;
 
 use Carbon\Carbon;
 
@@ -119,8 +120,17 @@ class LaporanController extends Controller
                 ->sum('pinjaman');
             }
 
-        $outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq);
+        $daterequest = new Carbon($request->tarikh);
+        $daterequest->addDays(1);
 
+        $bayaranpendahuluan = TransaksiKeuntungan::on('mysql7')
+            ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+            ->where('db2.sttebus','=','')
+            ->where('db2.hargajualan','<>','null')
+            ->where('tarikh_bayaran' ,'<=', $daterequest)
+            ->sum('bayaran_pembiayaan');
+
+        $outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq) - floatval($bayaranpendahuluan);
    
         /* Stok Audit */
 
@@ -129,10 +139,19 @@ class LaporanController extends Controller
                     ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
                     ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
 
-        $stokauditpembiayaan = $stokaudit->sum('pinjaman');
+        $stokauditget = $stokaudit->get();         
         $stokauditnilaimarhun = $stokaudit->sum('nilaimarhun'); 
         $stokauditcount = $stokaudit->count(); 
 
+        $totalstokaudit = 0;
+        foreach($stokauditget as $index1=>$stokA)
+        {
+            if($stokA['hargajualan'] == null)
+                $totalstokaudit += $stokA['pinjaman'];
+            else
+                $totalstokaudit += $stokA['bakipjm'];
+        }
+
 
         /* Kawalan Stok */
 
@@ -207,7 +226,7 @@ class LaporanController extends Controller
             'total_keuntungan'=>floatval($total_keuntungan),
             'petibesi_sistem'=>$petibesi_sistem,
             'petibesi_deno'=>$petibesi_deno,
-            'stokauditpembiayaan'=>$stokauditpembiayaan,
+            'stokauditpembiayaan'=>$totalstokaudit,
             'stokauditnilaimarhun'=>$stokauditnilaimarhun,
             'stokauditcount'=>$stokauditcount,
             'petibesiimbangduga'=>$totalbakiakhirtunai,
@@ -217,4 +236,17 @@ class LaporanController extends Controller
             
         return response()->json($laporan_harian);
     }
+
+
+    public function CalcHapusKira($kodcaw,Request $request)
+    {
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $hapuskira = HapusKira::on($cawangan['mysql'])
+                        ->where('kodcaw','=',$kodcaw)
+                        ->where('tarikh','<',$request->tarikh)
+                        ->sum('amaun');
+
+        return response()->json($hapuskira);
+    }
 }