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

Merge branch 'adminapi' into 'master'

Browse Source 
fix

See merge request online-sistem1/api_arrahn!149
This commit is contained in:
hafifie rahman
2022-06-17 04:53:46 +00:00
parent 11c5203b5d 9b057aee7e
commit 581fdf8891
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+3 -3
View File
@@ -204,7 +204,7 @@ class AdminPageController extends Controller
$tebus = Gadai::on($cawangan['mysql'])
->whereYear('t_update',$current->year)
->where('sttebus','!=','')
->sum('bakipjm');
->sum('pinjaman');
array_push($arrayTebus,['bajet' => $bajetgroup,'total' => $tebus]);
@@ -660,7 +660,7 @@ class AdminPageController extends Controller
$tebus = Gadai::on($cawangan['mysql'])
->selectRaw('SUM(bakipjm) AS totalpinjaman')
->selectRaw('SUM(pinjaman) AS totalpinjaman')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(t_update, "%Y-%m") as t_update'))
->groupBy(DB::connection($cawangan['mysql'])
@@ -1119,7 +1119,7 @@ class AdminPageController extends Controller
->whereYear('t_update',$current->year)
->where([['sttebus','!=',''],['t_update','<=',$harini],['t_update','>=',$monthly_date]])
->orderBy('t_update','asc')
->sum('bakipjm');
->sum('pinjaman');
switch($current->month){
case 1: $bulan = 'Januari';