diff --git a/app/Http/Controllers/BayaranController.php b/app/Http/Controllers/BayaranController.php index 6c4557e..613a2f4 100644 --- a/app/Http/Controllers/BayaranController.php +++ b/app/Http/Controllers/BayaranController.php @@ -19,7 +19,8 @@ class BayaranController extends Controller public function PembayaranAction(PaymentRequest $request) { $request->validated(); - + dd($request->all()); + dd($request->getPembiayaanFromNorujukan()); $arraybayar = $this->setUpahTawarruq($request->getPembiayaanFromNorujukan()); return view('includes.bayaran.pembayaransag', compact('arraybayar')); diff --git a/app/Http/Controllers/InformationController.php b/app/Http/Controllers/InformationController.php index ba8b16a..4647564 100644 --- a/app/Http/Controllers/InformationController.php +++ b/app/Http/Controllers/InformationController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Models\CompanyStatus; use App\Models\LelongBid; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -30,17 +31,28 @@ class InformationController extends Controller { $auth_user = Auth::User(); - $CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json(); + $customer_pkb = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json(); + $customer_koop = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url_koop') .'/portal/customer/info',['ic' => $auth_user['icno']])->json(); $pembiayaansemasa = []; - if(isset($CustomerInfo['gadai'])) - { - $pembiayaansemasa = $CustomerInfo['gadai']; + if(isset($customer_pkb['gadai'])){ + $pembiayaansemasa = array_map(function ($pkb) { + $pkb['tag_syarikat'] = CompanyStatus::COM_PKB; + return $pkb; + }, $customer_pkb['gadai']); } - if(isset($CustomerInfo['lelong'])){ - if(sizeof($CustomerInfo['lelong']) > 0){ - foreach($CustomerInfo['lelong'] as $index=>$lelong){ + if(isset($customer_koop['gadai'])){ + $array_koop = array_map(function ($koop) { + $koop['tag_syarikat'] = CompanyStatus::COM_KOOPPKB; + return $koop; + }, $customer_pkb['gadai']); + $pembiayaansemasa = array_merge($pembiayaansemasa,$array_koop); + } + + if(isset($customer_pkb['lelong'])){ + if(sizeof($customer_pkb['lelong']) > 0){ + foreach($customer_pkb['lelong'] as $index=>$lelong){ $array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api-lelong.url') . '/api/portalApi',['norujukan' => $lelong['norujukan']])->json(); if($array_lelong === null){ @@ -48,13 +60,32 @@ class InformationController extends Controller } if($array_lelong['lelong'] !== null){ - $CustomerInfo['lelong'][$index] = collect($lelong)->merge($array_lelong['lelong'])->toArray(); + $customer_pkb['lelong'][$index] = collect($lelong)->merge($array_lelong['lelong'])->toArray(); } } - $pembiayaansemasa = collect($pembiayaansemasa)->merge($CustomerInfo['lelong']); - $pembiayaansemasa = $pembiayaansemasa->toArray(); + $pembiayaansemasa = collect($pembiayaansemasa)->merge($customer_pkb['lelong']); + $pembiayaansemasa = $pembiayaansemasa->toArray(); } } + + if(isset($customer_koop['lelong'])){ + if(sizeof($customer_koop['lelong']) > 0){ + foreach($customer_koop['lelong'] as $index=>$lelong){ + $array_lelong = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api-lelong.url_koop') . '/api/portalApi',['norujukan' => $lelong['norujukan']])->json(); + + if($array_lelong === null){ + continue; + } + + if($array_lelong['lelong'] !== null){ + $customer_koop['lelong'][$index] = collect($lelong)->merge($array_lelong['lelong'])->toArray(); + } + } + $pembiayaansemasa = collect($pembiayaansemasa)->merge($customer_koop['lelong']); + $pembiayaansemasa = $pembiayaansemasa->toArray(); + } + } + return response()->json($pembiayaansemasa,200); // return view('includes.information.pembiayaanaktif',compact('pembiayaansemasa')); } diff --git a/app/Http/Requests/PaymentRequest.php b/app/Http/Requests/PaymentRequest.php index ff4fed0..9638f70 100644 --- a/app/Http/Requests/PaymentRequest.php +++ b/app/Http/Requests/PaymentRequest.php @@ -54,6 +54,15 @@ class PaymentRequest extends FormRequest public function getPembiayaanFromNorujukan() { $norujukanList = json_decode($this->totalSagInCartInput); + + dd($norujukanList,$this->test); + + + // $list_pkb = array_filter($fn($x) => ); + // $list_koop = array_filter($fn($x) => ); + + $pkb = array_map(fn($x) => Http::arrahn()->get('/api/gadai/norujukan/' . $x)->json()[0][0],$norujukanList); + $koop = array_map(fn($x) => Http::arrahn()->get('/api/gadai/norujukan/' . $x)->json()[0][0],$norujukanList); return array_map(fn($x) => Http::arrahn()->get('/api/gadai/norujukan/' . $x)->json()[0][0], $norujukanList); } diff --git a/app/Models/CompanyStatus.php b/app/Models/CompanyStatus.php new file mode 100644 index 0000000..ad1d728 --- /dev/null +++ b/app/Models/CompanyStatus.php @@ -0,0 +1,11 @@ + config('app.api_verify')])->baseUrl(config('api.url')); }); + + Http::macro('arrahn_koop', function () { + return Http::withOptions(['verify' => config('app.api_verify')])->baseUrl(config('api.url_koop')); + }); PendingRequest::macro('arrahn', function () { $this->options['verify'] = config('app.api_verify'); $this->baseUrl(config('api.url')); return $this; }); + + PendingRequest::macro('arrahn_koop', function () { + $this->options['verify'] = config('app.api_verify'); + $this->baseUrl(config('api.url_koop')); + return $this; + }); } } diff --git a/config/api-lelong.php b/config/api-lelong.php index 6114358..6ee436d 100644 --- a/config/api-lelong.php +++ b/config/api-lelong.php @@ -1,4 +1,5 @@ env('API_LELONG_URL', 'https://niklah.arrahn.com.my') + 'url' => env('API_LELONG_URL', 'https://niklah.arrahn.com.my'), + 'url_koop' => env('API_LELONG_URL_KOOP', 'https://niklah.arrahn.com.my') ]; diff --git a/config/api.php b/config/api.php index e8ea7a3..39b8ad4 100644 --- a/config/api.php +++ b/config/api.php @@ -1,4 +1,5 @@ env('API_URL') + 'url' => env('API_URL','http://localhost:8000'), + 'url_koop' => env('API_URL_KOOP','http://localhost:8000') ]; \ No newline at end of file diff --git a/public/js/miscellaneous/cart.js b/public/js/miscellaneous/cart.js index 03f28c6..d17232e 100644 --- a/public/js/miscellaneous/cart.js +++ b/public/js/miscellaneous/cart.js @@ -1,9 +1,3 @@ -// const test = () =>{ -// let btn_payment = document.getElementById('bayarsbmt'); - -// console.log(btn_payment,rad_payment); -// } - let checked_rad = () =>{ const radios = document.querySelectorAll('input[name="radpembayaran"]'); // let rad_payment = document.getElementById('radpembayaran'); @@ -37,17 +31,5 @@ radios.forEach((radio) => { } }); - // document.getElementById('radpembayaran').addEventListener('change', function () { - // const toggle = this.value; - // console.log(toggle); - // const content = document.getElementById(toggle); - - // console.log(dataToggleValue); - // if (this.checked) { - // content.classList.add('blurred'); - // } else { - // content.classList.remove('blurred'); - // } - // }); }); diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php index e03f792..68eb105 100644 --- a/resources/views/includes/home.blade.php +++ b/resources/views/includes/home.blade.php @@ -137,13 +137,13 @@ }); let totalSagInCart = []; - + let totaltagSyarikat = []; let updateSagInCart = function(norujukan){ let isNorujukanIsAlreadyInCart = totalSagInCart.includes(norujukan); if(isNorujukanIsAlreadyInCart){ - totalSagInCart = totalSagInCart.filter(x => x != norujukan); + totalSagInCart = totalSagInCart.filter(x => x != norujukan); } if(! isNorujukanIsAlreadyInCart){