diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index d79985f..bcba937 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -21,6 +21,20 @@ class HomeController extends Controller */ public function index() { - return view('includes.home'); + $harga_emas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/')->json(); + + $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(); + + $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]); + + } + + return view('includes.home',compact('hargaemasterdahulu')); } } diff --git a/resources/views/includes/analisaportal.blade.php b/resources/views/includes/analisaportal.blade.php index c0671d3..bef3525 100644 --- a/resources/views/includes/analisaportal.blade.php +++ b/resources/views/includes/analisaportal.blade.php @@ -214,62 +214,7 @@ --> -
-
-
-
-
-

Harga Emas

-
-
-
-
- - - - - - - - - - - @foreach($hargaemasterdahulu as $index=>$hm) - - - - @if($hm['percent'] > 0) - - @else - - @endif - - @endforeach - - -
KaratHarga (RM)Perubahan (%)
{{ $hm['karat'] }}{{ $hm['hargasemasa'] }}({{ number_format($hm['percent'],2) }})({{ number_format($hm['percent']*-1,2) }})
-
-
-
+ diff --git a/resources/views/includes/bayaran/senaraibayaransag.blade.php b/resources/views/includes/bayaran/senaraibayaransag.blade.php index 4055d5d..a2be44b 100644 --- a/resources/views/includes/bayaran/senaraibayaransag.blade.php +++ b/resources/views/includes/bayaran/senaraibayaransag.blade.php @@ -69,10 +69,7 @@ # Ar-Rahn No Rujukan - Pembiayaan Asal - Baki Pembiayaan Keuntungan Semasa - Status @@ -121,24 +118,18 @@ @php $marhun = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/marhun/' . $bt['norujukan'] )->json(); @endphp - {{ $bt['norujukan'] }} + {{ $bt['norujukan'] }} - - {{ number_format($bt['pinjaman'],2) }} - - - {{ number_format($bt['bakipjm'],2) }} - {{ is_numeric($koskeuntungan) ? number_format($koskeuntungan,2) : $koskeuntungan }} - + {{-- @if($bt['taglel'] === 1) Akan Dilelong @endif - + --}} @endif @endforeach @@ -217,6 +208,21 @@ var kodcaw = $(this).data('kodcaw'); var hargajualan = $(this).data('hargajualan'); var pinjaman = $(this).data('pinjaman'); + var bakipjm = $(this).data('bakipjm'); + var lelong = $(this).data('lelong'); + var pjmnum = $(this).data('pjmnum'); + + $('#pemb').text('RM ' + pjmnum); + $('#bpemb').text('RM ' + bakipjm); + + if(lelong === 1) + { + $('#statuslelong').text('Akan Dilelong'); + }else{ + $('#statuslelong').text('-'); + } + + $('#norujukan_modal').val(norujukan); $('#pinjaman_modal').val(pinjaman); diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php index b74684f..592ce88 100644 --- a/resources/views/includes/home.blade.php +++ b/resources/views/includes/home.blade.php @@ -101,13 +101,86 @@
- Gold + PitihEmas
+
+
+ {{--
+
+
+

Harga Emas

+
+
+
--}} +
+ + + + + + + + + + + @foreach($hargaemasterdahulu as $index=>$hm) + + + + @if($hm['percent'] > 0) + + @else + + @endif + + @endforeach + + +
KaratHarga (RM)Perubahan (%)
{{ $hm['karat'] }}{{ $hm['hargasemasa'] }}({{ number_format($hm['percent'],2) }})({{ number_format($hm['percent']*-1,2) }})
+
+
+
+
+ +
+
+
Pembiayaan:
+
+ +
+
B. Pembiayaan:
+
+ +
+
N. Marhun:
+
+ +
+
Berat:
+
+ +
+
Kos Keuntungan (12 Bulan):
+
+
+
diff --git a/resources/views/modal/marhun.blade.php b/resources/views/modal/marhun.blade.php index f4f8ecb..492d33b 100644 --- a/resources/views/modal/marhun.blade.php +++ b/resources/views/modal/marhun.blade.php @@ -10,9 +10,24 @@
+ +
+
+
Pembiayaan:
+
+ +
+
B. Pembiayaan:
+
+ +
+
Status:
+
+
+
- + diff --git a/routes/web.php b/routes/web.php index 3a3ded7..53b001c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -33,7 +33,22 @@ Route::get('/firsttime', function () { return view('/includes/login/firsttime'); }); Route::get('/portalhome', function () { - return view('/includes/home'); + + $harga_emas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/')->json(); + + $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(); + + $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]); + + } + + return view('includes.home',compact('hargaemasterdahulu')); }); Route::get('/portalprofile', function () { return view('/includes/profile'); @@ -57,7 +72,22 @@ Route::get('/bayarsag', function () { Route::get('/', function () { // return view('dashboard'); - return view('includes.home'); + + $harga_emas = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/harga_emas/')->json(); + + $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(); + + $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]); + + } + + return view('includes.home',compact('hargaemasterdahulu')); })->middleware(['auth','verified']); // Route::get('/home', 'HomeController@index');
Bil Jenis Marhun