KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added lejeram fix untuk keuntungan_sebenar tambahan ansuran dan akru 1persen dan ujrah tambahan untuk accumulative

Browse Source
This commit is contained in:
Hafifie PKB
2024-05-26 13:36:30 +08:00
parent 9c40ff9b55
commit bb567e0f6a
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Reports/OnePercentService.php
+20
View File
@@ -84,6 +84,15 @@ class OnePercentService
// $keuntungan = $this->calculateTotalProfit($akrual,$start);
// $keuntungan = $keuntungan['onepercent'];
$date = new Carbon($start);
$year = $date->year;
$month = $date->month;
$total_akru = AkruNetPecahan::on($this->cawangan['mysql'])
->where('tahun','=',$year)
->where('bulan','<',$month)
->sum('pend_akru_1persen');
$formData = [
'kodcaw' => $this->cawangan['kodcaw'],
'tarikh' => $start,
@@ -94,6 +103,7 @@ class OnePercentService
$akru = $this->calculateAccruedIncome($request);
$keuntungan = $akru['accrual_income_onepercent'];
$keuntungan += $total_akru;
}
return $keuntungan;
@@ -136,6 +146,15 @@ class OnePercentService
// $keuntungan = $this->calculateTotalProfit($akrual,$start);
// $keuntungan = $keuntungan['ujrah'];
$date = new Carbon($start);
$year = $date->year;
$month = $date->month;
$total_akru = AkruNetPecahan::on($this->cawangan['mysql'])
->where('tahun','=',$year)
->where('bulan','<',$month)
->sum('pend_akru_ujrah');
$formData = [
'kodcaw' => $this->cawangan['kodcaw'],
'tarikh' => $start,
@@ -146,6 +165,7 @@ class OnePercentService
$akru = $this->calculateAccruedIncome($request);
$keuntungan = $akru['accrual_income_ujrah'];
$keuntungan += $total_akru;
}
return $keuntungan;