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

fix dashboard

Browse Source
This commit is contained in:
fifi97
2021-04-20 21:43:57 +08:00
parent 451ec36d33
commit cbf21fca23
1 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+30 -8
View File
@@ -581,18 +581,40 @@ class GadaiController extends Controller
//Gadai Terkumpul //Gadai Terkumpul
$gadai = Gadai::on($cawangan['mysql']) $gadai = Gadai::on($cawangan['mysql'])
->where('sttebus','=','') ->where('sttebus','=','')
->whereNull('hargajualan')
->whereYear('t_gadai','=',$current->year) ->whereYear('t_gadai','=',$current->year)
->orderBy('t_gadai','desc')
->sum('pinjaman'); ->sum('pinjaman');
//Tebus Terkumpul $gadaitawarruq = Gadai::on($cawangan['mysql'])
$tebus = Tebus::on($cawangan['mysql']) ->where('sttebus','=','')
->where('jenistebus','=','T') ->whereNotNull('hargajualan')
->whereYear('t_tebus','=',$current->year) ->whereYear('t_gadai','=',$current->year)
->orderBy('t_tebus','desc')
->sum('pinjaman'); ->sum('pinjaman');
//Upah Terkumpul // //Tebus Terkumpul
// $tebus = Tebus::on($cawangan['mysql'])
// ->where('jenistebus','=','T')
// ->whereNull('hargajualan')
// ->whereYear('t_tebus','=',$current->year)
// ->sum('pinjaman');
// $tebustawarruq = Tebus::on($cawangan['mysql'])
// ->where('jenistebus','=','T')
// ->whereNotNull('hargajualan')
// ->whereYear('t_tebus','=',$current->year)
// ->sum('pinjaman');
$tebus = Gadai::on($cawangan['mysql'])
->where('sttebus','=','T')
->whereNull('hargajualan')
->whereYear('t_gadai','=',$current->year)
->sum('pinjaman');
$tebustawarruq = Gadai::on($cawangan['mysql'])
->where('sttebus','=','T')
->whereNotNull('hargajualan')
->whereYear('t_gadai','=',$current->year)
->sum('pinjaman');
//Variasi //Variasi
@@ -605,7 +627,7 @@ class GadaiController extends Controller
->orderBy('t_gadai','desc') ->orderBy('t_gadai','desc')
->sum('pinjaman'); ->sum('pinjaman');
array_push($array_dashboard,["gadai" => $gadai,"tebus" => $tebus, "variasi" => $variasi, "outstanding" => $outstanding]); array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $outstanding]);
return response()->json($array_dashboard); return response()->json($array_dashboard);
} }