From d757bcec1a816d860715009f7a9f5deba7c88379 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Tue, 26 Apr 2022 13:21:07 +0800 Subject: [PATCH] try test speed --- app/Http/Controllers/HomeController.php | 50 ++++++++--------- resources/views/includes/home.blade.php | 55 +++++++++++++++---- resources/views/includes/main/head.blade.php | 14 ++--- .../views/modal/historybayaran.blade.php | 10 +++- resources/views/modal/marhun.blade.php | 14 +++-- 5 files changed, 91 insertions(+), 52 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index b42635e..b1665ae 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -24,19 +24,19 @@ class HomeController extends Controller public function index() { $auth_user = Auth::user(); - $harga_emas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/')->json(); + // $harga_emas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/')->json(); - $hargaemasterdahulu = array(); + // $hargaemasterdahulu = array(); - foreach($harga_emas as $index=>$harga) - { - $hargaemassandaran = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/rekod/sandaran',['karat' => $harga['karat']])->json(); + // foreach($harga_emas as $index=>$harga) + // { + // $hargaemassandaran = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/rekod/sandaran',['karat' => $harga['karat']])->json(); - $percentnaik = (floatval($harga['harga']) - floatval($hargaemassandaran[1]['harga'])) / ($hargaemassandaran[1]['harga']) * 100; + // $percentnaik = (floatval($harga['harga']) - floatval($hargaemassandaran[1]['harga'])) / ($hargaemassandaran[1]['harga']) * 100; - array_push($hargaemasterdahulu,['karat' => $harga['karat'],'hargasemasa' => $harga['harga'], 'hargadahulu' => $hargaemassandaran[1]['harga'],'percent' => $percentnaik]); + // array_push($hargaemasterdahulu,['karat' => $harga['karat'],'hargasemasa' => $harga['harga'], 'hargadahulu' => $hargaemassandaran[1]['harga'],'percent' => $percentnaik]); - } + // } $CustomerInfo = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/portal/customer/info',['ic' => $auth_user['icno']])->json(); @@ -61,26 +61,26 @@ class HomeController extends Controller $bilanganlelong += 1; } - $arraysag = []; - $belum_tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. $auth_user['icno'] . '/gadai/' . 'belum_tebus')->json(); + // $arraysag = []; + // $belum_tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/customers/'. $auth_user['icno'] . '/gadai/' . 'belum_tebus')->json(); - if(is_array($belum_tebus)) - { - if(sizeof($belum_tebus) > 0) - { - foreach($belum_tebus as $index=>$bt) - { - foreach($bt as $index1=>$bet) - { - array_push($arraysag,$bet); - } - } - } - } + // if(is_array($belum_tebus)) + // { + // if(sizeof($belum_tebus) > 0) + // { + // foreach($belum_tebus as $index=>$bt) + // { + // foreach($bt as $index1=>$bet) + // { + // array_push($arraysag,$bet); + // } + // } + // } + // } - $belum_tebus = $arraysag; + // $belum_tebus = $arraysag; $api_url = config('api.url'); - return view('includes.home',compact('api_url','belum_tebus','hargaemasterdahulu','bilangan','sixmonths','total','bilanganlelong')); + return view('includes.home',compact('api_url','bilangan','sixmonths','total','bilanganlelong')); } } diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php index 488fd34..00c2e60 100644 --- a/resources/views/includes/home.blade.php +++ b/resources/views/includes/home.blade.php @@ -78,7 +78,7 @@
- + @@ -98,7 +98,7 @@
- + @@ -117,7 +117,7 @@
- + @@ -136,7 +136,7 @@
- + @@ -166,8 +166,8 @@ No Rujukan JBG Keuntungan - T Lanjut - Akan Dilelong + T Matang + Status @@ -289,14 +289,25 @@ var hargaemastable = $('#harga_emas').DataTable({ let marh = JSON.stringify(marhun[0]); + + var t_matang = new Date(ps.t_matang); + + var statementlelong = ''; + if(ps.taglel == 0) + { + statementlelong = '-'; + }else{ + statementlelong = 'Akan Dilelong'; + } + selepastawarruqtable.row.add([ ``, namacawangan, `${ps.norujukan}`, ps.tempoh, ps.bakiupah, - ps.t_matang, - ps.taglel + t_matang.toLocaleDateString("en-GB"), + statementlelong ]).draw(); counter = counter + 1; @@ -427,14 +438,24 @@ var hargaemastable = $('#harga_emas').DataTable({ let marh = JSON.stringify(marhun[0]); + var t_matang = new Date(ps.t_matang); + + var statementlelong = ''; + if(ps.taglel == 0) + { + statementlelong = '-'; + }else{ + statementlelong = 'Akan Dilelong'; + } + selepastawarruqtable.row.add([ ``, namacawangan, `${ps.norujukan}`, ps.tempoh, ps.bakiupah, - ps.t_matang, - ps.taglel + t_matang.toLocaleDateString("en-GB"), + statementlelong ]).draw(); counter = counter + 1; @@ -500,14 +521,24 @@ var hargaemastable = $('#harga_emas').DataTable({ let marh = JSON.stringify(marhun[0]); + var t_matang = new Date(ps.t_matang); + + var statementlelong = ''; + if(ps.taglel == 0) + { + statementlelong = '-'; + }else{ + statementlelong = 'Akan Dilelong'; + } + selepastawarruqtable.row.add([ ``, namacawangan, `${ps.norujukan}`, ps.tempoh, ps.bakiupah, - ps.t_matang, - ps.taglel + t_matang.toLocaleDateString("en-GB"), + statementlelong ]).draw(); counter = counter + 1; diff --git a/resources/views/includes/main/head.blade.php b/resources/views/includes/main/head.blade.php index 537ca60..161c7c5 100644 --- a/resources/views/includes/main/head.blade.php +++ b/resources/views/includes/main/head.blade.php @@ -112,14 +112,14 @@ @endif -
+{{--
loader_photo -
+
--}} \ No newline at end of file diff --git a/resources/views/modal/historybayaran.blade.php b/resources/views/modal/historybayaran.blade.php index 466ca46..9859142 100644 --- a/resources/views/modal/historybayaran.blade.php +++ b/resources/views/modal/historybayaran.blade.php @@ -58,11 +58,15 @@
-
Berat:
+
T.Matang:
-
-
Kos Keuntungan (12 Bulan):
+
+
Keuntungan:
+
+ +
+
T.Matang:
diff --git a/resources/views/modal/marhun.blade.php b/resources/views/modal/marhun.blade.php index c4a0811..5e1a80f 100644 --- a/resources/views/modal/marhun.blade.php +++ b/resources/views/modal/marhun.blade.php @@ -21,7 +21,7 @@
-
+ {{--
Pembiayaan:
@@ -33,7 +33,7 @@
Status:
-
+
--}}
@@ -82,11 +82,15 @@
-
Berat:
+
T.Matang:
-
-
Kos Keuntungan (12 Bulan):
+
+
Keuntungan:
+
+ +
+
T.Lanjut: