From b7fea2a7871748243b0c5dc26a86bdadd6aa1374 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sun, 17 Mar 2024 11:41:45 +0800 Subject: [PATCH 1/4] update lelong controller untuk kiraupahUjrahOnePercentRebate --- app/Http/Controllers/LelongController.php | 34 +++++++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index d303591..0549cc1 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -1668,10 +1668,38 @@ class LelongController extends Controller // } public function kiraupahUjrahOnePercentRebate($kodcaw,$norujukan){ - $master = new MasterServices($kodcaw); - $response = $master->kiraupahUjrahOnePercentRebate($kodcaw,$norujukan); + // $master = new MasterServices($kodcaw); + // $response = $master->kiraupahUjrahOnePercentRebate($kodcaw,$norujukan); - return $response; + // return $response; + $cawangan = Cawangan::on('mysql7') + ->where('kodcaw','=',$kodcaw) + ->first(); + + $onepercentservices = new Calculation(); + + // $cawangan = $kodcaw; + + $gadai_data = Gadai::on($cawangan['mysql']) + ->where('norujukan','=',$norujukan) + ->first(); + + if($gadai_data['tempoh'] >= 12.0){ + $tempoh = 12; + }else{ + $tempoh = $gadai_data['tempoh']; + } + + $bilang_bln = $tempoh - $gadai_data['tempohbayar']; + $array_upah = $onepercentservices->kiraanKeuntunganRebet($gadai_data['bakipjm'],$gadai_data['nilaimarhun'],$gadai_data['kadarupah'],$gadai_data['margin_semasa']); + // $ujrah_rounded = $onepercentservices->getRoundedMethod($array_upah['ujrah']); + // $keuntungan_rounded = $onepercentservices->getRoundedMethod($array_upah['onepercent']); + $ujrah = $bilang_bln * $array_upah['ujrah']; + $onepercent = $bilang_bln * $array_upah['onepercent']; + $ujrah = $onepercentservices->getRoundedMethod($ujrah); + $onepercent = $onepercentservices->getRoundedMethod($onepercent); + + return ['ujrah' => $ujrah, 'onepercent' => $onepercent]; } From 91a783dd18954b8050cbe8e547024a0f19342a7c Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sun, 17 Mar 2024 12:30:57 +0800 Subject: [PATCH 2/4] update exportlelong dari tlelong kepada tjual --- app/Http/Controllers/LelongController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 0549cc1..5b9e5d5 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -1101,7 +1101,7 @@ class LelongController extends Controller $lelong_to_be_inserted->hargaasas = $index['hargaasas']; $lelong_to_be_inserted->hargajual = $index['hargajual']; $lelong_to_be_inserted->glcode = "1000/010"; - $lelong_to_be_inserted->t_jual = $index['t_lelong']; + $lelong_to_be_inserted->t_jual = $index['t_jual']; $lelong_to_be_inserted->nopembeli = $no_pembeli_data; $lelong_to_be_inserted->jbg = $index['jbg']; $lelong_to_be_inserted->kadarupah = $index['kadarupah']; From 681c86f31de5d0757e752a6d32a93bfc6754fb61 Mon Sep 17 00:00:00 2001 From: Afiq Hamzah Date: Wed, 20 Mar 2024 11:03:26 +0800 Subject: [PATCH 3/4] Fix tennant config --- config/tennant_master.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/config/tennant_master.php b/config/tennant_master.php index cb1ca47..e0e2cbe 100644 --- a/config/tennant_master.php +++ b/config/tennant_master.php @@ -1,8 +1,5 @@ - - env('TENNANT_MASTER_DB','master_erahn') - ]; From 311d74ab1887310a316a7cd025ebe36ed891f9d5 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Thu, 21 Mar 2024 09:23:30 +0800 Subject: [PATCH 4/4] fix keuntungan sebenar in imbang duga akru --- app/Http/Controllers/AdminPageController.php | 56 +++----------------- 1 file changed, 8 insertions(+), 48 deletions(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index faf7af2..f7b41eb 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -3120,12 +3120,6 @@ class AdminPageController extends Controller $year = $current->year; $month = $tarikh->month; - // $test = Gadai::on($cawangan['mysql']) - // ->whereBetween('tempoh',[0.5,1]) - // ->where('sttebus','<>','') - // ->whereYear('t_gadai',$current->year()) - // ->pluck('norujukan'); - $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') @@ -3135,53 +3129,19 @@ class AdminPageController extends Controller ->where('sttebus','<>','') ->pluck('norujukan'); - $sum_keun_tebus = Transaction::on('mysql7') + $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'); + $join->on('transaction.norujukan', '=', 'trans.norujukan'); + $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); }) - ->whereIn('trans.norujukan',$get_norujukan) - ->where('transaction.trans_type','T') - ->where('margin_semasa','=',0) - ->sum('keuntungan_rebet'); - - $sum_keun_ansuran = Transaction::on('mysql7') - ->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) - ->where('transaction.trans_type','A') - ->where('margin_semasa','=',0) - ->sum('bayaran_keuntungan'); - - - $sagbaru_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','=',$year) - ->whereMonth('t_gadai','<=',$month) - ->where('sttebus','=','') - ->where('tagbaru',1) - ->pluck('norujukan'); - - $keuntungan_baru = Transaction::on('mysql7') - ->leftJoin('transaksi_keuntungan as trans', function($join) - { - $join->on('transaction.norujukan', '=', 'trans.norujukan'); - $join->on('transaction.created_at', '=', 'trans.tarikh_bayaran'); - }) - ->whereIn('trans.norujukan',$sagbaru_norujukan) - ->where('transaction.trans_type','A') - ->sum('bayaran_keuntungan'); - - - $total = $sum_keun_tebus + $sum_keun_ansuran + $keuntungan_baru; + ->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 = $sum_keuntungan + $sum_bayaran; return response()->json($total); }