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

fix laporan

Browse Source
This commit is contained in:
hafifierahman
2022-01-13 01:03:34 +08:00
parent 37e620cfbb
commit 4d45313c5a
2 changed files with 31 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+16 -11
View File
@@ -233,7 +233,7 @@ class AdminPageController extends Controller
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(t_jual,'%Y%m')"))
->whereYear('t_jual',$current->year)
->where([['t_jual','<=',$current->toDateString()],['t_jual','>=',$monthly_date]])
// ->where([['t_jual','<=',$current->toDateString()],['t_jual','>=',$monthly_date]])
->orderBy('t_jual','asc')
->get();
@@ -245,14 +245,21 @@ class AdminPageController extends Controller
$tebus = Tebus::on($cawangan['mysql'])
->selectRaw('SUM(bakiupah) AS totalupahsimpan')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(t_tebus, "%Y-%m") as t_tebus'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
->whereYear('t_tebus',$current->year)
->where([['jenistebus','=','T'],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])
->orWhere([['jenistebus','=','A'],['t_tebus','<=',$current->toDateString()],['t_tebus','>=',$monthly_date]])
->selectRaw('SUM(bakiupah) AS totalupahsimpan')
->addSelect(DB::connection($cawangan['mysql'])
->raw('DATE_FORMAT(t_tebus, "%Y-%m") as t_tebus'))
->groupBy(DB::connection($cawangan['mysql'])
->raw("DATE_FORMAT(t_tebus,'%Y%m')"))
->where(function($query) use ($current){
$query
->where([['jenistebus','=','T'],['t_tebus','<=',$current->toDateString()]])
->whereYear('t_tebus',$current->year);
})
->orWhere(function($query) use ($current){
$query
->where([['jenistebus','=','T'],['t_tebus','<=',$current->toDateString()]])
->whereYear('t_tebus',$current->year);
})
->orderBy('t_tebus','asc')
->get();
@@ -264,8 +271,6 @@ class AdminPageController extends Controller
$total = $totaltebus + $totallelong;
// $total = $lelongupahsimpan + $tebus;
array_push($arrayKeuntungan,['bajet' => $bajetgroup,'total' => $total]);