From a61b62edc377c88ce840f580866697a7257f842f Mon Sep 17 00:00:00 2001 From: Afiq Date: Tue, 12 Apr 2022 11:41:58 +0800 Subject: [PATCH 1/5] fix calculate jbg --- app/Http/Controllers/GadaiController.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 0f4dbbd..84f2d03 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -3286,14 +3286,14 @@ class GadaiController extends Controller if($gadai['t_gadai'] == $current->toDateString()){ $tempoh_gadai = 0.5; } - if($tempoh_gadai >= 6.0){ - if($gadai['t_matang'] >= $current->toDateString()){ - $tempoh_gadai = 6.0; - } - }else if($tempoh_gadai >= 12){ + if($tempoh_gadai >= 12.0){ if($gadai['t_matang1'] >= $current->toDateString()){ $tempoh_gadai = 12.0; } + }else if($tempoh_gadai >= 6.0){ + if($gadai['t_matang'] >= $current->toDateString()){ + $tempoh_gadai = 6.0; + } } $upah_semasa = $this->kiraupahTawarruqStokAudit($tempoh_gadai,$gadai['tempohbayar'],$gadai['kadarupah'],$gadai['bakipjm']); From 8402131de36691c11f7bed4438e8d5f850152427 Mon Sep 17 00:00:00 2001 From: Afiq Date: Tue, 12 Apr 2022 12:07:34 +0800 Subject: [PATCH 2/5] upah 12 --- app/Http/Controllers/GadaiController.php | 14 ++++++++++++-- app/Http/Controllers/TebusController.php | 23 ++++++++++++++++++++--- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 84f2d03..1d2ab0c 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -321,7 +321,12 @@ class GadaiController extends Controller ->where('norujukan','=',$norujukan) ->first(); - $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; + if($gadai_data['tempoh'] >= 12.0){ + $tempoh = 12; + }else{ + $tempoh = $gadai_data['tempoh']; + } + $bilang_bln = $tempoh - $gadai_data['tempohbayar']; $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']); @@ -343,7 +348,12 @@ class GadaiController extends Controller ->where('norujukan','=',$norujukan) ->first(); - $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; + if($gadai_data['tempoh'] >= 12.0){ + $tempoh = 12; + }else{ + $tempoh = $gadai_data['tempoh']; + } + $bilang_bln = $tempoh - $gadai_data['tempohbayar']; $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php index 5c5faba..1c58952 100644 --- a/app/Http/Controllers/TebusController.php +++ b/app/Http/Controllers/TebusController.php @@ -81,7 +81,12 @@ class TebusController extends Controller ->where('norujukan','=',$norujukan) ->first(); - $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; + if($gadai_data['tempoh'] >= 12.0){ + $tempoh = 12; + }else{ + $tempoh = $gadai_data['tempoh']; + } + $bilang_bln = $tempoh - $gadai_data['tempohbayar']; $upahsemasa_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['pinjaman']); @@ -106,7 +111,13 @@ class TebusController extends Controller ->where('norujukan','=',$norujukan) ->first(); - $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; + if($gadai_data['tempoh'] >= 12.0){ + $tempoh = 12; + }else{ + $tempoh = $gadai_data['tempoh']; + } + + $bilang_bln = $tempoh - $gadai_data['tempohbayar']; $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); @@ -131,6 +142,12 @@ class TebusController extends Controller ->where('norujukan','=',$norujukan) ->first(); + if($gadai_data['tempoh'] >= 12.0){ + $tempoh = 12; + }else{ + $tempoh = $gadai_data['tempoh']; + } + $bilang_bln = $gadai_data['tempoh'] - $gadai_data['tempohbayar']; $upahrebet_raw = $bilang_bln * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']); @@ -658,7 +675,7 @@ class TebusController extends Controller ->orderBy('tebus.sirit') ->get(); - $tebus = []; + $tebus = []; if($tebus_data){ foreach($tebus_data as $index=>$tebusData){ $customer_info = Customer::on('mysql7')->where('kplama','=',$tebusData['nokp'])->orWhere('kpbaru','=',$tebusData['nokp'])->first(); From 9320550558998ead028e5fc5178af04b7b83a628 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 12 Apr 2022 12:22:39 +0800 Subject: [PATCH 3/5] fix pasal notislelong --- app/Http/Controllers/AdminPageController.php | 12 ++++++++++++ app/Http/Controllers/LelongController.php | 2 +- routes/web.php | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/AdminPageController.php b/app/Http/Controllers/AdminPageController.php index 8c93613..9c34a16 100644 --- a/app/Http/Controllers/AdminPageController.php +++ b/app/Http/Controllers/AdminPageController.php @@ -1670,6 +1670,18 @@ class AdminPageController extends Controller return response()->json($detailslelong, 200); } + public function UpdateNotisLelong2($kodcaw,Request $request){ + + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first(); + + $detailslelong = Pelelong::on($cawangan['mysql'])-> + update(array( + 'para3'=>$request->content + )); + + return response()->json($detailslelong, 200); + } + public function paginate($items, $perPage = 5, $page = null, $options = []) { $page = $page ?: (Paginator::resolveCurrentPage() ?: 1); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 433e4aa..7582037 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -663,7 +663,7 @@ class LelongController extends Controller $lelong = Lelong::on($cawangan['mysql']) ->selectRaw('count(*) as total, batchno,t_lelong') ->where('t_lelong','>=',$current->toDateString()) - ->where('fasa', 1) + ->where('fasa', 2) ->whereNull('t_jual') ->orderBy('t_lelong','desc') ->groupBy('batchno') diff --git a/routes/web.php b/routes/web.php index 856ff17..0970d55 100644 --- a/routes/web.php +++ b/routes/web.php @@ -677,6 +677,7 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->post('DeleteBlacklist',['uses'=>'AdminPageController@DeleteBlackList']); $router->post('AddSenaraiHitam',['uses'=>'AdminPageController@AddSenaraiHitam']); $router->put('notislelong/update/{kodcaw}',['uses'=>'AdminPageController@UpdateNotisLelong']); + $router->put('notislelong/update2/{kodcaw}',['uses'=>'AdminPageController@UpdateNotisLelong2']); $router->get('ListOperasi/Paginate',['uses'=>'AdminPageController@listoperasi']); $router->get('ListOperasiKelulusan/Paginate',['uses'=>'AdminPageController@listoperasikelulusan']); From 01a041da64c4e821677f2bbfac52f623a4d373af Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 12 Apr 2022 12:47:18 +0800 Subject: [PATCH 4/5] settle lelongan orderby --- app/Http/Controllers/LelongController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 7582037..cffdc2f 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -691,6 +691,7 @@ class LelongController extends Controller ->where('batchno','=',$request->batchno) ->where('fasa',0) ->orderBy('gadai.t_gadai','asc') + ->orderBy('gadai.sirig','asc') ->where('gadai.taglel','=', 1); }else{ $lelong = Lelong::on($cawangan['mysql']) @@ -700,6 +701,7 @@ class LelongController extends Controller ->where('batchno','=',$request->batchno) ->where('fasa',1) ->orderBy('gadai.t_gadai','asc') + ->orderBy('gadai.sirig','asc') ->where('gadai.taglel','=', 1); } From 6e5014fdb880f7c09d9c3c12b1ad36e268914fc0 Mon Sep 17 00:00:00 2001 From: Afiq Date: Thu, 14 Apr 2022 07:08:43 +0800 Subject: [PATCH 5/5] update jbg --- app/Http/Controllers/GadaiController.php | 51 ++++++++++++------------ 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 1d2ab0c..43849e5 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -3262,7 +3262,6 @@ class GadaiController extends Controller }else{ $cawangan = Cawangan::on('mysql7')->where('zone',$request->zone)->get(); } - $current = Carbon::now(); foreach($cawangan as $cawangan_mysql){ $all_gadai = Gadai::on($cawangan_mysql['mysql'])->whereNotIn('sttebus',['L','T'])->get(); @@ -3273,39 +3272,39 @@ class GadaiController extends Controller $tarikh_update = Carbon::parse($gadai['t_update'].' 00:00:00' ); } $tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00'); + $current = Carbon::now(); - $diff_carbon = $tarikh_gadai->diffInDays($current); + $tahun_gadai = $tarikh_gadai->year; + $bulan_gadai = $tarikh_gadai->month; + $hari_gadai = $tarikh_gadai->day; - $year = floor($diff_carbon/356); - $day_year_minus = $year * 356; - $diff_carbon = $diff_carbon - $day_year_minus; + $tahun_semasa = $current->year; + $bulan_semasa = $current->month; + $hari_semasa = $current->day; - $month = floor($diff_carbon/30); - $day_month_minus = $month * 30; - $diff_carbon = $diff_carbon - $day_month_minus; + if($hari_semasa >= $hari_gadai){ + $beza_hari = $hari_semasa - $hari_gadai + 1; + }else if($hari_semasa < $hari_gadai){ + $bulan_semasa = $bulan_semasa - 1; + $beza_hari = ($hari_semasa + 30) - $hari_gadai + 1; + } $extensivemonth_gadai = 0; - if($diff_carbon >= 1 && $diff_carbon <= 15){ - $extensivemonth_gadai = 0.5; - } - else if($diff_carbon >= 16){ - $extensivemonth_gadai = 1; - } - $tempoh_gadai = ($year*12) + $month + $extensivemonth_gadai; - if($gadai['t_gadai'] == $current->toDateString()){ - $tempoh_gadai = 0.5; - } - if($tempoh_gadai >= 12.0){ - if($gadai['t_matang1'] >= $current->toDateString()){ - $tempoh_gadai = 12.0; - } - }else if($tempoh_gadai >= 6.0){ - if($gadai['t_matang'] >= $current->toDateString()){ - $tempoh_gadai = 6.0; - } + if($beza_hari >= 1 && $beza_hari <= 15){ + $extensivemonth_gadai = 0.5; + }else if($beza_hari >= 16){ + $extensivemonth_gadai = 1; + }else{ + $extensivemonth_gadai = 0; } + $beza_tahun = $tahun_semasa - $tahun_gadai; + + $beza_bulan = ($bulan_semasa + ($beza_tahun * 12)) - $bulan_gadai; + + $tempoh_gadai = $beza_bulan + $extensivemonth_gadai; + $upah_semasa = $this->kiraupahTawarruqStokAudit($tempoh_gadai,$gadai['tempohbayar'],$gadai['kadarupah'],$gadai['bakipjm']); Gadai::on($cawangan_mysql['mysql'])->where('norujukan','=',$gadai['norujukan'])->update(array(