From 8c8ea997bb3954ecaab205127f1daa79c6f9a2e3 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Sat, 21 Jan 2023 03:30:28 +0800
Subject: [PATCH] fix akru tentang pembaikan today

---
 app/Http/Controllers/AdminPageController.php | 36 +++++++++++++++-----
 app/Http/Controllers/TebusController.php     |  2 +-
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php
index 90e6a79..83ec9fa 100644
--- a/app/Http/Controllers/AdminPageController.php
+++ b/app/Http/Controllers/AdminPageController.php
@@ -3308,7 +3308,7 @@ class AdminPageController extends Controller
         //Upah Simpan Lelong
         $upahsimpanlelong = Lelong::on($cawangan['mysql']) //--masuk
             ->where('t_jual','>','2013-12-31')
-            ->whereYear('t_jual','<',$current->year)
+            ->whereYear('t_jual','<','2022')
             ->sum('bakiupah');
 
         //Upah Simpan Advansur
@@ -3320,7 +3320,7 @@ class AdminPageController extends Controller
 
         $keuntungan_data = TransaksiKeuntungan::on('mysql7')
         ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
-        ->whereYear('transaksi_keuntungan.tarikh_bayaran','<',$current->year)
+        ->whereYear('transaksi_keuntungan.tarikh_bayaran','<','2022')
         ->where('kodcaw',$kodcaw)
         ->pluck('norujukan');
 
@@ -3328,7 +3328,7 @@ class AdminPageController extends Controller
 
         $upahsimpankeuntungansebelumtawarruq = TransaksiKeuntungan::on('mysql7')
             ->where('tarikh_bayaran' ,'<=', $daterequest)
-            ->whereYear('tarikh_bayaran','<',$current->year)
+            ->whereYear('tarikh_bayaran','<','2022')
             ->whereIn('norujukan',$gadaiData)
             ->sum('bayaran_keuntungan');
 
@@ -3405,7 +3405,7 @@ class AdminPageController extends Controller
                         $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                     })
                     ->where('trans.trans_type','!=','A')
-                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', '2022')
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
                     ->whereYear('tarikh_bayaran','<','2022')
                     ->where('trans.kodcaw',$kodcaw)
@@ -3424,7 +3424,7 @@ class AdminPageController extends Controller
                         $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                     })
                     ->where('trans.trans_type','!=','A')
-                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
+                    ->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 +3436,7 @@ class AdminPageController extends Controller
                         $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
                     })
                     ->where('trans.trans_type','=','A')
-                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
+                    ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', '2022')
                     ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', '2021-06-09')
                     ->whereYear('tarikh_bayaran','<','2022')
                     ->where('trans.kodcaw',$kodcaw)
@@ -3455,19 +3455,39 @@ class AdminPageController extends Controller
                 $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
             })
             ->where('trans.trans_type','=','A')
-            ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
+            ->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');
 
         $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');
+        
+        $sum_keun = Transaction::on('mysql7')
+        ->selectRaw("trans.norujukan,SUM(CASE WHEN (transaction.trans_type) = 'T' THEN (trans.keuntungan_rebet) ELSE 0 END) AS sum_keun,SUM(CASE WHEN (transaction.trans_type) = 'A' THEN (trans.bayaran_keuntungan) ELSE 0 END) AS sum_bayaran")
+        ->leftJoin('transaksi_keuntungan as trans', function($join)
+        {
+            $join->on('transaction.norujukan', '=', 'trans.norujukan');
+            $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
+        })
+        ->whereIn('trans.norujukan',$get_norujukan)->get()->toArray();
+
+        $sum_keuntungan = ($sum_keun) ? $sum_keun[0]['sum_keun'] : 0;
+        $sum_bayaran = ($sum_keun) ? $sum_keun[0]['sum_bayaran'] : 0;
+
+        $total_keuntungan_sebenar =  $sum_keuntungan + $sum_bayaran;
+
         $previousYear = Carbon::now()->subYears(1);
         $available_akru = AkruNet::on($cawangan['mysql'])
                 ->where('tahun',$previousYear->year)
                 ->sum('jumlah');
 
-        $total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong + $keuntungansebenar + $upahsimpankeuntungansebelumtawarruq + $available_akru) + $parameter;
+        $total = ($utgrugilama + $lelong + $upahsimpantebus + $upahsimpanlelong + $upahsimpanansur + $gstcajlelong + $keuntungansebenar + $upahsimpankeuntungansebelumtawarruq + $available_akru + $total_keuntungan_sebenar) + $parameter;
 
         if($kodcaw == '011229')
             $total -= 45390.37;
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 4c62edb..daa85f3 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -2134,7 +2134,7 @@ class TebusController extends Controller
                 }else{
                     if($available_akru[0]['jumlah'] !== ($accrual_net - $total))
                     {
-                        AkruNet::on($cawangan['mysql'])->where('bulan','=',(int)$month_sekarang)
+                        AkruNet::on($cawangan['mysql'])->where('bulan','=',(int)$month_sekarang)->where('tahun',$current->year)
                         ->update(['jumlah' => ($accrual_net - $total)]);
                     }