From cba6a7118c2d45c5c60912e216941855464ff556 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 7 Apr 2021 15:51:04 +0800 Subject: [PATCH] baiki ui/ux design --- app/Http/Controllers/KhazanahController.php | 1 + public/css/main.css | 2 +- resources/views/aliran_tunai/index.blade.php | 23 ++- resources/views/auth/login.blade.php | 32 +++- resources/views/customers/info.blade.php | 43 +++-- resources/views/harga_emas/index.blade.php | 16 +- .../views/homepage/khazanah/home.blade.php | 26 +-- .../views/homepage/operasi/home.blade.php | 10 +- .../views/homepage/penilai/home.blade.php | 38 ++-- .../views/homepage/teller/home.blade.php | 12 +- .../views/khazanah/agingbulanan.blade.php | 2 - .../views/khazanah/alirantunai.blade.php | 175 +++++++++++------- resources/views/khazanah/capaian.blade.php | 14 +- resources/views/khazanah/dashboard.blade.php | 33 ++-- resources/views/khazanah/gadaian.blade.php | 30 +-- resources/views/khazanah/kakitangan.blade.php | 34 ++-- resources/views/khazanah/kelulusan.blade.php | 22 ++- .../khazanah/laporan/agingbulanan.blade.php | 2 - .../views/khazanah/laporan/ansuran.blade.php | 14 +- .../laporan/batalsuratgadai.blade.php | 15 +- .../khazanah/laporan/datalejer_am.blade.php | 2 - .../views/khazanah/laporan/gadaian.blade.php | 14 +- .../khazanah/laporan/imbangduga.blade.php | 2 - .../views/khazanah/laporan/index.blade.php | 37 ++-- .../khazanah/laporan/kawalanstok.blade.php | 10 +- .../views/khazanah/laporan/lelongan.blade.php | 14 +- .../khazanah/laporan/marhunharian.blade.php | 14 +- .../laporan/marhunterkumpul.blade.php | 10 +- .../khazanah/laporan/pelangganbaru.blade.php | 15 +- .../khazanah/laporan/penebusan.blade.php | 14 +- .../views/khazanah/laporan/petibesi.blade.php | 10 +- .../khazanah/laporan/stokaudit.blade.php | 10 +- resources/views/khazanah/menu.blade.php | 19 +- resources/views/khazanah/panjar.blade.php | 14 +- resources/views/khazanah/pelanggan.blade.php | 2 +- .../views/khazanah/pendahuluan.blade.php | 16 +- .../khazanah/pendahuluanserahanmain.blade.php | 16 +- .../views/khazanah/rekodtelahlulus.blade.php | 14 +- resources/views/khazanah/serahan.blade.php | 15 +- resources/views/khazanah/tebus.blade.php | 28 +-- resources/views/khazanah/unjuran.blade.php | 14 +- resources/views/layouts/app.blade.php | 20 +- resources/views/layouts/app_operasi.blade.php | 23 ++- resources/views/modal/historytebus.blade.php | 24 ++- .../views/operasi/daftar_kakitangan.blade.php | 25 ++- resources/views/operasi/hargaemas.blade.php | 22 ++- resources/views/operasi/kelulusan.blade.php | 19 +- .../views/operasi/komuditi/index.blade.php | 14 +- .../komuditi/rekod_transaksi.blade.php | 16 +- resources/views/operasi/parameter.blade.php | 10 +- resources/views/penebusan/index.blade.php | 69 +++++-- 51 files changed, 670 insertions(+), 406 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index d9fe95b..3a5f19f 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -195,6 +195,7 @@ class KhazanahController extends Controller return view('khazanah.alirantunai',compact('cawangan_info','api_url','arraytunaiharini','arraytunai','listUser','petibesi','arraygadaitebus','arraytuntutbaki','arrayaddtunai')); } + public function gadaian() { $auth_user = Auth::user(); diff --git a/public/css/main.css b/public/css/main.css index ef99b8a..e9c3b4d 100644 --- a/public/css/main.css +++ b/public/css/main.css @@ -2,5 +2,5 @@ width: 290px !important; } .logo-arrahn-header{ - width: 20px; + width: 70px; } diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index 0352aeb..f542f8e 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -11,8 +11,15 @@ @php $auth_user = Auth::user();@endphp
- Kembali -

aliran tunai

+ + + +
@@ -127,8 +134,8 @@ +
+
+
-
{{ __('Aliran Tunai') }}
+ + + {{-- {{ dd($tunai) }} --}}
- +
-

Aliran Tunai

-
+ {{--
-
+
--}} + {{-- Peti Besi --}}
+ + +
@@ -70,7 +135,7 @@
-
+
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['bakiawal'],2) }}
@@ -83,7 +148,7 @@
-
+
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['tambah'],2) }}
@@ -96,7 +161,7 @@
-
+
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['kurang'],2) }}
@@ -111,7 +176,7 @@
-
+
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['baki'],2) }}
@@ -124,7 +189,7 @@
-
+
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['keluar'],2) }}
@@ -137,7 +202,7 @@
-
+
RM {{ (empty($arraytunaiharini[$index1])) ? '0.00' : number_format($arraytunaiharini[$index1]['masuk'],2) }}
@@ -155,10 +220,10 @@
diff --git a/resources/views/khazanah/capaian.blade.php b/resources/views/khazanah/capaian.blade.php index ac488e2..61e14af 100644 --- a/resources/views/khazanah/capaian.blade.php +++ b/resources/views/khazanah/capaian.blade.php @@ -5,16 +5,20 @@
-
{{ __('Dashboard') }}
+ +
-
-

Capaian

@@ -48,8 +52,8 @@
- - +
+ diff --git a/resources/views/khazanah/dashboard.blade.php b/resources/views/khazanah/dashboard.blade.php index 21dde55..5582405 100644 --- a/resources/views/khazanah/dashboard.blade.php +++ b/resources/views/khazanah/dashboard.blade.php @@ -5,16 +5,21 @@
-
{{ __('Dashboard') }}
+ + +
-
-

Dashboard

@@ -26,11 +31,11 @@
-
+

RM {{ ($ringkasanharian['gadai'][0]['jumlahpinjaman']) ? number_format($ringkasanharian['gadai'][0]['jumlahpinjaman'],2) : "0.00" }}

-

Gadai Hari Ini

+

Gadai Hari Ini

@@ -40,7 +45,7 @@
-
+

RM {{ ($ringkasanharian['tebus'][0]['jumlahpinjaman']) ? number_format($ringkasanharian['tebus'][0]['jumlahpinjaman'],2) : "0.00" }}

@@ -54,7 +59,7 @@
-
+

RM {{ number_format($keseluruhanupahharian,2) }}

@@ -71,7 +76,7 @@ {{-- Second Column --}}
-
+

RM {{ ($dashboard[0]['gadai']) ? number_format((float)$dashboard[0]['gadai'],2) : "0.00" }}

@@ -85,7 +90,7 @@
-
+

RM {{ ($dashboard[0]['tebus']) ? number_format((float)$dashboard[0]['tebus'],2) : "0.00" }}

@@ -99,7 +104,7 @@
-
+

RM {{ number_format($keseluruhanupahterkumpul) }}

@@ -117,7 +122,7 @@
-
+

RM {{ ($dashboard[0]['variasi']) ? number_format((float)$dashboard[0]['variasi'],2) : "0.00" }}

@@ -131,7 +136,7 @@
-
+

RM {{ number_format($totalmarhun,2) }}

@@ -145,7 +150,7 @@
-
+

RM {{ ($dashboard[0]['outstanding']) ? number_format((float)$dashboard[0]['outstanding'],2) : "0.00" }}

@@ -163,7 +168,7 @@
-
+

RM {{ number_format($getVault,2) }}

diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php index a94d326..9857c00 100644 --- a/resources/views/khazanah/gadaian.blade.php +++ b/resources/views/khazanah/gadaian.blade.php @@ -55,12 +55,18 @@
-
{{ __('Dashboard') }}
+ +
-
@@ -89,14 +95,12 @@
-

Kelulusan Gadaian

-
Gadaian :
-
Bil Teller
- +
+ @@ -132,14 +136,12 @@
-

Pengesahan Marhun Dari Khazanah

-
Semakan Marhun :
-
Bil No Rujukan
- +
+ @@ -174,15 +176,15 @@
-
- +
+
- diff --git a/resources/views/khazanah/kakitangan.blade.php b/resources/views/khazanah/kakitangan.blade.php index 585a30e..f8fb290 100644 --- a/resources/views/khazanah/kakitangan.blade.php +++ b/resources/views/khazanah/kakitangan.blade.php @@ -2,28 +2,28 @@ @section('content')
-
+
-
{{ __('Dashboard') }}
+ + -
+ +
-
- -
-
-

Kakitangan

-
-
-
+
@csrf -
+
-
+
@@ -40,7 +40,7 @@
-
+
@@ -61,14 +61,14 @@
- +
-
Bil No Rujukan
- +
+ diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php index 88c0518..a04b7c5 100644 --- a/resources/views/khazanah/kelulusan.blade.php +++ b/resources/views/khazanah/kelulusan.blade.php @@ -82,26 +82,32 @@
-
+
-
{{ __('Dashboard') }}
+ + +
- +
-

Kelulusan

-
Bil Teller
- +
+ @@ -146,9 +152,9 @@
No Rujukan Teller
-
+ diff --git a/resources/views/khazanah/laporan/agingbulanan.blade.php b/resources/views/khazanah/laporan/agingbulanan.blade.php index c39e884..a51f96a 100644 --- a/resources/views/khazanah/laporan/agingbulanan.blade.php +++ b/resources/views/khazanah/laporan/agingbulanan.blade.php @@ -10,10 +10,8 @@
-
-

Laporan Aging Bulanan

diff --git a/resources/views/khazanah/laporan/ansuran.blade.php b/resources/views/khazanah/laporan/ansuran.blade.php index 85b62b2..65450c2 100644 --- a/resources/views/khazanah/laporan/ansuran.blade.php +++ b/resources/views/khazanah/laporan/ansuran.blade.php @@ -5,15 +5,19 @@
-
{{ __('Laporan Semakan Penebusan') }}
+
-
-

Laporan Semakan Ansuran

@@ -32,8 +36,8 @@
- - +
+ diff --git a/resources/views/khazanah/laporan/batalsuratgadai.blade.php b/resources/views/khazanah/laporan/batalsuratgadai.blade.php index e6c335b..07f963a 100644 --- a/resources/views/khazanah/laporan/batalsuratgadai.blade.php +++ b/resources/views/khazanah/laporan/batalsuratgadai.blade.php @@ -5,15 +5,20 @@
-
{{ __('Laporan Batal Gadai') }}
+ +
-
-

Laporan Batal Surat Gadai

@@ -32,8 +37,8 @@
-
Bil No Rujukan
- +
+ diff --git a/resources/views/khazanah/laporan/datalejer_am.blade.php b/resources/views/khazanah/laporan/datalejer_am.blade.php index abcd5d5..de299bf 100644 --- a/resources/views/khazanah/laporan/datalejer_am.blade.php +++ b/resources/views/khazanah/laporan/datalejer_am.blade.php @@ -11,10 +11,8 @@
-
-

Data Lejer Am

diff --git a/resources/views/khazanah/laporan/gadaian.blade.php b/resources/views/khazanah/laporan/gadaian.blade.php index 29245bf..dc0b4cb 100644 --- a/resources/views/khazanah/laporan/gadaian.blade.php +++ b/resources/views/khazanah/laporan/gadaian.blade.php @@ -5,15 +5,19 @@
-
{{ __('Laporan Semakan Gadaian') }}
+
-
-

Laporan Semakan Gadaian

@@ -32,8 +36,8 @@
-
Bil No Rujukan
- +
+ diff --git a/resources/views/khazanah/laporan/imbangduga.blade.php b/resources/views/khazanah/laporan/imbangduga.blade.php index d5e3817..a4d0031 100644 --- a/resources/views/khazanah/laporan/imbangduga.blade.php +++ b/resources/views/khazanah/laporan/imbangduga.blade.php @@ -12,10 +12,8 @@
-
-

Data Imbangduga

diff --git a/resources/views/khazanah/laporan/index.blade.php b/resources/views/khazanah/laporan/index.blade.php index f484981..0ce928b 100644 --- a/resources/views/khazanah/laporan/index.blade.php +++ b/resources/views/khazanah/laporan/index.blade.php @@ -5,23 +5,28 @@
-
{{ __('Laporan') }}
+
Aging Pinjaman @@ -61,16 +66,16 @@
diff --git a/resources/views/khazanah/laporan/kawalanstok.blade.php b/resources/views/khazanah/laporan/kawalanstok.blade.php index 1575468..3b95c01 100644 --- a/resources/views/khazanah/laporan/kawalanstok.blade.php +++ b/resources/views/khazanah/laporan/kawalanstok.blade.php @@ -5,15 +5,19 @@
-
{{ __('Laporan Semakan Penebusan') }}
+
-
-

Laporan Kawalan Stok

diff --git a/resources/views/khazanah/laporan/lelongan.blade.php b/resources/views/khazanah/laporan/lelongan.blade.php index 11ab05a..8274f1f 100644 --- a/resources/views/khazanah/laporan/lelongan.blade.php +++ b/resources/views/khazanah/laporan/lelongan.blade.php @@ -5,15 +5,19 @@
-
{{ __('Laporan Semakan Penebusan') }}
+
-
-

Laporan Semakan Lelongan

@@ -32,8 +36,8 @@
-
Bil Nama
- +
+ diff --git a/resources/views/khazanah/laporan/marhunharian.blade.php b/resources/views/khazanah/laporan/marhunharian.blade.php index 7454c24..e4925a5 100644 --- a/resources/views/khazanah/laporan/marhunharian.blade.php +++ b/resources/views/khazanah/laporan/marhunharian.blade.php @@ -5,15 +5,19 @@
-
{{ __('Laporan Semakan Penebusan') }}
+
-
-

Laporan Marhun Harian

@@ -32,8 +36,8 @@
-
Bil No Rujukan
- +
+ diff --git a/resources/views/khazanah/laporan/marhunterkumpul.blade.php b/resources/views/khazanah/laporan/marhunterkumpul.blade.php index 7f77789..5e070c4 100644 --- a/resources/views/khazanah/laporan/marhunterkumpul.blade.php +++ b/resources/views/khazanah/laporan/marhunterkumpul.blade.php @@ -5,15 +5,19 @@
-
{{ __('Laporan Semakan Penebusan') }}
+
-
-

Laporan Marhun Terkumpul

diff --git a/resources/views/khazanah/laporan/pelangganbaru.blade.php b/resources/views/khazanah/laporan/pelangganbaru.blade.php index 2e937f7..dd3c930 100644 --- a/resources/views/khazanah/laporan/pelangganbaru.blade.php +++ b/resources/views/khazanah/laporan/pelangganbaru.blade.php @@ -5,15 +5,20 @@
-
{{ __('Laporan Pelanggan Baru') }}
+ +
-
-

Laporan Pelanggan Baru

@@ -32,8 +37,8 @@
-
Bil No Rujukan
- +
+ diff --git a/resources/views/khazanah/laporan/penebusan.blade.php b/resources/views/khazanah/laporan/penebusan.blade.php index 273cd73..61cb897 100644 --- a/resources/views/khazanah/laporan/penebusan.blade.php +++ b/resources/views/khazanah/laporan/penebusan.blade.php @@ -5,15 +5,19 @@
-
{{ __('Laporan Semakan Penebusan') }}
+
-
-

Laporan Semakan Penebusan

@@ -32,8 +36,8 @@
-
Bil No Pelanggan
- +
+ diff --git a/resources/views/khazanah/laporan/petibesi.blade.php b/resources/views/khazanah/laporan/petibesi.blade.php index a26f7de..a9ad8da 100644 --- a/resources/views/khazanah/laporan/petibesi.blade.php +++ b/resources/views/khazanah/laporan/petibesi.blade.php @@ -5,15 +5,19 @@
-
{{ __('Laporan Semakan Penebusan') }}
+
-
-

Laporan Peti Besi

diff --git a/resources/views/khazanah/laporan/stokaudit.blade.php b/resources/views/khazanah/laporan/stokaudit.blade.php index a3ed59b..508588d 100644 --- a/resources/views/khazanah/laporan/stokaudit.blade.php +++ b/resources/views/khazanah/laporan/stokaudit.blade.php @@ -5,15 +5,19 @@
-
{{ __('Laporan Semakan Penebusan') }}
+
-
-

Laporan Stok Audit

diff --git a/resources/views/khazanah/menu.blade.php b/resources/views/khazanah/menu.blade.php index b40fb3d..87f2ca6 100644 --- a/resources/views/khazanah/menu.blade.php +++ b/resources/views/khazanah/menu.blade.php @@ -5,14 +5,21 @@
diff --git a/resources/views/khazanah/panjar.blade.php b/resources/views/khazanah/panjar.blade.php index 02a5aa4..19bdd69 100644 --- a/resources/views/khazanah/panjar.blade.php +++ b/resources/views/khazanah/panjar.blade.php @@ -9,16 +9,20 @@
-
{{ __('Perbelanjaan') }}
+ +
-
-

Panjar

@@ -48,8 +52,8 @@
-
Bil Nama
- +
+ diff --git a/resources/views/khazanah/pelanggan.blade.php b/resources/views/khazanah/pelanggan.blade.php index ac488e2..f4a30fd 100644 --- a/resources/views/khazanah/pelanggan.blade.php +++ b/resources/views/khazanah/pelanggan.blade.php @@ -48,7 +48,7 @@
-
bil tarikh
+
diff --git a/resources/views/khazanah/pendahuluan.blade.php b/resources/views/khazanah/pendahuluan.blade.php index 37ed8f9..019b50a 100644 --- a/resources/views/khazanah/pendahuluan.blade.php +++ b/resources/views/khazanah/pendahuluan.blade.php @@ -5,16 +5,22 @@
-
{{ __('Dashboard') }}
+ + +
-
-

Pendahuluan

@@ -45,8 +51,8 @@
-
Bil
- +
+ diff --git a/resources/views/khazanah/pendahuluanserahanmain.blade.php b/resources/views/khazanah/pendahuluanserahanmain.blade.php index d0e020a..951cc09 100644 --- a/resources/views/khazanah/pendahuluanserahanmain.blade.php +++ b/resources/views/khazanah/pendahuluanserahanmain.blade.php @@ -10,16 +10,20 @@
-
{{ __('Pendahuluan Serahan') }}
+ +
- -
Senarai Pendahuluan Serahan
-
+
-
Bil Teller ID
- +
+ diff --git a/resources/views/khazanah/rekodtelahlulus.blade.php b/resources/views/khazanah/rekodtelahlulus.blade.php index 0bf5c09..1e4cccd 100644 --- a/resources/views/khazanah/rekodtelahlulus.blade.php +++ b/resources/views/khazanah/rekodtelahlulus.blade.php @@ -5,23 +5,27 @@
-
{{ __('Dashboard') }}
+
-
-

Kelulusan

-
Tarikh Description
- +
+ diff --git a/resources/views/khazanah/serahan.blade.php b/resources/views/khazanah/serahan.blade.php index c7233e4..45c6d4d 100644 --- a/resources/views/khazanah/serahan.blade.php +++ b/resources/views/khazanah/serahan.blade.php @@ -5,16 +5,21 @@
-
{{ __('Dashboard') }}
+ +
-
-

Serahan

@@ -46,8 +51,8 @@
-
No Rujukan Komen
- +
+ diff --git a/resources/views/khazanah/tebus.blade.php b/resources/views/khazanah/tebus.blade.php index 40c021b..6074e54 100644 --- a/resources/views/khazanah/tebus.blade.php +++ b/resources/views/khazanah/tebus.blade.php @@ -44,12 +44,18 @@
-
{{ __('Dashboard') }}
+ +
-
@@ -61,26 +67,25 @@
- + {{--

Jumlah SAG : {{ count($listserah) + count($senaraitebus) }}

--}}
-

Penebusan Penilai

-
Bil Teller ID
- +
+ @@ -111,10 +116,9 @@
-

Telah Scan

-
Bil No Rujukan
- +
+ @@ -146,7 +150,7 @@
-

Jumlah SAG : {{ count($listserah) + count($senaraitebus) }}

+
Cetak diff --git a/resources/views/khazanah/unjuran.blade.php b/resources/views/khazanah/unjuran.blade.php index c8ae3ee..69d0212 100644 --- a/resources/views/khazanah/unjuran.blade.php +++ b/resources/views/khazanah/unjuran.blade.php @@ -5,16 +5,20 @@
-
{{ __('Dashboard') }}
+ +
-
-

Unjuran Pinjaman

@@ -22,8 +26,8 @@
-
Bil No Rujukan
- +
+ diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index f298256..bfc150d 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -67,19 +67,21 @@ - +
-
Bil Nama