diff --git a/app/Http/Controllers/AnalisaController.php b/app/Http/Controllers/AnalisaController.php index d9b8584..4054b7c 100644 --- a/app/Http/Controllers/AnalisaController.php +++ b/app/Http/Controllers/AnalisaController.php @@ -67,6 +67,19 @@ class AnalisaController extends Controller $harga_emas = Http::get(config('api.url') .'/api/harga_emas/')->json(); + $hargaemasterdahulu = array(); + + foreach($harga_emas as $index=>$harga) + { + $hargaemassandaran = Http::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]); + + } + + $belum_tebus = Http::get(config('api.url') . '/api/customers/'. $kpbaru . '/gadai/' . 'belum_tebus')->json(); if(is_array($belum_tebus)) @@ -77,9 +90,13 @@ class AnalisaController extends Controller } } + //Harga Emas + + + // $StatistikBulanan = Http::get(config('api.url') .'/portal/financeMonth/',['icno' => $kpbaru])->json(); - return view('analisa.index', compact("totalgadai",'bilangan_belum_tebus','belum_tebus','harga_emas','bilangan_melebihi_6_bulan','bilakandilelong')); + return view('analisa.index', compact("totalgadai",'bilangan_belum_tebus','belum_tebus','hargaemasterdahulu','bilangan_melebihi_6_bulan','bilakandilelong')); } } diff --git a/public/argon/login/backg1.jpg b/public/argon/login/backg1.jpg index 12ca0f7..6b29ab4 100644 Binary files a/public/argon/login/backg1.jpg and b/public/argon/login/backg1.jpg differ diff --git a/public/argon/login/backg1backup.jpg b/public/argon/login/backg1backup.jpg new file mode 100644 index 0000000..12ca0f7 Binary files /dev/null and b/public/argon/login/backg1backup.jpg differ diff --git a/public/argon/login/backg4.jpg b/public/argon/login/backg4.jpg new file mode 100644 index 0000000..e4faf7f Binary files /dev/null and b/public/argon/login/backg4.jpg differ diff --git a/public/argon/login/backg4.jpeg b/public/argon/login/backg4backup.jpeg similarity index 100% rename from public/argon/login/backg4.jpeg rename to public/argon/login/backg4backup.jpeg diff --git a/resources/views/analisa/index.blade.php b/resources/views/analisa/index.blade.php index 9853c5e..dc37b66 100644 --- a/resources/views/analisa/index.blade.php +++ b/resources/views/analisa/index.blade.php @@ -230,15 +230,19 @@ Karat Harga (RM) - Kenaikan + Perubahan (%) - @foreach($harga_emas as $index=>$hm) + @foreach($hargaemasterdahulu as $index=>$hm) {{ $hm['karat'] }} - {{ $hm['harga'] }} - + {{ $hm['hargasemasa'] }} + @if($hm['percent'] > 0) + ({{ number_format($hm['percent'],2) }}) + @else + ({{ number_format($hm['percent']*-1,2) }}) + @endif @endforeach diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 2efc742..4dc2f94 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -56,7 +56,8 @@
- Pertama Kali |@if (Route::has('password.request')) Lupa Katalaluan@endif + Pertama Kali |@if (Route::has('password.request')) Lupa Katalaluan@endif + {{-- Pertama Kali |@if (Route::has('password.request')) Lupa Katalaluan@endif --}}


Paparan terbaik menggunakan Mozilla Firefox, Google Chrome & Internet Explorer 9.0 ke atas dengan resolusi 1920 x 1080
diff --git a/resources/views/auth/pertama-kali/pertamakalistep1.blade.php b/resources/views/auth/pertama-kali/pertamakalistep1.blade.php index ed6c11f..b1ff3c8 100644 --- a/resources/views/auth/pertama-kali/pertamakalistep1.blade.php +++ b/resources/views/auth/pertama-kali/pertamakalistep1.blade.php @@ -202,6 +202,7 @@ { var otp_verify = $('#login-otp').val(); var otp_icno = $('#login-icno').val(); + var boolotp = false;var boolicno = false; if(otp_verify == null || otp_verify == '') { @@ -209,11 +210,13 @@ $('#errorotp').text('sila isikan otp anda!'); $('#spanotp').addClass('visible'); $('#spanotp').removeClass('invisible'); + boolotp = true; } else{ $('#errorotp').text(''); $('#spanotp').addClass('invisible'); $('#spanotp').removeClass('visible'); + boolotp = false; } if(otp_icno == null || otp_icno == '') @@ -221,13 +224,17 @@ $('#erroricno').text('sila isikan icno anda!'); $('#spanic').addClass('visible'); $('#spanic').removeClass('invisible'); + boolicno = true; }else{ $('#erroricno').text(''); $('#spanic').addClass('invisible'); $('#spanic').removeClass('visible'); + boolicno = false; } - $.ajax({ + if(boolotp === false && boolicno === false) + { + $.ajax({ url: api_url + '/api/otp/check/'+ otp_verify, method:'GET', success:function(data){ @@ -276,13 +283,28 @@ } }); } + else{ + $.notify({ + icon: 'fas fa-exclamation-triangle fa-2x', + newest_on_top: true, + message: "Pelanggan tidak membuat sebarang login!" + },{ + type: 'danger', + allow_dismiss: false, + placement:{ align:'center',from:'bottom'}, + animate: { + enter: 'animate__animated animate__bounce', + + exit: 'animate__animated animate__bounceOutDown' + } + }); + } } - }); + }); - - - + } + } function backfunc() diff --git a/resources/views/auth/slides/slidespage.blade.php b/resources/views/auth/slides/slidespage.blade.php index edd1582..ea96e23 100644 --- a/resources/views/auth/slides/slidespage.blade.php +++ b/resources/views/auth/slides/slidespage.blade.php @@ -3,13 +3,12 @@
-
1 / 3
+
1 / 2
{{--
Caption Text
--}}
-
@@ -25,13 +24,12 @@
--}}
-
3 / 3
- +
2 / 2
+ {{--
Caption Three
--}}
-
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index f338406..7791d10 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -66,7 +66,7 @@
-
+
@@ -163,6 +163,27 @@
+ @endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index cf87338..7d31666 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -4,6 +4,9 @@ + + + @@ -64,7 +67,7 @@ } } - .btn-primary { + /* .btn-primary { color: #fff !important; background-color: #282460 !important; border-color: #357ebd !important; @@ -77,7 +80,7 @@ color: #385d8a !important; background-color: #3598dc !important; border-color: #3598dc !important; - } + } */ /* body { font-family: "Noto Sans", sans-serif !important; @@ -159,9 +162,9 @@ transition: background-color 0.6s ease; } - .active { + /* .active { background-color: #717171; - } + } */ /* Fading animation */ .fade { diff --git a/resources/views/modal/marhun.blade.php b/resources/views/modal/marhun.blade.php new file mode 100644 index 0000000..8195a70 --- /dev/null +++ b/resources/views/modal/marhun.blade.php @@ -0,0 +1,49 @@ +
+
+
+ + +
+

Senarai Marhun

+ +
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
BilJenis MarhunBeratKaratNilai MarhunNota
dassaddassaddassaddassaddassaddassad
+
+ + +
+ +
+ +
+
+
\ No newline at end of file diff --git a/resources/views/pembayaran/result/berjaya.blade.php b/resources/views/pembayaran/result/berjaya.blade.php index 525f760..2f5a413 100644 --- a/resources/views/pembayaran/result/berjaya.blade.php +++ b/resources/views/pembayaran/result/berjaya.blade.php @@ -42,9 +42,9 @@ allow_dismiss: false, placement:{ align:'center',from:'bottom'}, animate: { - enter: 'animated bounceInDown', + enter: 'animate__animated animate__bounce', - exit: 'animated bounceOutUp' + exit: 'animate__animated animate__bounceOutDown' } }); diff --git a/resources/views/pembayaran/result/gagal.blade.php b/resources/views/pembayaran/result/gagal.blade.php index bfddae9..a04ba72 100644 --- a/resources/views/pembayaran/result/gagal.blade.php +++ b/resources/views/pembayaran/result/gagal.blade.php @@ -42,9 +42,9 @@ allow_dismiss: false, placement:{ align:'center',from:'bottom'}, animate: { - enter: 'animated bounceInDown', + enter: 'animate__animated animate__bounce', - exit: 'animated bounceOutUp' + exit: 'animate__animated animate__bounceOutDown' } }); diff --git a/resources/views/pembayaran/senaraibayaran.blade.php b/resources/views/pembayaran/senaraibayaran.blade.php index a1d7b57..8874f82 100644 --- a/resources/views/pembayaran/senaraibayaran.blade.php +++ b/resources/views/pembayaran/senaraibayaran.blade.php @@ -2,6 +2,7 @@ @section('content') @include('layouts.headers.cards') + @include('modal.marhun') @error('chkboxsag') @@ -63,15 +64,15 @@ - - - - - - - - - + + + + + + + + + @@ -81,7 +82,10 @@ @@ -158,6 +162,41 @@ return true; } + var api_url = "{{ config('api.url') }}"; + + $('.linktarget').on('click', function(event) { + + var arraymarhun = $(this).data('marhun'); + var norujukan = $(this).data('norujukan'); + var kodcaw = $(this).data('kodcaw'); + var hargajualan = $(this).data('hargajualan'); + var pinjaman = $(this).data('pinjaman'); + + $('#norujukan_modal').val(norujukan); + $('#pinjaman_modal').val(pinjaman); + $('#tablemarhun').empty(); + var bil_count = 0; + $.each(arraymarhun,function(index,marhun){ + $.each(marhun, function(index2,marhun_detail){ + + var marhun_name; + $.ajax({ + method:'GET', + url: api_url + '/api/jemas/nama_marhun', + dataType: 'json', + data:{ + marhun:marhun_detail['marhun'] + }, + success:function(marhun_ajax){ + bil_count++; + $("#tablemarhun").append(""); + } + }); + }); + }); + + }); + diff --git a/resources/views/semak/semaksag.blade.php b/resources/views/semak/semaksag.blade.php index bfddae9..a04ba72 100644 --- a/resources/views/semak/semaksag.blade.php +++ b/resources/views/semak/semaksag.blade.php @@ -42,9 +42,9 @@ allow_dismiss: false, placement:{ align:'center',from:'bottom'}, animate: { - enter: 'animated bounceInDown', + enter: 'animate__animated animate__bounce', - exit: 'animated bounceOutUp' + exit: 'animate__animated animate__bounceOutDown' } });
No RujukanPembiayaanKeuntunganNilai MarhunBeratMarhunJBGKadar UpahTindakanNo RujukanPembiayaanKeuntunganNilai MarhunBeratMarhunJBGKadar UpahTindakan
- {{ $bt['norujukan'] }} + @php + $marhun = Http::get(config('api.url') . '/api/marhun/' . $bt['norujukan'] )->json(); + @endphp + {{ $bt['norujukan'] }}
" + bil_count + "" + marhun_ajax['descpt'] +"" + marhun_detail['berat'] +"" + marhun_detail['karat'] +"RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +""+ marhun_detail['nota'] +"