fix laporan

app/Http/Controllers/LaporanController.php

@@ -62,17 +62,10 @@ class LaporanController extends Controller
         $bilangan_customer_baru = Customer::on($cawangan['mysql'])->where('tarikhdaftar','=',$request->tarikh)->count();
 
         //c
+        /* Sistem */
         $petibesi_sistem = Vault::on($cawangan['mysql'])->where('tarikh','=', $request->tarikh)->sum('bakiakhir');
-        $petibesi_deno = Denominasi::on($cawangan['mysql'])->where('tarikh','=', $request->tarikh)->sum('txtjumlah'); 
+       
-
-        //d
-        $panjar_harian = Panjar::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('bayaran');
-        $panjar_bulanan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDay]])->sum('bayaran');
-        $panjar_tahunan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDayYear]])->sum('bayaran');
-
-        //e
         /* Imbang Duga */
-
         $totalbakiakhirtunai = 0;
   
         $vault=Vault::on($cawangan['mysql'])
@@ -100,18 +93,53 @@ class LaporanController extends Controller
            $totalbakiakhirtunai = $vault['bakiakhir'];
         }
 
+        /* Denominasi */
+        $petibesi_deno = Denominasi::on($cawangan['mysql'])->where('tarikh','=', $request->tarikh)->sum('txtjumlah'); 
+
+
+        //d
+        $panjar_harian = Panjar::on($cawangan['mysql'])->where('tarikh','=',$request->tarikh)->sum('bayaran');
+        $panjar_bulanan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDay]])->sum('bayaran');
+        $panjar_tahunan = Panjar::on($cawangan['mysql'])->where([['tarikh','<=',$request->tarikh],['tarikh','>=',$firstDayYear]])->sum('bayaran');
+
+        //e
+        /* Imbang Duga */
+
+        $rekodkoop = Gadai::on($cawangan['mysql'])
+                            ->where('tagpalsu','=',0)
+                            ->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']])
+                            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']])
+                            ->sum('pinjaman');
+
+        if($request->tarikh > '2021-04-13'){
+            $rekodtawarruq = Gadai::on($cawangan['mysql'])
+                ->where('tagpalsu','=',0)
+                ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
+                ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
+                ->sum('pinjaman');
+            }
+
+        $outstandingimbangduga = floatval($rekodkoop) + floatval($rekodtawarruq);
+
+   
         /* Stok Audit */
 
         $stokaudit = Gadai::on($cawangan['mysql'])
                     ->where('tagpalsu','=',0)
                     ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-                    ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+                    ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]);
-                    ->sum('pinjaman');
+
+        $stokauditpembiayaan = $stokaudit->sum('pinjaman');
+        $stokauditnilaimarhun = $stokaudit->sum('nilaimarhun'); 
+        $stokauditcount = $stokaudit->count(); 
+
 
         /* Kawalan Stok */
 
         
 
+        
+
 
         //f
         $data_lelong = Lelong::on($cawangan['mysql'])->where('t_jual','=',$request->tarikh)->get();
@@ -179,8 +207,11 @@ class LaporanController extends Controller
             'total_keuntungan'=>floatval($total_keuntungan),
             'petibesi_sistem'=>$petibesi_sistem,
             'petibesi_deno'=>$petibesi_deno,
-            'stokaudit'=>$stokaudit,
+            'stokauditpembiayaan'=>$stokauditpembiayaan,
-            'petibesiimbangduga'=>$totalbakiakhirtunai 
+            'stokauditnilaimarhun'=>$stokauditnilaimarhun,
+            'stokauditcount'=>$stokauditcount,
+            'petibesiimbangduga'=>$totalbakiakhirtunai,
+            'outstandingimbangduga'=>$outstandingimbangduga
 
             ]);
             

app/Http/Controllers/PanjarController.php

@@ -96,7 +96,6 @@ class PanjarController extends Controller
 
       $panjar=Panjar::on($cawangan['mysql'])
                ->create([ 
-              
                         'tarikh'=> $harini->toDateString(),
                         'deskripsi'=> $request->deskripsi,
                         'bayaran' => $request->bayaran,