diff --git a/app/Services/Reports/RingkasanHarianService.php b/app/Services/Reports/RingkasanHarianService.php index d6e4121..39bb403 100644 --- a/app/Services/Reports/RingkasanHarianService.php +++ b/app/Services/Reports/RingkasanHarianService.php @@ -911,11 +911,11 @@ class RingkasanHarianService $keuntungan_kaunter_query = TransaksiKeuntungan::on('mysql7') ->whereIn('norujukan', $gadaiDataKaunter); - $keuntungan_onepercent = $keuntungan_kaunter_query->sum('onepercent'); + $keuntungan_onepercent = $keuntungan_kaunter_query->sum('onepercent_rebet'); - $onepercenttebus = Tebus::on($this->connectionCawangan) - ->whereDate('t_tebus', '>=', $this->startDate)->whereDate('t_tebus', '<=', $this->endDate) - ->sum('onepercent'); + // $onepercenttebus = Tebus::on($this->connectionCawangan) + // ->whereDate('t_tebus', '>=', $this->startDate)->whereDate('t_tebus', '<=', $this->endDate) + // ->sum('onepercent'); $onepercentlelong = Lelong::on($this->connectionCawangan) @@ -934,7 +934,7 @@ class RingkasanHarianService $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); } @@ -956,12 +956,12 @@ class RingkasanHarianService $keuntungan_kaunter_query = TransaksiKeuntungan::on('mysql7') ->whereIn('norujukan', $gadaiDataKaunter); - $keuntungan_ujrah = $keuntungan_kaunter_query->sum('ujrah'); + $keuntungan_ujrah = $keuntungan_kaunter_query->sum('ujrah_rebet'); - $ujrahtebus = Tebus::on($this->connectionCawangan) - ->whereDate('t_tebus', '>=', $this->startDate)->whereDate('t_tebus', '<=', $this->endDate) - ->sum('ujrah'); + // $ujrahtebus = Tebus::on($this->connectionCawangan) + // ->whereDate('t_tebus', '>=', $this->startDate)->whereDate('t_tebus', '<=', $this->endDate) + // ->sum('ujrah'); $ujrahlelong = Lelong::on($this->connectionCawangan) @@ -980,7 +980,7 @@ class RingkasanHarianService $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); }