biasa la

2021-03-28 08:02:49 +08:00
parent b39dc33827
commit da8ed07029
2 changed files with 37 additions and 9 deletions
@@ -148,14 +148,30 @@ class LelongController extends Controller
        $rugilelonglama = imbangdugalama::on($cawangan['mysql'])
            ->sum('rugi_lelong');

-        $bakilelong = Lelong::on($cawangan['mysql'])
-        ->where('t_jual','<=',$request->tarikh)
-        ->where(function($query) use ($tarikhbaru){
-            $query->whereNull('trkhtuntut')
-                  ->orWhere('trkhtuntut','>',$tarikhbaru);
-        })
-        ->where('baki','>=',0)
-        ->sum('baki');
+
+        if($request->tarikh <= '2021-02-25')
+        {
+            $bakilelong = Lelong::on($cawangan['mysql'])
+            ->where('t_jual','<=',$request->tarikh)
+            ->where(function($query) use ($tarikhbaru){
+                $query->whereNull('trkhtuntut')
+                      ->orWhere('trkhtuntut','>',$tarikhbaru);
+            })
+            ->where('baki','>=',0)
+            ->sum('baki');
+        }else{
+            $bakilelong = Lelong::on($cawangan['mysql'])
+            ->where('t_jual','<=',$request->tarikh)
+            ->where(function($query) use ($tarikhbaru){
+                $query->whereNull('trkhtuntut')
+                      ->orWhere('trkhtuntut','>','2021-02-25');
+            })
+            ->where('baki','>=',0)
+            ->sum('baki');
+        } 
+       
+
+

        $ansrugi = AnsRugi::on($cawangan['mysql'])
            ->sum('bayaran');