KoPKB/admin-erahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in hotfix/cawangan (pull request #48)

Browse Source 
fix hostname selection at imbangduga
This commit is contained in:
Muhd hafifie
2024-06-12 03:43:44 +00:00
parent 88a5a97205 d37fd88654
commit 5f428d14d8
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AkaunController.php
+2 -2
View File
@@ -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')
app/Services/ImbangdugaServices.php
+5 -5
View File
@@ -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)
{