diff --git a/app/Support/v2/GadaiV2.php b/app/Support/v2/GadaiV2.php index 982a12f..0fca06f 100644 --- a/app/Support/v2/GadaiV2.php +++ b/app/Support/v2/GadaiV2.php @@ -244,7 +244,7 @@ class GadaiV2 try { - DB::connection('mysql7')->transaction(function () use($onepercentasal,$ujrahasal,$keuntungan,$norujukan,$gadai,$request,$kodcaw,$current,$baki_hargajualan,$upahsemasa,$baki_bayaran,$upahrebet,$cawangan,$old_data,$baki_pinjaman,$lelong_tawarruq,$margin_semasa) { + DB::connection('mysql7')->transaction(function () use($onepercentasal,$ujrahasal,$keuntungan,$norujukan,$gadai,$request,$kodcaw,$current,$baki_hargajualan,$upahsemasa,$baki_bayaran,$upahrebet,$cawangan,$old_data,$baki_pinjaman,$lelong_tawarruq,$margin_semasa,$onepercent) { $transaction = Transaction::on('mysql7')->create([ 'trans_type' => 'A', @@ -266,7 +266,11 @@ class GadaiV2 $tempoh = $gadai['tempoh']; } $bilang_bln = $tempoh - $gadai['tempohbayar']; - + + $ujrah = $onepercent->getRoundedMethod($keuntungan['ujrah'] * $bilang_bln); + $ujrah_rebate = $onepercent->getRoundedMethod($ujrahasal * $bilang_bln); + $keun = $onepercent->getRoundedMethod($onepercentasal * $bilang_bln); + $keuntungan_rebate = $onepercent->getRoundedMethod($keuntungan['onepercent'] * $bilang_bln); $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([ 'norujukan' => $norujukan, @@ -275,10 +279,10 @@ class GadaiV2 'keuntungan_rebet'=> $upahrebet, 'tarikh_bayaran'=> $current, 'kodcaw'=> $kodcaw, - 'ujrah' => ($keuntungan['ujrah'] * $bilang_bln), - 'ujrah_rebet' => ($ujrahasal*$bilang_bln), - 'onepercent' => ($onepercentasal * $bilang_bln), - 'onepercent_rebet' => ($keuntungan['onepercent'] * $bilang_bln), + 'ujrah' => $ujrah, + 'ujrah_rebet' => $ujrah_rebate, + 'onepercent' => $keun, + 'onepercent_rebet' => $keuntungan_rebate, 'tempoh' => $gadai['tempoh'], 'beza_tempoh' => $bilang_bln, 'margin_semasa' => $margin_semasa,