fix
This commit is contained in:
@@ -204,7 +204,7 @@ class AdminPageController extends Controller
|
|||||||
$tebus = Gadai::on($cawangan['mysql'])
|
$tebus = Gadai::on($cawangan['mysql'])
|
||||||
->whereYear('t_update',$current->year)
|
->whereYear('t_update',$current->year)
|
||||||
->where('sttebus','!=','')
|
->where('sttebus','!=','')
|
||||||
->sum('bakipjm');
|
->sum('pinjaman');
|
||||||
|
|
||||||
|
|
||||||
array_push($arrayTebus,['bajet' => $bajetgroup,'total' => $tebus]);
|
array_push($arrayTebus,['bajet' => $bajetgroup,'total' => $tebus]);
|
||||||
@@ -660,7 +660,7 @@ class AdminPageController extends Controller
|
|||||||
|
|
||||||
|
|
||||||
$tebus = Gadai::on($cawangan['mysql'])
|
$tebus = Gadai::on($cawangan['mysql'])
|
||||||
->selectRaw('SUM(bakipjm) AS totalpinjaman')
|
->selectRaw('SUM(pinjaman) AS totalpinjaman')
|
||||||
->addSelect(DB::connection($cawangan['mysql'])
|
->addSelect(DB::connection($cawangan['mysql'])
|
||||||
->raw('DATE_FORMAT(t_update, "%Y-%m") as t_update'))
|
->raw('DATE_FORMAT(t_update, "%Y-%m") as t_update'))
|
||||||
->groupBy(DB::connection($cawangan['mysql'])
|
->groupBy(DB::connection($cawangan['mysql'])
|
||||||
@@ -1119,7 +1119,7 @@ class AdminPageController extends Controller
|
|||||||
->whereYear('t_update',$current->year)
|
->whereYear('t_update',$current->year)
|
||||||
->where([['sttebus','!=',''],['t_update','<=',$harini],['t_update','>=',$monthly_date]])
|
->where([['sttebus','!=',''],['t_update','<=',$harini],['t_update','>=',$monthly_date]])
|
||||||
->orderBy('t_update','asc')
|
->orderBy('t_update','asc')
|
||||||
->sum('bakipjm');
|
->sum('pinjaman');
|
||||||
|
|
||||||
switch($current->month){
|
switch($current->month){
|
||||||
case 1: $bulan = 'Januari';
|
case 1: $bulan = 'Januari';
|
||||||
|
|||||||
Reference in New Issue
Block a user