From eb330fc9d10bab09643b0eb486fa7d1da1600953 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sun, 3 Dec 2023 17:10:21 +0800 Subject: [PATCH] edit group id getKadarUjrah --- app/Http/Controllers/GadaiController.php | 4 ++-- app/Services/OnePercentServices.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index a2b1741..b73d840 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -3861,10 +3861,10 @@ class GadaiController extends Controller } public function getKadarUjrah(Request $request){ - + $cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first(); $onePercentServices = new OnePercentServices(); - $kadarujrah = $onePercentServices->getKadarUjrah($request->nilaimarhun); + $kadarujrah = $onePercentServices->getKadarUjrah($request->nilaimarhun,$cawangan['group_id']); // $test = $this->kiraupahTawarruq('KB2','KB2231109-0001'); // dd($test); diff --git a/app/Services/OnePercentServices.php b/app/Services/OnePercentServices.php index 9c4c165..afce9d0 100644 --- a/app/Services/OnePercentServices.php +++ b/app/Services/OnePercentServices.php @@ -72,9 +72,9 @@ class OnePercentServices return ['keuntungan' => $keuntungan,'onepercent' => $onepercent, 'ujrah' => $ujrah_sebenar]; } - public function getKadarUjrah(float $nilaimarhun = 0.0) : Float{ + public function getKadarUjrah(float $nilaimarhun = 0.0, $groupid) : Float{ - $kadarujrah = KadarUpah::on('mysql7')->select('kadarujrah')->where([['min','<=',$nilaimarhun],['max','>=',$nilaimarhun]])->where('group_id',$cawagan['group_id'])->get()->toArray(); + $kadarujrah = KadarUpah::on('mysql7')->select('kadarujrah')->where([['min','<=',$nilaimarhun],['max','>=',$nilaimarhun]])->where('group_id',$groupid)->get()->toArray(); return isset($kadarujrah[0]) ? $kadarujrah[0]['kadarujrah'] : 0; }