untuk imac sahaja

2021-03-29 15:31:20 +08:00
parent a3d127e749
commit d1d1636e6b
3 changed files with 58 additions and 4 deletions
@@ -1998,6 +1998,7 @@ class GadaiController extends Controller
        ->where('t_gadai','<=',$request->tarikh)
        ->where('t_gadai','>=','2021-03-14')
        ->where('sttebus','=','')
+        ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-03-14']])
        ->whereNotNull('upah12')
        ->sum('upah12');