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

production

Browse Source
This commit is contained in:
e.arrahn
2021-05-07 16:59:48 +08:00
parent 1921006635
commit 9601a2c500
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
+3 -1
View File
@@ -831,7 +831,7 @@ class TebusController extends Controller
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
$dateSM = new Carbon('2021-04-21');
$dateSM = new Carbon('2021-04-24');
$dateSM->addDays(1);
$current = Carbon::now();
@@ -840,6 +840,7 @@ class TebusController extends Controller
$keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
->where('transaksi_keuntungan.tarikh_bayaran', '<=', $daterequest)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
@@ -849,6 +850,7 @@ class TebusController extends Controller
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet');