merged server

2024-12-31 00:16:55 +08:00
parent 6c780beb7e 909c3e3a16
commit 52cb63600c
10 changed files with 169 additions and 36 deletions
@@ -1977,7 +1977,7 @@ class TebusController extends Controller

        /* Keuntungan Lelong */
        $upahlelong = Lelong::on($cawangan['mysql'])
-            ->where([['t_jual', '>=', $firstMonth], ['t_jual', '<=', $lastMonth], ['t_jual', '>', '2022-07-24']])
+            ->where([['tagujrah','0'],['t_jual', '>=', $firstMonth], ['t_jual', '<=', $lastMonth], ['t_jual', '>', '2022-07-24']])
            ->whereYear('t_jual', '=', $currentDate->year)
            ->sum('bakiupah');