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

Merge branch 'Bug#fix-akru' into 'master'

Browse Source 
fix kesalahan whereDate dekat ansuran dan bukanansuran

See merge request online-sistem1/api_arrahn!172
This commit is contained in:
hafifie rahman
2023-01-20 20:11:55 +00:00
parent c5e0d48805 974e7ca283
commit c2916677cc
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
-4
View File
@@ -3424,7 +3424,6 @@ class AdminPageController extends Controller
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','!=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', '2022')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
->whereYear('transaksi_keuntungan.tarikh_bayaran','<','2022')
->sum('transaksi_keuntungan.keuntungan_rebet');
@@ -3436,7 +3435,6 @@ class AdminPageController extends Controller
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->where('trans.trans_type','=','A')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', '2022')
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
->whereYear('tarikh_bayaran','<','2022')
->where('trans.kodcaw',$kodcaw)
@@ -3462,8 +3460,6 @@ class AdminPageController extends Controller
$keuntungansebenar = ($keuntungan + $keuntunganreducing + $ansuran + $bukanansuran);
$keuntungansebenarakru = 0;
$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")
->whereNotNull('hargajualan')->having('result','=',1)->whereYear('t_gadai','=','2022')->where('sttebus','<>','')->pluck('norujukan');