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

fix

Browse Source
This commit is contained in:
fifi97
2021-07-12 10:47:22 +08:00
parent 5b030f6092
commit 94d80b4971
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+7 -4
View File
@@ -921,6 +921,7 @@ class GadaiController extends Controller
$dateans = new Carbon($request->tarikh); $dateans = new Carbon($request->tarikh);
$ansuran = Transaction::on('mysql7') $ansuran = Transaction::on('mysql7')
->select('transaction.norujukan','trans.tarikh_bayaran','transaction.nokp','transaction.kodcaw','transaction.trans_type','cust.nama','db2.tempoh','db2.bakipjm','trans.bayaran_pembiayaan','transaction.duit_masuk','trans.bayaran_keuntungan','transaction.teller')
->leftJoin('transaksi_keuntungan as trans', function($join) ->leftJoin('transaksi_keuntungan as trans', function($join)
{ {
$join->on('transaction.norujukan', '=', 'trans.norujukan'); $join->on('transaction.norujukan', '=', 'trans.norujukan');
@@ -2547,12 +2548,14 @@ class GadaiController extends Controller
->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']]) ->orWhere([['t_update','>',$request->mula],['sttebus','!=',''],['t_gadai','>=',$request->mula],['t_gadai','<=',$request->hingga],['hargajualan','<>','null']])
->sum('pinjaman'); ->sum('pinjaman');
$Tebus = Gadai::on($cawangan['mysql']) $Tebus = Tebus::on($cawangan['mysql'])
->join('Tebus as teb','teb.norujukan','=','Gadai.norujukan') ->join('Gadai as gad','gad.norujukan','=','Tebus.norujukan')
->where('Gadai.tagpalsu','=',0) ->where('gad.tagpalsu','=',0)
->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['Gadai.sttebus','=','T'],['Gadai.hargajualan','<>','NULL']]) ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga],['gad.sttebus','=','T'],['gad.hargajualan','<>','NULL']])
->sum('teb.pinjaman'); ->sum('teb.pinjaman');
dd($Tebus);
$rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus]; $rekod_pinjamandiberi = ['Gadai' => $Gadai,'Tebus' => $Tebus];
return response()->json($rekod_pinjamandiberi); return response()->json($rekod_pinjamandiberi);
app/Http/Controllers/TebusController.php
+1
View File
@@ -515,6 +515,7 @@ class TebusController extends Controller
}) })
->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan') ->join('online_arrahn.transaksi_keuntungan as trans','tebus.norujukan','=','trans.norujukan')
->where('tebus.t_tebus','=',$tarikh) ->where('tebus.t_tebus','=',$tarikh)
->groupBy('tebus.norujukan')
->orderBy('tebus.teller') ->orderBy('tebus.teller')
->orderBy('tebus.sirit') ->orderBy('tebus.sirit')
->get(); ->get();