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

Merge branch 'bug#ringkasanterkumpul' into 'master'

Browse Source 
fix summation bayaran_pembiayaan ada negatif jugak

See merge request online-sistem1/api_arrahn!195
This commit is contained in:
hafifie rahman
2023-05-22 05:52:44 +00:00
parent 67d6afe4ef 37f8a6486a
commit 0bd99f6447
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+6 -6
View File
@@ -1393,7 +1393,7 @@ class GadaiController extends Controller
->selectRaw('COUNT(*) as bil, SUM(bayaran_pembiayaan) AS total') ->selectRaw('COUNT(*) as bil, SUM(bayaran_pembiayaan) AS total')
->whereIn('norujukan',$ansuran1) ->whereIn('norujukan',$ansuran1)
->where('kodcaw',$kodcaw) ->where('kodcaw',$kodcaw)
->where('bayaran_pembiayaan','>',0) //->where('bayaran_pembiayaan','>',0)
->where('tarikh_bayaran' ,'<=', $daterequest) ->where('tarikh_bayaran' ,'<=', $daterequest)
->get(); ->get();
@@ -1423,7 +1423,7 @@ class GadaiController extends Controller
->whereIn('norujukan',$ansuran1harini) ->whereIn('norujukan',$ansuran1harini)
->whereDate('tarikh_bayaran','=',$tarikh) ->whereDate('tarikh_bayaran','=',$tarikh)
->where('kodcaw',$kodcaw) ->where('kodcaw',$kodcaw)
->where('bayaran_pembiayaan','>',0) //->where('bayaran_pembiayaan','>',0)
->get(); ->get();
@@ -1452,7 +1452,7 @@ class GadaiController extends Controller
->whereIn('norujukan',$ansuran2) ->whereIn('norujukan',$ansuran2)
->where('tarikh_bayaran' ,'<=', $daterequest) ->where('tarikh_bayaran' ,'<=', $daterequest)
->where('kodcaw',$kodcaw) ->where('kodcaw',$kodcaw)
->where('bayaran_pembiayaan','>',0) //->where('bayaran_pembiayaan','>',0)
->get(); ->get();
$ansuranharini2_data = TransaksiKeuntungan::on('mysql7') $ansuranharini2_data = TransaksiKeuntungan::on('mysql7')
@@ -1480,7 +1480,7 @@ class GadaiController extends Controller
->whereIn('norujukan',$ansuran2harini) ->whereIn('norujukan',$ansuran2harini)
->whereDate('tarikh_bayaran','=',$tarikh) ->whereDate('tarikh_bayaran','=',$tarikh)
->where('kodcaw',$kodcaw) ->where('kodcaw',$kodcaw)
->where('bayaran_pembiayaan','>',0) //->where('bayaran_pembiayaan','>',0)
->get(); ->get();
$ansuran3_data = TransaksiKeuntungan::on('mysql7') $ansuran3_data = TransaksiKeuntungan::on('mysql7')
@@ -1508,7 +1508,7 @@ class GadaiController extends Controller
->whereIn('norujukan',$ansuran3) ->whereIn('norujukan',$ansuran3)
->where('tarikh_bayaran' ,'<=', $daterequest) ->where('tarikh_bayaran' ,'<=', $daterequest)
->where('kodcaw',$kodcaw) ->where('kodcaw',$kodcaw)
->where('bayaran_pembiayaan','>',0) //->where('bayaran_pembiayaan','>',0)
->get(); ->get();
@@ -1537,7 +1537,7 @@ class GadaiController extends Controller
->whereIn('norujukan',$ansuran3harini) ->whereIn('norujukan',$ansuran3harini)
->whereDate('tarikh_bayaran','=',$tarikh) ->whereDate('tarikh_bayaran','=',$tarikh)
->where('kodcaw',$kodcaw) ->where('kodcaw',$kodcaw)
->where('bayaran_pembiayaan','>',0) //->where('bayaran_pembiayaan','>',0)
->get(); ->get();