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

Merge branch 'master' of https://gitlab.com/online-sistem1/api_arrahn

Browse Source
This commit is contained in:
e.arrahn
2021-11-08 01:18:21 +08:00
parent 030b527818 c99d93c3c8
commit c0837e8188
3 changed files with 49 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/GadaiController.php
+22 -8
View File
@@ -2728,6 +2728,12 @@ class GadaiController extends Controller
->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]]) ->where([['teb.t_tebus','>=',$request->mula],['teb.t_tebus','<=',$request->hingga]])
->sum('teb.pinjaman'); ->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]; $array_rekodemas = ['Gadai' => $gadai,'Tebus' => $tebus];
return response()->json($array_rekodemas); return response()->json($array_rekodemas);
@@ -2915,16 +2921,24 @@ class GadaiController extends Controller
->where('kodcaw',$kodcaw) ->where('kodcaw',$kodcaw)
->pluck('norujukan'); ->pluck('norujukan');
$transaksi_kredit_gadai = Gadai::on($cawangan['mysql'])->whereIn('norujukan',$transaksi_data) $transaksi_kredit_gadai = Gadai::on($cawangan['mysql'])
->where([['sttebus',''],['hargajualan','<>','null']]) ->whereIn('gadai.norujukan',$transaksi_data)
->pluck('norujukan'); ->join('tebus as t','gadai.norujukan','=','t.norujukan')
->where([['hargajualan','<>','null']])
->pluck('gadai.norujukan');
$transaksi_kredit = TransaksiKeuntungan::on('mysql7') $transaksi_kredit = TransaksiKeuntungan::on('mysql7')
->whereIn('norujukan',$transaksi_kredit_gadai) ->leftJoin('transaction as trans', function($join)
->whereDate('tarikh_bayaran','<=', $request->hingga) {
->whereDate('tarikh_bayaran','>=', $request->mula) $join->on('transaksi_keuntungan.norujukan', '=', 'trans.norujukan');
// ->whereBetween('tarikh_bayaran',[$from,$to]) $join->on('transaksi_keuntungan.tarikh_bayaran', '=', 'trans.created_at');
->sum('bayaran_pembiayaan'); })
->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') // $transaksi_kredit = 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')
app/Http/Controllers/TransactionController.php
+26 -2
View File
@@ -63,14 +63,38 @@ class TransactionController extends Controller
} }
public function getTransactionByid($id){ 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); return response()->json($transaction);
} }
public function getTransactionByRujukanOne($norujukan){ 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); return response()->json($transaction);
} }
routes/web.php
+1
View File
@@ -196,6 +196,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
$router->get('transaction/one/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanOne']); $router->get('transaction/one/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanOne']);
$router->get('transaction/id/{id}',['uses'=>'TransactionController@getTransactionByid']); $router->get('transaction/id/{id}',['uses'=>'TransactionController@getTransactionByid']);
$router->get('transaction/norujukan/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanAll']); $router->get('transaction/norujukan/{norujukan}',['uses'=>'TransactionController@getTransactionByRujukanAll']);
$router->get('transaction/norujukan/total/ansuran',['uses'=>'TransactionController@getTotalBayaranAnsuran']);
$router->get('maxpinjaman',['uses'=>'MaxPinjamanController@getAllMaxPinjaman']); $router->get('maxpinjaman',['uses'=>'MaxPinjamanController@getAllMaxPinjaman']);