diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index e6f94d9..9aadc48 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -42,6 +42,8 @@ class ImbangdugaServices protected float $utgterkumpulxtra = 0; protected float $jualan1stop = 0; protected float $hapuskira = 0; + protected float $ujrah = 0; + protected float $onepercent = 0; private function SwitchFuncImbangDuga($value = 0.0,$name_variable = null,$tarikh,$kodcaw) : Float{ $value = floatval($value); @@ -132,6 +134,8 @@ class ImbangdugaServices 'utgterkumpulxtra' => ($this->utgterkumpulxtra) ? $this->utgterkumpulxtra : 0, 'jualan1stop' => ($this->jualan1stop) ? $this->jualan1stop : 0, 'hapuskira' => ($this->hapuskira) ? $this->hapuskira : 0, + 'ujrah' => ($this->ujrah) ? $this->ujrah : 0, + 'onepercent' => ($this->onepercent) ? $this->onepercent : 0, 'totalharta' => $sum_harta, 'totaltanggungan' => $sum_tanggungan, 'tagtally' => $tagtally, @@ -148,7 +152,8 @@ class ImbangdugaServices $current = new Carbon(); $tarikh = $current->toDateString(); - + $yesterday = Carbon::now()->subDays(1)->toDateString(); + $imbangdugadata = ImbangDuga::orderBy('glcode')->get(); $array_harta = []; $array_tanggungan = []; @@ -161,9 +166,11 @@ 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(config('api.url'). $imbangdugaiteration['api_redirect'],['tarikh' => $tarikh,'kodcaw' => $kodcaw])->json(); + ${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'],['tarikh' => ($imbangdugaiteration['variable'] == 'pend_terakru') ? $tarikh : $yesterday,'kodcaw' => $kodcaw])->json(); }else{ - ${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'] . $kodcaw,['tarikh' => $tarikh])->json(); + // ${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'] . $kodcaw,['tarikh' => $tarikh])->json(); + ${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'] . $kodcaw,['tarikh' => ($imbangdugaiteration['variable'] == 'keun_penggadai') ? $tarikh : $yesterday])->json(); } if(is_object($imbangdugaiteration)) $data = ($imbangdugaiteration->is_array == 1) ? ${$imbangdugaiteration['variable']}[$imbangdugaiteration['single_var']] : ${$imbangdugaiteration['variable']}; @@ -195,7 +202,7 @@ class ImbangdugaServices } $tagtally = (number_format($summation_harta,2) == number_format($summation_tanggungan,2)) ? 1 : 0; - $response = $this->InsertImbangDugaBackup($tarikh,$kodcaw,$summation_harta,$summation_tanggungan,$tagtally); + $response = $this->InsertImbangDugaBackup($yesterday,$kodcaw,$summation_harta,$summation_tanggungan,$tagtally); if($response == 'successful'){ return response('succesful');