read group id
This commit is contained in:
@@ -133,6 +133,7 @@ class GadaiController extends Controller
|
|||||||
$current = Carbon::now();
|
$current = Carbon::now();
|
||||||
$current = new Carbon();
|
$current = new Carbon();
|
||||||
|
|
||||||
|
|
||||||
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
$cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
|
||||||
|
|
||||||
try{
|
try{
|
||||||
@@ -247,11 +248,17 @@ class GadaiController extends Controller
|
|||||||
$total_nilai_marhun = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('n_marhun');
|
$total_nilai_marhun = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('n_marhun');
|
||||||
$total_berat = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('berat');
|
$total_berat = Marhun::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->sum('berat');
|
||||||
|
|
||||||
$kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first();
|
//query kadar upah baru
|
||||||
|
$kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->where('group_id',$cawagan['group_id'])->first();
|
||||||
|
|
||||||
|
dd($kadar_raw);
|
||||||
|
|
||||||
|
// query kadar upah lama
|
||||||
|
// $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->first();
|
||||||
|
|
||||||
$onepercentservices = new OnePercentServices();
|
$onepercentservices = new OnePercentServices();
|
||||||
$keuntungan = $onepercentservices->kiraanKeuntunganSebenar($request->pinjaman,$total_nilai_marhun,$kadar_raw['kadarujrah'],$margin_pinjam);
|
$keuntungan = $onepercentservices->kiraanKeuntunganSebenar($request->pinjaman,$total_nilai_marhun,$kadar_raw['kadarujrah'],$margin_pinjam);
|
||||||
// $upah1 = $request->pinjaman * ($kadar_raw['kadarupdah']/100);
|
// $upah1 = $request->pinjaman * ($kadar_raw['kadarupdah']/100);
|
||||||
// $upah6 = $upah1 * 6;
|
// $upah6 = $upah1 * 6;
|
||||||
// $upah12 = $upah1 * 12;
|
// $upah12 = $upah1 * 12;
|
||||||
$upah1 = $keuntungan['keuntungan'];
|
$upah1 = $keuntungan['keuntungan'];
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ class OnePercentServices
|
|||||||
|
|
||||||
public function getKadarUjrah(float $nilaimarhun = 0.0) : Float{
|
public function getKadarUjrah(float $nilaimarhun = 0.0) : Float{
|
||||||
|
|
||||||
$kadarujrah = KadarUpah::on('mysql7')->select('kadarujrah')->where([['min','<=',$nilaimarhun],['max','>=',$nilaimarhun]])->get()->toArray();
|
$kadarujrah = KadarUpah::on('mysql7')->select('kadarujrah')->where([['min','<=',$nilaimarhun],['max','>=',$nilaimarhun]])->where('group_id',$cawagan['group_id'])->get()->toArray();
|
||||||
|
|
||||||
return isset($kadarujrah[0]) ? $kadarujrah[0]['kadarujrah'] : 0;
|
return isset($kadarujrah[0]) ? $kadarujrah[0]['kadarujrah'] : 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user