From d37fd886541b69dd4078af8d7dab93c2c7b607d6 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Wed, 12 Jun 2024 11:43:09 +0800 Subject: [PATCH] fix hostname selection at imbangduga --- app/Http/Controllers/AkaunController.php | 4 ++-- app/Services/ImbangdugaServices.php | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index dbe0733..14fd073 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -1387,9 +1387,9 @@ class AkaunController extends Controller $date1 = new DateTime($tarikh_imbangan2); $date2 = new DateTime($current->toDateString()); if($date1 < $date2){ - $response = (new ImbanganDuga())->GetImbangDugaBackup( $request->kodcaw,$request->datetimepicker1); + $response = (new ImbanganDuga())->GetImbangDugaBackup($request->hostname,$request->kodcaw,$request->datetimepicker1); }else{ - $response = (new ImbanganDuga())->ViewImbangDugaAROS( $request->kodcaw,$tarikh_imbangan2); + $response = (new ImbanganDuga())->ViewImbangDugaAROS($request->hostname,$request->kodcaw,$tarikh_imbangan2); } if($response->getContent() == 'notfound') diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index ce2a2c9..e536012 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -204,7 +204,7 @@ class ImbangdugaServices } } - public function ViewImbangDugaAROS($kodcaw,$tarikh){ + public function ViewImbangDugaAROS($hostname,$kodcaw,$tarikh){ $current = Carbon::now(); $current = new Carbon(); @@ -222,9 +222,9 @@ class ImbangdugaServices foreach($imbangdugadata as $index => $imbangdugaiteration){ if($imbangdugaiteration->api_redirect != null){ if($imbangdugaiteration['variable'] == 'keun_sebenar' || $imbangdugaiteration['variable'] == 'pend_terakru'){ - ${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'],['tarikh' => $tarikh,'kodcaw' => $kodcaw])->json(); + ${$imbangdugaiteration['variable']} = Http::get($hostname . $imbangdugaiteration['api_redirect'],['tarikh' => $tarikh,'kodcaw' => $kodcaw])->json(); }else{ - ${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'] . $kodcaw,['tarikh' => $tarikh])->json(); + ${$imbangdugaiteration['variable']} = Http::get($hostname . $imbangdugaiteration['api_redirect'] . $kodcaw,['tarikh' => $tarikh])->json(); } if(is_object($imbangdugaiteration)) $data = ($imbangdugaiteration->is_array == 1) ? ${$imbangdugaiteration['variable']}[$imbangdugaiteration['single_var']] : ${$imbangdugaiteration['variable']}; @@ -260,12 +260,12 @@ class ImbangdugaServices return response($array_ig); } - public function GetImbangDugaBackup($kodcaw,$tarikh){ + public function GetImbangDugaBackup($hostname,$kodcaw,$tarikh){ // $date = date_create_from_format('j-m-Y', $tarikh); // $new_date = date_format($date, 'Y-m-d'); $new_date = $tarikh; - $response = Http::get(config('api.url'). '/api/Backup/ImbangDuga/' . $kodcaw,['tarikh' => $new_date])->json(); + $response = Http::get($hostname . '/api/Backup/ImbangDuga/' . $kodcaw,['tarikh' => $new_date])->json(); if($response == 'notfound' || $response == null) {