From 6db54b7c573b2303397bb3553ce222a8f59f0d38 Mon Sep 17 00:00:00 2001 From: afiq Date: Thu, 10 Jun 2021 13:33:37 +0800 Subject: [PATCH 1/3] update online --- app/Console/Commands/updateOnline.php | 48 +++++++++++++++++++++++++++ app/Console/Kernel.php | 2 ++ 2 files changed, 50 insertions(+) create mode 100644 app/Console/Commands/updateOnline.php diff --git a/app/Console/Commands/updateOnline.php b/app/Console/Commands/updateOnline.php new file mode 100644 index 0000000..98ec298 --- /dev/null +++ b/app/Console/Commands/updateOnline.php @@ -0,0 +1,48 @@ +json(); + if($updateOnline == 'successful'){ + return 0; + }else{ + return 'failed'; + } + } +} diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index 84d8703..878ce50 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -15,6 +15,7 @@ class Kernel extends ConsoleKernel protected $commands = [ Commands\resetRoleDaily::class, Commands\updateJbg::class, + Commands\updateOnline::class, ]; /** @@ -27,6 +28,7 @@ class Kernel extends ConsoleKernel { $schedule->command('reset:dailyrole')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:01'); $schedule->command('update:jbg')->daily()->timezone('Asia/Kuala_Lumpur')->at('00:01'); + $schedule->command('update:online')->daily()->timezone('Asia/Kuala_Lumpur')->everyFifteenMinutes(); } /** From 7f1597ebf4b736075fe7f934f124c2879c0dd265 Mon Sep 17 00:00:00 2001 From: Afiq Zakwan Hamdan Date: Mon, 14 Jun 2021 14:28:44 +0800 Subject: [PATCH 2/3] fix customer api --- app/Http/Controllers/CustomersController.php | 28 ++++++------- app/Http/Controllers/GadaianController.php | 42 +++++++++---------- app/Http/Controllers/KhazanahController.php | 24 +++++------ app/Http/Controllers/LelongController.php | 2 +- app/Http/Controllers/PenebusanController.php | 4 +- .../views/homepage/penilai/home.blade.php | 6 +-- resources/views/khazanah/kelulusan.blade.php | 2 +- .../views/khazanah/laporan/ansuran.blade.php | 2 +- .../views/khazanah/laporan/gadaian.blade.php | 2 +- .../views/khazanah/laporan/lelongan.blade.php | 2 +- .../khazanah/laporan/penebusan.blade.php | 2 +- .../views/onetimepassword/home.blade.php | 12 +++--- resources/views/operasi/kelulusan.blade.php | 2 +- .../views/print/laporan_ansuran.blade.php | 2 +- .../views/print/laporan_gadaian.blade.php | 4 +- .../views/print/laporan_lelongan.blade.php | 2 +- .../views/print/laporan_penebusan.blade.php | 2 +- 17 files changed, 70 insertions(+), 70 deletions(-) diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php index 4502b23..97abe7f 100644 --- a/app/Http/Controllers/CustomersController.php +++ b/app/Http/Controllers/CustomersController.php @@ -44,12 +44,12 @@ class CustomersController extends Controller $auth_user = Auth::user(); $api_url = config('api.url'); $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $customers_info = Http::get(config('api.url') . '/api/customers/'. Session::get('noic'))->json(); - if($customers_info){ - $customer_info = $customers_info[0]; - }else{ - $customer_info = $customers_info; - } + $customer_info = Http::get(config('api.url') . '/api/customers/'. Session::get('noic'))->json(); + // if($customers_info){ + // $customer_info = $customers_info[0]; + // }else{ + // $customer_info = $customers_info; + // } $bakilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/baki')->json(); $rugilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/rugi')->json(); @@ -68,13 +68,13 @@ class CustomersController extends Controller $auth_user = Auth::user(); $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $bank = Http::get(config('api.url') . '/api/bank')->json(); - $customers_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json(); + $customer_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json(); - if($customers_info){ - $customer_info = $customers_info[0]; - }else{ - $customer_info = $customers_info; - } + // if($customers_info){ + // $customer_info = $customers_info[0]; + // }else{ + // $customer_info = $customers_info; + // } $request->session()->forget('page_reload'); $request->session()->forget('norujukan'); @@ -94,7 +94,7 @@ class CustomersController extends Controller $customers_info = Http::get(config('api.url') . '/api/customers/'. $request->icno)->json(); if(sizeof($customers_info) > 0) - return $customers_info[0]; + return $customers_info; else return "no-data"; } @@ -242,7 +242,7 @@ class CustomersController extends Controller $nokp = $request->noic_otp; $customer = Http::get(config('api.url'). '/api/customers/'.$nokp)->json(); - $recipient = '+6'.$customer[0]['telefon']; + $recipient = '+6'.$customer['telefon']; //pembinaan token function token($length) { $characters = array( diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php index e8e4885..beb0518 100644 --- a/app/Http/Controllers/GadaianController.php +++ b/app/Http/Controllers/GadaianController.php @@ -33,7 +33,7 @@ class GadaianController extends Controller $current_day = sprintf("%02d", $current->day); $noic = $request->noic; $customers_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json(); - $customer_info = $customers_info[0]; + $customer_info = $customers_info; $limit_pinjaman_semasa = 0; $auth_user = Auth::user(); if($request->session()->get('page_reload') == null){ @@ -106,7 +106,7 @@ class GadaianController extends Controller $noic = $request->noic; $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadaiannorujukan['nokp'])->json(); - $customer_info = $customers_info[0]; + $customer_info = $customers_info; $limit_pinjaman_semasa = 0; $auth_user = Auth::user(); @@ -295,7 +295,7 @@ class GadaianController extends Controller } $customer = Http::get(config('api.url') . '/api/customers/'. $gadai_detail['nokp'])->json(); - $customer_detail = $customer[0]; + $customer_detail = $customer; $marhun = Http::get(config('api.url'). '/api/marhun/'. $norujukan)->json(); $marhun_detail = $marhun[0]; @@ -326,8 +326,8 @@ class GadaianController extends Controller $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); - if(sizeof($customers_info) != 0) - $customers_info = $customers_info[0]; + // if(sizeof($customers_info) != 0) + // $customers_info = $customers_info[0]; return view('print.resitansuran',compact('transaction','gadai','customers_info')); } @@ -346,8 +346,8 @@ class GadaianController extends Controller $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); - if(sizeof($customers_info) != 0) - $customers_info = $customers_info[0]; + // if(sizeof($customers_info) != 0) + // $customers_info = $customers_info[0]; return view('print.resitansuran',compact('transaction','gadai','customers_info')); @@ -369,8 +369,8 @@ class GadaianController extends Controller $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); - if(sizeof($customers_info) != 0) - $customers_info = $customers_info[0]; + // if(sizeof($customers_info) != 0) + // $customers_info = $customers_info[0]; $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json(); @@ -407,8 +407,8 @@ class GadaianController extends Controller $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); - if(sizeof($customers_info) != 0) - $customers_info = $customers_info[0]; + // if(sizeof($customers_info) != 0) + // $customers_info = $customers_info[0]; $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json(); @@ -447,8 +447,8 @@ class GadaianController extends Controller $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); $transaction_keuntungan = Http::get(config('api.url'). '/api/transaksi_keuntungan_latest/'. $id)->json(); - if(sizeof($customers_info) != 0) - $customers_info = $customers_info[0]; + // if(sizeof($customers_info) != 0) + // $customers_info = $customers_info[0]; $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json(); @@ -489,8 +489,8 @@ class GadaianController extends Controller $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); - if(sizeof($customers_info) != 0) - $customers_info = $customers_info[0]; + // if(sizeof($customers_info) != 0) + // $customers_info = $customers_info[0]; $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'],[ "norujukan" => $id])->json(); @@ -520,8 +520,8 @@ class GadaianController extends Controller $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); - if(sizeof($customers_info) != 0) - $customers_info = $customers_info[0]; + // if(sizeof($customers_info) != 0) + // $customers_info = $customers_info[0]; $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'] ,[ "norujukan" => $id])->json(); @@ -559,8 +559,8 @@ class GadaianController extends Controller $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); - if(sizeof($customers_info) != 0) - $customers_info = $customers_info[0]; + // if(sizeof($customers_info) != 0) + // $customers_info = $customers_info[0]; $advansur = Http::get(config('api.url') . '/api/advansur/'. $auth_user['cawangan'] . '/'. $id)->json(); @@ -592,8 +592,8 @@ class GadaianController extends Controller $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json(); - if(sizeof($customers_info) != 0) - $customers_info = $customers_info[0]; + // if(sizeof($customers_info) != 0) + // $customers_info = $customers_info[0]; $penebusan = Http::get(config('api.url') . '/api/listpenebusanhistory/' . $auth_user['cawangan'] ,[ "norujukan" => $id])->json(); diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index c606223..5bf00dd 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -52,13 +52,13 @@ class KhazanahController extends Controller $auth_user = Auth::user(); $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); $bank = Http::get(config('api.url') . '/api/bank')->json(); - $customers_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json(); + $customer_info = Http::get(config('api.url') . '/api/customers/'. $noic)->json(); - if($customers_info){ - $customer_info = $customers_info[0]; - }else{ - $customer_info = $customers_info; - } + // if($customers_info){ + // $customer_info = $customers_info[0]; + // }else{ + // $customer_info = $customers_info; + // } $request->session()->forget('page_reload'); $request->session()->forget('norujukan'); @@ -76,12 +76,12 @@ class KhazanahController extends Controller $auth_user = Auth::user(); $api_url = config('api.url'); $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - $customers_info = Http::get(config('api.url') . '/api/customers/'. Session::get('noic'))->json(); - if($customers_info){ - $customer_info = $customers_info[0]; - }else{ - $customer_info = $customers_info; - } + $customer_info = Http::get(config('api.url') . '/api/customers/'. Session::get('noic'))->json(); + // if($customers_info){ + // $customer_info = $customers_info[0]; + // }else{ + // $customer_info = $customers_info; + // } $bakilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/baki')->json(); $rugilelong = Http::get(config('api.url') . '/api/bakilelong/cawangan/' . $auth_user['cawangan'] . '/' . Session::get('noic') . '/rugi')->json(); diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 8ce3e9c..bcf260a 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -23,7 +23,7 @@ class LelongController extends Controller $gadaidetail = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json(); $noic = $gadaidetail[0][0]['nokp']; $customerdetail = Http::get(config('api.url') . '/api/customers/'. $noic)->json(); - $nama = $customerdetail[0]['nama']; + $nama = $customerdetail['nama']; $lelong = Http::get(config('api.url') . '/api/lelong/cawangan/'. $auth_user['cawangan'] . '/' . $norujukan)->json(); diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index ebd0b67..f8569e7 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -29,7 +29,7 @@ class PenebusanController extends Controller $marhundetail = Http::get(config('api.url') . '/api/marhun/'. $norujukan)->json(); $marhun = $marhundetail[0]; - $nama = $customerdetail[0]['nama']; + $nama = $customerdetail['nama']; $gadai = $gadaidetail[0][0]; @@ -945,7 +945,7 @@ class PenebusanController extends Controller $marhundetail = Http::get(config('api.url') . '/api/marhun/'. $norujukan)->json(); $marhun = $marhundetail[0]; - $nama = $customerdetail[0]['nama']; + $nama = $customerdetail['nama']; $gadai = $gadaidetail[0][0]; diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index f5fc33d..3591ecf 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -146,7 +146,7 @@ @php $customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json(); - echo ($customer_info[0]['nama']); + echo ($customer_info['nama']); @endphp {{ $gadaian['nokp'] }} @@ -192,7 +192,7 @@ $customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json(); @endphp - {{ $customer_info[0]['nama'] }} + {{ $customer_info['nama'] }} {{ $gadaian['nokp'] }} @php @@ -341,7 +341,7 @@ count++; table_rekod_gadaian.row.add([ count, - rekodcustomer[0]['nama'], + rekodcustomer['nama'], rekodgadaian['nokp'], rekodgadaian['norujukan'], rekodgadaian['pinjaman'], diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php index a04b7c5..0e2068e 100644 --- a/resources/views/khazanah/kelulusan.blade.php +++ b/resources/views/khazanah/kelulusan.blade.php @@ -194,7 +194,7 @@ dataType: 'json', success:function(datagadaiwithnokp){ - let nama = datagadaiwithnokp[0].nama; + let nama = datagadaiwithnokp.nama; $('#namalanjut').text(nama); $('#nokplanjut').text(nokp); diff --git a/resources/views/khazanah/laporan/ansuran.blade.php b/resources/views/khazanah/laporan/ansuran.blade.php index a2f478e..9724af1 100644 --- a/resources/views/khazanah/laporan/ansuran.blade.php +++ b/resources/views/khazanah/laporan/ansuran.blade.php @@ -129,7 +129,7 @@ tabletebus.row.add([ counter, tebus['norujukan'], - customer[0]['nama'], + customer['nama'], gadai[0][0]['nokp'], gadai[0][0]['tempoh'], gadai[0][0]['bakipjm'], diff --git a/resources/views/khazanah/laporan/gadaian.blade.php b/resources/views/khazanah/laporan/gadaian.blade.php index 8ec11b6..dd4b71e 100644 --- a/resources/views/khazanah/laporan/gadaian.blade.php +++ b/resources/views/khazanah/laporan/gadaian.blade.php @@ -131,7 +131,7 @@ total_berat += Number(gadai['berat']); tablegadai.row.add([ counter, - customer[0]['nama'], + customer['nama'], gadai['nokp'], gadai['norujukan'], formatter.format(gadai['pinjaman']), diff --git a/resources/views/khazanah/laporan/lelongan.blade.php b/resources/views/khazanah/laporan/lelongan.blade.php index 8274f1f..17043ab 100644 --- a/resources/views/khazanah/laporan/lelongan.blade.php +++ b/resources/views/khazanah/laporan/lelongan.blade.php @@ -120,7 +120,7 @@ tabletebus.row.add([ counter, tebus['norujukan'], - customer[0]['nama'] + "
" +gadai[0][0]['nokp'], + customer['nama'] + "
" +gadai[0][0]['nokp'], tebus['nilaimarhun'], tebus['pinjaman'], tebus['bakiupah'], diff --git a/resources/views/khazanah/laporan/penebusan.blade.php b/resources/views/khazanah/laporan/penebusan.blade.php index 5e3534a..b722677 100644 --- a/resources/views/khazanah/laporan/penebusan.blade.php +++ b/resources/views/khazanah/laporan/penebusan.blade.php @@ -136,7 +136,7 @@ total_bayaran += parseFloat(tebus['bakipjm']); tabletebus.row.add([ counter, - customer[0]['nama'], + customer['nama'], gadai[0][0]['nokp'], tebus['norujukan'], tebus['t_tebus'], diff --git a/resources/views/onetimepassword/home.blade.php b/resources/views/onetimepassword/home.blade.php index a6290f9..0c010b0 100644 --- a/resources/views/onetimepassword/home.blade.php +++ b/resources/views/onetimepassword/home.blade.php @@ -131,12 +131,12 @@ function carila() $( "#form-display" ).fadeIn( "slow", function() { $('#form-display').show(); - $('#nama').val(customerdata[0]['nama']); - $('#noic1').val(customerdata[0]['kpbaru']); - $('#alamat').val(customerdata[0]['alamat1']); - $('#notel').val(customerdata[0]['telefon']); - $('#notel2').val(customerdata[0]['telefon2']); - $('#poskod').val(customerdata[0]['poskod']); + $('#nama').val(customerdata['nama']); + $('#noic1').val(customerdata['kpbaru']); + $('#alamat').val(customerdata['alamat1']); + $('#notel').val(customerdata['telefon']); + $('#notel2').val(customerdata['telefon2']); + $('#poskod').val(customerdata['poskod']); var poskod = $('#poskod').val(); diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php index 99583da..3b3e707 100644 --- a/resources/views/operasi/kelulusan.blade.php +++ b/resources/views/operasi/kelulusan.blade.php @@ -192,7 +192,7 @@ dataType: 'json', success:function(datagadaiwithnokp){ - let nama = datagadaiwithnokp[0].nama; + let nama = datagadaiwithnokp.nama; $('#namalanjut').text(nama); $('#nokplanjut').text(nokp); diff --git a/resources/views/print/laporan_ansuran.blade.php b/resources/views/print/laporan_ansuran.blade.php index c72a728..223b3a6 100644 --- a/resources/views/print/laporan_ansuran.blade.php +++ b/resources/views/print/laporan_ansuran.blade.php @@ -219,7 +219,7 @@ $gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json(); $customer_detail = Http::get($api_url . '/api/customers/' . $gadai_detail[0][0]['nokp'])->json(); - echo $customer_detail[0]['nama']; + echo $customer_detail['nama']; @endphp {{ $gadai_detail[0][0]['nokp'] }} diff --git a/resources/views/print/laporan_gadaian.blade.php b/resources/views/print/laporan_gadaian.blade.php index c59f39d..f7b6e19 100644 --- a/resources/views/print/laporan_gadaian.blade.php +++ b/resources/views/print/laporan_gadaian.blade.php @@ -237,10 +237,10 @@ @php $customer_detail = Http::get($api_url . '/api/customers/' . $item['nokp'])->json(); - echo $customer_detail[0]['nama']; + echo $customer_detail['nama']; @endphp - {{$customer_detail[0]['alamat1']}} + {{$customer_detail['alamat1']}} {{ $item['nokp'] }} {{ $item['masa'] }} {{ number_format($item['berat'],2) }} diff --git a/resources/views/print/laporan_lelongan.blade.php b/resources/views/print/laporan_lelongan.blade.php index 7905ca0..9dbb0a6 100644 --- a/resources/views/print/laporan_lelongan.blade.php +++ b/resources/views/print/laporan_lelongan.blade.php @@ -220,7 +220,7 @@ $gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json(); $customer_detail = Http::get($api_url . '/api/customers/' . $gadai_detail[0][0]['nokp'])->json(); - echo $customer_detail[0]['nama'] . '
' . $gadai_detail[0][0]['nokp'] . '
' . $customer_detail[0]['alamat1'] . '
' . $customer_detail[0]['alamat2']; + echo $customer_detail['nama'] . '
' . $gadai_detail[0][0]['nokp'] . '
' . $customer_detail['alamat1'] . '
' . $customer_detail['alamat2']; @endphp {{$item['nilaimarhun']}} diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php index 442e8cb..49fbfca 100644 --- a/resources/views/print/laporan_penebusan.blade.php +++ b/resources/views/print/laporan_penebusan.blade.php @@ -243,7 +243,7 @@ $gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json(); $customer_detail = Http::get($api_url . '/api/customers/' . $gadai_detail[0][0]['nokp'])->json(); - echo $customer_detail[0]['nama']; + echo $customer_detail['nama']; @endphp {{$gadai_detail[0][0]['nokp']}} From 7ea49b4c75653f8baa5dc9a54bc4cf39cf96605f Mon Sep 17 00:00:00 2001 From: Afiq Zakwan Hamdan Date: Mon, 14 Jun 2021 15:11:03 +0800 Subject: [PATCH 3/3] fix penilai --- resources/views/homepage/penilai/home.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index 3591ecf..d3e45b3 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -191,7 +191,7 @@ @php $customer_info = Http::get($api_url . '/api/customers/'. $gadaian['nokp'])->json(); @endphp - + {{ $customer_info['nama'] }} {{ $gadaian['nokp'] }}