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']);