From ef758359cb2887cee6795cb19b00b9b30850e317 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Mon, 5 Apr 2021 16:32:15 +0800 Subject: [PATCH 1/8] fix penebusan --- app/Http/Controllers/PenebusanController.php | 23 ++++++++++++++++++++ resources/views/customers/info.blade.php | 2 +- resources/views/penebusan/index.blade.php | 15 +++++++++++++ routes/web.php | 3 +++ 4 files changed, 42 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index f61e54f..482329b 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -509,4 +509,27 @@ class PenebusanController extends Controller return 0; } + public function tukaranhargaemas(Request $request) + { + + $marhunsaglama = Http::get(config('api.url') . '/api/marhun/'. $request->norujukan)->json(); + + $marhunsaglama = $marhunsaglama[0]; + $totalnilaimarhun = 0; + + foreach($marhunsaglama as $index=>$marhunloop) + { + $karatbaru = str_replace('.','-',$marhunloop['karat']); + $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat'])); + + $totalnilaimarhun += $nilaimarhun; + + } + + return response($totalnilaimarhun); + + } + } diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index afebfe2..00d49cf 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -889,7 +889,7 @@ }else if (result.dismiss === Swal.DismissReason.cancel){ swalWithBootstrapButtons.fire( 'Batal', - 'Tidak Berjaya Mendaptkan Pengesahan Khazanah', + 'Tidak Berjaya Mendapatkan Pengesahan Khazanah', 'error' ) } diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 6bb5896..73e602a 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -1450,6 +1450,21 @@ jenisbayarantebus = "tawarruq"; } + + //Buat Harga Baru Emas Semasa + $.ajax({ + method: "get", + url: "{{ route('tukaran.hargaemas') }}", + data: { + 'norujukan' : norujukan + }, + success:function(data){ + console.log(data); + } + }); + + return; + var nopelanggan = "{{ $gadai['nopelanggan'] }}"; var jenistebus = $('#sltjenistebus').find(":selected").val(); var jbg = "{{ $gadai['tempoh'] }}"; diff --git a/routes/web.php b/routes/web.php index def71f8..ffc0ccf 100644 --- a/routes/web.php +++ b/routes/web.php @@ -155,6 +155,9 @@ Route::post('/createkelulu',['as'=>'teller.createkelulusan','uses'=>'GadaianCont Route::put('/updatekelulu',['as'=>'teller.updatekelulusan','uses'=>'GadaianController@updatekelulusan'])->middleware('auth','khazanah'); +//Tukaran Harga Emas Semasa +Route::get('/gethargaemassemasa',['as'=>'tukaran.hargaemas','uses'=>'PenebusanController@tukaranhargaemas']); + //Tuntut Baki Route::put('/simpantuntutbaki',['as'=>'lelong.tuntutbaki','uses'=>'LelongController@transaksituntutbaki'])->middleware('auth','teller'); From cba6a7118c2d45c5c60912e216941855464ff556 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Wed, 7 Apr 2021 15:51:04 +0800 Subject: [PATCH 2/8] 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 @@
-

Gadaian Belum Serah

- - - - +
+ + +
+
+ - + @@ -219,7 +226,6 @@
-

Rekod Gadaian

@@ -228,8 +234,8 @@
-
Bil Nama No KP No Rujukan Pembiayaan (RM)Nilai Marhun (RM)Nilai Marhun (RM) Berat (g)
- +
+ diff --git a/resources/views/homepage/teller/home.blade.php b/resources/views/homepage/teller/home.blade.php index f662a41..754ca9d 100644 --- a/resources/views/homepage/teller/home.blade.php +++ b/resources/views/homepage/teller/home.blade.php @@ -2,16 +2,16 @@ @section('content')
-
+
-
{{ __('Dashboard') }}
+
{{ __('Dashboard') }}
- PELANGGAN - HARGA EMAS - ALIRAN TUNAI - TETAPAN + PELANGGAN + HARGA EMAS + ALIRAN TUNAI + TETAPAN
diff --git a/resources/views/khazanah/agingbulanan.blade.php b/resources/views/khazanah/agingbulanan.blade.php index c39e884..a51f96a 100644 --- a/resources/views/khazanah/agingbulanan.blade.php +++ b/resources/views/khazanah/agingbulanan.blade.php @@ -10,10 +10,8 @@
-
-

Laporan Aging Bulanan

diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php index 329de77..94f8573 100644 --- a/resources/views/khazanah/alirantunai.blade.php +++ b/resources/views/khazanah/alirantunai.blade.php @@ -2,24 +2,83 @@ @section('content')
+ + + + +
Bil Nama
+ + + + + + + + + + + + + + + {{-- {{ dd($petibesi) }} --}} + @foreach ($petibesi as $tunai) + + + + + + + + + + + + @endforeach + +
BilTarikhBaki Awal TunaiKeluarMasukBaki EODBaki Akhir TunaiPendahuluanSerahan
{{ $loop->iteration }}{{ $tunai['tarikh'] }}{{ $tunai['bakiawal'] }}{{ $tunai['keluar'] }}{{ $tunai['masuk'] }}{{ $tunai['bakieod'] }}{{ $tunai['bakiakhir'] }}{{ $tunai['pendahuluan'] }}{{ $tunai['serahan'] }}
+
+ {{--
+ +
--}} +
+
+
+
-
{{ __('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 @@
-
- +
+
-
- Laporan Scan Barcode Gadaian +
+ Rekod Barcode Gadaian
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
-
+
- Rekod Telah Lulus + Rekod Kelulusan
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') }}
+
- Gadaian + Gadaian
- Lelongan + Lelongan
- Pelanggan Baru + Pelanggan Baru
- Ringkasan Terkumpul + Ringkasan Terkumpul
Aging Bulan @@ -30,24 +35,24 @@ Aging Pemodal
{{--
- Stok Audit Bersih + Stok Audit Bersih
--}} {{--
- Stok Audit Details + Stok Audit Details
--}}
- Penebusan + Penebusan
- Kawalan Stok Produk + Kawalan Stok Produk
- Batal Surat Gadai + Batal Surat Gadai
- Marhun Harian + Marhun Harian
Aging Pinjaman @@ -61,16 +66,16 @@
- Ansuran + Ansuran
- Stok Audit + Stok Audit
- Ringkasan Harian + Ringkasan Harian
- Marhun Terkumpul + Marhun Terkumpul
Aging Kawalan Stok @@ -79,7 +84,7 @@ Laporan ImbangDuga
- Laporan Peti Besi + Laporan Peti Besi
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 @@
-
{{ __('Khazanah') }}
+ + -
+
- Gadai {{ count($gadai) }} - Tebus {{ count($listserah) }} - Pendahuluan {{ $countmodal }} - Serahan {{ $countserahan }} + Gadai {{ count($gadai) }} + Tebus {{ count($listserah) }} + + Pendahuluan {{ $countmodal }} + Serahan {{ $countserahan }}
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 @@ - +
-
- + + + @@ -121,9 +123,21 @@ @endphp + + @php $count++; @endphp @endforeach @@ -131,8 +145,9 @@ + - +
Bil Nama
Bil MarhunNilai MarhunN. MarhunN. Marhun Semasa Berat/gram Karat HargaHarga Semasa
{{ $marhunperibadi['descpt'] }} RM {{ number_format($m['n_marhun'],2) }}@php + $karatbaru = str_replace('.','-',$m['karat']); + $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $hargaemassemasa = floatval($hargabaru['harga']) * floatval($m['berat']); + + echo "RM " . number_format($hargaemassemasa,2); + @endphp {{ $m['berat'] }} {{ $m['karat'] }} RM {{ $m['harga'] }}RM {{ number_format(floatval($hargabaru['harga']),2) }} @php if($m['harga'] > $hargabaru['harga']) echo ''; if($m['harga'] < $hargabaru['harga']) echo ''; + if($m['harga'] === $hargabaru['harga']) echo ''; + + @endphp
JUMLAH RM {{ number_format($gadai['nilaimarhun'],2) }}RM {{ number_format($nilaihargasemasa,2) }} {{ number_format($gadai['berat'],2) }}
@@ -191,13 +206,14 @@
PEMBIAYAAN HARGA SEMASA (RM)
- {{-- @php - $percent_asal = ($gadai['bakipjm'] / $gadai['nilaimarhun']) * 100; - @endphp --}} + @php + + $percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100; + @endphp
- +
- 40.88 + {{ number_format($percent_hargaemassemasa,2) }}
@@ -272,7 +288,7 @@ {{ number_format($percent_asal,2) }}
-
+
@@ -282,7 +298,7 @@
-
+
@@ -377,8 +393,9 @@ function tebusan(){ if(hargajualan != null ){ let maxgadaila = "{{ $maxgadai = ($gadai['nilaimarhun'] * 0.7) - $gadai['bakipjm'] }}"; + let maxgadaipembiayaanbaru = "{{ $maxgadaipemb = ($nilaihargasemasa * 0.7) - $gadai['bakipjm'] }}"; - $('#tambahpinjamsebenar').val(Number(maxgadaila).toFixed(2)); + $('#tambahpinjamsebenar').val(Number(maxgadaipembiayaanbaru).toFixed(2)); $('#divpembiayaanasal').hide(); $('#divbakihargajualan').show(); @@ -761,21 +778,32 @@ var maxpinjam = parseFloat($('#tambahpinjamsebenar').val()); var pinjambaru = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,"")); var pinjam = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")); + var pembiayaanbaru = parseFloat($('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,"")); //pembiayaan yang baru + var nm = parseFloat("{{ $gadai['nilaimarhun'] }}"); + var nmsemasa = parseFloat("{{ $nilaihargasemasa }}"); + const percentpinj = parseFloat("{{ $percent_asal }}"); + const percentpemb = parseFloat("{{ $percent_hargaemassemasa }}"); //pembiayaan yang baru + + console.log(percentpemb); var totalpinjbaru=0; totalpinjbaru = pinjam + parseFloat(e.value); $(e).val() == '' ? $('#pinjamanbaru').val(pinjam.toFixed(2)) : $('#pinjamanbaru').val(totalpinjbaru.toFixed(2)); + $(e).val() == '' ? $('#hargapembiayaansemasa').val(pinjam.toFixed(2)) : $('#hargapembiayaansemasa').val(totalpinjbaru.toFixed(2)); // if(parseFloat($(e).val()) > maxpinjam) // $(e).val(maxpinjam); var total = totalpinjbaru/nm * 100; + var totalsemasa = totalpinjbaru/nmsemasa * 100; $(e).val() == '' ? $('#basic-addon2').text(percentpinj.toFixed(2)) : $('#basic-addon2').text(total.toFixed(2)); + $(e).val() == '' ? $('#basic-hargaemas').text(percentpemb.toFixed(2)) : $('#basic-hargaemas').text(totalsemasa.toFixed(2)); + } let teller = "{{ Auth::user()->name }}"; @@ -1203,7 +1231,7 @@ /////////// }else if($('#sltjenistebus').find(":selected").val() == 'P'){ - let pinjamanbaru = $('#pinjamanbaru').val(); + let pinjamanbaru = $('#hargapembiayaansemasa').val(); let jenisbayarantebus = ''; if(hargajualan == null){ jenisbayarantebus = "nottawarruq"; @@ -1221,7 +1249,7 @@ return false; } - if(parseFloat($('#basic-addon2').text()) > 70 && parseFloat($('#basic-addon2').text()) <= 75){ + if(parseFloat($('#basic-hargaemas').text()) > 70 && parseFloat($('#basic-hargaemas').text()) <= 75){ const swalWithBootstrapButtons = Swal.mixin({ customClass: { confirmButton: 'btn btn-success', @@ -1241,9 +1269,9 @@ }).then((result) => { if (result.isConfirmed) { - let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-addon2').text(); + let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text(); let komen = "Pembiayaan Melebihi Margin 70%|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman"; - let jumpinjam = $('#pinjamanbaru').val(); + let jumpinjam = $('#hargapembiayaansemasa').val(); let teller = "{{ Auth::user()->name }}"; Swal.fire({ @@ -1329,7 +1357,7 @@ event.preventDefault(); return false; - }else if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80) || pinjamanbaru >= 10000){ + }else if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80) || pinjamanbaru >= 10000){ const swalWithBootstrapButtons = Swal.mixin({ customClass: { @@ -1340,7 +1368,7 @@ }); let text = ''; - if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80)) + if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80)) { text = 'Tetapan margin melebihi 75% untuk Operasi!'; }else if(pinjamanbaru >= 10000) @@ -1360,9 +1388,9 @@ }).then((result) => { if (result.isConfirmed) { - let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-addon2').text(); + let nm = $('#nilai_marhun_total').text();let ber = $('#berat_marhun_total').text();let marg = $('#basic-hargaemas').text(); let komen = ''; - if((parseFloat($('#basic-addon2').text()) > 75 && parseFloat($('#basic-addon2').text()) <= 80)) + if((parseFloat($('#basic-hargaemas').text()) > 75 && parseFloat($('#basic-hargaemas').text()) <= 80)) { komen = "Pembiayaan Melebihi Margin 75%|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman"; }else if(pinjamanbaru >= 10000) @@ -1370,7 +1398,7 @@ komen = "Pembiayaan Melebihi RM 10,000|" + nm + "|" + ber + "|" + marg + "| Tambah Pinjaman"; } - let jumpinjam = $('#pinjamanbaru').val(); + let jumpinjam = $('#hargapembiayaansemasa').val(); let teller = "{{ Auth::user()->name }}"; Swal.fire({ @@ -1459,7 +1487,7 @@ event.preventDefault(); return false; - }else if(parseFloat($('#basic-addon2').text()) > 80){ + }else if(parseFloat($('#basic-hargaemas').text()) > 80){ $("#terima_transaksi").prop('disabled', false); Swal.fire( 'Amaran!', @@ -1484,27 +1512,15 @@ } - //Buat Harga Baru Emas Semasa - $.ajax({ - method: "get", - url: "{{ route('tukaran.hargaemas') }}", - data: { - 'norujukan' : norujukan - }, - success:function(data){ - console.log(data); - } - }); - return; var nopelanggan = "{{ $gadai['nopelanggan'] }}"; var jenistebus = $('#sltjenistebus').find(":selected").val(); var jbg = "{{ $gadai['tempoh'] }}"; var kadarupah = "{{ $gadai['kadarupah'] }}"; - var nilai_marhun = "{{ $gadai['nilaimarhun']}}"; + var nilai_marhun = "{{ $nilaihargasemasa }}"; var pinjaman_lama = "{{ $gadai['bakipjm'] }}"; - var pinjaman = parseFloat($('#pinjamanbaru').val().replace(/[^0-9.-]+/g,"")); + var pinjaman = parseFloat($('#hargapembiayaansemasa').val().replace(/[^0-9.-]+/g,"")); var ansuran = 0; var addpinjaman = $('#tambahpinjam').val() == '' ? 0 : parseFloat($('#tambahpinjam').val().replace(/[^0-9.-]+/g,"")); var maxpinjaman = parseFloat($('#tambahpinjamsebenar').val().replace(/[^0-9.-]+/g,"")); From 90195887aec66e6d8c5eb66cd4c1a7c8e081efaa Mon Sep 17 00:00:00 2001 From: fifi97 Date: Sat, 10 Apr 2021 17:04:29 +0800 Subject: [PATCH 5/8] fix --- app/Http/Controllers/KhazanahController.php | 20 +++++++-- app/Http/Controllers/PenebusanController.php | 2 - .../views/homepage/teller/home.blade.php | 2 +- resources/views/penebusan/index.blade.php | 42 +++++++++++++++---- .../views/print/laporan_imbanduga.blade.php | 42 +++++++++++-------- 5 files changed, 75 insertions(+), 33 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index a4f7f0d..dc9d85d 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1975,9 +1975,11 @@ class KhazanahController extends Controller //Harta semasa $pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberi/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); + $pembiayaantawarruq = Http::get(config('api.url').'/api/PembiayaanDiberiTawarruq/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTangan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $penghutangkaki = Http::get(config('api.url').'/api/PenghutangKakitangan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); - + $untungrugi = Http::get(config('api.url').'/api/UntungRugiCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); + $bayaranpendahuluan = Http::get(config('api.url').'/api/BayaranPendahuluan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); //Tanggungan Semasa $panjar = Http::get(config('api.url').'/api/CalculationPanjar/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); @@ -1994,11 +1996,12 @@ class KhazanahController extends Controller $hartasemasa = []; // $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']]; - array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan['bakiakhir']]); + array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $tunaiditangan]); + array_push($hartasemasa,['glcode' => '1000/010','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq]); array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Penghutang Kakitangan', 'amaun' => $penghutangkaki]); array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); - array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => 0]); + array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]); array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => 0]); array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); @@ -2035,7 +2038,16 @@ class KhazanahController extends Controller $totaltanggungansemasa += $ts['amaun']; } - return view('print.laporan_imbanduga',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','tanggungansemasa','totalhartasemasa','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail')); + $untungrugifield = []; + $untungrugi = 0; + array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]); + + + $totaluntungrugi = 0; + $totaluntungrugi = $totaltanggungansemasa + $untungrugi; + + + return view('print.laporan_imbanduga',compact('tarikh_imbangan', 'tarikh_imbangan2','hartasemasa','untungrugifield','tanggungansemasa','totalhartasemasa','totaluntungrugi','totaltanggungansemasa','tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail')); } diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index 5df17b3..20d15c6 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -526,11 +526,9 @@ class PenebusanController extends Controller $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat'])); $totalnilaimarhun += $nilaimarhun; - } return $totalnilaimarhun; - } } diff --git a/resources/views/homepage/teller/home.blade.php b/resources/views/homepage/teller/home.blade.php index 754ca9d..e89091f 100644 --- a/resources/views/homepage/teller/home.blade.php +++ b/resources/views/homepage/teller/home.blade.php @@ -5,7 +5,7 @@
-
{{ __('Dashboard') }}
+
{{ __('Paparan Utama') }}
PELANGGAN diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index d094457..1b4403a 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -117,18 +117,19 @@ @php $count = 0; @endphp @foreach ($marhun as $index=>$m) - {{ $index+1 }} + @php + $karatbaru = str_replace('.','-',$m['karat']); + $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $hargaemassemasa = floatval($hargabaru['harga']) * floatval($m['berat']); + @endphp + {{ $index+1 }} @php $marhunperibadi = Http::get(config('api.url') .'/api/jemas/nama_marhun/',["marhun" => $m['marhun']])->json(); @endphp {{ $marhunperibadi['descpt'] }} RM {{ number_format($m['n_marhun'],2) }} @php - $karatbaru = str_replace('.','-',$m['karat']); - $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); - - $hargaemassemasa = floatval($hargabaru['harga']) * floatval($m['berat']); - echo "RM " . number_format($hargaemassemasa,2); @endphp {{ $m['berat'] }} @@ -273,6 +274,17 @@
+
+
+
+ PEMBIAYAAN BARU HARGA SEMASA (RM) +
+
+ +
+
+
+
@@ -299,7 +311,6 @@
-
@@ -341,16 +352,19 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); + $('#divpembiayaanseparuhhargasemasa').hide(); var array_recno = []; var array_nm = []; var array_marhun = []; var array_berat = []; + var array_nmhs = []; //max bayaran let jumlahasalmarhun = parseFloat("{{ $gadai['nilaimarhun'] }}"); let totalmarhun = jumlahasalmarhun; + let totalmarhunhargasemasa = jumlahasalmarhun; let bayaranseparuhasal = 0; @@ -501,19 +515,23 @@ var nilaimarhun = $(this).data('nm'); var marhun = $(this).data('marhun'); var berat = $(this).data('berat'); + var nilaimarhunhargasemasa = $(this).data('nmhs'); if ($(this).is(':checked')) { array_recno.push(recno); array_nm.push(nilaimarhun); array_marhun.push(marhun); array_berat.push(berat); + array_nmhs.push(nilaimarhunhargasemasa); totalmarhun = totalmarhun - parseFloat(nilaimarhun); + totalmarhunhargasemasa = totalmarhunhargasemasa - parseFloat(nilaimarhunhargasemasa); }else{ var rm = array_recno.findIndex(x => x === recno); var rmnilai = array_nm.findIndex(y => y == nilaimarhun); + var rmhargasemasa = array_nmhs.findIndex(y => y == nilaimarhunhargasemasa); var rmmarhun = array_marhun.findIndex(z => z == marhun); var rmberat = array_berat.findIndex(a => a == berat); @@ -521,10 +539,10 @@ array_nm.splice(rmnilai,1); array_marhun.splice(rmmarhun,1); array_berat.splice(rmberat,1); + array_nmhs.splice(rmhargasemasa,1); totalmarhun = totalmarhun + parseFloat(nilaimarhun); - - + totalmarhunhargasemasa = totalmarhunhargasemasa + parseFloat(nilaimarhunhargasemasa); } if(numbernotchecked != totalCheckboxes){ $.ajax({ @@ -646,6 +664,8 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); + $('#divpembiayaanseparuhhargasemasa').hide(); + $('#divtelahdibayar').show(); @@ -668,6 +688,7 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); + $('#divpembiayaanseparuhhargasemasa').hide(); $('#divtelahdibayar').show(); @@ -696,6 +717,8 @@ $('#divtelahdibayar').show(); $('#divbayaran').show(); $('#divperludibayar').show(); + $('#divpembiayaanseparuhhargasemasa').show(); + $('#perludibayar').val(formatter.format(jumupah)); @@ -711,6 +734,7 @@ $('#divhargaemassemasa').show(); $('#divtelahdibayar').hide(); + $('#divpembiayaanseparuhhargasemasa').hide(); $('#divbakipinjaman').hide(); $('#divbayaran').hide(); $('#divperludibayar').hide(); diff --git a/resources/views/print/laporan_imbanduga.blade.php b/resources/views/print/laporan_imbanduga.blade.php index 51b727a..5898b6a 100644 --- a/resources/views/print/laporan_imbanduga.blade.php +++ b/resources/views/print/laporan_imbanduga.blade.php @@ -411,16 +411,6 @@ - - - - - - - - - - @@ -442,8 +432,6 @@
-
- @@ -451,7 +439,6 @@
LAPORAN IMBANGAN DUGA CAWANGAN
-
@@ -463,7 +450,6 @@

-
@@ -494,12 +480,10 @@

-
-
- + @@ -518,6 +502,30 @@ +
TANGGUNGAN SEMASA T. SEMASA
{{ number_format($totaltanggungansemasa,2) }}
+
+ + + + + + + + + @foreach($untungrugifield as $index => $untungrugi) + + + + + + @endforeach + + + + + + +
Untung Rugi
{{ $untungrugi['glcode'] }}{{ $untungrugi['descpt'] }}{{ number_format($untungrugi['amaun'],2) }}
JUMLAH {{ number_format($totaluntungrugi,2) }}

From 65911fde8883f31b9f4d32ac1e3da111a1f8273c Mon Sep 17 00:00:00 2001 From: fifi97 Date: Sun, 11 Apr 2021 07:35:57 +0800 Subject: [PATCH 6/8] fix untuk ppi --- app/Http/Controllers/KhazanahController.php | 6 +++--- resources/views/print/laporan_imbanduga.blade.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index dc9d85d..137d17b 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -1972,6 +1972,7 @@ class KhazanahController extends Controller //Calculation Imbang Duga $imbangduga = Http::get(config('api.url').'/api/CalculationPendahuluanSerahan/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); $keuntungan = Http::get(config('api.url').'/api/KeuntunganArRahn/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); + $rebet = Http::get(config('api.url').'/api/RebetCalculation/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); //Harta semasa $pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberi/' . $auth_user['cawangan'],['tarikh' => $tarikh_imbangan2])->json(); @@ -2002,7 +2003,7 @@ class KhazanahController extends Controller array_push($hartasemasa,['glcode' => '1000/045','descpt' => 'Serahan Bayaran Online', 'amaun' => 0.00]); array_push($hartasemasa,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); array_push($hartasemasa,['glcode' => '5000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan * -1)]); - array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => 0]); + array_push($hartasemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); array_push($hartasemasa,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]); array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]); @@ -2020,7 +2021,7 @@ class KhazanahController extends Controller array_push($tanggungansemasa,['glcode' => '2000/007','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]); array_push($tanggungansemasa,['glcode' => '5000/013','descpt' => 'Keuntungan Sebenar','amaun' => $keuntungansebenar]); - array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => 0]); + array_push($tanggungansemasa,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet * -1)]); array_push($tanggungansemasa,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); array_push($tanggungansemasa,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => -$panjar['bds']]); array_push($tanggungansemasa,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => -$panjar['perubatan']]); @@ -2039,7 +2040,6 @@ class KhazanahController extends Controller } $untungrugifield = []; - $untungrugi = 0; array_push($untungrugifield,['glcode' => '2000/007','descpt' => 'Keuntungan', 'amaun' => $untungrugi]); diff --git a/resources/views/print/laporan_imbanduga.blade.php b/resources/views/print/laporan_imbanduga.blade.php index 5898b6a..8bfdfbb 100644 --- a/resources/views/print/laporan_imbanduga.blade.php +++ b/resources/views/print/laporan_imbanduga.blade.php @@ -475,7 +475,7 @@ JUMLAH - {{ number_format($totalhartasemasa,2) }} + {{ number_format($totalhartasemasa,2) }} @@ -523,7 +523,7 @@ JUMLAH - {{ number_format($totaluntungrugi,2) }} + {{ number_format($totaluntungrugi,2) }} From c99af69229fcdf8738c42af86a58e6ee0b29343e Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Sun, 11 Apr 2021 17:37:42 +0800 Subject: [PATCH 7/8] fix skit2 --- app/Http/Controllers/PenebusanController.php | 15 ++++- resources/views/penebusan/index.blade.php | 58 +++++++------------- 2 files changed, 34 insertions(+), 39 deletions(-) diff --git a/app/Http/Controllers/PenebusanController.php b/app/Http/Controllers/PenebusanController.php index 20d15c6..107f500 100644 --- a/app/Http/Controllers/PenebusanController.php +++ b/app/Http/Controllers/PenebusanController.php @@ -203,6 +203,7 @@ class PenebusanController extends Controller $auth_user = Auth::user(); + //////////////////////// /// UPDATE TEBUS API//// /////////////////////// @@ -305,7 +306,12 @@ class PenebusanController extends Controller $marhunyangdiambil = $marhunsediada[0]; foreach($marhunyangdiambil as $index=>$marhunloop) { - array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $marhunloop['harga'], "n_marhun" => $marhunloop['n_marhun']]); + $karatbaru = str_replace('.','-',$marhunloop['karat']); + $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat'])); + + array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]); } foreach($arraymarhunbaru as $array1){ @@ -437,7 +443,12 @@ class PenebusanController extends Controller { if(!in_array($marhunloop['recno'], $arraydiola)) { - array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $marhunloop['harga'], "n_marhun" => $marhunloop['n_marhun']]); + $karatbaru = str_replace('.','-',$marhunloop['karat']); + $hargabaru = Http::get(config('api.url') . '/api/harga_emas/'. $karatbaru)->json(); + + $nilaimarhun = (floatval($hargabaru['harga']) * floatval($marhunloop['berat'])); + + array_push($arraymarhunbaru, ["bil" => $marhunloop['bil'],"marhun" => $marhunloop['marhun'],"nota" => $marhunloop['nota'],"karat" => $marhunloop['karat'], "berat" => $marhunloop['berat'], "harga" => $hargabaru['harga'], "n_marhun" => $nilaimarhun]); } } diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index 1b4403a..e7b1342 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -205,13 +205,12 @@
- PEMBIAYAAN HARGA SEMASA (RM) + PEMBIAYAAN H. SEMASA (RM)
@php - $percent_hargaemassemasa = ($gadai['bakipjm'] / $nilaihargasemasa) * 100; @endphp -
+
{{ number_format($percent_hargaemassemasa,2) }} @@ -274,16 +273,6 @@
-
-
-
- PEMBIAYAAN BARU HARGA SEMASA (RM) -
-
- -
-
-
@@ -352,14 +341,13 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); - $('#divpembiayaanseparuhhargasemasa').hide(); var array_recno = []; var array_nm = []; var array_marhun = []; var array_berat = []; - var array_nmhs = []; + // var array_nmhs = []; //max bayaran let jumlahasalmarhun = parseFloat("{{ $gadai['nilaimarhun'] }}"); @@ -516,13 +504,15 @@ var marhun = $(this).data('marhun'); var berat = $(this).data('berat'); var nilaimarhunhargasemasa = $(this).data('nmhs'); + var nmsemasa = parseFloat("{{ $nilaihargasemasa }}"); + if ($(this).is(':checked')) { array_recno.push(recno); - array_nm.push(nilaimarhun); + // array_nm.push(nilaimarhun); //nilai harga lama array_marhun.push(marhun); array_berat.push(berat); - array_nmhs.push(nilaimarhunhargasemasa); + array_nm.push(nilaimarhunhargasemasa); //nilai harga semasa totalmarhun = totalmarhun - parseFloat(nilaimarhun); @@ -530,27 +520,31 @@ }else{ var rm = array_recno.findIndex(x => x === recno); - var rmnilai = array_nm.findIndex(y => y == nilaimarhun); - var rmhargasemasa = array_nmhs.findIndex(y => y == nilaimarhunhargasemasa); + // var rmnilai = array_nm.findIndex(y => y == nilaimarhun); // harga lama + var rmnilai = array_nm.findIndex(y => y == nilaimarhunhargasemasa); // harga lama + // var rmhargasemasa = array_nmhs.findIndex(y => y == nilaimarhunhargasemasa); var rmmarhun = array_marhun.findIndex(z => z == marhun); var rmberat = array_berat.findIndex(a => a == berat); array_recno.splice(rm,1); - array_nm.splice(rmnilai,1); + // array_nm.splice(rmnilai,1); // yang lama array_marhun.splice(rmmarhun,1); array_berat.splice(rmberat,1); - array_nmhs.splice(rmhargasemasa,1); + array_nm.splice(rmnilai,1); //yang harga semasa totalmarhun = totalmarhun + parseFloat(nilaimarhun); totalmarhunhargasemasa = totalmarhunhargasemasa + parseFloat(nilaimarhunhargasemasa); } if(numbernotchecked != totalCheckboxes){ + + // console.log(nmsemasa); $.ajax({ method:'GET', url: api + '/api/tebusseparuhtawarruq/' + kodcaw + '/' + norujukan, dataType: 'json', data:{ - "array_recno" : array_recno + "array_recno" : array_recno, + "hargasemasa" : nmsemasa }, success:function(success){ let bayarz = $('#bayaran').val(formatter.format(success)); @@ -664,7 +658,6 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); - $('#divpembiayaanseparuhhargasemasa').hide(); @@ -688,7 +681,6 @@ $('#divbayaranditerima').hide(); $('#divbakipinjaman').hide(); $('#divhargaemassemasa').hide(); - $('#divpembiayaanseparuhhargasemasa').hide(); $('#divtelahdibayar').show(); @@ -717,7 +709,6 @@ $('#divtelahdibayar').show(); $('#divbayaran').show(); $('#divperludibayar').show(); - $('#divpembiayaanseparuhhargasemasa').show(); @@ -734,7 +725,6 @@ $('#divhargaemassemasa').show(); $('#divtelahdibayar').hide(); - $('#divpembiayaanseparuhhargasemasa').hide(); $('#divbakipinjaman').hide(); $('#divbayaran').hide(); $('#divperludibayar').hide(); @@ -755,9 +745,9 @@ let pdbyr = 0; let totalseparuh = 0; - console.log($('#jumlahupah').val()); - console.log(bayaranseparuhasal); - console.log(byr); + // console.log($('#jumlahupah').val()); + // console.log(bayaranseparuhasal); + // console.log(byr); if(byr < (bayaranseparuhasal + parseFloat($('#jumlahupah').val()))){ $('#bayaran').val(bayaranseparuhasal.toFixed(2)); @@ -810,8 +800,6 @@ const percentpinj = parseFloat("{{ $percent_asal }}"); const percentpemb = parseFloat("{{ $percent_hargaemassemasa }}"); //pembiayaan yang baru - console.log(percentpemb); - var totalpinjbaru=0; totalpinjbaru = pinjam + parseFloat(e.value); @@ -1152,7 +1140,7 @@ var jbg = "{{ $gadai['tempoh'] }}"; var kadarupah = "{{ $gadai['kadarupah'] }}"; var nilai_marhun_lama = parseFloat("{{ $gadai['nilaimarhun'] }}"); - var nilai_marhun = parseFloat("{{ $gadai['nilaimarhun'] }}") - sumnilaimarhun; + var nilai_marhun = parseFloat("{{ $nilaihargasemasa }}") - sumnilaimarhun; var pinjamanbaru = $('#bakipinjaman').val().replace(/[^0-9.-]+/g,""); var ansuran = 0; var addpinjaman = 0; @@ -1166,7 +1154,6 @@ var marhun_detail = marhun_baru; var kuantiti_marhun = Number("{{sizeof($marhun)}}") - array_recno.length; var nowakil = nw; - var kadarupahbaru = 0; @@ -1228,7 +1215,6 @@ "_token": "{{ csrf_token() }}" }, success:function(data){ - console.log(data); }, error: function(xhr, status, error) { var err = eval("(" + xhr.responseText + ")"); alert(xhr.responseText); @@ -1535,9 +1521,6 @@ jenisbayarantebus = "tawarruq"; } - - return; - var nopelanggan = "{{ $gadai['nopelanggan'] }}"; var jenistebus = $('#sltjenistebus').find(":selected").val(); var jbg = "{{ $gadai['tempoh'] }}"; @@ -1598,6 +1581,7 @@ }, success:function(success_data){ + var urlroute = '{{ route("resit.tambahpinjam", ":id") }}'; urlroute = urlroute.replace(':id', norujukan); From 4376e164b88f1e79c2e9b73ee6fb2d6690ba7488 Mon Sep 17 00:00:00 2001 From: MUHD HAFIFIE Date: Mon, 12 Apr 2021 16:24:43 +0800 Subject: [PATCH 8/8] buat penebusan je --- resources/views/penebusan/index.blade.php | 60 ++++++++++++++++++++++- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php index e7b1342..6a996ed 100644 --- a/resources/views/penebusan/index.blade.php +++ b/resources/views/penebusan/index.blade.php @@ -256,10 +256,14 @@
PEMBIAYAAN BARU(RM)
-
+
+ +
+
+
@@ -505,7 +509,8 @@ var berat = $(this).data('berat'); var nilaimarhunhargasemasa = $(this).data('nmhs'); var nmsemasa = parseFloat("{{ $nilaihargasemasa }}"); - + let totalnilaimarhunseparuh = 0; + if ($(this).is(':checked')) { array_recno.push(recno); @@ -535,6 +540,16 @@ totalmarhun = totalmarhun + parseFloat(nilaimarhun); totalmarhunhargasemasa = totalmarhunhargasemasa + parseFloat(nilaimarhunhargasemasa); } + + $.each( array_nm, function( index, value ) { + totalnilaimarhunseparuh += parseFloat(value); + }); + + // console.log("TOTAL HARGA SEMASA :" + totalmarhunhargasemasa); + // console.log("TOTAL HARGA SEMASA SPEARUH :" + totalnilaimarhunseparuh); + // console.log("YANG DIAMBIL :" + nilaimarhunhargasemasa); + + if(numbernotchecked != totalCheckboxes){ // console.log(nmsemasa); @@ -549,6 +564,8 @@ success:function(success){ let bayarz = $('#bayaran').val(formatter.format(success)); + + bayaranseparuhasal = Number(success); let bakihargajual = $('#bakihargajualan').val().replace(/[^0-9.-]+/g,""); @@ -558,6 +575,11 @@ let totalbakipinjam = parseFloat($('#pinjaman').val().replace(/[^0-9.-]+/g,"")) - success; $('#bakipinjaman').val(formatter.format(totalbakipinjam)); + let bakinm = nmsemasa - totalnilaimarhunseparuh; + var totalcalculate = ((totalbakipinjam/bakinm)*100); + + $('#basic-separuh').text(Number(totalcalculate.toFixed(2))); + },error:function(xhr, textStatus, errorThrown){ console.log(xhr.responseText); console.log(textStatus); @@ -567,6 +589,7 @@ }else{ $('#perludibayar').val(parseFloat($('#jumlahupah').val())); $('#bakipinjaman').val(0); + $('#basic-separuh').text(0) $('#bayaran').val(0); } @@ -744,11 +767,18 @@ let total = 0; let pdbyr = 0; let totalseparuh = 0; + let totalnilaimarhunseparuh = 0; + var nmsemasa = parseFloat("{{ $nilaihargasemasa }}"); + // console.log($('#jumlahupah').val()); // console.log(bayaranseparuhasal); // console.log(byr); + $.each( array_nm, function( index, value ) { + totalnilaimarhunseparuh += parseFloat(value); + }); + if(byr < (bayaranseparuhasal + parseFloat($('#jumlahupah').val()))){ $('#bayaran').val(bayaranseparuhasal.toFixed(2)); }else{ @@ -762,6 +792,15 @@ // $('#perludibayar').val(pdbyr); $('#bakipinjaman').val(total.toFixed(2)); + + + + let bakinm = nmsemasa - totalnilaimarhunseparuh; + var totalcalculate = ((total/bakinm)*100); + + $('#basic-separuh').text(Number(totalcalculate.toFixed(2))); + + } } @@ -1059,6 +1098,9 @@ //////////// }else if($('#sltjenistebus').find(":selected").val() == 'S'){ + + let separuhla = Number($('#basic-separuh').text()); + let jenisbayarantebus = ''; if(hargajualan == null) { @@ -1068,6 +1110,20 @@ jenisbayarantebus = "tawarruq"; } + if(separuhla <= 10) + { + $("#terima_transaksi").prop('disabled', false); + Swal.fire('Amaran!','Margin Pembiayaan kurang daripada 10%!','error'); + return false; + } + + if(separuhla >= 80) + { + $("#terima_transaksi").prop('disabled', false); + Swal.fire('Amaran!','Margin Pembiayaan lebih daripada 80%!','error'); + return false; + } + if($('#perludibayar').val() < (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val()))) { $("#terima_transaksi").prop('disabled', false);