From 931166e77b6f074397b8f446f44d55fe57d08dc9 Mon Sep 17 00:00:00 2001 From: Amir Hamzan <62345746+amirhamzan@users.noreply.github.com> Date: Mon, 21 Mar 2022 03:27:00 +0800 Subject: [PATCH 1/2] fix portal --- .../views/includes/login/index.blade.php | 5 +- .../includes/login/loginportal.blade.php | 2 +- .../includes/main/footercontent.blade.php | 16 +- .../includes/rekod/pilihcawangan.blade.php | 4 +- .../views/includes/rekod/rekodsag.blade.php | 6 +- .../views/modal/historybayaran.blade.php | 64 +- resources/views/resit/resitansuran.blade.php | 1074 ++++++++++------- .../views/resit/resitansuransebelum.blade.php | 4 +- .../views/resit/resittambahpinjam.blade.php | 4 +- resources/views/resit/resittebus.blade.php | 979 ++++++++------- .../resit/resittebusautotawarruq.blade.php | 4 +- .../views/resit/resittebussebelum.blade.php | 4 +- .../views/resit/resittebusseparuh.blade.php | 4 +- .../resit/resittebusseparuhbelum.blade.php | 4 +- 14 files changed, 1223 insertions(+), 951 deletions(-) diff --git a/resources/views/includes/login/index.blade.php b/resources/views/includes/login/index.blade.php index 0132981..0107510 100644 --- a/resources/views/includes/login/index.blade.php +++ b/resources/views/includes/login/index.blade.php @@ -72,13 +72,14 @@ Hak Milik © Koperasi Permodalan Kelantan Berhad + Permodalan Kelantan Berhad
diff --git a/resources/views/includes/login/loginportal.blade.php b/resources/views/includes/login/loginportal.blade.php index 1f85d30..15e9088 100644 --- a/resources/views/includes/login/loginportal.blade.php +++ b/resources/views/includes/login/loginportal.blade.php @@ -35,7 +35,7 @@
- +
diff --git a/resources/views/includes/main/footercontent.blade.php b/resources/views/includes/main/footercontent.blade.php index 69c31a0..b7c786b 100644 --- a/resources/views/includes/main/footercontent.blade.php +++ b/resources/views/includes/main/footercontent.blade.php @@ -56,16 +56,16 @@
  • Hotline : 1300-22-4343
    • - + arcc@pkb.net.my +
    diff --git a/resources/views/includes/rekod/pilihcawangan.blade.php b/resources/views/includes/rekod/pilihcawangan.blade.php index 660ce49..cc3f9a0 100644 --- a/resources/views/includes/rekod/pilihcawangan.blade.php +++ b/resources/views/includes/rekod/pilihcawangan.blade.php @@ -2,13 +2,13 @@ @section('content') -Rekod Pembelian | Customer Portal +Rekod Pembayaran | Customer Portal
    diff --git a/resources/views/includes/rekod/rekodsag.blade.php b/resources/views/includes/rekod/rekodsag.blade.php index 53b6142..58a435c 100644 --- a/resources/views/includes/rekod/rekodsag.blade.php +++ b/resources/views/includes/rekod/rekodsag.blade.php @@ -147,7 +147,7 @@
    -
    Penyata Yang Sudah Ditebus
    +
    Pembiayaan Yang Sudah Diselesaikan
    @@ -269,9 +269,9 @@ var date = new Date(bayaran['created_at']); historybayarandatatable.row.add([ counter, - date.toLocaleDateString(), + // date.toLocaleDateString(), + ''+date.toLocaleDateString()+'', "RM " + bayaran['duit_masuk'], - 'Cetak' ]).draw(); counter = counter + 1; }); diff --git a/resources/views/modal/historybayaran.blade.php b/resources/views/modal/historybayaran.blade.php index 7c40282..4f6f040 100644 --- a/resources/views/modal/historybayaran.blade.php +++ b/resources/views/modal/historybayaran.blade.php @@ -3,7 +3,7 @@
    - + @@ -33,37 +33,37 @@
    -
    +
    - -
    - - -
    - - -
    - - - - - - - - - - - -
    BilTarikh BayaranBayaranAction
    -
    - - -
    - -
    + +
    + +
    + + +
    +
    + + + + + + + + + + + +
    BilTarikh BayaranBayaran
    +
    +

    *Sila klik di atas tarikh bayaran untuk mencetak resit bayaran.

    +
    + + +
    + +
    +
    -
    - - - +
    \ No newline at end of file diff --git a/resources/views/resit/resitansuran.blade.php b/resources/views/resit/resitansuran.blade.php index d7586aa..714eeaf 100644 --- a/resources/views/resit/resitansuran.blade.php +++ b/resources/views/resit/resitansuran.blade.php @@ -1,459 +1,589 @@ - - - - - - - - - + + - - - - - - - - - - - - -
    User Image User Image
    - - - - - - - - - - -
    Salinan Pelanggan
    RESIT BAYARAN
    - -
    - - - - - - - - + } + + #copy_cust td, + #copy_cust th { + border: 1px solid #ddd; + padding: 2px; + font-size: 9px; + text-align: right; + width: 10%; + + } + + #copy_cust { + margin-right: 0px; + margin-left: auto + } + + + + + + #inside tr:nth-child(even) { + background-color: #ffffff; + } + + #inside tr:hover { + background-color: #ddd; + } + + #inside th { + padding-top: 12px; + padding-bottom: 12px; + text-align: center; + background-color: #d9deda; + color: black; + padding: 4px; + } + + + Resit | Portal Pelanggan + + + + + + + + + + +
    Marhun : {{ $gadai['marhun'] }} No SAG: {{ $transaction['norujukan'] }}
    Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp
    + + + - - - - - - - - - - - -
    User Image User Image
    No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpanan: {{ $gadai['tempoh'] }}
    Nama Wakil :
    No K/P Wakil :
    -
    - -

    A

    - - - - - - - - - - - - - - - - - - - - - - - - -
    Harga Jualan/Baki: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} Pembiayaan/Baki: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }}
    Bayaran Harga Jualan: RM {{ number_format($transaction['duit_masuk'],2) }} Ansuran Pembiyaan: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }}
    Baki Harga Jualan: RM {{ number_format($transaction['bakiharga'],2) }}Baki Pembiayaan: RM {{ number_format($gadai['bakipjm'],2) }}
    Keuntungan: RM {{ number_format($transaction['bayaran_keuntungan'],2) }}
    -

    * Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penebusan

    + + + + + + + + + + +
    Cetakan Atas Talian Ar-Rahn Pay
    RESIT BAYARAN
    + +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    Marhun: {{ $gadai['marhun'] }}
    Nama: {{ $customers_info['nama'] }}
    No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp
    Nama Wakil :
    No K/P Wakil :
    +
    +
    + + + + + + + + + + + + + + + + + +
    No SAG: {{ $transaction['norujukan'] }}
    Tarikh Bayar: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp
    Tempoh Simpanan: {{ $gadai['tempoh'] }}
    +

    A

    +
    +
    +
    +
    + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    Harga Jualan/Baki: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }}
    Bayaran Harga Jualan: RM {{ number_format($transaction['duit_masuk'],2) }}
    Baki Harga Jualan: RM {{ number_format($transaction['bakiharga'],2) }}
    +
    +
    + + + + + + + + + + + + + + + + + +
    Pembiayaan/Baki: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }}
    Ansuran Pembiyaan: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }}
    Baki Pembiayaan: RM {{ number_format($gadai['bakipjm'],2) }}
    Keuntungan: RM {{ number_format($transaction['bayaran_keuntungan'],2) }}
    +
    +
    +
    +

    * Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penebusan

    +

    * *Paparan terbaik resit menggunakan paparan web.


    - - - - +{{--
    ....................................................
    + - + - + - - + + + + - - + + - + - + -
    .................................................... .................................................... ....................................................
    ....................................................
    DiSemak DiSemak Cagaran Di Keluarkan Cagaran Diterima Ar-Rahn
    {{ Auth::user()->name }}
    -
    -
    -
    + +
    +
    +
    +

    @@ -462,37 +592,67 @@ hr.new5 { - - - - - + + + + + - +
    Salinan Pejabat
    RESIT BAYARAN
    Salinan Pejabat
    RESIT BAYARAN

    - - - - - - + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + +
    Marhun : {{ $gadai['marhun'] }} No SAG: {{ $transaction['norujukan'] }}
    Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp
    Marhun: {{ $gadai['marhun'] }} No SAG: {{ $transaction['norujukan'] }}
    Nama: {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($transaction['created_at']); $date = $time->format('d/m/Y'); echo $date; @endphp
    No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['tempoh'] }}
    No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['tempoh'] }}
    Nama Wakil :
    No K/P Wakil :
    Nama Wakil :
    No K/P Wakil :

    @@ -532,26 +692,26 @@ hr.new5 { - - - + - + - + - - + + + + - - + + - + - + - +
    ....................................................
    .................................................... .................................................... ....................................................
    ....................................................
    DiSemak DiSemak Cagaran Di Keluarkan Cagaran Diterima Ar-Rahn
    {{ Auth::user()->name }}
    -
    +
    --}} \ No newline at end of file diff --git a/resources/views/resit/resitansuransebelum.blade.php b/resources/views/resit/resitansuransebelum.blade.php index 1c4b76b..c6525b5 100644 --- a/resources/views/resit/resitansuransebelum.blade.php +++ b/resources/views/resit/resitansuransebelum.blade.php @@ -442,7 +442,7 @@ hr.new5 { -
    +{{--
    @@ -565,4 +565,4 @@ hr.new5 { -
    \ No newline at end of file +
    --}} \ No newline at end of file diff --git a/resources/views/resit/resittambahpinjam.blade.php b/resources/views/resit/resittambahpinjam.blade.php index 5f3ffa4..db76484 100644 --- a/resources/views/resit/resittambahpinjam.blade.php +++ b/resources/views/resit/resittambahpinjam.blade.php @@ -445,7 +445,7 @@ hr.new5 { -
    +{{--
    @@ -571,4 +571,4 @@ hr.new5 { -
    \ No newline at end of file +
    --}} \ No newline at end of file diff --git a/resources/views/resit/resittebus.blade.php b/resources/views/resit/resittebus.blade.php index 830076f..abfac3d 100644 --- a/resources/views/resit/resittebus.blade.php +++ b/resources/views/resit/resittebus.blade.php @@ -1,430 +1,505 @@ - - + - - - - + + + Resit | Portal Pelanggan + + + + - + + + } - + #inside tr:nth-child(even) { + background-color: #ffffff; + } + #inside tr:hover { + background-color: #ddd; + } + #inside th { + padding-top: 12px; + padding-bottom: 12px; + text-align: center; + background-color: #d9deda; + color: black; + padding: 4px; + } + + - - - - - - - - - - - - - - - - - -
    User Image User Image
    - - - - - - - - - - -
    Salinan Pelanggan
    RESIT BAYARAN
    +
    - +
    +
    +
    +
    - - - - - - + + + + + + + + - - - + + + + - - - + + + + - - - -
    Marhun : {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
    Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
    Marhun: {{ $gadai['marhun'] }}
    Nama: {{ $customers_info['nama'] }}
    No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['tempoh'] }}
    No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp
    Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp
    Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp
    No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
    -
    + + No K/P Wakil + : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp + + +
    +
    + -

    T

    + + + + + + + + + + + + + + + +
    No SAG: {{ $gadai['norujukan'] }}
    Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
    Tempoh Simpan: {{ $gadai['tempoh'] }}
    +

    T

    + +
    +
    +
    +
    + + @@ -449,38 +524,40 @@ hr.new5 {
    +

    *Paparan terbaik resit menggunakan paparan web.


    - - - - - - - - - - - +{{--
    .................................................... .................................................... .................................................... ....................................................
    + + + + + + + + + + - - - - - - - + + + + + + + -
    .................................................... .................................................... .................................................... ....................................................
    DiSemak Cagaran Di KeluarkanCagaran Diterima Ar-Rahn
    {{ Auth::user()->name }}    		DiSemak Cagaran Di KeluarkanCagaran Diterima Ar-Rahn
    {{ Auth::user()->name }}
    -
    -
    -
    + +
    +
    +
    +

    @@ -489,40 +566,74 @@ hr.new5 { - - - - - + + + + + - +
    Salinan Pejabat
    RESIT BAYARAN
    Salinan Pejabat
    RESIT BAYARAN

    - - - - - - + + + + + + + + + + + + + + + + - - - + + + + + + + + - - - + + + + + + + + - - - + + + + + + + +
    Marhun : {{ $gadai['marhun'] }} No SAG: {{ $gadai['norujukan'] }}
    Nama : {{ $customers_info['nama'] }} Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
    Marhun: {{ $gadai['marhun'] }} + + No SAG: {{ $gadai['norujukan'] }}
    Nama: {{ $customers_info['nama'] }} + + Tarikh Bayar: @php $time = new DateTime($penebusan['t_tebus']); $date = $time->format('d/m/Y'); echo $date; @endphp
    No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp Tempoh Simpan: {{ $gadai['tempoh'] }}
    No K/P : @php if($customers_info['kpbaru'] == '') echo $customers_info['kplama']; else echo $customers_info['kpbaru']; @endphp + + Tempoh Simpan: {{ $gadai['tempoh'] }}
    Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp
    Nama Wakil : @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp + +
    No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp
    No K/P Wakil : @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp +

    @@ -558,26 +669,26 @@ hr.new5 { - - - + - + - + - - + + + + - - + + - + - + - +
    ....................................................
    .................................................... .................................................... ....................................................
    ....................................................
    DiSemak DiSemak Cagaran Di Keluarkan Cagaran Diterima Ar-Rahn
    {{ Auth::user()->name }}
    -
    \ No newline at end of file +
    --}} \ No newline at end of file diff --git a/resources/views/resit/resittebusautotawarruq.blade.php b/resources/views/resit/resittebusautotawarruq.blade.php index 03dce05..052b373 100644 --- a/resources/views/resit/resittebusautotawarruq.blade.php +++ b/resources/views/resit/resittebusautotawarruq.blade.php @@ -425,7 +425,7 @@ hr.new5 { -
    +{{--
    @@ -562,4 +562,4 @@ hr.new5 { -
    \ No newline at end of file +
    --}} \ No newline at end of file diff --git a/resources/views/resit/resittebussebelum.blade.php b/resources/views/resit/resittebussebelum.blade.php index 451287e..955f8b3 100644 --- a/resources/views/resit/resittebussebelum.blade.php +++ b/resources/views/resit/resittebussebelum.blade.php @@ -447,7 +447,7 @@ hr.new5 { -
    +{{--
    @@ -570,4 +570,4 @@ hr.new5 { -
    +
    --}} diff --git a/resources/views/resit/resittebusseparuh.blade.php b/resources/views/resit/resittebusseparuh.blade.php index bbfa8fb..61800b9 100644 --- a/resources/views/resit/resittebusseparuh.blade.php +++ b/resources/views/resit/resittebusseparuh.blade.php @@ -452,7 +452,7 @@ hr.new5 { -
    +{{--
    @@ -587,4 +587,4 @@ hr.new5 { -
    \ No newline at end of file +
    --}} \ No newline at end of file diff --git a/resources/views/resit/resittebusseparuhbelum.blade.php b/resources/views/resit/resittebusseparuhbelum.blade.php index 827ba3b..aba4a61 100644 --- a/resources/views/resit/resittebusseparuhbelum.blade.php +++ b/resources/views/resit/resittebusseparuhbelum.blade.php @@ -436,7 +436,7 @@ hr.new5 { -
    +{{--
    @@ -562,4 +562,4 @@ hr.new5 { -
    \ No newline at end of file +
    --}} \ No newline at end of file From 79711d5078d6190f5119b2c17a375e7c6c8bd96a Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 21 Mar 2022 04:37:55 +0800 Subject: [PATCH 2/2] fix komen kak aida --- app/Http/Controllers/HomeController.php | 16 +++- .../views/includes/analisaportal.blade.php | 57 +------------- .../bayaran/senaraibayaransag.blade.php | 30 +++++--- resources/views/includes/home.blade.php | 75 ++++++++++++++++++- .../views/includes/main/navigation.blade.php | 2 +- .../views/includes/rekod/rekodsag.blade.php | 38 +++++----- .../views/modal/historybayaran.blade.php | 23 ++++++ resources/views/modal/marhun.blade.php | 17 ++++- routes/web.php | 34 ++++++++- 9 files changed, 197 insertions(+), 95 deletions(-) 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