From b90ba86f70c1d0442f1cb084101a0012ff077eed Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Thu, 4 Jan 2024 12:44:13 +0800 Subject: [PATCH] fix onepercent miscalculate --- app/Support/v2/Calculation.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/Support/v2/Calculation.php b/app/Support/v2/Calculation.php index 69c310f..829212e 100644 --- a/app/Support/v2/Calculation.php +++ b/app/Support/v2/Calculation.php @@ -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);