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

updated server 21/12/2022

Browse Source
This commit is contained in:
e.arrahn
2022-12-21 16:33:36 +08:00
parent ddd7e4d6e0
commit a272171ebb
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LaporanController.php
+11 -2
View File
@@ -125,8 +125,17 @@ class LaporanController extends Controller
$gadaiDataOnline = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$total_keuntunganansuran_data_online)->whereNotNull('hargajualan')->pluck('norujukan');
$keuntunganansuran_online_query = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$gadaiDataOnline)
->whereDate('tarikh_bayaran','=',$request->tarikh);
->leftJoin('transaction as trans', function($join)
{
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
})
->whereDate('trans.created_at','=',$request->tarikh)
->where('trans.teller','=','Online')
->where('trans.trans_type','=','A')
->where('trans.kodcaw',$request->kodcaw)
->whereIn('trans.norujukan',$gadaiDataOnline)
->whereDate('transaksi_keuntungan.tarikh_bayaran','=',$request->tarikh);
$total_keuntunganansuran_online = $keuntunganansuran_online_query->sum('bayaran_keuntungan');
$bil_keuntunganansuran_online = $keuntunganansuran_online_query->count();
app/Http/Controllers/LelongController.php
+1
View File
@@ -547,6 +547,7 @@ class LelongController extends Controller
$lelong = Lelong::on($cawangan['mysql'])
->whereNotNull('t_jual')
->where('t_jual','=', $current->toDateString())
->where('teller','LIKE','LELONG')
->sum('hargajual');
return response()->json($lelong,200);
app/Http/Controllers/TebusController.php
+3 -2
View File
@@ -2033,8 +2033,8 @@ class TebusController extends Controller
->whereNotNull('hargajualan')
->having('result','=',1)
->whereYear('t_gadai','=',$year)
->whereMonth('t_gadai','>',7)
->whereMonth('t_gadai','<=',$month)
//->whereMonth('t_gadai','>',7)
->whereMonth('t_gadai','=',$month)
->where('sttebus','<>','')
->pluck('norujukan');
@@ -2125,6 +2125,7 @@ class TebusController extends Controller
}
}
//dd($jumlahakru,$accrual_net,$total);
$total_accrual_net = $jumlahakru + ($accrual_net - $total);
}else{