add conflict from branch new-onepercent
This commit is contained in:
@@ -21,7 +21,7 @@ class OnePercentServices
|
||||
$formula_margin = ($this->maks_margin - $margin) / $this->maks_margin;
|
||||
$ujrah_margin = $formula_margin * $kadarujrah;
|
||||
$rebate_ujrah = $nilaimarhun*($ujrah_margin/100);
|
||||
$ujrah_sebenar = $ujrah - $rebate_ujrah;
|
||||
$ujrah_sebenar = $ujrah;
|
||||
|
||||
return $ujrah_sebenar;
|
||||
}
|
||||
@@ -48,10 +48,20 @@ class OnePercentServices
|
||||
$formula_margin = ($this->maks_margin - $margin) / $this->maks_margin;
|
||||
$rebate_ujrah = $formula_margin * $ujrah;
|
||||
$ujrah_sebenar = $ujrah - $rebate_ujrah;
|
||||
|
||||
|
||||
return $ujrah_sebenar;
|
||||
}
|
||||
|
||||
public function kiraanKeuntunganRebet(float $pembiayaan = 0.0,float $nilaimarhun = 0.0,float $kadarujrah = 0.0,float $margin = 0.0){
|
||||
|
||||
$onepercent = $this->kiraanOnePercent($pembiayaan);
|
||||
$ujrah_sebenar = $this->kiraanUjrahSebenar($nilaimarhun,$kadarujrah,$margin);
|
||||
|
||||
$keuntungan = $onepercent + $ujrah_sebenar;
|
||||
|
||||
return ['keuntungan' => $keuntungan,'onepercent' => $onepercent, 'ujrah' => $ujrah_sebenar];
|
||||
}
|
||||
|
||||
public function kiraanKeuntunganSebenar(float $pembiayaan = 0.0,float $nilaimarhun = 0.0,float $kadarujrah = 0.0,float $margin = 0.0){
|
||||
|
||||
$onepercent = $this->kiraanOnePercent($pembiayaan);
|
||||
|
||||
Reference in New Issue
Block a user