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

Merged in api-laporan-ujrah (pull request #67)

Browse Source 
update ujrah rebet
This commit is contained in:
nur amirah zulkipli
2024-01-01 07:00:12 +00:00
parent 96c825815a 8f115e36e6
commit b49402cff9
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Reports/RingkasanHarianService.php
+10 -10
View File
@@ -911,11 +911,11 @@ class RingkasanHarianService
$keuntungan_kaunter_query = TransaksiKeuntungan::on('mysql7') $keuntungan_kaunter_query = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan', $gadaiDataKaunter); ->whereIn('norujukan', $gadaiDataKaunter);
$keuntungan_onepercent = $keuntungan_kaunter_query->sum('onepercent'); $keuntungan_onepercent = $keuntungan_kaunter_query->sum('onepercent_rebet');
$onepercenttebus = Tebus::on($this->connectionCawangan) // $onepercenttebus = Tebus::on($this->connectionCawangan)
->whereDate('t_tebus', '>=', $this->startDate)->whereDate('t_tebus', '<=', $this->endDate) // ->whereDate('t_tebus', '>=', $this->startDate)->whereDate('t_tebus', '<=', $this->endDate)
->sum('onepercent'); // ->sum('onepercent');
$onepercentlelong = Lelong::on($this->connectionCawangan) $onepercentlelong = Lelong::on($this->connectionCawangan)
@@ -934,7 +934,7 @@ class RingkasanHarianService
$total_keuntungan_onepercent_bukanansuran_kaunter = $total_keuntunganbukanansuran_data_kaunter->sum('onepercent_rebet'); $total_keuntungan_onepercent_bukanansuran_kaunter = $total_keuntunganbukanansuran_data_kaunter->sum('onepercent_rebet');
$upahsimpanonepercent = $keuntungan_onepercent + $onepercenttebus + $onepercentlelong + $total_keuntungan_onepercent_bukanansuran_kaunter; $upahsimpanonepercent = $keuntungan_onepercent + $onepercentlelong + $total_keuntungan_onepercent_bukanansuran_kaunter;
return floatval($upahsimpanonepercent); return floatval($upahsimpanonepercent);
} }
@@ -956,12 +956,12 @@ class RingkasanHarianService
$keuntungan_kaunter_query = TransaksiKeuntungan::on('mysql7') $keuntungan_kaunter_query = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan', $gadaiDataKaunter); ->whereIn('norujukan', $gadaiDataKaunter);
$keuntungan_ujrah = $keuntungan_kaunter_query->sum('ujrah'); $keuntungan_ujrah = $keuntungan_kaunter_query->sum('ujrah_rebet');
$ujrahtebus = Tebus::on($this->connectionCawangan) // $ujrahtebus = Tebus::on($this->connectionCawangan)
->whereDate('t_tebus', '>=', $this->startDate)->whereDate('t_tebus', '<=', $this->endDate) // ->whereDate('t_tebus', '>=', $this->startDate)->whereDate('t_tebus', '<=', $this->endDate)
->sum('ujrah'); // ->sum('ujrah');
$ujrahlelong = Lelong::on($this->connectionCawangan) $ujrahlelong = Lelong::on($this->connectionCawangan)
@@ -980,7 +980,7 @@ class RingkasanHarianService
$total_keuntungan_onepercent_bukanansuran_kaunter = $total_keuntunganbukanansuran_data_kaunter->sum('ujrah_rebet'); $total_keuntungan_onepercent_bukanansuran_kaunter = $total_keuntunganbukanansuran_data_kaunter->sum('ujrah_rebet');
$upahsimpanujrah = $keuntungan_ujrah + $ujrahtebus + $ujrahlelong + $total_keuntungan_onepercent_bukanansuran_kaunter; $upahsimpanujrah = $keuntungan_ujrah + $ujrahlelong + $total_keuntungan_onepercent_bukanansuran_kaunter;
return floatval($upahsimpanujrah); return floatval($upahsimpanujrah);
} }