From 3eb90e2c894c784c14d613fc0725ee21c573bbd6 Mon Sep 17 00:00:00 2001 From: "LAPTOP-DGCU80CH\\user1" Date: Thu, 26 Nov 2020 16:53:16 +0800 Subject: [PATCH] latest --- app/Http/Controllers/Auth/LoginController.php | 4 +- app/Http/Controllers/HomeController.php | 4 +- resources/views/customers/info.blade.php | 10 +- resources/views/gadaian/index.blade.php | 25 ++- .../views/homepage/penilai/home.blade.php | 201 +++++++++++++++++- resources/views/layouts/app.blade.php | 4 +- routes/web.php | 6 +- 7 files changed, 228 insertions(+), 26 deletions(-) diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 5f081f2..b183f1e 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -64,7 +64,9 @@ class LoginController extends Controller return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info')); }elseif($auth_user['roles'] == 'penilai'){ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info')); + $gadaian_semasa = Http::get(config('api.url') . '/api/gadaiansemasa/'. $auth_user['cawangan'])->json(); + $gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json(); + return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah')); } elseif($auth_user['roles'] == 'khazanah'){ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index ce03ad7..3037dcb 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -33,7 +33,9 @@ class HomeController extends Controller return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info')); }elseif($auth_user['roles'] == 'penilai'){ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); - return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info')); + $gadaian_semasa = Http::get(config('api.url') . '/api/gadaiansemasa/'. $auth_user['cawangan'])->json(); + $gadaian_belumserah = Http::get(config('api.url') . '/api/gadaiansemasa/belum_serah/'. $auth_user['cawangan'])->json(); + return view('homepage.'.$auth_user['roles'].'.home',compact('cawangan_info','gadaian_semasa','gadaian_belumserah')); } elseif($auth_user['roles'] == 'khazanah'){ $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php index 7c24c58..7017d02 100644 --- a/resources/views/customers/info.blade.php +++ b/resources/views/customers/info.blade.php @@ -61,20 +61,20 @@ -
+
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php index 8f2faa8..42ed935 100644 --- a/resources/views/gadaian/index.blade.php +++ b/resources/views/gadaian/index.blade.php @@ -149,9 +149,9 @@
- - - + Batal + +
@@ -283,7 +283,7 @@ getHargaEmas(karat,berat) }); - $('#berat_emas').change(function(){ + $('#berat_emas').on('input',function(){ var berat = this.value; var karat = $('#karat').val(); karat = karat.replace(/\./g,'-'); @@ -353,12 +353,13 @@ counter = counter + 1; }); }); - var pinjaman_pelulus = 0; - var pinjaman_teller = 0; + $.ajax({ method:'GET', url:'http://localhost:8000/api/maxpinjaman', success:function(data){ + var pinjaman_pelulus = 0; + var pinjaman_teller = 0; $.each(data,function(index,pinjaman){ if(pinjaman['user_type'] == 'teller'){ pinjaman_teller = Number(pinjaman['max']); @@ -369,16 +370,15 @@ }); $('.span-pinjaman-max-pelulus').text(pinjaman_pelulus + ' %'); $('.span-pinjaman-max').text(pinjaman_teller + ' %'); + var max_teller = total_nilai_marhun * (pinjaman_teller/100); + var max_pelulus = total_nilai_marhun * (pinjaman_pelulus/100); + $('#pinjaman_max_teller').val(formatter.format(max_teller)); + $('#pinjaman_max_pelulus').val(formatter.format(max_pelulus)); } }); - var max_teller = total_nilai_marhun * (pinjaman_teller/100); - var max_pelulus = total_nilai_marhun * (pinjaman_pelulus/100); - - $('#pinjaman_max_teller').val(max_teller.toFixed(2)); - $('#pinjaman_max_pelulus').val(max_pelulus.toFixed(2)); } - $('#pinjaman').change(function(){ + $('#pinjaman').on('input',function(){ var pinjaman = Number(this.value); if(pinjaman > 0 && pinjaman < 401){ @@ -511,7 +511,6 @@ var pinjaman = Number($('#pinjaman').val()); var percentpinj = Number(pinjaman)/Number(total_nilai_marhun); - // console.log(kodcaw,nokp,jantina,bangsa,nopelanggan,norujukan,pinjaman,percentpinj); $.ajax({ method:'PUT', url: 'http://localhost:8000/api/gadai/norujukan/'+kodcaw+'/'+norujukan, diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php index 3a57be1..e9ccbab 100644 --- a/resources/views/homepage/penilai/home.blade.php +++ b/resources/views/homepage/penilai/home.blade.php @@ -1,17 +1,212 @@ @extends('layouts.app') + + @section('content')
-
+
{{ __('Dashboard') }}
- +
- Penilai + +
+
+

Gadaian Semasa

+ + + + + + + + + + + + @php $count=1; @endphp + @if (is_array($gadaian_semasa) || is_object($gadaian_semasa)) + @foreach($gadaian_semasa as $index=>$gadaian) + + + + + + + + @php $count++; @endphp + @endforeach + @endif + +
BilNo RujukanPembiayaan (RM)Nilai Marhun (RM)Berat (g)
{{ $count }} + @php + $marhun = Http::get('http://localhost:8000/api/marhun/' . $gadaian['norujukan'] )->json(); + @endphp + {{$gadaian['norujukan']}} + {{ $gadaian['pinjaman'] }}{{ $gadaian['nilaimarhun'] }}{{ $gadaian['berat'] }}
+
+
+

Gadaian Belum Serah

+ + + + + + + + + + + + @php $count=1; @endphp + @if (is_array($gadaian_belumserah) || is_object($gadaian_belumserah)) + @foreach($gadaian_belumserah as $index=>$gadaian) + + + + + + + + @php $count++; @endphp + @endforeach + @endif + +
BilNo RujukanPembiayaan (RM)Nilai Marhun (RM)Berat (g)
+ @php + $marhun = Http::get('http://localhost:8000/api/marhun/' . $gadaian['norujukan'] )->json(); + @endphp + {{$gadaian['norujukan']}} + {{ $gadaian['pinjaman'] }}{{ $gadaian['nilaimarhun'] }}{{ $gadaian['berat'] }}
+
+
+ Jumlah Nilai Marhun Dipilih +
+ +
+ + Serah Marhun +
+
+
+
+ @endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 7b5427a..584a81b 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -39,7 +39,7 @@ function startTime() { var today = new Date(); var d = today.getDate(); - var mon = today.getMonth(); + var mon = today.getMonth()+1; var y = today.getFullYear() var h = today.getHours(); var m = today.getMinutes(); @@ -62,7 +62,7 @@