From b17f60a71ce9fc3f13041edfbd369c2ae6af7ab8 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 10 Jan 2023 12:21:15 +0800 Subject: [PATCH 1/4] fix issues lelong arrahnbid --- app/Http/Controllers/HomeController.php | 1 + .../Controllers/InformationController.php | 24 +++++++-- app/Models/LelongBid.php | 53 +++++++++++++++++++ config/database.php | 22 ++++++++ 4 files changed, 97 insertions(+), 3 deletions(-) create mode 100644 app/Models/LelongBid.php diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 8f3d1d5..5393469 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -58,6 +58,7 @@ class HomeController extends Controller $bilanganlelong = 0; foreach($CustomerInfo['lelong'] as $index1=>$lelong) { + $bilangan++; $bilanganlelong += 1; } diff --git a/app/Http/Controllers/InformationController.php b/app/Http/Controllers/InformationController.php index d749776..52abfc5 100644 --- a/app/Http/Controllers/InformationController.php +++ b/app/Http/Controllers/InformationController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Models\LelongBid; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Http; @@ -37,6 +38,16 @@ class InformationController extends Controller $pembiayaansemasa = $CustomerInfo['gadai']; } + if(isset($CustomerInfo['lelong'])){ + if(sizeof($CustomerInfo['lelong']) > 0){ + foreach($CustomerInfo['lelong'] as $index=>$lelong){ + $array_lelong = LelongBid::select('fasa','t_lelong')->where([['norujukan',$lelong['norujukan']],['hargajual','>',0]])->first()->toArray(); + $CustomerInfo['lelong'][$index] = collect($lelong)->merge($array_lelong)->toArray(); + } + $pembiayaansemasa = collect($pembiayaansemasa)->merge($CustomerInfo['lelong']); + } + } + $pembiayaansemasa = $pembiayaansemasa->toArray(); return response()->json($pembiayaansemasa,200); // return view('includes.information.pembiayaanaktif',compact('pembiayaansemasa')); } @@ -71,9 +82,15 @@ class InformationController extends Controller $CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json(); $lelong = []; - if(isset($CustomerInfo['lelong'])) - { - $lelong += $CustomerInfo['lelong']; + + if(isset($CustomerInfo['lelong'])){ + if(sizeof($CustomerInfo['lelong']) > 0){ + foreach($CustomerInfo['lelong'] as $index=>$lel){ + $array_lelong = LelongBid::select('fasa','t_lelong')->where([['norujukan',$lel['norujukan']],['hargajual','>',0]])->first()->toArray(); + $CustomerInfo['lelong'][$index] = collect($lel)->merge($array_lelong)->toArray(); + } + $lelong = collect($lelong)->merge($CustomerInfo['lelong']); + } } @@ -88,3 +105,4 @@ class InformationController extends Controller return view('auth.termasyarat', compact('termasyarat')); } } + diff --git a/app/Models/LelongBid.php b/app/Models/LelongBid.php new file mode 100644 index 0000000..db5f2bc --- /dev/null +++ b/app/Models/LelongBid.php @@ -0,0 +1,53 @@ + env('MYSQL_ATTR_SSL_CA'), ]) : [], ], + + 'lelong' => [ + 'driver' => 'mysql', + 'url' => env('DATABASE_URL'), + 'host' => env('DB_HOST_LELONG', '127.0.0.1'), + 'port' => env('DB_PORT_LELONG', '3306'), + 'database' => env('DB_DATABASE_LELONG', 'lelong'), + 'username' => env('DB_USERNAME_LELONG', 'root'), + 'password' => env('DB_PASSWORD_LELONG', ''), + 'unix_socket' => env('DB_SOCKET_LELONG', ''), + 'charset' => 'utf8mb4', + 'collation' => 'utf8mb4_unicode_ci', + 'prefix' => '', + 'prefix_indexes' => true, + 'strict' => true, + 'engine' => null, + 'options' => extension_loaded('pdo_mysql') ? array_filter([ + PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'), + ]) : [], + ], + + 'pgsql' => [ 'driver' => 'pgsql', From 4e990ffb5f857089f198690bcceab6574bdd218a Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 10 Jan 2023 13:06:59 +0800 Subject: [PATCH 2/4] fix arrahnbid connection --- app/Http/Controllers/InformationController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/InformationController.php b/app/Http/Controllers/InformationController.php index 52abfc5..d140e78 100644 --- a/app/Http/Controllers/InformationController.php +++ b/app/Http/Controllers/InformationController.php @@ -41,8 +41,8 @@ class InformationController extends Controller if(isset($CustomerInfo['lelong'])){ if(sizeof($CustomerInfo['lelong']) > 0){ foreach($CustomerInfo['lelong'] as $index=>$lelong){ - $array_lelong = LelongBid::select('fasa','t_lelong')->where([['norujukan',$lelong['norujukan']],['hargajual','>',0]])->first()->toArray(); - $CustomerInfo['lelong'][$index] = collect($lelong)->merge($array_lelong)->toArray(); + $array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $lel['norujukan']])->json(); + $CustomerInfo['lelong'][$index] = collect($lelong)->merge($array_lelong['lelong'])->toArray(); } $pembiayaansemasa = collect($pembiayaansemasa)->merge($CustomerInfo['lelong']); } @@ -86,8 +86,10 @@ class InformationController extends Controller if(isset($CustomerInfo['lelong'])){ if(sizeof($CustomerInfo['lelong']) > 0){ foreach($CustomerInfo['lelong'] as $index=>$lel){ - $array_lelong = LelongBid::select('fasa','t_lelong')->where([['norujukan',$lel['norujukan']],['hargajual','>',0]])->first()->toArray(); - $CustomerInfo['lelong'][$index] = collect($lel)->merge($array_lelong)->toArray(); + $array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $lel['norujukan']])->json(); + if($array_lelong['lelong'] !== null){ + $CustomerInfo['lelong'][$index] = collect($lel)->merge($array_lelong['lelong'])->toArray(); + } } $lelong = collect($lelong)->merge($CustomerInfo['lelong']); } From 5ee5589f288c817ef2e264c75e05bd4daef38b52 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 10 Jan 2023 13:13:11 +0800 Subject: [PATCH 3/4] fix issues lelong2 --- app/Http/Controllers/InformationController.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/InformationController.php b/app/Http/Controllers/InformationController.php index d140e78..c7f8ed9 100644 --- a/app/Http/Controllers/InformationController.php +++ b/app/Http/Controllers/InformationController.php @@ -41,8 +41,11 @@ class InformationController extends Controller if(isset($CustomerInfo['lelong'])){ if(sizeof($CustomerInfo['lelong']) > 0){ foreach($CustomerInfo['lelong'] as $index=>$lelong){ - $array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $lel['norujukan']])->json(); - $CustomerInfo['lelong'][$index] = collect($lelong)->merge($array_lelong['lelong'])->toArray(); + $array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $lelong['norujukan']])->json(); + + if($array_lelong['lelong'] !== null){ + $CustomerInfo['lelong'][$index] = collect($lelong)->merge($array_lelong['lelong'])->toArray(); + } } $pembiayaansemasa = collect($pembiayaansemasa)->merge($CustomerInfo['lelong']); } From 09b600fe63c9a092fee6de0e10d8ea16c169407d Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Thu, 16 Feb 2023 20:04:05 +0800 Subject: [PATCH 4/4] updated 16/2/2023 --- app/Http/Controllers/BayaranController.php | 5 +++++ app/Http/Controllers/InformationController.php | 3 ++- resources/views/includes/login/loginportal.blade.php | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/BayaranController.php b/app/Http/Controllers/BayaranController.php index 66608d8..ab0b2c3 100644 --- a/app/Http/Controllers/BayaranController.php +++ b/app/Http/Controllers/BayaranController.php @@ -77,6 +77,11 @@ class BayaranController extends Controller { $gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/'. $sag)->json(); + //$array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get('https://adminbid.arrahn.com.my/api/portalApi',['norujukan' => $sag])->json(); + //if($array_lelong['lelong'] !== null){ + // return redirect()->route('home')->with('error','Barangan Sedang Dilelong.'); + //} + if($gadai[0][0]['tempoh'] >= 12){ return redirect()->route('home')->with('error','SAG Yang Dipilih melebihi tempoh 12 bulan ke atas.'); } diff --git a/app/Http/Controllers/InformationController.php b/app/Http/Controllers/InformationController.php index c7f8ed9..6be26fe 100644 --- a/app/Http/Controllers/InformationController.php +++ b/app/Http/Controllers/InformationController.php @@ -48,9 +48,9 @@ class InformationController extends Controller } } $pembiayaansemasa = collect($pembiayaansemasa)->merge($CustomerInfo['lelong']); + $pembiayaansemasa = $pembiayaansemasa->toArray(); } } - $pembiayaansemasa = $pembiayaansemasa->toArray(); return response()->json($pembiayaansemasa,200); // return view('includes.information.pembiayaanaktif',compact('pembiayaansemasa')); } @@ -95,6 +95,7 @@ class InformationController extends Controller } } $lelong = collect($lelong)->merge($CustomerInfo['lelong']); + $lelong = $lelong->toArray(); } } diff --git a/resources/views/includes/login/loginportal.blade.php b/resources/views/includes/login/loginportal.blade.php index 95ac41a..a09dc75 100644 --- a/resources/views/includes/login/loginportal.blade.php +++ b/resources/views/includes/login/loginportal.blade.php @@ -40,9 +40,9 @@
-
+

Pertama Kali @@ -57,4 +57,4 @@ -@endsection \ No newline at end of file +@endsection