KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'server'

Browse Source 
# Conflicts:
#   app/Http/Controllers/GadaiController.php
This commit is contained in:
Zakwan Hamdan
2021-05-19 08:43:30 +00:00
parent 82708b046c 311befabb2
commit 5b97af3887
9 changed files with 234 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+6
View File
@@ -1150,6 +1150,7 @@ class GadaiController extends Controller
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
->where('trans.created_at','<',$daterequest)
->where('trans.trans_type','=','A')
->where('db2.sttebus','=','')
->whereBetween('nilaimarhun', [1, 400.99])
->groupBy('trans.id')
->get();
@@ -1164,6 +1165,7 @@ class GadaiController extends Controller
// ->where('trans.created_at','=',$daterequest)
->whereDate('trans.created_at','=',$tarikh)
->where('trans.trans_type','=','A')
->where('db2.sttebus','=','')
->whereBetween('nilaimarhun', [1, 400.99])
->groupBy('trans.id')
->get();
@@ -1177,6 +1179,7 @@ class GadaiController extends Controller
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
->where('trans.created_at','<',$daterequest)
->where('trans.trans_type','=','A')
->where('db2.sttebus','=','')
->whereBetween('nilaimarhun', [401, 2000.99])
->groupBy('trans.id')
->get();
@@ -1190,6 +1193,7 @@ class GadaiController extends Controller
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
->whereDate('trans.created_at','=',$tarikh)
->where('trans.trans_type','=','A')
->where('db2.sttebus','=','')
->whereBetween('nilaimarhun', [401, 2000.99])
->groupBy('trans.id')
->get();
@@ -1203,6 +1207,7 @@ class GadaiController extends Controller
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
->where('trans.created_at','<',$daterequest)
->where('trans.trans_type','=','A')
->where('db2.sttebus','=','')
->whereBetween('nilaimarhun', [2001, 100000])
->groupBy('trans.id')
->get();
@@ -1216,6 +1221,7 @@ class GadaiController extends Controller
->join($cawangan['db_name'].'.gadai as db2','trans.norujukan','=','db2.norujukan')
->whereDate('trans.created_at','=',$tarikh)
->where('trans.trans_type','=','A')
->where('db2.sttebus','=','')
->whereBetween('nilaimarhun', [2001, 100000])
->groupBy('trans.id')
->get();