KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in izzati-ujrah (pull request #24)

Browse Source 
edit group id getKadarUjrah
This commit is contained in:
izzati zulkifli
2023-12-04 02:57:58 +00:00
parent e548c89c35 5326fafcca
commit 28e9859dd2
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+4 -4
View File
@@ -249,9 +249,9 @@ class GadaiController extends Controller
$total_berat = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('berat'); $total_berat = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('berat');
//query kadar upah baru //query kadar upah baru
$kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->where('group_id',$cawagan['group_id'])->first(); $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->where('group_id',$cawangan['group_id'])->first();
dd($kadar_raw); // dd($kadar_raw);
// query kadar upah lama // query kadar upah lama
// $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first(); // $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first();
@@ -3867,10 +3867,10 @@ class GadaiController extends Controller
} }
public function getKadarUjrah(Request $request){ public function getKadarUjrah(Request $request){
$cawangan = Cawangan::on('mysql7')->where('kodcaw',$request->kodcaw)->first();
$onePercentServices = new OnePercentServices(); $onePercentServices = new OnePercentServices();
$kadarujrah = $onePercentServices->getKadarUjrah($request->nilaimarhun); $kadarujrah = $onePercentServices->getKadarUjrah($request->nilaimarhun,$cawangan['group_id']);
// $test = $this->kiraupahTawarruq('KB2','KB2231109-0001'); // $test = $this->kiraupahTawarruq('KB2','KB2231109-0001');
// dd($test); // dd($test);
app/Services/OnePercentServices.php
+2 -2
View File
@@ -72,9 +72,9 @@ class OnePercentServices
return ['keuntungan' => $keuntungan,'onepercent' => $onepercent, 'ujrah' => $ujrah_sebenar]; 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; return isset($kadarujrah[0]) ? $kadarujrah[0]['kadarujrah'] : 0;
} }