Fix ujrah rebet calculation
This commit is contained in:
@@ -20,6 +20,7 @@ use App\Support\v2\GadaiV2 as Version2Gadai;
|
|||||||
use App\Support\v2\Calculation;
|
use App\Support\v2\Calculation;
|
||||||
|
|
||||||
use App\Http\Controllers\TebusController as TebusController;
|
use App\Http\Controllers\TebusController as TebusController;
|
||||||
|
use Illuminate\Support\Facades\Http;
|
||||||
|
|
||||||
class TransactionOnlineController extends Controller
|
class TransactionOnlineController extends Controller
|
||||||
{
|
{
|
||||||
@@ -373,9 +374,11 @@ class TransactionOnlineController extends Controller
|
|||||||
$upahrebet = $gadaionepercent->kiraUpahRebet($norujukan);
|
$upahrebet = $gadaionepercent->kiraUpahRebet($norujukan);
|
||||||
$baki_bayaran = $bayaran - $upahsemasa;
|
$baki_bayaran = $bayaran - $upahsemasa;
|
||||||
|
|
||||||
|
$ujrah_calculation = $this->getUjrah($kodcaw, $norujukan);
|
||||||
|
|
||||||
$onepercent = new Calculation();
|
$onepercent = new Calculation();
|
||||||
$ujrah = $onepercent->getRoundedMethod($ujrahasal * $bilang_bln);
|
$ujrah = $onepercent->getRoundedMethod($ujrahasal * $bilang_bln);
|
||||||
$ujrah_rebate = $onepercent->getRoundedMethod($keuntungan['ujrah'] * $bilang_bln);
|
$ujrah_rebate = $onepercent->getRoundedMethod($ujrah_calculation['ujrah_sebenar'] - $ujrah_calculation['ujrah_rebet']);
|
||||||
$keun = $onepercent->getRoundedMethod($onepercentasal * $bilang_bln);
|
$keun = $onepercent->getRoundedMethod($onepercentasal * $bilang_bln);
|
||||||
$keuntungan_rebate = $onepercent->getRoundedMethod($keuntungan['onepercent'] * $bilang_bln);
|
$keuntungan_rebate = $onepercent->getRoundedMethod($keuntungan['onepercent'] * $bilang_bln);
|
||||||
|
|
||||||
@@ -594,4 +597,37 @@ class TransactionOnlineController extends Controller
|
|||||||
return response()->json($transaction,200);
|
return response()->json($transaction,200);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function getUjrah($kodcaw, $norujukan)
|
||||||
|
{
|
||||||
|
|
||||||
|
try {
|
||||||
|
$base_url = config('app.url');
|
||||||
|
|
||||||
|
$gadai = Http::get($base_url . "/api/gadai/norujukan/$kodcaw/$norujukan")->json()[0];
|
||||||
|
$jenis_keuntungan = $gadai['tagbaru'] === 1 ? 'onepercent' : 'asal';
|
||||||
|
|
||||||
|
|
||||||
|
$upah_tawarruq = Http::get($base_url . "/api/upahtawarruq/$kodcaw/$norujukan", ['jeniskeuntungan' => $jenis_keuntungan])->json();
|
||||||
|
$upah_rebet_tawarruq = Http::get($base_url . "/api/upahrebettawarruq/$kodcaw/$norujukan", ['jeniskeuntungan' => $jenis_keuntungan])->json();
|
||||||
|
|
||||||
|
if($jenis_keuntungan === 'onepercent'){
|
||||||
|
$ujrah_sebenar = (float)$upah_tawarruq['ujrah'];
|
||||||
|
$ujrah_rebet = $ujrah_sebenar - (float)$upah_rebet_tawarruq['ujrah'];
|
||||||
|
|
||||||
|
return [
|
||||||
|
'ujrah_sebenar' => $ujrah_sebenar,
|
||||||
|
'ujrah_rebet' => $ujrah_rebet,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return [
|
||||||
|
'ujrah_sebenar' => (float)$upah_tawarruq,
|
||||||
|
'ujrah_rebet' => (float)$upah_rebet_tawarruq,
|
||||||
|
];
|
||||||
|
|
||||||
|
} catch (\Throwable $th) {
|
||||||
|
Log::error($th);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user