From 7d5157461f30edbea369277cff6cac1605430813 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 7 Nov 2021 13:45:00 +0800 Subject: [PATCH 1/3] fix lejeram --- app/Http/Controllers/GadaiController.php | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 7387700..42e1d4c 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2912,16 +2912,24 @@ class GadaiController extends Controller ->where('kodcaw',$kodcaw) ->pluck('norujukan'); - $transaksi_kredit_gadai = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data) - ->where([['sttebus',''],['hargajualan','<>','null']]) - ->pluck('norujukan'); + $transaksi_kredit_gadai = Gadai::on($cawangan['mysql']) + ->whereIn('gadai.norujukan',$transaksi_data) + ->join('tebus as t','gadai.norujukan','=','t.norujukan') + ->where([['hargajualan','<>','null']]) + ->pluck('gadai.norujukan'); $transaksi_kredit = TransaksiKeuntungan::on('mysql7') - ->whereIn('norujukan',$transaksi_kredit_gadai) - ->whereDate('tarikh_bayaran','<=', $request->hingga) - ->whereDate('tarikh_bayaran','>=', $request->mula) - // ->whereBetween('tarikh_bayaran',[$from,$to]) - ->sum('bayaran_pembiayaan'); + ->leftJoin('transaction as trans', function($join) + { + $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan'); + $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at'); + }) + ->whereIn('transaksi_keuntungan.norujukan',$transaksi_kredit_gadai) + ->where('trans.trans_type','=','A') + ->whereDate('tarikh_bayaran','<=', $request->hingga) + ->whereDate('tarikh_bayaran','>=', $request->mula) + // ->whereBetween('tarikh_bayaran',[$from,$to]) + ->sum('bayaran_pembiayaan'); // $transaksi_kredit = TransaksiKeuntungan::on('mysql7') // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan') From 67e95902bd979d5fd8a445ab1c29ccc23cf114aa Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 7 Nov 2021 16:14:33 +0800 Subject: [PATCH 2/3] fix lejer v1 --- app/Http/Controllers/GadaiController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 42e1d4c..5488754 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2725,6 +2725,12 @@ class GadaiController extends Controller ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]]) ->sum('teb.pinjaman'); + $pembiayaanlelong = Lelong::on($cawangan['mysql']) + ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga]]) + ->sum('pinjaman'); + + $tebus = $tebus + $pembiayaanlelong; + $array_rekodemas = ['Gadai' => $gadai,'Tebus' => $tebus]; return response()->json($array_rekodemas); From c99d93c3c8b2cf1a9f10d16b08a1d0087c104a1e Mon Sep 17 00:00:00 2001 From: afiq Date: Mon, 8 Nov 2021 01:14:14 +0800 Subject: [PATCH 3/3] resit baru --- .../Controllers/TransactionController.php | 28 +++++++++++++++++-- routes/web.php | 1 + 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 5edc06f..3fcd8cf 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -63,14 +63,38 @@ class TransactionController extends Controller } public function getTransactionByid($id){ - $transaction = Transaction::on('mysql7')->where('id','=',$id)->get(); + $transaction = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan as tk', function($join){ + $join->on('tk.norujukan', '=', 'transaction.norujukan'); + $join->on('tk.tarikh_bayaran', '=', 'transaction.created_at'); + }) + ->where('transaction.id','=',$id)->get(); return response()->json($transaction); } public function getTransactionByRujukanOne($norujukan){ - $transaction = Transaction::on('mysql7')->where('norujukan','=',$norujukan)->orderBy('created_at','desc')->first(); + $transaction = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan as tk', function($join){ + $join->on('tk.norujukan', '=', 'transaction.norujukan'); + $join->on('tk.tarikh_bayaran', '=', 'transaction.created_at'); + }) + ->where('transaction.norujukan','=',$norujukan) + ->orderBy('transaction.created_at','desc')->first(); + + return response()->json($transaction); + } + + public function getTotalBayaranAnsuran(Request $request){ + $transaction = Transaction::on('mysql7') + ->leftJoin('transaksi_keuntungan as tk', function($join){ + $join->on('tk.norujukan', '=', 'transaction.norujukan'); + $join->on('tk.tarikh_bayaran', '=', 'transaction.created_at'); + }) + ->where('transaction.norujukan','=',$request->norujukan) + ->where('transaction.trans_type','A') + ->sum('tk.bayaran_pembiayaan'); return response()->json($transaction); } diff --git a/routes/web.php b/routes/web.php index 88c3bcf..863e9ef 100644 --- a/routes/web.php +++ b/routes/web.php @@ -188,6 +188,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('transaction/one/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanOne']); $router->get('transaction/id/{id}',['uses'=>'TransactionController@getTransactionByid']); $router->get('transaction/norujukan/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanAll']); + $router->get('transaction/norujukan/total/ansuran',['uses'=>'TransactionController@getTotalBayaranAnsuran']); $router->get('maxpinjaman',['uses'=>'MaxPinjamanController@getAllMaxPinjaman']);