diff --git a/app/Http/Controllers/BarangkesController.php b/app/Http/Controllers/BarangkesController.php index dd4f10c..b4d6586 100644 --- a/app/Http/Controllers/BarangkesController.php +++ b/app/Http/Controllers/BarangkesController.php @@ -6,10 +6,13 @@ use App\Audit; use App\Polis; use App\Cawangan; use App\LookupAlasan; +use App\Palsu; +use App\Gadai; use Illuminate\Http\Request; use Carbon\Carbon; use Illuminate\Support\Facades\DB; +use Illuminate\Support\Facades\Log; class BarangkesController extends Controller { @@ -40,4 +43,77 @@ class BarangkesController extends Controller return response()->json($result); } + + public function store(Request $request) //cara fifi ajar + { + + $current = Carbon::now(); + $kodcaw = $request->kodcaw; + $cawangan = Cawangan::on('mysql7') + ->where('kodcaw', $kodcaw) + ->first(); + + $insert = Palsu::on($cawangan['mysql'])->create([ + 'kodcaw' => $request->kodcaw, + 'tarikh' => $current->toDateString(), + 'norujukan' => $request->norujukan, + 'teller' => $request->teller, + 'nota' => $request->nota ? $request->nota : '', + 'pembiayaan' => $request->pinjaman, + 'nilaimarhun' => $request->nilaimarhun, + 'jbg' => $request->jbg, + 'untung' => $request->tunggakan, + 'untungonepercent' => $request->tunggakanonepercent, + 'untungcajlain' => $request->tunggakanujrah, + ]); + + // return $insert; + + return response()->json([ + 'success' => true, + 'message' => 'Barang kes berjaya didaftar', + 'data' => $insert + ], 201); + } + + public function update(Request $request) + { + + $current = Carbon::now(); + $kodcaw = $request->kodcaw; + Log::info($request->all()); + + // Cari connection cawangan + $cawangan = Cawangan::on('mysql7') + ->where('kodcaw', $kodcaw) + ->first(); + + if (!$cawangan) { + return response()->json([ + 'success' => false, + 'message' => 'Cawangan tidak dijumpai', + ], 404); + } + + // Update direct (ikut norujukan) + $palsu = palsu::on($cawangan['mysql']) + ->where('norujukan', $request->norujukan) + ->update([ + 'kodcaw' => $request->kodcaw, + 'tarikh' => $request->tarikh, + 'teller' => $request->teller, + 'nota' => $request->nota ?? '', + 'pembiayaan' => $request->pinjaman, + 'nilaimarhun' => $request->nilaimarhun, + 'jbg' => $request->jbg, + 'untung' => $request->tunggakan, + 'untungonepercent' => $request->tunggakanonepercent, + 'untungcajlain' => $request->tunggakanujrah, + ]); + + return response()->json([ + 'success' => $palsu ? true : false, + 'message' => $palsu ? 'Rekod gadai berjaya dikemaskini' : 'Rekod tidak dijumpai', + ], 200); + } } \ No newline at end of file diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 6080cac..c19232b 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -14,6 +14,7 @@ use App\Blacklist; use App\AuditCustomer; use Illuminate\Http\Request; use App\TuntutBaki; +use Illuminate\Support\Facades\Auth; use Carbon\Carbon; use Illuminate\Support\Facades\Log; @@ -904,6 +905,69 @@ class CustomerController extends Controller return response()->json($customer); } +public function AdminsearchCustomerBySAG(Request $request) +{ + // Ambil kodcaw dari user login + $kodcaw = $request->kodcaw; + // $norujukan = $request->input('norujukan'); + + // Cari connection untuk cawangan + $cawangan = Cawangan::on('mysql7')->where('kodcaw', $kodcaw)->first(); + if (!$cawangan) { + return response()->json([], 404); + } + + $gadai = optional(Gadai::on($cawangan['mysql'])->where('norujukan',$request->norujukan)->first())->toArray() ?? []; + + if(!empty($gadai)){ + $customer = optional(Customer::on('mysql7')->where(function ($query) use ($gadai) { + $query->where('kpbaru',$gadai['nokp']) + ->orWhere('kplama',$gadai['nokp']); + })->first())->toArray() ?? []; + }else{ + return response()->json(['success' => false,'message' => 'norujukan tidak dijumpainya'], 404); + } + + // cara fifi ajar + $result = [[ + 'id' => $customer['id'], + 'kodcaw' => $gadai['kodcaw'], + 'norujukan' => $gadai['norujukan'], + 'teller' => $gadai['teller'], + 'nota' => $customer['nota'], + 'pinjaman' => $gadai['pinjaman'], + 'nilaimarhun' => $gadai['nilaimarhun'], + 'jbg' => $gadai['jbg'], + 'tunggakan' => $gadai['tunggakan'], + 'tunggakanonepercent' => $gadai['tunggakanonepercent'], + 'tunggakanujrah' => $gadai['tunggakanujrah'], + 'nama' => $customer['nama'], + 'kplama' => $customer['kplama'], + 'kpbaru' => $customer['kpbaru'], + ]]; + + // saya buat sendiri + // Join customer + gadai ikut nokp + // $result = DB::connection($cawangan['mysql']) + // ->table('gadai') + // ->join('online_arrahn.customer as c', function($join) { + // $join->on('gadai.nokp', '=', 'c.kpbaru') + // ->orOn('gadai.nokp', '=', 'c.kplama'); + // }) + // ->where('norujukan', $request->norujukan) + // ->select( + // 'id', + // 'gadai.kodcaw','gadai.norujukan','gadai.teller', + // 'c.nota','gadai.pinjaman','gadai.nilaimarhun','gadai.jbg', + // 'gadai.tunggakan','gadai.tunggakanonepercent','gadai.tunggakanujrah', + // 'c.nama','c.kpbaru','c.kplama' + // ) + // ->take(5) + // ->get(); + + return response()->json($result); +} + public function changepassword(Request $request, $kodcaw, $id) { $current = Carbon::now(); @@ -1003,20 +1067,4 @@ class CustomerController extends Controller return response()->json($results); } -// public function createNotaArcc($kodcaw, Request $request) -// { -// $current = Carbon::now(); - -// $customer = Customer::on('mysql7')->create([ -// 'kodcaw' => $kodcaw, -// 'tarikhdaftar' => $current->toDateString(), -// 'nota_arcc' => $request->nota_arcc, -// 'teller' => $request->teller, -// 'aktif' => 'A' -// ]); - -// return response()->json($customer, 201); -// } - - } diff --git a/app/Palsu.php b/app/Palsu.php index 06c5eaa..f9d2e90 100644 --- a/app/Palsu.php +++ b/app/Palsu.php @@ -21,6 +21,7 @@ class Palsu extends Model protected $fillable = [ 'recno', 'kodcaw', + 'tarikh', 'norujukan', 'teller', 'nota', diff --git a/routes/web.php b/routes/web.php index 98df23c..55de8c1 100644 --- a/routes/web.php +++ b/routes/web.php @@ -56,12 +56,13 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->put('customers/update/khazanah/{nokp}', ['uses' => 'CustomerController@customerUpdateKhazanah']); $router->get('customers/laporan/{kodcaw}/{tarikh}',['uses'=>'CustomerController@getLaporanCustomers']); $router->get('customers/latest/{kodcaw}',['uses'=>'CustomerController@getLatestCustomer']); - $router->put('customers/information/update/admin', ['uses' => 'CustomerController@customerUpdateAdmin']); + $router->put('customers/information/update/admin', ['uses' => 'CustomerController@customerUpdateAdmin']); //blh refer sini izazi $router->get('admin/customers/nokp/search',['uses'=>'CustomerController@showOneCustomerByICAdmin']); $router->get('customer/blacklist',['uses'=>'CustomerController@blacklistCustomer']); $router->get('customer/eachcawangan/{ic}',['uses'=>'CustomerController@showCustomerByEachCawangan']); //arcc $router->get('customer/searchbyname',['uses'=>'CustomerController@searchByName']); + $router->get('customer/searchbygadai/{kodcaw}/{norujukan}',['uses'=>'CustomerController@AdminsearchGadai']); // Route::get('/api/customers/searchbyname', [CustomerController::class, 'searchByName']); // $router->put('customers/update/{nokp}', ['uses' => 'CallCenterController@customerUpdate']); //kena tengok api ni // $router->put('customers/update/kaunter/{nokp}/{kodcaw}', ['uses' => 'CallCenterController@customerUpdateKaunter']); @@ -87,7 +88,7 @@ $router->group(['prefix'=>'api'], function () use ($router){ $router->get('gadai/cawangan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@showOneGadaiByCawanganOnly']); $router->get('gadai/norujukan/{norujukan}',['uses'=>'GadaiController@showOneGadaiByNorujukan']); $router->get('gadai/norujukankodcaw/{kodcaw}/{norujukan}',['uses'=>'GadaiController@showOneGadaiByNorujukanKodcaw']); - $router->get('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@showOneGadaibyRujukanAndCawangan']); + $router->get('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@showOneGadaibyRujukanAndCawangan']); // refer sini utk pass gadai $router->post('gadai/{kodcaw}',['uses'=>'GadaiController@create']); $router->post('gadaiold/{kodcaw}',['uses'=>'GadaiController@createold']); $router->get('gadai/{cawangan_code}/{date}',['uses'=>'GadaiController@gadaiTransactionByCawanganAndDay']); @@ -460,8 +461,14 @@ $router->group(['prefix'=>'api'], function () use ($router){ //laporanlelong adminportal $router->get('laporan/lelong',['uses' => 'LelongController@LaporanLelong']); $router->get('lookupbatchlel/{kodcaw}',['uses' => 'LelongController@LookupBatchLel']); - + //barangkes $router->get('palsu/laporan', ['uses' => 'BarangkesController@LaporanBarangKes']); + $router->get('barangkes', ['uses' => 'BarangkesController@index']); // + $router->post('barangkes/store', ['uses' => 'BarangkesController@store']); + + // $router->post('/barangkes/{id}', ['uses' => 'BarangkesController@show']); + $router->put('barangkes/update/{recno}', ['uses' => 'BarangkesController@update']); + //update tagterima Tebus @@ -802,9 +809,11 @@ $router->group(['prefix'=>'admin'], function () use ($router){ $router->get('TuntutBakiTarikhTeller/{kodcaw}',['uses'=>'AdminPageController@showTuntutBakiTarikhTeller']); $router->get('lelong/tarikh/{kodcaw}',['uses'=>'AdminPageController@LelonganTarikh']); $router->post('updateTunaiGTByTarikh/{kodcaw}',['uses'=>'AdminPageController@UpdateTunaiByTarikh']); - $router->get('searchByName',['uses'=>'CustomerController@AdminsearchCustomerByName']); - $router->get('searchByIC',['uses'=>'CustomerController@AdminsearchCustomerByIC']); + $router->get('searchByIC',['uses'=>'CustomerController@AdminsearchCustomerByIC']); //refer ni jugak + + // sag + $router->get('searchBySag',['uses'=>'CustomerController@AdminsearchCustomerBySAG']); //refer ni jugak $router->get('pembiayaanTahunan',['uses'=>'AdminPageController@TahunanGadai']); $router->get('penebusanTahunan',['uses'=>'AdminPageController@TahunanTebus']);