fix onepercent miscalculate
This commit is contained in:
@@ -57,6 +57,8 @@ class Calculation
|
||||
|
||||
public function kiraanKeuntunganRebet(float $pembiayaan = 0.0,float $nilaimarhun = 0.0,float $kadarujrah = 0.0,float $margin = 0.0){
|
||||
|
||||
$this->one_percent = $this->getKadarUpah($nilaimarhun);
|
||||
|
||||
$onepercent = $this->kiraanOnePercent($pembiayaan);
|
||||
$ujrah_sebenar = $this->kiraanUjrahSebenar($nilaimarhun,$kadarujrah,$margin);
|
||||
|
||||
@@ -70,6 +72,8 @@ class Calculation
|
||||
|
||||
public function kiraanKeuntunganSebenar(float $pembiayaan = 0.0,float $nilaimarhun = 0.0,float $kadarujrah = 0.0,float $margin = 0.0){
|
||||
|
||||
$this->one_percent = $this->getKadarUpah($nilaimarhun);
|
||||
|
||||
$onepercent = $this->kiraanOnePercent($pembiayaan);
|
||||
$ujrah_sebenar = $this->kiraanUjrah($nilaimarhun,$kadarujrah,$margin);
|
||||
|
||||
@@ -88,6 +92,12 @@ class Calculation
|
||||
return isset($kadarujrah[0]) ? $kadarujrah[0]['kadarujrah'] : 0;
|
||||
}
|
||||
|
||||
public function getKadarUpah(float $nilaimarhun = 0.0){
|
||||
$kadarupah = KadarUpah::on('mysql7')->where([['min','<=',$nilaimarhun],['max','>=',$nilaimarhun]])->where('group_id',1)->first();
|
||||
|
||||
return isset($kadarupah) ? $kadarupah['kadaronepercent'] : 1;
|
||||
}
|
||||
|
||||
public function getRoundedMethod(float $number = 0.0) : Float{
|
||||
$number_string = number_format(floor(($number*100))/100,2);
|
||||
$rounded = substr($number_string, 0, -1);
|
||||
|
||||
Reference in New Issue
Block a user