From 2929a6cb8dd8a5d9accf318f86e1604ff1bdba41 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Tue, 13 Dec 2022 11:09:01 +0800 Subject: [PATCH 01/12] remove tetapan teller --- resources/views/homepage/teller/home.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/homepage/teller/home.blade.php b/resources/views/homepage/teller/home.blade.php index b1ef37d..0531ceb 100644 --- a/resources/views/homepage/teller/home.blade.php +++ b/resources/views/homepage/teller/home.blade.php @@ -11,7 +11,7 @@ PELANGGAN HARGA EMAS ALIRAN TUNAI - TETAPAN + {{-- TETAPAN --}} From b285d04d2453adf6c3352528a46af3a7540d58e7 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 14 Dec 2022 00:51:08 +0800 Subject: [PATCH 02/12] 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 03/12] 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 04/12] 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 05/12] 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 06/12] 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()); }); From 94eeeacf287e6e32da3ea556faf1b02d473d5e63 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 20 Dec 2022 22:13:08 +0800 Subject: [PATCH 07/12] fix skit2 --- app/Http/Controllers/KhazanahController.php | 49 ++ app/Services/ImbangdugaServices.php | 59 ++- .../laporan/imbangduga_akru.blade.php | 74 +++ .../views/khazanah/laporan/index.blade.php | 3 + .../print/laporan_imbangduga-akru.blade.php | 486 ++++++++++++++++++ routes/web.php | 3 + 6 files changed, 673 insertions(+), 1 deletion(-) create mode 100644 resources/views/khazanah/laporan/imbangduga_akru.blade.php create mode 100644 resources/views/print/laporan_imbangduga-akru.blade.php diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 08c75e9..d36253e 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -2,6 +2,8 @@ namespace App\Http\Controllers; +use App\Services\ImbangdugaServices as ImbanganDuga; + //Events use App\Events\StatusLiked; use App\Events\NotifikasiPembayaran; @@ -4109,4 +4111,51 @@ class KhazanahController extends Controller return view('print.laporan_serahmarhun', compact('cawangan_detail','api_url','serahmarhun','cawangan_info','datemula','datehingga','tarikh_cetak')); } + public function ImbangDugaAkru(){ + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + + return view('khazanah.laporan.imbangduga_akru', compact('cawangan_info','api_url')); + } + + public function cetakimbangdugaAkru(Request $request){ + + $auth_user = Auth::user(); + $api_url = config('api.url'); + $current = Carbon::now(); + $current = new Carbon(); + + $tarikh_cetak = $current->toDateString(); + + $tarikh_imbangan= $current->toDateString(); + $tarikh_imbangan2= $current->toDateString(); + + + $tarikh_cetak = $current->toDateString(); + + + if($request->datetimepicker2 == null){ + $tarikh_cetak = $current->toDateString(); + }else{ + $split_date = explode('-',$request->datetimepicker2); + $tarikh_imbangan2 = $request->datetimepicker2; + } + + $response = (new ImbanganDuga())->ViewImbangDugaAROS($auth_user['cawangan'],$tarikh_imbangan2); + + $array_ig = json_decode($response->getContent()); + $hartasemasa = $array_ig->array_harta; + $tanggungansemasa = $array_ig->array_tanggungan; + $totalhartasemasa = $array_ig->sum_harta; + $totaltanggungansemasa = $array_ig->sum_tanggungan; + + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + return view('print.laporan_imbangduga-akru',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','tanggungansemasa','totalhartasemasa','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail')); + } + } diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index b3346e5..3d1e188 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -160,7 +160,7 @@ class ImbangdugaServices foreach($imbangdugadata as $index => $imbangdugaiteration){ if($imbangdugaiteration->api_redirect != null){ - if($imbangdugaiteration['variable'] == 'keun_sebenar'){ + if($imbangdugaiteration['variable'] == 'keun_sebenar' || $imbangdugaiteration['variable'] == 'pend_terakru'){ ${$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(); @@ -203,4 +203,61 @@ class ImbangdugaServices return response('error'); } } + + public function ViewImbangDugaAROS($kodcaw,$tarikh){ + $current = Carbon::now(); + $current = new Carbon(); + + $tarikh = $current->toDateString(); + + $imbangdugadata = ImbangDuga::orderBy('glcode')->get(); + $array_harta = []; + $array_tanggungan = []; + $summation_harta = 0; + $summation_tanggungan = 0; + + $penyelarasan = CawanganAR::select('penyelarasan')->where('kodcaw',$kodcaw)->get()->toArray(); + $penyelarasan = $penyelarasan[0]; + + 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(); + }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; + }else $data = 0; + if($imbangdugaiteration['variable'] == 'pend_terakru') + + $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]); + }else{ + $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]); + } + + } + + $array_ig = ['array_harta' => $array_harta,'array_tanggungan' => $array_tanggungan,'sum_harta' => $summation_harta,'sum_tanggungan' => $summation_tanggungan]; + return response($array_ig); + } } \ No newline at end of file diff --git a/resources/views/khazanah/laporan/imbangduga_akru.blade.php b/resources/views/khazanah/laporan/imbangduga_akru.blade.php new file mode 100644 index 0000000..2eded65 --- /dev/null +++ b/resources/views/khazanah/laporan/imbangduga_akru.blade.php @@ -0,0 +1,74 @@ +@extends('layouts.app') + +@section('content') + +
+
+
+ +
+ + +
+
+
+
+
+
+
+ @csrf +
+
Tarikh
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + +@endsection + + + diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php index 3ce4fd1..53d0ac2 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -111,6 +111,9 @@ {{--
Audit Customer
--}} +
+ Imbang Duga Akru +
diff --git a/resources/views/print/laporan_imbangduga-akru.blade.php b/resources/views/print/laporan_imbangduga-akru.blade.php new file mode 100644 index 0000000..a584c77 --- /dev/null +++ b/resources/views/print/laporan_imbangduga-akru.blade.php @@ -0,0 +1,486 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
LAPORAN IMBANGAN DUGA CAWANGAN
+ + + + + + + + +
Tarikh Laporan {{ ($tarikh_imbangan2) ? $tarikh_imbangan2 : ''}} Tarikh Cetak {{$tarikh_cetak}}
+
+ + + + + + + + + + + + + + @foreach($hartasemasa as $index => $assets) + @if($assets->amaun != 0) + + + + + + @endif + @endforeach + + + + + + + +
Kod GL Keterangan Amaun
HARTA SEMASA
{{ $assets->glcode }}{{ $assets->descpt }}{{ number_format($assets->amaun,2) }}
JUMLAH {{ number_format($totalhartasemasa,2) }}
+
+ + + + + + @foreach($tanggungansemasa as $index => $liabilities) + @if($liabilities->amaun != 0) + + + + + + @endif + @endforeach + + + + + + + +
TANGGUNGAN SEMASA
{{ $liabilities->glcode }}{{ $liabilities->descpt }}{{ number_format($liabilities->amaun,2) }}
JUMLAH {{ number_format($totaltanggungansemasa,2) }}
+
+ +
+
+ + + \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 3d5f47d..50ca013 100644 --- a/routes/web.php +++ b/routes/web.php @@ -337,6 +337,9 @@ route::post('/cetaklejer_am',['as'=>'cetak.lejer_am', 'uses'=>'KhazanahControlle Route::get('laporan/dataimbangduga',['as'=> 'laporan.imbangduga' , 'uses'=>'KhazanahController@laporanImbangduga' ])->middleware('auth','khazanah'); Route::post('/laporan/imbangduga',['as' =>'imbangduga.cetak', 'uses'=>'KhazanahController@cetakImbangDuga'])->middleware('auth', 'khazanah'); +Route::get('laporan/imbangduga-akru',['as'=> 'laporan.imbangdugaakru' , 'uses'=>'KhazanahController@ImbangDugaAkru' ])->middleware('auth','khazanah'); +Route::post('/laporan/cetak/imbangduga-akru',['as' =>'imbangdugaakru.cetak', 'uses'=>'KhazanahController@cetakimbangdugaAkru'])->middleware('auth', 'khazanah'); + Route::get('khazanah/jana_permohonan',['as'=> 'permohonan.jana' , 'uses'=>'KhazanahController@JanaPermohonan' ])->middleware('auth','khazanah'); Route::post('khazanah/jana_permohonan/proses_permohonan',['as'=> 'permohonan.proses' , 'uses'=>'KhazanahController@ProsesPermohonan'])->middleware('auth','khazanah'); From e53c516c16aad413556fee2a05a50fb43c2f165a Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 20 Dec 2022 22:52:09 +0800 Subject: [PATCH 08/12] fix negative value for rugi lelong xtra --- app/Services/ImbangdugaServices.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index 3d1e188..ed6c43f 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -75,7 +75,7 @@ class ImbangdugaServices $data = ($kodcaw === '1STOP') ? floatval(6727.10) : $value; break; case 'rugilelongxtra': - $data = ($kodcaw === '1STOP') ? floatval(10079.30) : -($value); + $data = ($kodcaw === '1STOP') ? floatval(-10079.30) : -($value); break; case 'bakilelongxtra': $data = ($kodcaw === '1STOP') ? floatval(123.20) : $value; @@ -231,8 +231,7 @@ class ImbangdugaServices $data = ($imbangdugaiteration->neg_values == 1) ? $data = -1 * abs($data) : $data; $data = ($imbangdugaiteration['variable'] == 'untungrugiterkumpul') ? $data + $penyelarasan['penyelarasan'] : $data; }else $data = 0; - if($imbangdugaiteration['variable'] == 'pend_terakru') - + $data = $this->SwitchFuncImbangDuga($data,$imbangdugaiteration['variable'],$tarikh,$kodcaw); /* declare for protected above */ From 8a088404cf1673deb1dd2564ab5c1fc7f7604f68 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 21 Dec 2022 01:50:08 +0800 Subject: [PATCH 09/12] adding backup imbang duga --- app/Http/Controllers/KhazanahController.php | 23 +++++++++---- app/Services/ImbangdugaServices.php | 32 +++++++++++++++++++ .../laporan/imbangduga_akru.blade.php | 11 +++++-- 3 files changed, 57 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index d36253e..88a121a 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -4127,15 +4127,17 @@ class KhazanahController extends Controller $current = Carbon::now(); $current = new Carbon(); + $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + $tarikh_cetak = $current->toDateString(); $tarikh_imbangan= $current->toDateString(); $tarikh_imbangan2= $current->toDateString(); - $tarikh_cetak = $current->toDateString(); - if($request->datetimepicker2 == null){ $tarikh_cetak = $current->toDateString(); }else{ @@ -4143,17 +4145,24 @@ class KhazanahController extends Controller $tarikh_imbangan2 = $request->datetimepicker2; } - $response = (new ImbanganDuga())->ViewImbangDugaAROS($auth_user['cawangan'],$tarikh_imbangan2); + + + if($tarikh_imbangan2 < $current->toDateString()){ + $response = (new ImbanganDuga())->GetImbangDugaBackup($auth_user['cawangan'],$request->datetimepicker2); + }else{ + $response = (new ImbanganDuga())->ViewImbangDugaAROS($auth_user['cawangan'],$tarikh_imbangan2); + } + + if($response->getContent() == 'notfound') + { + return redirect()->route('laporan.imbangdugaakru')->with('error','Tiada Rekod Dijumpai Dalam Imbang Duga Backup!'); + } $array_ig = json_decode($response->getContent()); $hartasemasa = $array_ig->array_harta; $tanggungansemasa = $array_ig->array_tanggungan; $totalhartasemasa = $array_ig->sum_harta; $totaltanggungansemasa = $array_ig->sum_tanggungan; - - $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $cawangan = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); - $cawangan_detail=$cawangan[0]; return view('print.laporan_imbangduga-akru',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','tanggungansemasa','totalhartasemasa','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail')); } diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index ed6c43f..92aebe7 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -259,4 +259,36 @@ class ImbangdugaServices $array_ig = ['array_harta' => $array_harta,'array_tanggungan' => $array_tanggungan,'sum_harta' => $summation_harta,'sum_tanggungan' => $summation_tanggungan]; return response($array_ig); } + + public function GetImbangDugaBackup($kodcaw,$tarikh){ + + $date = date_create_from_format('j-m-Y', $tarikh); + $new_date = date_format($date, 'Y-m-d'); + + $response = Http::get(config('api.url'). '/api/Backup/ImbangDuga/' . $kodcaw,['tarikh' => $new_date])->json(); + + if($response == 'notfound' || $response == null) + { + return response('notfound'); + }else{ + $array_harta = []; + $array_tanggungan = []; + foreach($response as $variable=>$res) + { + if($variable !== 'recno' && $variable !== 'kodcaw' && $variable !== 'tarikh' && $variable !== 'totalharta' && $variable !== 'totaltanggungan' && $variable !== 'tagtally' && $variable !== 'created_at' && $variable !== 'updated_at'){ + $imbangdugadata = ImbangDuga::orderBy('glcode')->where('variable',$variable)->orWhere('single_var',$variable)->first()->toArray(); + if($imbangdugadata['jenis'] == 'harta'){ + array_push($array_harta,['glcode' => $imbangdugadata['glcode'],'descpt' => $imbangdugadata['descpt'],'amaun' => $res]); + }else{ + array_push($array_tanggungan,['glcode' => $imbangdugadata['glcode'],'descpt' => $imbangdugadata['descpt'],'amaun' => $res]); + } + } + } + + $array_all = ['array_harta' => $array_harta,'array_tanggungan' => $array_tanggungan,'sum_harta' => $response['totalharta'],'sum_tanggungan' => $response['totaltanggungan']]; + return response($array_all); + } + + } + } \ No newline at end of file diff --git a/resources/views/khazanah/laporan/imbangduga_akru.blade.php b/resources/views/khazanah/laporan/imbangduga_akru.blade.php index 2eded65..1dc98dd 100644 --- a/resources/views/khazanah/laporan/imbangduga_akru.blade.php +++ b/resources/views/khazanah/laporan/imbangduga_akru.blade.php @@ -16,6 +16,11 @@
+ @if(session()->has('error')) +
+ {{ session()->get('error') }} +
+ @endif
@@ -30,7 +35,7 @@
-
+
@@ -51,7 +56,9 @@ $('#datetimepicker2').datepicker({ format: 'dd-mm-yyyy', }); - $('#datetimepicker2').datepicker('setStartDate', new Date(2022,11,18)); + $('#datetimepicker2').datepicker('setStartDate', new Date(2022,11,19)); + $('#datetimepicker2').datepicker('setEndDate', new Date()); + }); function loadingmodal() From c744e232884d9a3a8fe36798bc31576d9a991596 Mon Sep 17 00:00:00 2001 From: "e.arrahn" Date: Wed, 21 Dec 2022 16:27:06 +0800 Subject: [PATCH 10/12] updated server 21/12/2022 --- app/Services/ImbangdugaServices.php | 10 +++++++++- resources/views/khazanah/info.blade.php | 13 +++++++++++-- resources/views/lelongan/index.blade.php | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/Services/ImbangdugaServices.php b/app/Services/ImbangdugaServices.php index 92aebe7..e6f94d9 100644 --- a/app/Services/ImbangdugaServices.php +++ b/app/Services/ImbangdugaServices.php @@ -285,10 +285,18 @@ class ImbangdugaServices } } + + uasort($array_harta, array($this,'glcode_compare')); + uasort($array_tanggungan, array($this,'glcode_compare')); + $array_all = ['array_harta' => $array_harta,'array_tanggungan' => $array_tanggungan,'sum_harta' => $response['totalharta'],'sum_tanggungan' => $response['totaltanggungan']]; return response($array_all); } } -} \ No newline at end of file + private static function glcode_compare($a, $b) { + return strcmp($a['glcode'], $b['glcode']); + } + +} diff --git a/resources/views/khazanah/info.blade.php b/resources/views/khazanah/info.blade.php index ca05497..753a83f 100644 --- a/resources/views/khazanah/info.blade.php +++ b/resources/views/khazanah/info.blade.php @@ -155,6 +155,7 @@ Margin Tempoh Keuntungan + Lelong @@ -170,6 +171,7 @@ Pembiayaan Margin Tempoh + Lelong @@ -507,6 +509,11 @@ if(jenistebus == "belum_tebus"){ var urlroute = '{{ route("penebusan.khazanah", ":id") }}'; urlroute = urlroute.replace(':id', gadai_detail["norujukan"]); + if(gadai_detail['taglel'] == 1){ + var taglel = 'Akan Dilelong'; + }else{ + var taglel = ''; + } if(gadai_detail["bakihargajualan"] == null){ xtawarruq.row.add([ '', @@ -515,7 +522,8 @@ gadai_detail['t_matang'], 'RM '+formatter.format(gadai_detail['pinjaman']), (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', - gadai_detail['tempoh'] + gadai_detail['tempoh'], + taglel ]).draw(); }else{ if(gadai_detail['lelong_tawarruq'] == 0){ @@ -532,7 +540,8 @@ 'RM '+formatter.format(gadai_detail['bakipjm']), (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%', gadai_detail['tempoh'], - 'RM '+ upahsemasa + 'RM '+ upahsemasa, + taglel ]).draw(); } }else if(jenistebus == "sudah_tebus"){ diff --git a/resources/views/lelongan/index.blade.php b/resources/views/lelongan/index.blade.php index bd54bfe..d4c7ee7 100644 --- a/resources/views/lelongan/index.blade.php +++ b/resources/views/lelongan/index.blade.php @@ -550,7 +550,7 @@ function ubahwakil(e) } - let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val(); + let batchno = $('#batch').val();let teller = "{{ Auth::user()->name }}";let bakipjm = $('#pembiayaan').val().replace(/[^0-9.-]+/g,"");let bakiupah = $('#keuntungan').val().replace(/[^0-9.-]+/g,""); let cajlain = 0.00; let cajlelong = $('#cajlelong').val(); let jumlah = $('#jumlah').val().replace(/[^0-9.-]+/g,"");let hargajual = $('#hargajual').val().replace(/[^0-9.-]+/g,""); From f10abeb97a3de17220eecae390d08da988a03a9d Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 31 Jan 2023 11:03:52 +0800 Subject: [PATCH 11/12] fix edit kakitangan --- resources/views/operasi/edit_kakitangan.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/operasi/edit_kakitangan.blade.php b/resources/views/operasi/edit_kakitangan.blade.php index 5c7ee7d..b6acb4a 100644 --- a/resources/views/operasi/edit_kakitangan.blade.php +++ b/resources/views/operasi/edit_kakitangan.blade.php @@ -9,13 +9,13 @@
-
+ @csrf
From c32d5ff80030d2d5b366a3f3084cec72f2252d1b Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Thu, 26 Jan 2023 00:38:02 +0800 Subject: [PATCH 12/12] Buat Padam Kakitangan --- app/Http/Controllers/KakitanganController.php | 22 +++++-- .../views/operasi/daftar_kakitangan.blade.php | 65 +++++++++++++++---- routes/web.php | 4 ++ 3 files changed, 74 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/KakitanganController.php b/app/Http/Controllers/KakitanganController.php index 58a7582..e1c1f70 100644 --- a/app/Http/Controllers/KakitanganController.php +++ b/app/Http/Controllers/KakitanganController.php @@ -214,11 +214,19 @@ class KakitanganController extends Controller } public function deleteKakitangan(Request $request){ - // dd($request->all()); + + $auth_user = Auth::user(); $user = User::find($request->staff_id); $user->delete(); - // dd($user_delete); - return redirect()->route('admin.daftar.kakitangan'); + + // if($auth_user->roles == 'operasi'){ + // // return redirect()->route('daftar.kakitangan'); + // return "route('daftar.kakitangan')"; + // }else if($auth_user->roles == 'admin'){ + // // return redirect()->route('admin.daftar.kakitangan'); + // return "route('admin.daftar.kakitangan')"; + // } + return response()->json('success'); } public function editKakitangan(Request $request){ @@ -233,6 +241,7 @@ class KakitanganController extends Controller public function editStoreKakitangan(Request $request){ // dd($request->all()); + $auth_user = Auth::user(); $user = User::find($request->user_id); $user->name = strtoupper($request->nama); $user->email = $request->email; @@ -242,7 +251,12 @@ class KakitanganController extends Controller $user->password = Hash::make($request->nokp); $user->save(); - return redirect()->route('admin.daftar.kakitangan'); + + if($auth_user->roles == 'operasi'){ + return redirect()->route('daftar.kakitangan'); + }else if($auth_user->roles == 'admin'){ + return redirect()->route('admin.daftar.kakitangan'); + } } public function resetCredentials(Request $request){ diff --git a/resources/views/operasi/daftar_kakitangan.blade.php b/resources/views/operasi/daftar_kakitangan.blade.php index ca9fb38..15745a3 100644 --- a/resources/views/operasi/daftar_kakitangan.blade.php +++ b/resources/views/operasi/daftar_kakitangan.blade.php @@ -128,7 +128,7 @@ @else @php $cawangan_staff = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $staff->cawangan)->json(); - echo ucwords($cawangan_staff['details_caw']); + echo ($cawangan_staff) ? ucwords($cawangan_staff['details_caw']) : 'test'; @endphp @endif @@ -136,16 +136,18 @@ @if($auth_user->roles == 'operasi') edit work + settings + @elseif($auth_user->roles == 'admin') - - {{ @csrf_field() }} + {{-- + {{ @csrf_field() }} --}} edit work settings restore - + {{-- --}} @endif @@ -165,20 +167,57 @@ var tablerekod = $('#rekod_kakitangan').DataTable(); $('.btn-delete').on('click', function(){ - var form = $(this).closest('form'); - Swal.fire( - { - title: 'Are you sure?', - text: "You won't be able to revert this!", + // var form = $(this).closest('form'); + var roles = $(this).data('roles'); + var staff_id = $(this).data('staff-id'); + + var url_redirected = (roles == 'operasi') ? "{{ route('operasi.kakitangan.delete') }}" : "{{ route('admin.kakitangan.delete') }}"; + + Swal.fire({ + title: 'Padam Kakitangan Ini?', + text: "Anda tidak boleh mengembalikan data ini balik selepas dipadamkan!", type: 'warning', showCancelButton: true, confirmButtonClass: 'btn btn-danger', cancelButtonClass: 'btn btn-warning', - confirmButtonText: 'Yes, delete it!', + confirmButtonText: 'Padam!', + cancelButtonText: 'Batal!', buttonsStyling: false - } - ).then(function() { - form.submit(); + }).then(function(result) { + if (result.isConfirmed) { + + $.ajax({ + method:'post', + url: url_redirected, + data: { + "_token": "{{ csrf_token() }}", + "staff_id" : staff_id + }, + success:function(data){ + if(data == 'success') + { + if(roles == 'operasi') + window.location.href = "{{ route('daftar.kakitangan') }}"; + else + window.location.href = "{{ route('admin.daftar.kakitangan') }}"; + + Swal.fire({ + title: 'Memuatkan...', + allowEscapeKey : false, + allowOutsideClick: false, + didOpen: function () { + Swal.showLoading(); + } + }); + } + }, + error: function(xhr, status, error) { + var err = eval("(" + xhr.responseText + ")"); + alert(xhr.responseText); + } + }); + + } }).catch(swal.noop) }); diff --git a/routes/web.php b/routes/web.php index 50ca013..8e40ef2 100644 --- a/routes/web.php +++ b/routes/web.php @@ -314,6 +314,10 @@ Route::post('kakitangan/tukar_taraf/update',['as'=>'kakitangan.tukartaraf.update Route::get('kakitangan/tukar_cawangan',['as'=>'kakitangan.tukarcawangan','uses'=>'KakitanganController@tukarcawangan'])->middleware('auth','operasi'); Route::post('kakitangan/tukar_cawangan/update',['as'=>'kakitangan.tukarcawangan.update','uses'=>'KakitanganController@tukarcawanganUpdate'])->middleware('auth','operasi'); Route::post('operasi/komoditi/limit',['as'=>'komoditi.limit','uses'=>'KomuditiController@komoditiUpdate'])->middleware('auth','operasi'); +Route::post('operasi/kakitangan/delete',['as'=>'operasi.kakitangan.delete','uses'=>'KakitanganController@deleteKakitangan'])->middleware('auth','operasi'); +Route::get('operasi/kakitangan/edit',['as'=>'operasi.kakitangan.edit','uses'=>'KakitanganController@editKakitangan'])->middleware('auth','operasi'); +Route::post('operasi/kakitangan/edit/store',['as'=>'operasi.kakitangan.edit.store','uses'=>'KakitanganController@editStoreKakitangan'])->middleware('auth','operasi'); + Route::get('/operasi/margin',['as'=>'operasi.margin','uses'=>'OperasiController@margin'])->middleware('auth','operasi');