From e91382a1a1c94c4c97bcb5b6ae3a4945c20c66e6 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 21 Jan 2023 04:19:34 +0800 Subject: [PATCH] updated server 21/1/2023 --- app/Http/Controllers/AdminPageController.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 5ba4e3d..e498452 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -3405,7 +3405,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) @@ -3440,6 +3439,7 @@ class AdminPageController extends Controller ->where('trans.kodcaw',$kodcaw) ->pluck('transaksi_keuntungan.norujukan'); + $gadaiData = Gadai::on($cawangan['mysql']) ->whereIn('norujukan',$ansuran_data) ->whereNotNull('hargajualan') @@ -3453,7 +3453,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.bayaran_keuntungan');