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

fix imbang duga

Browse Source
This commit is contained in:
MUHD HAFIFIE
2021-04-15 08:58:19 +08:00
parent f8079b193a
commit 94f8e8f32d
3 changed files with 56 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+23 -6
View File
@@ -1937,10 +1937,10 @@ class GadaiController extends Controller
// ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
if($request->tarikh > '2021-04-13')
{
$request->tarikh = '2021-04-13';
}
// if($request->tarikh > '2021-04-13')
// {
// $request->tarikh = '2021-04-13';
// }
$rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
@@ -1948,6 +1948,12 @@ class GadaiController extends Controller
->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
->sum('pinjaman');
$gadaibaru = Gadai::on($cawangan['mysql'])
->where('tagpalsu','=',0)
->where([['t_gadai','>=','2021-04-14'],['sttebus','=','']])
->sum('pinjaman');
$rekod_pinjamandiberi = $rekod_pinjamandiberi - $gadaibaru;
$array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
@@ -1978,6 +1984,9 @@ class GadaiController extends Controller
$daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1);
$current = Carbon::now();
$current = new Carbon();
$keuntungan = Gadai::on($cawangan['mysql'])
->where('t_gadai','<=',$request->tarikh)
->where('t_gadai','>=','2021-04-14')
@@ -1987,10 +1996,18 @@ class GadaiController extends Controller
->sum('upah12');
$transaksi = TransaksiKeuntungan::on('mysql7')
->where('tarikh_bayaran' ,'>=', $datetawarruq)
->where('tarikh_bayaran' ,'<=', $daterequest)
->join('arrahn_'.$cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
// $transaksi = TransaksiKeuntungan::on('mysql7')
// ->where('tarikh_bayaran' ,'>=', $datetawarruq)
// ->where('tarikh_bayaran' ,'<=', $daterequest)
// ->sum('bayaran_keuntungan');
$totalkeuntungan = $keuntungan - $transaksi;
return response()->json($totalkeuntungan,200);