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

fix imbang duga untung rugi

Browse Source
This commit is contained in:
fifi97
2021-06-10 09:41:40 +08:00
parent 5e578a1a9a
commit b4e82cc58c
1 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/TebusController.php
+29 -28
View File
@@ -1015,17 +1015,15 @@ class TebusController extends Controller
$daterequest = new Carbon($request->tarikh); $daterequest = new Carbon($request->tarikh);
$daterequest->addDays(1); $daterequest->addDays(1);
$dateSM = new Carbon('2021-04-24'); $dateSM = '2021-04-24';
$dateSM->addDays(1);
$current = Carbon::now(); $current = Carbon::now();
$current = new Carbon(); $current = new Carbon();
$keuntungan = TransaksiKeuntungan::on('mysql7') $keuntungan = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
// ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq) ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->tarikh)
->where('transaksi_keuntungan.tarikh_bayaran', '<=', $daterequest) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM)
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan'); ->sum('bayaran_keuntungan');
@@ -1033,15 +1031,14 @@ class TebusController extends Controller
$keuntunganreducing = TransaksiKeuntungan::on('mysql7') $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet'); ->sum('keuntungan_rebet');
$keuntunganreducinga = TransaksiKeuntungan::on('mysql7') $bukanansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join) ->leftJoin('transaction as trans', function($join)
{ {
@@ -1049,31 +1046,35 @@ class TebusController extends Controller
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
}) })
->where('trans.trans_type','!=','A') ->where('trans.trans_type','!=','A')
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) // ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) // ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan') ->whereNotNull('db2.hargajualan')
->sum('keuntungan_rebet'); ->sum('keuntungan_rebet');
$keuntunganansuran = TransaksiKeuntungan::on('mysql7') $ansuran = TransaksiKeuntungan::on('mysql7')
->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
->leftJoin('transaction as trans', function($join) ->leftJoin('transaction as trans', function($join)
{ {
$join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
$join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
}) })
->where('trans.trans_type','=','A') ->where('trans.trans_type','=','A')
->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest) // ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM) // ->where('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->whereYear('tarikh_bayaran','=',$current->year) ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->tarikh)
->whereNotNull('db2.hargajualan') ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $dateSM)
->sum('bayaran_keuntungan'); ->whereYear('tarikh_bayaran','=',$current->year)
->whereNotNull('db2.hargajualan')
->sum('bayaran_keuntungan');
dd($keuntunganreducing,$keuntungan,$keuntunganreducinga,$keuntunganansuran); dd($keuntunganreducing,$keuntungan,$bukanansuran,$ansuran);
$total = $keuntungan + $keuntunganreducing + ($keuntunganreducinga - $keuntunganansuran); // $total = $keuntungan + $keuntunganreducing + ($keuntunganreducinga - $keuntunganansuran);
dd($total); // dd($total);
$total = $keuntungan + $keuntunganreducing + $keuntunganansuran; // $total = $keuntungan + $keuntunganreducing + $keuntunganansuran;
// $total = $keuntungan + $keuntunganreducing; // $total = $keuntungan + $keuntunganreducing;