diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index 1e40636..0b4b3e9 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -2929,7 +2929,9 @@ class GadaiController extends Controller $audit = Gadai::on($cawangan['mysql']) ->where([['tagpalsu','=',0],['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); + ->orWhere([['tagpalsu','=',0],['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + ->orderBy('t_gadai', 'ASC') + ->orderBy('sirig', 'ASC'); $rekodaudit = $audit->get(); $totalrekod = $audit->sum('pinjaman'); @@ -2947,7 +2949,9 @@ class GadaiController extends Controller $audit = Gadai::on($cawangan['mysql']) ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']]) - ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]); + ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]]) + ->orderBy('t_gadai', 'ASC') + ->orderBy('sirig', 'ASC'); $rekodaudit = $audit->get(); $totalrekod = $audit->sum('pinjaman'); diff --git a/app/Http/Controllers/TransactionController.php b/app/Http/Controllers/TransactionController.php index 6167d8a..5edc06f 100644 --- a/app/Http/Controllers/TransactionController.php +++ b/app/Http/Controllers/TransactionController.php @@ -6,6 +6,7 @@ use App\Transaction; use App\TransaksiKeuntungan; use App\Pengguna; use App\Cawangan; +use App\Advansur; use Illuminate\Http\Request; @@ -118,4 +119,15 @@ class TransactionController extends Controller return response()->json($transaction); } + + public function TransaksiUpah(Request $request){ + $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first(); + + $listadvansur = Advansur::on($cawangan['mysql']) + ->where('norujukan','=',$request->norujukan) + ->orderBy('tarikh','desc') + ->get(); + + return response()->json($listadvansur,200); + } } \ No newline at end of file diff --git a/app/Http/Controllers/TransactionOnlineController.php b/app/Http/Controllers/TransactionOnlineController.php index a1f4a66..edfac42 100644 --- a/app/Http/Controllers/TransactionOnlineController.php +++ b/app/Http/Controllers/TransactionOnlineController.php @@ -223,4 +223,17 @@ class TransactionOnlineController extends Controller return response()->json($transactionOnline); } + + public function searchSAGOnline(Request $request){ + + $current = Carbon::now(); + $current = new Carbon(); + + $transaction_online = TransactionOnline::on('mysql7')->where([['norujukan',$request->norujukan],['status','PAID'],['update_status',0],['tarikh',$current->toDateString()]])->first(); + if($transaction_online){ + return response()->json(true); + }else{ + return response()->json(false); + } + } } diff --git a/routes/web.php b/routes/web.php index de60730..7b2e63c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -581,6 +581,8 @@ $router->group(['prefix'=>'dashboard'], function () use ($router){ $router->group(['prefix'=>'portal'], function () use ($router){ $router->get('financeMonth',['uses'=>'GadaiController@PembiayaanBulanan']); $router->get('transaksipelanggan',['uses'=>'TransactionController@TransaksiPelanggan']); + $router->get('transaksipelanggan/upah',['uses'=>'TransactionController@TransaksiUpah']); + $router->get('searchsagonline',['uses'=>'TransactionOnlineController@searchSAGOnline']); });