diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php index 831eae0..ccb6a99 100644 --- a/app/Http/Controllers/CustomersController.php +++ b/app/Http/Controllers/CustomersController.php @@ -61,6 +61,7 @@ class CustomersController extends Controller $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $bank = Http::get(config('api.url') . '/api/bank')->json(); $customers_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json(); + if($customers_info){ $customer_info = $customers_info[0]; }else{ diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index 6922d95..d808e9f 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -2,6 +2,10 @@ namespace App\Http\Controllers; +//Events +use App\Events\StatusLiked; +use App\Events\NotifikasiPembayaran; + use Illuminate\Http\Request; use App\Services\CustomerService; use Illuminate\Support\Facades\Session; @@ -116,7 +120,7 @@ class GadaianController extends Controller $auth_user = Auth::user(); $gadaiannorujukan = Http::put(config('api.url') . '/api/gadai/edit/marhun/'. $auth_user['cawangan'] . '/' . $request->norujukan,[ - "marhun" => $request->marhun + "recno" => $request->recno ])->json(); return $gadaiannorujukan; @@ -128,18 +132,16 @@ class GadaianController extends Controller $auth_user = Auth::user(); - dd(request()->all()); - - $gadaiannorujukan = Http::put(config('api.url') . '/api/gadai/ubah/marhun/'. $auth_user['cawangan'] . '/' . $request->norujukan,[ - 'marhun' => $request->valmarhun, - 'karat' => $request->karat, + $gadaiannorujukan = Http::put(config('api.url') . '/api/gadai/ubah/marhun/'. $auth_user['cawangan'] . '/' . $request->norujukedit,[ + 'recno' => $request->recno, + 'karat' => $request->sltkarat, 'berat' => $request->berat, 'harga' => $request->harga, - 'n_marhun' => $request->n_marhun + 'n_marhun' => $request->nilaimarhun ])->json(); - return $gadaiannorujukan; + return redirect()->back(); } public function store(Request $request){ @@ -147,6 +149,8 @@ class GadaianController extends Controller $total_nilai_marhun = $request->total_nilai_marhun; $total_nilai_marhun = str_replace(',','',$total_nilai_marhun); + + $margin_pinjaman = $request->pinjaman / $total_nilai_marhun; $kadarupah = $request->kadarkeuntungan * 100; $keuntungan6bulan = $request->keuntungan_6bln; @@ -166,6 +170,7 @@ class GadaianController extends Controller 'hargajualan' => $hargajualan, 'kuantiti_marhun' => $request->kuantiti_marhun ])->json(); + $request->session()->forget('page_reload'); $request->session()->forget('norujukan'); return redirect()->route('customer_info'); @@ -290,9 +295,53 @@ class GadaianController extends Controller return view('print.resitansuran',compact('transaction','gadai','customers_info')); } + public function resitansurans($id) + { + + $totaltransaction = 0; + + if(sizeof($transaction) != 0) + $transaction = $transaction[0]; + + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json(); + + if(sizeof($gadai) != 0) + $gadai = $gadai[0][0]; + + $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); + + if(sizeof($customers_info) != 0) + $customers_info = $customers_info[0]; + + return view('print.resitansuran',compact('transaction','gadai','customers_info')); + } + + public function resitbelumansurans($id) + { + + $totaltransaction = 0; + + if(sizeof($transaction) != 0) + $transaction = $transaction[0]; + + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json(); + + if(sizeof($gadai) != 0) + $gadai = $gadai[0][0]; + + $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); + + if(sizeof($customers_info) != 0) + $customers_info = $customers_info[0]; + + return view('print.resitansuransebelum',compact('transaction','gadai','customers_info')); + } + public function resittebus($id) { + $auth_user = Auth::user(); + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json(); $totaltransaction = 0; @@ -314,12 +363,12 @@ class GadaianController extends Controller $customers_info = $customers_info[0]; - $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/ALS',[ "norujukan" => $id])->json(); + $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json(); if(sizeof($penebusan) != 0) $penebusan = $penebusan[0]; - $wakil = Http::get(config('api.url') . '/api/getwakil/ALS/code/' . $penebusan['nowakil'])->json(); + $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json(); // dd($wakil); if(sizeof($wakil) != 0) @@ -328,6 +377,45 @@ class GadaianController extends Controller return view('print.resittebus',compact('transaction','gadai','customers_info','penebusan','wakil','totaltransaction')); } + public function resitbelumtebus($id) + { + + $auth_user = Auth::user(); + + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $id)->json(); + + + if(sizeof($gadai) != 0) + $gadai = $gadai[0][0]; + + $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); + + if(sizeof($customers_info) != 0) + $customers_info = $customers_info[0]; + + + $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'] ,[ "norujukan" => $id])->json(); + + if(sizeof($penebusan) != 0) + $penebusan = $penebusan[0]; + + // dd($penebusan['nowakil']); + + if($penebusan['nowakil'] != 0) + { + $wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json(); + + if(sizeof($wakil) != 0) + $wakil = $wakil[0]; + } + else + { + $wakil = []; + } + + return view('print.resittebussebelum',compact('gadai','customers_info','penebusan','wakil','totaltransaction')); + } + public function history(Request $request) { $auth_user = Auth::user(); @@ -359,5 +447,69 @@ class GadaianController extends Controller return response()->json($arrayhist,200); } + + /// KELULUSAN/// + + public function getkelulusan(Request $request) + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $norujukan = $request->norujukan; + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $kelulusan = Http::get(config('api.url') . '/api/GetLulus/' . $auth_user['cawangan'],[ + "norujukan" => $norujukan + ])->json(); + + if(sizeof($kelulusan) > 0) + { + $kelulusan = $kelulusan['benar']; + } + else + { + $kelulusan = ''; + } + + return response($kelulusan); + } + + public function updatekelulusan(Request $request) + { + $auth_user = Auth::user(); + + $api_url = config('api.url'); + + $norujukan = $request->norujukan; + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/kepohonan/' . $auth_user['cawangan'] . '/' . $norujukan)->json(); + + return response()->json($updatelulus,200); + } + + public function createkelulusan(Request $request) + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $norujukan = $request->norujukan; + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + $createlulus = Http::post(config('api.url') . '/api/CreateLulus/' . $auth_user['cawangan'] . '/' . $norujukan, [ + 'mohon' => $request->mohon, + 'teller' => $auth_user['name'] + ])->json(); + + event(new StatusLiked('Penghantaran kepada Khazanah!')); + + return response()->json($createlulus,201); + } + + ///END KELULUSAN/// + } diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 9abbe35..e2ac26d 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -236,8 +236,9 @@ class KhazanahController extends Controller $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $kelulusan = Http::get(config('api.url') . '/api/SenaraiKelulusan/' . $auth_user['cawangan'])->json(); + $kelulusanmohonid = Http::get(config('api.url') . '/api/GetLulusAll/' . $auth_user['cawangan'])->json(); - return view('khazanah.kelulusan',compact('cawangan_info','api_url','kelulusan')); + return view('khazanah.kelulusan',compact('cawangan_info','api_url','kelulusan','kelulusanmohonid')); } @@ -276,7 +277,18 @@ class KhazanahController extends Controller $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan)->json(); + + if($request->khazanah != null) + { + $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/kepohonan/' . $auth_user['cawangan'] . '/' . $norujukan,[ + "khazanah" => $request->khazanah + ])->json(); + } + else + { + $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan)->json(); + } + return response()->json($updatelulus,200); } diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php index 59242a7..63c15f5 100644 --- a/app/Http/Controllers/OperasiController.php +++ b/app/Http/Controllers/OperasiController.php @@ -23,7 +23,19 @@ class OperasiController extends Controller $api_url = config('api.url'); $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $kelulusan = Http::get(config('api.url') . '/api/SenaraiKelulusan/' . $auth_user['cawangan'])->json(); + $kelulusan = Http::get(config('api.url') . '/api/ListOperasi/')->json(); + + + if(sizeof($kelulusan) != 0) + { + $kelulusan = $kelulusan[0]; + } + else + { + + } + + return view('operasi.kelulusan',compact('cawangan_info','api_url','kelulusan')); } @@ -58,10 +70,11 @@ class OperasiController extends Controller $api_url = config('api.url'); $norujukan = $request->norujukan; + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $auth_user['cawangan'] . '/' . $norujukan)->json(); + $updatelulus = Http::put(config('api.url') . '/api/UpdateKelulusan/' . $request->kodcaw . '/' . $norujukan)->json(); return response()->json($updatelulus,200); } diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php index 16064ae..4fe0b63 100644 --- a/resources/views/customers/index.blade.php +++ b/resources/views/customers/index.blade.php @@ -14,7 +14,7 @@