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

Merge branch 'branch_fix' into 'master'

Browse Source 
2#issues-lejer am bug dekat keuntungan semasa

See merge request online-sistem1/api_arrahn!167
This commit is contained in:
hafifie rahman
2023-01-02 01:48:08 +00:00
parent a272171ebb 305f0ee96d
commit a1f0a5e77c
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LaporanController.php
+5 -2
View File
@@ -1244,6 +1244,9 @@ class LaporanController extends Controller
$current = Carbon::now();
$current = new Carbon();
$mulaCarbon = new Carbon($request->mula);
$hinggaCarbon = new Carbon($request->hingga);
/* Start Keuntungan Sebenar Calculation */
$get_norujukan = Gadai::on($cawangan['mysql'])
->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
@@ -1278,13 +1281,13 @@ class LaporanController extends Controller
->whereIn('trans.norujukan',$get_norujukan)
->whereDate('trans.tarikh_bayaran' ,'>=', $request->mula)
->whereDate('trans.tarikh_bayaran' ,'<=', $request->hingga)
->whereYear('tarikh_bayaran','=',$current->year)
->whereYear('tarikh_bayaran','=',$mulaCarbon->year)
->where('trans.kodcaw',$request->kodcaw)
->get()->toArray();
$upahlelong = Lelong::on($cawangan['mysql'])
->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2022-07-24']])
->whereYear('t_jual','=',$current->year)
->whereYear('t_jual','=',$mulaCarbon->year)
->sum('bakiupah');
$sum_keuntungan = ($summation) ? $summation[0]['sum_keun'] : 0;