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

fix imbangduga latest

Browse Source
This commit is contained in:
Hafifie PKB
2023-12-30 14:23:59 +08:00
parent 9b611cbaf7
commit bc8f9a14e9
7 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AdminPageController.php
+23 -1
View File
@@ -3157,7 +3157,29 @@ class AdminPageController extends Controller
->where('margin_semasa','=',0)
->sum('bayaran_keuntungan');
$total = $sum_keun_tebus + $sum_keun_ansuran;
$sagbaru_norujukan = Gadai::on($cawangan['mysql'])
->selectRaw("norujukan,CASE WHEN (YEAR(t_gadai) = YEAR(t_update) and MONTH(t_gadai) = MONTH(t_update)) THEN '1' ELSE '0' END AS result")
->whereNotNull('hargajualan')
->having('result','=',1)
->whereYear('t_gadai','=',$year)
->whereMonth('t_gadai','<=',$month)
->where('sttebus','=','')
->where('tagbaru',1)
->pluck('norujukan');
$keuntungan_baru = Transaction::on('mysql7')
->leftJoin('transaksi_keuntungan as trans', function($join)
{
$join->on('transaction.norujukan', '=', 'trans.norujukan');
$join->on('transaction.created_at', '=', 'trans.tarikh_bayaran');
})
->whereIn('trans.norujukan',$sagbaru_norujukan)
->where('transaction.trans_type','A')
->sum('bayaran_keuntungan');
$total = $sum_keun_tebus + $sum_keun_ansuran + $keuntungan_baru;
return response()->json($total);
app/Http/Controllers/GadaiController.php
+6 -4
View File
@@ -2022,8 +2022,8 @@ class GadaiController extends Controller
if($tebus['jenistebus'] == 'S')
$bakiakhir = $baki - $tebus['bakipjm'];
// dd($totalmasuk,$totalkeluar,$bakiakhir);
else
$bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
@@ -2051,11 +2051,13 @@ class GadaiController extends Controller
}else{
$totalmasuk = $masuk - ($tebus['pinjaman']+$tebus['bakiupah']);
$totalkeluar = $keluar - (($tebus['pinjaman'] + $tebus['bakiupah']) - $tebus['bakipjm']);
$totalmasuk = $masuk;
$totalkeluar = $keluar;
if($tebus['jenistebus'] == 'S')
$bakiakhir = ($bakiakhir - $tebus['bakipjm']);
else
$bakiakhir = $bakiawal - $totalkeluar + $totalmasuk + $pendahuluan - $serahan;
$updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
update(array(
app/Http/Controllers/TebusController.php
+3 -1
View File
@@ -1497,7 +1497,7 @@ class TebusController extends Controller
$ansuran = 0;
if($ansuran_data){
foreach($ansuran_data as $index=>$ansuranData){
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$ansuranData['norujukan']],['hargajualan','<>',null]])->first();
$gadaiData = Gadai::on($cawangan['mysql'])->where([['norujukan',$ansuranData['norujukan']],['hargajualan','<>',null],['tagbaru',0]])->first();
if($gadaiData){
$ansuran += $ansuranData['bayaran_keuntungan'];
}
@@ -1710,6 +1710,7 @@ class TebusController extends Controller
})
->whereIn('trans.norujukan',$get_norujukan)
->where('transaction.trans_type','T')
// ->where('trans.margin_semasa','=',0) //3.80
->sum('keuntungan_rebet');
$sum_keun_ansuran = Transaction::on('mysql7')
@@ -1720,6 +1721,7 @@ class TebusController extends Controller
})
->whereIn('trans.norujukan',$get_norujukan)
->where('transaction.trans_type','A')
->where('trans.margin_semasa','=',0)
->sum('bayaran_keuntungan');
$total = $sum_keun_tebus + $sum_keun_ansuran;