From b285d04d2453adf6c3352528a46af3a7540d58e7 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 14 Dec 2022 00:51:08 +0800 Subject: [PATCH 1/5] fix skit2 --- app/Services/ImbangdugaServices.php | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 app/Services/ImbangdugaServices.php diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php new file mode 100644 index 0000000..7f5f327 --- /dev/null +++ b/app/Services/ImbangdugaServices.php @@ -0,0 +1,28 @@ +toDateString(); + $tarikh_imbangan2 = $current->toDateString(); + + + + } +} \ No newline at end of file From cb748b8f2d636c5a1e4ace4fdcb0da1515776cbf Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 14 Dec 2022 04:03:52 +0800 Subject: [PATCH 2/5] imbangduga add services --- app/Console/Commands/DailyAkru.php | 54 +++++++++++++++++ app/ImbangDuga.php | 21 +++++++ app/Services/ImbangdugaServices.php | 90 +++++++++++++++++++++++++++-- 3 files changed, 159 insertions(+), 6 deletions(-) create mode 100644 app/Console/Commands/DailyAkru.php create mode 100644 app/ImbangDuga.php diff --git a/app/Console/Commands/DailyAkru.php b/app/Console/Commands/DailyAkru.php new file mode 100644 index 0000000..9afbfce --- /dev/null +++ b/app/Console/Commands/DailyAkru.php @@ -0,0 +1,54 @@ +option('zone'); + + $updateAkruDaily = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/laporan/akrual/generateDaily',[ + 'zone' => $zone + ])->json(); + + if($updateAkruDaily == 'succesful') + { + return 0; + }else{ + return 'failed'; + } + } +} diff --git a/app/ImbangDuga.php b/app/ImbangDuga.php new file mode 100644 index 0000000..71b19e3 --- /dev/null +++ b/app/ImbangDuga.php @@ -0,0 +1,21 @@ += '2021-04-22' && $tarikh < '2021-05-05'){ + $advansurharini = Http::get(config('api.url').'/api/advansurharini/' . $kodcaw,['tarikh' => $tarikh])->json(); + $data = floatval($value) - floatval($advansurharini); + }else $data = $value; + + if($kodcaw == '010219') + if($tarikh >= '2022-11-24') + $data = $value - 78379.9; + else $data = $value; + else $data = $value; + break; + case 'penghutangkaki' : + if($kodcaw == '010219') + if($tarikh < '2022-11-24') + $data = $value - 78379.9; + else $data = $value; + else $data = $value; + break; + case 'jualan1stop': + $data = ($kodcaw === '1STOP') ? floatval(129857.00) : 0; + break; + case 'belian1stop': + $data = ($kodcaw === '1STOP') ? floatval(122446.50) : 0; + break; + case 'utgterkumpulxtra': + $data = ($kodcaw === '1STOP') ? floatval(6727.10) : $value; + break; + case 'rugilelongxtra': + $data = ($kodcaw === '1STOP') ? floatval(10079.30) : -($value); + break; + case 'bakilelongxtra': + $data = ($kodcaw === '1STOP') ? floatval(123.20) : $value; + break; + case 'cajlelongxtra': + $data = ($kodcaw === '1STOP') ? floatval(25.50) : 0; + break; + case 'upahsimpanxtra': + $data = ($kodcaw === '1STOP') ? floatval(4894.40) : $value; + break; + case null: + $data = 0; + break; + default: + $data = $value; + break; + } + + return floatval($data); + } + + public function SaveImbangDuga($kodcaw){ + $auth_user = Auth::user(); $api_url = config('api.url'); $current = Carbon::now(); $current = new Carbon(); - $tarikh_imbangan = $current->toDateString(); - $tarikh_imbangan2 = $current->toDateString(); + $tarikh = $current->toDateString(); + // dd($tarikh); + // $tarikh_imbangan2 = $current->toDateString(); + + $imbangdugadata = ImbangDuga::orderBy('glcode')->get(); + $array_harta = []; + $array_tanggungan = []; + + foreach($imbangdugadata as $index => $imbangdugaiteration) + { + if($imbangdugaiteration->api_redirect != null){ + ${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'] . $kodcaw,['tarikh' => $tarikh])->json(); + + if(is_object($imbangdugaiteration)) $data = ($imbangdugaiteration->is_array == 1) ? ${$imbangdugaiteration['variable']}[$imbangdugaiteration['single_var']] : ${$imbangdugaiteration['variable']}; + }else $data = 0; + + $data = $this->SwitchFuncImbangDuga($data,$imbangdugaiteration['variable'],$tarikh,$kodcaw); + + if($imbangdugaiteration->jenis == 'harta'){ + array_push($array_harta,['glcode' => $imbangdugaiteration->glcode, 'descpt' => $imbangdugaiteration->descpt,'amaun' => ($data) ? $data : 0]); + }else{ + array_push($array_tanggungan,['glcode' => $imbangdugaiteration->glcode, 'descpt' => $imbangdugaiteration->descpt,'amaun' => ($data) ? $data : 0]); + } + } + + dd($array_harta,$array_tanggungan); - - } } \ No newline at end of file From ae40d231cc4db51e453dfe190774a90ea740d7be Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 14 Dec 2022 21:12:20 +0800 Subject: [PATCH 3/5] fix skit2 --- app/CawanganAR.php | 3 +- app/ImbangDuga.php | 3 +- app/Services/ImbangdugaServices.php | 68 +++++++++++++++++++++++------ routes/web.php | 8 ++-- 4 files changed, 64 insertions(+), 18 deletions(-) diff --git a/app/CawanganAR.php b/app/CawanganAR.php index 7521d5e..2e767c2 100644 --- a/app/CawanganAR.php +++ b/app/CawanganAR.php @@ -13,6 +13,7 @@ class CawanganAR extends Model 'kodcaw', 'syarikat', 'min', - 'max' + 'max', + 'penyelarasan' ]; } diff --git a/app/ImbangDuga.php b/app/ImbangDuga.php index 71b19e3..b3d8e69 100644 --- a/app/ImbangDuga.php +++ b/app/ImbangDuga.php @@ -16,6 +16,7 @@ class ImbangDuga extends Model 'variable', 'single_var', 'is_array', - 'jenis' + 'jenis', + 'neg_values' ]; } diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index fa24cf7..3cf2494 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -2,10 +2,10 @@ namespace App\Services; +use App\CawanganAR; use App\ImbangDuga; use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; -use Illuminate\Support\Facades\Auth; use Carbon\Carbon; @@ -13,7 +13,7 @@ use Carbon\Carbon; class ImbangdugaServices { - private function SwitchFuncImbangDuga($value = 0.0,$name_variable = null,$tarikh,$kodcaw) : Float{ + private function SwitchFuncImbangDuga($value = 0.0,$name_variable = null,$tarikh,$kodcaw) : Float{ $value = floatval($value); switch ($name_variable) { case 'tunaiditangan' : @@ -69,38 +69,80 @@ class ImbangdugaServices public function SaveImbangDuga($kodcaw){ - $auth_user = Auth::user(); - $api_url = config('api.url'); - $current = Carbon::now(); $current = new Carbon(); $tarikh = $current->toDateString(); - // dd($tarikh); - // $tarikh_imbangan2 = $current->toDateString(); $imbangdugadata = ImbangDuga::orderBy('glcode')->get(); $array_harta = []; $array_tanggungan = []; + $summation_harta = 0; + $summation_tanggungan = 0; - foreach($imbangdugadata as $index => $imbangdugaiteration) - { + $penyelarasan = CawanganAR::select('penyelarasan')->where('kodcaw',$kodcaw)->get()->toArray(); + $penyelarasan = $penyelarasan[0]; + + foreach($imbangdugadata as $index => $imbangdugaiteration){ if($imbangdugaiteration->api_redirect != null){ ${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'] . $kodcaw,['tarikh' => $tarikh])->json(); - if(is_object($imbangdugaiteration)) $data = ($imbangdugaiteration->is_array == 1) ? ${$imbangdugaiteration['variable']}[$imbangdugaiteration['single_var']] : ${$imbangdugaiteration['variable']}; + $data = ($imbangdugaiteration->neg_values == 1) ? $data = -1 * abs($data) : $data; + $data = ($imbangdugaiteration['variable'] == 'untungrugiterkumpul') ? $data + $penyelarasan['penyelarasan'] : $data; }else $data = 0; $data = $this->SwitchFuncImbangDuga($data,$imbangdugaiteration['variable'],$tarikh,$kodcaw); if($imbangdugaiteration->jenis == 'harta'){ - array_push($array_harta,['glcode' => $imbangdugaiteration->glcode, 'descpt' => $imbangdugaiteration->descpt,'amaun' => ($data) ? $data : 0]); + $summation_harta += $data; + array_push($array_harta,['variable' => ($imbangdugaiteration->is_array == 1) ? $imbangdugaiteration->single_var : $imbangdugaiteration->variable,'glcode' => $imbangdugaiteration->glcode, 'descpt' => $imbangdugaiteration->descpt,'amaun' => ($data) ? $data : 0]); }else{ - array_push($array_tanggungan,['glcode' => $imbangdugaiteration->glcode, 'descpt' => $imbangdugaiteration->descpt,'amaun' => ($data) ? $data : 0]); + $summation_tanggungan += $data; + array_push($array_tanggungan,['variable' => ($imbangdugaiteration->is_array == 1) ? $imbangdugaiteration->single_var : $imbangdugaiteration->variable,'glcode' => $imbangdugaiteration->glcode, 'descpt' => $imbangdugaiteration->descpt,'amaun' => ($data) ? $data : 0]); } } - dd($array_harta,$array_tanggungan); + dd($array_harta,$array_tanggungan,$summation_harta,$summation_tanggungan); + Http::post(config('api.url'). 'admin/laporan/akrual/insertImbangDuga',[ + 'tarikh' => $tarikh, + 'kodcaw' => $kodcaw, + 'tunaiditangan' => ($array_harta['variable'] == 'tunaiditangan') ? $array_harta['amaun'] : 0, + 'pembiayaantawarruq' => ($array_harta['variable'] == 'pembiayaantawarruq') ? $array_harta['amaun'] : 0, + 'bayaranpendahuluan' => ($array_harta['variable'] == 'bayaranpendahuluan') ? $array_harta['amaun'] : 0, + 'pinjamankoop' => ($array_harta['variable'] == 'pinjamankoop') ? $array_harta['amaun'] : 0, + 'emaspalsu' => ($array_harta['variable'] == 'emaspalsu') ? $array_harta['amaun'] : 0, + 'serahan' => ($array_harta['variable'] == 'serahan') ? $array_harta['amaun'] : 0, + 'bds' => ($array_tanggungan['variable'] == 'bds') ? $array_tanggungan['amaun'] : 0, + 'perubatan' => ($array_tanggungan['variable'] == 'perubatan') ? $array_tanggungan['amaun'] : 0, + 'keraian' => ($array_tanggungan['variable'] == 'keraian') ? $array_tanggungan['amaun'] : 0, + 'rugilelong' => ($array_tanggungan['variable'] == 'rugilelong') ? $array_tanggungan['amaun'] : 0, + 'bakilelong' => ($array_tanggungan['variable'] == 'bakilelong') ? $array_tanggungan['amaun'] : 0, + 'wtd' => ($array_tanggungan['variable'] == 'wtd') ? $array_tanggungan['amaun'] : 0, + 'untungrugiterkumpul' => ($array_tanggungan['variable'] == 'untungrugiterkumpul') ? $array_tanggungan['amaun'] : 0, + 'keun_sebenar' => ($array_tanggungan['variable'] == 'keun_sebenar') ? $array_tanggungan['amaun'] : 0, + 'pendahuluan' => ($array_tanggungan['variable'] == 'pendahuluan') ? $array_tanggungan['amaun'] : 0, + 'cajlelong' => ($array_tanggungan['variable'] == 'cajlelong') ? $array_tanggungan['amaun'] : 0, + 'pindahkekpkb' => ($array_harta['variable'] == 'pindahkekpkb') ? $array_harta['amaun'] : 0, + 'penghutangkaki' => ($array_harta['variable'] == 'penghutangkaki') ? $array_harta['amaun'] : 0, + 'phapuskira' => ($array_harta['variable'] == 'phapuskira') ? $array_harta['amaun'] : 0, + 'belian1stop' => ($array_harta['variable'] == 'belian1stop') ? $array_harta['amaun'] : 0, + 'keun_penggadai' => ($array_harta['variable'] == 'keun_penggadai') ? $array_harta['amaun'] : 0, + 'pend_terakru' => ($array_tanggungan['variable'] == 'pend_terakru') ? $array_harta['amaun'] : 0, + 'cajperkhidmatan' => ($array_tanggungan['variable'] == 'cajperkhidmatan') ? $array_tanggungan['amaun'] : 0, + 'cajlelongxtra' => ($array_tanggungan['variable'] == 'cajlelongxtra') ? $array_tanggungan['amaun'] : 0, + 'upahsimpanxtra' => ($array_tanggungan['variable'] == 'upahsimpan') ? $array_tanggungan['amaun'] : 0, + 'bakilelongxtra' => ($array_tanggungan['variable'] == 'bakilelong') ? $array_tanggungan['amaun'] : 0, + 'rugilelongxtra' => ($array_tanggungan['variable'] == 'kerugianlelong') ? $array_tanggungan['amaun'] : 0, + 'utgterkumpulxtra' => ($array_tanggungan['variable'] == 'untungrugiterkumpul') ? $array_tanggungan['amaun'] : 0, + 'jualan1stop' => ($array_tanggungan['variable'] == 'jualan1stop') ? $array_tanggungan['amaun'] : 0, + 'hapuskira' => ($array_tanggungan['variable'] == 'hapuskira') ? $array_tanggungan['amaun'] : 0, + 'totalharta' => $request->totalharta, + 'totaltanggungan' => $request->totaltanggungan, + 'tagtally' => $request->tagtally, + 'created_at' => $request->tarikh, + 'updated_at' => $request->tarikh + ])->json(); + // dd($array_harta,$array_tanggungan); } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 834e02b..fd4d6f9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -1,7 +1,7 @@ 'login','uses'=>'HomeController@index']); -Route::get('/testtry',function(){ +Route::get('/testtry',function(ImbangdugaServices $imbangduga){ - return view('testing'); + // return view('testing'); + $test = $imbangduga->SaveImbangDuga('KB2'); + dd($test); }); From 85d964d9fd8bb5ab2e03d2a0ebd0d967ed34f257 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Thu, 15 Dec 2022 09:09:25 +0800 Subject: [PATCH 4/5] fix skit2 --- app/Services/ImbangdugaServices.php | 144 +++++++++++++++++++--------- routes/web.php | 2 +- 2 files changed, 102 insertions(+), 44 deletions(-) diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index 3cf2494..cff31a2 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -13,6 +13,37 @@ use Carbon\Carbon; class ImbangdugaServices { + protected float $tunaiditangan = 0; + protected float $pembiayaantawarruq = 0; + protected float $bayaranpendahuluan = 0; + protected float $pinjamankoop = 0; + protected float $emaspalsu = 0; + protected float $serahan = 0; + protected float $pindahkekpkb = 0; + protected float $penghutangkaki = 0; + protected float $phapuskira = 0; + protected float $belian1stop = 0; + protected float $keun_penggadai = 0; + protected float $bds = 0; + protected float $perubatan = 0; + protected float $keraian = 0; + protected float $rugilelong = 0; + protected float $bakilelong = 0; + protected float $wtd = 0; + protected float $untungrugiterkumpul = 0; + protected float $keun_sebenar = 0; + protected float $pendahuluan = 0; + protected float $cajlelong = 0; + protected float $pend_terakru = 0; + protected float $cajperkhidmatan = 0; + protected float $cajlelongxtra = 0; + protected float $upahsimpan = 0; + protected float $bakilelongxtra = 0; + protected float $kerugianlelong = 0; + protected float $utgterkumpulxtra = 0; + protected float $jualan1stop = 0; + protected float $hapuskira = 0; + private function SwitchFuncImbangDuga($value = 0.0,$name_variable = null,$tarikh,$kodcaw) : Float{ $value = floatval($value); switch ($name_variable) { @@ -67,8 +98,54 @@ class ImbangdugaServices return floatval($data); } - public function SaveImbangDuga($kodcaw){ + private function InsertImbangDugaBackup($tarikh,$kodcaw,$sum_harta = 0.0,$sum_tanggungan = 0.0,$tagtally = 0) : String{ + $insert_imbangduga_backup = Http::get(config('api.url'). '/admin/laporan/akrual/insertImbangDuga',[ + 'tarikh' => $tarikh, + 'kodcaw' => $kodcaw, + 'tunaiditangan' => ($this->tunaiditangan) ? $this->tunaiditangan : 0, + 'pembiayaantawarruq' => ($this->pembiayaantawarruq) ? $this->pembiayaantawarruq : 0, + 'bayaranpendahuluan' => ($this->bayaranpendahuluan) ? $this->bayaranpendahuluan : 0, + 'pinjamankoop' => ($this->pinjamankoop) ? $this->pinjamankoop : 0, + 'emaspalsu' => ($this->emaspalsu) ? $this->emaspalsu : 0, + 'serahan' => ($this->serahan) ? $this->serahan : 0, + 'bds' => ($this->bds) ? $this->bds : 0, + 'perubatan' => ($this->perubatan) ? $this->perubatan : 0, + 'keraian' => ($this->keraian) ? $this->keraian : 0, + 'rugilelong' => ($this->rugilelong) ? $this->rugilelong : 0, + 'bakilelong' => ($this->bakilelong) ? $this->bakilelong: 0, + 'wtd' => ($this->wtd) ? $this->wtd : 0, + 'untungrugiterkumpul' => ($this->untungrugiterkumpul) ? $this->untungrugiterkumpul : 0, + 'keun_sebenar' => ($this->keun_sebenar) ? $this->keun_sebenar : 0, + 'pendahuluan' => ($this->pendahuluan) ? $this->pendahuluan : 0, + 'cajlelong' => ($this->cajlelong) ? $this->cajlelong : 0, + 'pindahkekpkb' => ($this->pindahkekpkb) ? $this->pindahkekpkb : 0, + 'penghutangkaki' => ($this->penghutangkaki) ? $this->penghutangkaki : 0, + 'phapuskira' => ($this->phapuskira) ? $this->phapuskira : 0, + 'belian1stop' => ($this->belian1stop) ? $this->belian1stop : 0, + 'keun_penggadai' => ($this->keun_penggadai) ? $this->keun_penggadai : 0, + 'pend_terakru' => ($this->pend_terakru) ? $this->pend_terakru : 0, + 'cajperkhidmatan' => ($this->cajperkhidmatan) ? $this->cajperkhidmatan : 0, + 'cajlelongxtra' => ($this->cajlelongxtra) ? $this->cajlelongxtra : 0, + 'upahsimpanxtra' => ($this->upahsimpan) ? $this->upahsimpan : 0, + 'bakilelongxtra' => ($this->bakilelongxtra) ? $this->bakilelongxtra : 0, + 'rugilelongxtra' => ($this->kerugianlelong) ? $this->kerugianlelong : 0, + 'utgterkumpulxtra' => ($this->utgterkumpulxtra) ? $this->utgterkumpulxtra : 0, + 'jualan1stop' => ($this->jualan1stop) ? $this->jualan1stop : 0, + 'hapuskira' => ($this->hapuskira) ? $this->hapuskira : 0, + 'totalharta' => $sum_harta, + 'totaltanggungan' => $sum_tanggungan, + 'tagtally' => $tagtally, + ])->json(); + + dd($insert_imbangduga_backup); + if($insert_imbangduga_backup == 'success') + return 'successful'; + else + return 'error'; + } + + public function OperationImbangDuga($kodcaw){ $current = Carbon::now(); $current = new Carbon(); @@ -85,7 +162,12 @@ class ImbangdugaServices foreach($imbangdugadata as $index => $imbangdugaiteration){ if($imbangdugaiteration->api_redirect != null){ - ${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'] . $kodcaw,['tarikh' => $tarikh])->json(); + if($imbangdugaiteration['variable'] == 'keun_sebenar'){ + ${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'],['tarikh' => $tarikh,'kodcaw' => $kodcaw])->json(); + }else{ + ${$imbangdugaiteration['variable']} = Http::get(config('api.url'). $imbangdugaiteration['api_redirect'] . $kodcaw,['tarikh' => $tarikh])->json(); + } + if(is_object($imbangdugaiteration)) $data = ($imbangdugaiteration->is_array == 1) ? ${$imbangdugaiteration['variable']}[$imbangdugaiteration['single_var']] : ${$imbangdugaiteration['variable']}; $data = ($imbangdugaiteration->neg_values == 1) ? $data = -1 * abs($data) : $data; $data = ($imbangdugaiteration['variable'] == 'untungrugiterkumpul') ? $data + $penyelarasan['penyelarasan'] : $data; @@ -93,6 +175,18 @@ class ImbangdugaServices $data = $this->SwitchFuncImbangDuga($data,$imbangdugaiteration['variable'],$tarikh,$kodcaw); + /* declare for protected above */ + if($imbangdugaiteration->is_array == 1){ + $nama = $imbangdugaiteration['single_var']; + if($imbangdugaiteration['variable'] == 'bakilelongxtra'){ + $nama = $imbangdugaiteration['variable']; + }else if($imbangdugaiteration['variable'] == 'utgterkumpulxtra'){ + $nama = $imbangdugaiteration['variable']; + } + $this->$nama = $data; + }else $this->{$imbangdugaiteration['variable']} = $data; + + if($imbangdugaiteration->jenis == 'harta'){ $summation_harta += $data; array_push($array_harta,['variable' => ($imbangdugaiteration->is_array == 1) ? $imbangdugaiteration->single_var : $imbangdugaiteration->variable,'glcode' => $imbangdugaiteration->glcode, 'descpt' => $imbangdugaiteration->descpt,'amaun' => ($data) ? $data : 0]); @@ -102,47 +196,11 @@ 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); - dd($array_harta,$array_tanggungan,$summation_harta,$summation_tanggungan); - Http::post(config('api.url'). 'admin/laporan/akrual/insertImbangDuga',[ - 'tarikh' => $tarikh, - 'kodcaw' => $kodcaw, - 'tunaiditangan' => ($array_harta['variable'] == 'tunaiditangan') ? $array_harta['amaun'] : 0, - 'pembiayaantawarruq' => ($array_harta['variable'] == 'pembiayaantawarruq') ? $array_harta['amaun'] : 0, - 'bayaranpendahuluan' => ($array_harta['variable'] == 'bayaranpendahuluan') ? $array_harta['amaun'] : 0, - 'pinjamankoop' => ($array_harta['variable'] == 'pinjamankoop') ? $array_harta['amaun'] : 0, - 'emaspalsu' => ($array_harta['variable'] == 'emaspalsu') ? $array_harta['amaun'] : 0, - 'serahan' => ($array_harta['variable'] == 'serahan') ? $array_harta['amaun'] : 0, - 'bds' => ($array_tanggungan['variable'] == 'bds') ? $array_tanggungan['amaun'] : 0, - 'perubatan' => ($array_tanggungan['variable'] == 'perubatan') ? $array_tanggungan['amaun'] : 0, - 'keraian' => ($array_tanggungan['variable'] == 'keraian') ? $array_tanggungan['amaun'] : 0, - 'rugilelong' => ($array_tanggungan['variable'] == 'rugilelong') ? $array_tanggungan['amaun'] : 0, - 'bakilelong' => ($array_tanggungan['variable'] == 'bakilelong') ? $array_tanggungan['amaun'] : 0, - 'wtd' => ($array_tanggungan['variable'] == 'wtd') ? $array_tanggungan['amaun'] : 0, - 'untungrugiterkumpul' => ($array_tanggungan['variable'] == 'untungrugiterkumpul') ? $array_tanggungan['amaun'] : 0, - 'keun_sebenar' => ($array_tanggungan['variable'] == 'keun_sebenar') ? $array_tanggungan['amaun'] : 0, - 'pendahuluan' => ($array_tanggungan['variable'] == 'pendahuluan') ? $array_tanggungan['amaun'] : 0, - 'cajlelong' => ($array_tanggungan['variable'] == 'cajlelong') ? $array_tanggungan['amaun'] : 0, - 'pindahkekpkb' => ($array_harta['variable'] == 'pindahkekpkb') ? $array_harta['amaun'] : 0, - 'penghutangkaki' => ($array_harta['variable'] == 'penghutangkaki') ? $array_harta['amaun'] : 0, - 'phapuskira' => ($array_harta['variable'] == 'phapuskira') ? $array_harta['amaun'] : 0, - 'belian1stop' => ($array_harta['variable'] == 'belian1stop') ? $array_harta['amaun'] : 0, - 'keun_penggadai' => ($array_harta['variable'] == 'keun_penggadai') ? $array_harta['amaun'] : 0, - 'pend_terakru' => ($array_tanggungan['variable'] == 'pend_terakru') ? $array_harta['amaun'] : 0, - 'cajperkhidmatan' => ($array_tanggungan['variable'] == 'cajperkhidmatan') ? $array_tanggungan['amaun'] : 0, - 'cajlelongxtra' => ($array_tanggungan['variable'] == 'cajlelongxtra') ? $array_tanggungan['amaun'] : 0, - 'upahsimpanxtra' => ($array_tanggungan['variable'] == 'upahsimpan') ? $array_tanggungan['amaun'] : 0, - 'bakilelongxtra' => ($array_tanggungan['variable'] == 'bakilelong') ? $array_tanggungan['amaun'] : 0, - 'rugilelongxtra' => ($array_tanggungan['variable'] == 'kerugianlelong') ? $array_tanggungan['amaun'] : 0, - 'utgterkumpulxtra' => ($array_tanggungan['variable'] == 'untungrugiterkumpul') ? $array_tanggungan['amaun'] : 0, - 'jualan1stop' => ($array_tanggungan['variable'] == 'jualan1stop') ? $array_tanggungan['amaun'] : 0, - 'hapuskira' => ($array_tanggungan['variable'] == 'hapuskira') ? $array_tanggungan['amaun'] : 0, - 'totalharta' => $request->totalharta, - 'totaltanggungan' => $request->totaltanggungan, - 'tagtally' => $request->tagtally, - 'created_at' => $request->tarikh, - 'updated_at' => $request->tarikh - ])->json(); - // dd($array_harta,$array_tanggungan); + if($response == 'successful'){ + return response('succesful'); + } } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index fd4d6f9..c13cbc3 100644 --- a/routes/web.php +++ b/routes/web.php @@ -18,7 +18,7 @@ Route::get('/',['as'=>'login','uses'=>'HomeController@index']); Route::get('/testtry',function(ImbangdugaServices $imbangduga){ // return view('testing'); - $test = $imbangduga->SaveImbangDuga('KB2'); + $test = $imbangduga->OperationImbangDuga('KB2'); dd($test); }); From 81e7c47229043b15dd56c4393c10a6cb870bbe5d Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 18 Dec 2022 10:56:26 +0800 Subject: [PATCH 5/5] add commands --- app/Console/Commands/DailyAkru.php | 9 +++- app/Console/Commands/DailyImbangDuga.php | 65 ++++++++++++++++++++++++ app/Services/ImbangdugaServices.php | 4 +- routes/web.php | 2 +- 4 files changed, 76 insertions(+), 4 deletions(-) create mode 100644 app/Console/Commands/DailyImbangDuga.php diff --git a/app/Console/Commands/DailyAkru.php b/app/Console/Commands/DailyAkru.php index 9afbfce..83efce4 100644 --- a/app/Console/Commands/DailyAkru.php +++ b/app/Console/Commands/DailyAkru.php @@ -2,6 +2,7 @@ namespace App\Console\Commands; +use Exception; use Illuminate\Console\Command; use Illuminate\Support\Facades\Http; @@ -12,7 +13,7 @@ class DailyAkru extends Command * * @var string */ - protected $signature = 'akru:daily {--zone=1 : Choose which zone to update}'; + protected $signature = 'akru:daily {--zone=1 : Choose which zone to update zone [1,2,3]}'; /** * The console command description. @@ -40,6 +41,12 @@ class DailyAkru extends Command { $zone = $this->option('zone'); + + if($zone < 1 || $zone > 3) + { + throw new Exception('The zone is not in the range!'); + } + $updateAkruDaily = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/admin/laporan/akrual/generateDaily',[ 'zone' => $zone ])->json(); diff --git a/app/Console/Commands/DailyImbangDuga.php b/app/Console/Commands/DailyImbangDuga.php new file mode 100644 index 0000000..a3637fe --- /dev/null +++ b/app/Console/Commands/DailyImbangDuga.php @@ -0,0 +1,65 @@ +imbangduga = $imbangduga; + parent::__construct(); + } + + /** + * Execute the console command. + * + * @return int + */ + public function handle() + { + $array_cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan')->json(); + $zone = $this->option('zone'); + + if($zone < 1 || $zone > 3) + { + throw new Exception('The zone is not in the range!'); + } + + foreach($array_cawangan as $caw) + { + if($caw['zone'] == $zone) + { + $response = $this->imbangduga->OperationImbangDuga($caw['kodcaw']); + } + } + + return 0; + } +} diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index cff31a2..b3346e5 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -4,7 +4,6 @@ namespace App\Services; use App\CawanganAR; use App\ImbangDuga; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; use Carbon\Carbon; @@ -138,7 +137,6 @@ class ImbangdugaServices 'tagtally' => $tagtally, ])->json(); - dd($insert_imbangduga_backup); if($insert_imbangduga_backup == 'success') return 'successful'; else @@ -201,6 +199,8 @@ class ImbangdugaServices if($response == 'successful'){ return response('succesful'); + }else{ + return response('error'); } } } \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index c13cbc3..3d5f47d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -19,7 +19,7 @@ Route::get('/testtry',function(ImbangdugaServices $imbangduga){ // return view('testing'); $test = $imbangduga->OperationImbangDuga('KB2'); - dd($test); + dd($test->getContent()); });