diff --git a/app/Services/PembiayaanService.php b/app/Services/PembiayaanService.php index 35e3c4f..c7a141c 100644 --- a/app/Services/PembiayaanService.php +++ b/app/Services/PembiayaanService.php @@ -7,6 +7,7 @@ use App\Models\CompanyStatus; use Illuminate\Http\Client\Pool; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\Http; +use Illuminate\Support\Facades\Log; class PembiayaanService { @@ -115,29 +116,40 @@ class PembiayaanService public function getMarhunModalData($norujukan,$tagsyarikat) { - $CallableHttp = $tagsyarikat == CompanyStatus::COM_PKB - ? Http::arrahn() - : Http::arrahn_koop(); + try{ + $CallableHttp = $tagsyarikat == CompanyStatus::COM_PKB + ? Http::arrahn() + : Http::arrahn_koop(); - $gadaianDetails = $CallableHttp->get('/api/gadai/norujukan/' . $norujukan)->json()[0][0]; - - $attachCawanganName = function ($x) use ($gadaianDetails,$CallableHttp) { - $x['cawangan_name'] = $CallableHttp->get('/api/cawangan/detail/' . $gadaianDetails['kodcaw'])->json()[0]['cawangan']; - return $x; - }; - - $gadaianDetails = $attachCawanganName($gadaianDetails); - - $marhunDetails = MarhunService::from($norujukan)->getMarhunDetails($tagsyarikat); - - $bayaranHistoryDetails = BayaranHistoryService::from($norujukan)->getBayaranHistory($tagsyarikat); - - - return [ - 'gadaianDetails' => $gadaianDetails, - 'marhunDetails' => $marhunDetails, - 'bayaranHistoryDetails' => $bayaranHistoryDetails, - ]; + $gadaianDetails = $CallableHttp->get('/api/gadai/norujukan/' . $norujukan)->json()[0][0]; + + $attachCawanganName = function ($x) use ($gadaianDetails,$CallableHttp) { + $x['cawangan_name'] = $CallableHttp->get('/api/cawangan/detail/' . $gadaianDetails['kodcaw'])->json()[0]['cawangan']; + return $x; + }; + + $gadaianDetails = $attachCawanganName($gadaianDetails); + + $marhunDetails = MarhunService::from($norujukan)->getMarhunDetails($tagsyarikat); + + $bayaranHistoryDetails = BayaranHistoryService::from($norujukan)->getBayaranHistory($tagsyarikat); + + + return [ + 'gadaianDetails' => $gadaianDetails, + 'marhunDetails' => $marhunDetails, + 'bayaranHistoryDetails' => $bayaranHistoryDetails, + ]; + }catch(\Exception $e){ + Log::debug('norujukan:' . $norujukan); + Log::debug('tagsyarikat:' . $tagsyarikat); + Log::debug('error message:' . $e->getMessage()); + return [ + 'gadaianDetails' => [], + 'marhunDetails' => [], + 'bayaranHistoryDetails' => [], + ]; + } } private function getNorujukanRecentlyAttemptPayment($norujukanList) diff --git a/resources/views/includes/partials/table-pembiayaan-akan-dilelong.blade.php b/resources/views/includes/partials/table-pembiayaan-akan-dilelong.blade.php index 228bea0..ce42c17 100644 --- a/resources/views/includes/partials/table-pembiayaan-akan-dilelong.blade.php +++ b/resources/views/includes/partials/table-pembiayaan-akan-dilelong.blade.php @@ -14,11 +14,12 @@ disabled_payment ? 'disabled' : '' }} /> + data-syarikat="{{ $data->tag_syarikat }}" {{ $data->disabled_payment ? 'disabled' : '' }} /> {{ $data->norujukan }} + {{ $data->t_lelong_formatted }}