diff --git a/app/Http/Controllers/AnalisaController.php b/app/Http/Controllers/AnalisaController.php index 394904e..24729b7 100644 --- a/app/Http/Controllers/AnalisaController.php +++ b/app/Http/Controllers/AnalisaController.php @@ -90,14 +90,17 @@ class AnalisaController extends Controller } } - //Harga Emas - + + $financemonth = Http::get(config('api.url') .'/portal/financeMonth/',['icno' => $kpbaru])->json(); + // dd(json_encode($financemonth)); - // $StatistikBulanan = Http::get(config('api.url') .'/portal/financeMonth/',['icno' => $kpbaru])->json(); - + $financemonth = json_encode(array_values($financemonth)); + + // dd($financemonth); + // return view('analisa.index', compact("totalgadai",'bilangan_belum_tebus','belum_tebus','hargaemasterdahulu','bilangan_melebihi_6_bulan','bilakandilelong')); - return view('includes.analisaportal', compact("totalgadai",'bilangan_belum_tebus','belum_tebus','hargaemasterdahulu','bilangan_melebihi_6_bulan','bilakandilelong')); + return view('includes.analisaportal', compact("totalgadai",'bilangan_belum_tebus','belum_tebus','hargaemasterdahulu','bilangan_melebihi_6_bulan','bilakandilelong','financemonth')); } } diff --git a/app/Http/Controllers/SemakController.php b/app/Http/Controllers/SemakController.php index ab3ec6e..3e98528 100644 --- a/app/Http/Controllers/SemakController.php +++ b/app/Http/Controllers/SemakController.php @@ -31,7 +31,8 @@ class SemakController extends Controller { $validated = $request->validate([ - 'sltcawangan' => 'required' + 'sltcawangan' => 'required', + 'namacawangan' => 'required' ]); $auth_user = Auth::user(); @@ -40,7 +41,7 @@ class SemakController extends Controller $sudah_tebus = Http::get(config('api.url') . '/api/customers/'. $auth_user['icno'] . '/gadai/' . 'sudah_tebus/' . $request->sltcawangan)->json(); // return view('semak.senaraisag', compact('belum_tebus','sudah_tebus')); - return view('includes.rekod.rekodsag', compact('belum_tebus','sudah_tebus')); + return view('includes.rekod.rekodsag', compact('belum_tebus','sudah_tebus', 'validated')); } public function PenyataSummary($kodcaw,$norujukan) diff --git a/public/argon/js/argon.js b/public/argon/js/argon.js index fc5d8a1..832012b 100644 --- a/public/argon/js/argon.js +++ b/public/argon/js/argon.js @@ -905,215 +905,3 @@ var Charts = (function() { }; })(); - -// -// Orders chart -// - -var OrdersChart = (function() { - - // - // Variables - // - - var $chart = $('#chart-orders'); - var $ordersSelect = $('[name="ordersSelect"]'); - - - // - // Methods - // - - // Init chart - function initChart($chart) { - - var datafinance = []; - var PembiayaanBulanan = new Array(); - var BayaranBulanan = new Array(); - var NamaBulan = new Array(); - - $.ajax({ - url: api_url + '/portal/financeMonth/', - data:{'icno' : icno}, - method:'GET', - async:false, - success:function(data){ - datafinance = data; - } - }); - - $.each(datafinance,function(index,finance){ - PembiayaanBulanan.push(finance['pembiayaan']); - BayaranBulanan.push(finance['bayaran']); - NamaBulan.push(finance['namabulan']); - }); - - PembiayaanBulanan.reverse(); - BayaranBulanan.reverse(); - NamaBulan.reverse(); - - const formatter = new Intl.NumberFormat('en-US', { - }); - - // Create chart - var ordersChart = new Chart($chart, { - type: 'bar', - options: { - scales: { - yAxes: [{ - ticks: { - callback: function(value) { - if (!(value % 10)) { - //return '$' + value + 'k' - return formatter.format(value) - } - } - } - }] - }, - tooltips: { - callbacks: { - label: function(item, data) { - var label = data.datasets[item.datasetIndex].label || ''; - var yLabel = item.yLabel; - var content = ''; - - if (data.datasets.length > 1) { - content += '' + label + ''; - } - - content += '' + yLabel + ''; - - return content; - } - } - } - }, - data: { - labels: NamaBulan, - datasets: [{ - label: 'Pembiayaan', - data: PembiayaanBulanan - }] - } - }); - - // Save to jQuery object - $chart.data('chart', ordersChart); - } - - - // Init chart - if ($chart.length) { - initChart($chart); - } - -})(); - -// -// Charts -// - -'use strict'; - -// -// Sales chart -// - -var SalesChart = (function() { - - // Variables - - var $chart = $('#chart-sales'); - - - // Methods - - function init($chart) { - - var datafinance = []; - var PembiayaanBulanan = new Array(); - var BayaranBulanan = new Array(); - var NamaBulan = new Array(); - - $.ajax({ - url: api_url + '/portal/financeMonth/', - data:{'icno' : icno}, - method:'GET', - async:false, - success:function(data){ - datafinance = data; - } - }); - - $.each(datafinance,function(index,finance){ - PembiayaanBulanan.push(finance['pembiayaan']); - BayaranBulanan.push(finance['bayaran']); - NamaBulan.push(finance['namabulan']); - }); - - PembiayaanBulanan.reverse(); - BayaranBulanan.reverse(); - NamaBulan.reverse(); - - const formatter = new Intl.NumberFormat('en-US', { - }); - - var salesChart = new Chart($chart, { - type: 'line', - options: { - scales: { - yAxes: [{ - gridLines: { - color: Charts.colors.gray[900], - zeroLineColor: Charts.colors.gray[900] - }, - ticks: { - callback: function(value) { - if (!(value % 10)) { - return 'RM' + formatter.format(value); - } - } - } - }] - }, - tooltips: { - callbacks: { - label: function(item, data) { - var label = data.datasets[item.datasetIndex].label || ''; - var yLabel = item.yLabel; - var content = ''; - - if (data.datasets.length > 1) { - content += '' + label + ''; - } - - content += 'RM' + formatter.format(yLabel) + ''; - return content; - } - } - } - }, - data: { - labels: NamaBulan, - datasets: [{ - label: 'Prestasi', - data: BayaranBulanan - }] - } - }); - - // Save to jQuery object - - $chart.data('chart', salesChart); - - }; - - - // Events - - if ($chart.length) { - init($chart); - } - -})(); diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 169cd6c..46a8581 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -1,137 +1,86 @@ -@extends('layouts.app', ['class' => 'bg-white']) +@extends('includes.login.index') @section('content') -{{-- @include('layouts.headers.guest') --}} -
-
-
-
- -
+Lupa Kata Laluan | Customer Portal - @if (session('status')) - {{-- -
+
+ +
+

- @include('auth.slides.slidespage') + Pertama Kali + | + Log-Masuk +

+ -
-
-
- - @endsection \ No newline at end of file diff --git a/resources/views/auth/passwords/email1.blade.php b/resources/views/auth/passwords/email1.blade.php new file mode 100644 index 0000000..169cd6c --- /dev/null +++ b/resources/views/auth/passwords/email1.blade.php @@ -0,0 +1,137 @@ +@extends('layouts.app', ['class' => 'bg-white']) + +@section('content') +{{-- @include('layouts.headers.guest') --}} + + + + +@endsection \ No newline at end of file diff --git a/resources/views/auth/passwords/email.blade copy.php b/resources/views/auth/passwords/email2.blade.php similarity index 100% rename from resources/views/auth/passwords/email.blade copy.php rename to resources/views/auth/passwords/email2.blade.php diff --git a/resources/views/includes/analisaportal.blade.php b/resources/views/includes/analisaportal.blade.php index 0f42060..3df6afc 100644 --- a/resources/views/includes/analisaportal.blade.php +++ b/resources/views/includes/analisaportal.blade.php @@ -169,7 +169,7 @@ pattern-lines
-
+
@@ -180,7 +180,7 @@
- +
@@ -191,7 +191,7 @@ @foreach($belum_tebus as $index1=>$bt) - + @endforeach -
No. SAG
{{ $bt['norujukan'] }}{{ $bt['pinjaman'] }}{{ number_format($bt['pinjaman'],2) }}
+
@@ -269,18 +266,23 @@ @endsection \ No newline at end of file diff --git a/resources/views/includes/bayaran/pembayaransag.blade.php b/resources/views/includes/bayaran/pembayaransag.blade.php index 89487b9..6686f61 100644 --- a/resources/views/includes/bayaran/pembayaransag.blade.php +++ b/resources/views/includes/bayaran/pembayaransag.blade.php @@ -14,13 +14,6 @@ @csrf
-

Home /Pembayaran /

@@ -44,29 +37,11 @@
-
-
-
- -
-
-
+
-
- + -
+
-
Karat
+
- + - + @php $counter = 1;$jenisbayaran = 'tawarruq'; @endphp @@ -200,7 +175,8 @@ -
+ + + + +
+
+
+
+
+

Ringkasan Pembayaran

+ +
+
+
+ +
+
+
No No Rujukan Pembiayaan AsalB. PembiayaanBaki Pembiayaan Tempoh KeuntunganBayaranBayaran
+ + + + + + + + @php $counter = 1; + @endphp + + @foreach($arraybayar as $index=>$bayar) + @if($bayar['hargajualan'] != '') + + + + + + + + + @php + $counter++; + @endphp + @endif + @endforeach +
NoNo RujukanBayaran
+ {{ $counter }} + + {{ $bayar['norujukan'] }} + +

+
+
+
+
+
+ +
+ +
+ RM 0.00 +
+
+
+ +
+ + +
+ +
@@ -284,7 +315,9 @@ 'previous': '', 'next': '' } - } + }, + "scrollX": true, + "pageLength": 10 }); var selepastawarruqtable = $('#selepas_tawarruq').DataTable({ @@ -296,8 +329,20 @@ 'previous': '', 'next': '' } - } + }, + "scrollX": true, + "pageLength": 10, + "pagingType": "simple", + "paging": false + }); + // var selepastawarruqtable = $('#ringkasan_bayaran').DataTable({ + // "bLengthChange": false, + // "bFilter": false, + // "bInfo": false, + + // "scrollX": true, + // }); function validateform() { return false; @@ -320,6 +365,8 @@ } else { // $(this).closest('tr').find("input").val(); $(this).closest('tr').find("input").attr('readonly', false); + $(this).closest('tr').find(".txtbayaran").val(upah); + $(this).closest('tr').find(".bayaran").val(upah); calculateall(jenis, taglel); } @@ -379,6 +426,18 @@ $(this).closest('tr').find('.bayaran').val(upah); calculateall(jenis, taglel); return false; + }else if(bayar < parseFloat(upah) && parseFloat(upah) !== 0.00) + { + $("#bayarsbmt").prop('disabled', false); + Swal.fire( + 'Amaran!', + 'Bayaran tidak boleh kurang daripada upah!', + 'error' + ) + $(this).val(upah); + $(this).closest('tr').find('.bayaran').val(upah); + calculateall(jenis, taglel); + return false; } $(this).closest('tr').find('.bayaran').val(this.value); @@ -401,7 +460,10 @@ }); - $('#selepas_tawarruq').find('input[name=txtbayarantawarruq]').each(function() { + $('#selepas_tawarruq').find('input[name=txtbayarantawarruq]').each(function(index) { + + $('#spantransaksi' + (index+1)).text(formatter.format(this.value)); + sumtawarruq += parseFloat(this.value) || 0; if (this.value <= 0 || this.value == '') { diff --git a/resources/views/includes/bayaran/senaraibayaransag.blade.php b/resources/views/includes/bayaran/senaraibayaransag.blade.php index bb5fd8a..ebe8845 100644 --- a/resources/views/includes/bayaran/senaraibayaransag.blade.php +++ b/resources/views/includes/bayaran/senaraibayaransag.blade.php @@ -36,25 +36,20 @@
- +{{--
-
+
-
+
--}}
@@ -63,92 +58,20 @@
-
+ +
+
- +
+ - - - - - - - - @foreach($belum_tebus as $index=>$bt) - @if($bt['hargajualan'] == '') - @php - - $koskeuntungan = Http::get(config('api.url') . '/api/upahbukantawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json(); - $searchonline = Http::get(config('api.url') . '/portal/searchsagonline/',['norujukan' => $bt['norujukan']])->json(); - - $searchLelong = Http::get(config('api.url').'/api/search/lelong',[ - 'kodcaw' => $bt['kodcaw'], - 'norujukan' => $bt['norujukan'] - ])->json(); - - $tarikh_hari_ini = Carbon\Carbon::now()->toDateString(); - - if($searchLelong){ - $t_lelong = Carbon\Carbon::parse($searchLelong['t_lelong'].' 00:00:00'); - $tarikhini = Carbon\Carbon::parse($tarikh_hari_ini.' 00:00:00'); - $diff=date_diff($tarikhini,$t_lelong); - $diff = (int)$diff->format("%R%a"); - if($diff <= 2){ // 'messageamaran'=>'Rekod Gadaian Dalam Proses Lelong, Sila Hadir ke Cawangan.' - }elseif($searchLelong['t_jual'] != null && $searchLelong['hargajual'] != 0.00){ - // 'messageamaran'=>'Rekod Gadaian Telah Dilelong.' - } - } - @endphp - - - - - - - - - - @endif - @endforeach - -
#Ar-Rahn No RujukanPembiayaanTempoh SimpanUpah telah bayarUpah semasa
- - -
-
- @php - $marhun = Http::get(config('api.url') . '/api/marhun/' . $bt['norujukan'] )->json(); - @endphp - {{ $bt['norujukan'] }} -
-
- 		- {{ number_format($bt['pinjaman'],2) }} - - {{ number_format($bt['tempoh'],2) }} - - {{ number_format($bt['telahbayar'],2) }} - - {{ number_format($koskeuntungan,2) }} -
-
-
-
- - -
- - - - - - - - - + + + + @@ -182,9 +105,15 @@ @endphp + @endif @@ -220,7 +151,7 @@
- +
@@ -239,19 +170,25 @@ 'previous': '', 'next': '' } - } + }, + "pageLength": 10, + "scrollX": true + }); var selepastawarruqtable = $('#selepas_tawarruq').DataTable({ "bLengthChange": false, "bFilter": true, - "paging" : false, + "paging" : true, + "pagingType": "simple", language: { 'paginate': { 'previous': '', 'next': '' } - } + }, + "scrollX": true, + "pageLength": 10 }); $("input[type='checkbox'][name='chkboxsag[]']").click(function() { diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php index 2746f9a..d037cd6 100644 --- a/resources/views/includes/home.blade.php +++ b/resources/views/includes/home.blade.php @@ -34,7 +34,7 @@
- Rekod Pembelian + Rekod Pembayaran
Enter
@@ -82,7 +82,7 @@
- Analisa + Ringkasan Transaksi Pembiayaan
Enter
@@ -99,7 +99,7 @@
- Gold? + Gold
diff --git a/resources/views/includes/main/footerwhite.blade.php b/resources/views/includes/main/footerwhite.blade.php index f027c6e..2fda6fd 100644 --- a/resources/views/includes/main/footerwhite.blade.php +++ b/resources/views/includes/main/footerwhite.blade.php @@ -1,136 +1,85 @@
-
+
-
Ar-Rahn
-

Koperasi Permodalan Kelantan Berhad

+ logo ar-rahn +
Ar-Rahn
+
Koperasi Permodalan Kelantan Berhad
-
    + +
+
+
+
+
Alamat
+
    +
  • + Permodalan Kelantan Berhad Tingkat 8, Bangunan Kelantan Trade Centre, Jalan Bayam, 15200 Kota Bharu, Kelantan.
    • +
-
Company
+
Hubungi Kami
-
+
-
-
- -
-
-
+
-

- All rights reserved. Copyright © +

+ Hak Milik © Koperasi Permodalan Kelantan Berhad. + Koperasi Permodalan Kelantan Berhad

diff --git a/resources/views/includes/rekod/pilihcawangan.blade.php b/resources/views/includes/rekod/pilihcawangan.blade.php index 5605360..cea9c12 100644 --- a/resources/views/includes/rekod/pilihcawangan.blade.php +++ b/resources/views/includes/rekod/pilihcawangan.blade.php @@ -45,6 +45,7 @@ @foreach($cawangan as $index1=>$caw) + @endforeach
diff --git a/resources/views/includes/rekod/rekodsag.blade.php b/resources/views/includes/rekod/rekodsag.blade.php index c7351cc..dab56b9 100644 --- a/resources/views/includes/rekod/rekodsag.blade.php +++ b/resources/views/includes/rekod/rekodsag.blade.php @@ -18,20 +18,19 @@
-
- engineering -
+ + + logo ar-rahn + -

Senarai SAG gadaian dan tebusan pelanggan.

-
Cawangan : XTRA
+

Senarai SAG gadaian dan penebusan pelanggan.

+
Cawangan : {{ $validated['namacawangan'] }}
-
- +
#No RujukanPembiayaanB. PembiayaanKeuntungan (6bulan)KeuntunganPembiayaan AsalBaki PembiayaanKeuntungan SemasaStatus
- + {{-- --}} + @php + $namacawangan = Http::get(config('api.url') . '/api/cawangan/detail/' . $bt['kodcaw'] )->json(); + echo substr($namacawangan[0]['namacaw'],8); + @endphp +
@@ -202,10 +131,12 @@ {{ number_format($bt['bakipjm'],2) }}
- {{ number_format($bt['bakiupah'],2) }} + {{ is_numeric($koskeuntungan) ? number_format($koskeuntungan,2) : $koskeuntungan }} - {{ number_format($koskeuntungan,2) }} + @if($bt['taglel'] === 1) + Akan Dilelong + @endif
@@ -82,14 +81,14 @@
-
+
-->
-
Tawarruq
+
Transaksi Bayaran
-
+
@@ -142,14 +141,14 @@
-
+
-
Penyata Terdahulu
+
Penyata Yang Sudah Ditebus
-
No Rujukan
+
@@ -164,6 +163,7 @@ @foreach($sudah_tebus as $index=>$st) + @if($st['hargajualan'] != '') + @endif @endforeach
No Rujukan
@@ -194,6 +194,7 @@ {{ $st['t_update'] }}
@@ -218,7 +219,9 @@ 'previous': '', 'next': '' } - } + }, + "scrollX": true + }); var selepastawarruqtable = $('#selepas_tawarruq').DataTable({ @@ -235,7 +238,10 @@ 'previous': '', 'next': '' } - } + }, + + "scrollX": true + }); var sudahtebustable = $('#saghistory').DataTable({ @@ -248,7 +254,9 @@ 'previous': '', 'next': '' } - } + }, + "scrollX": true + }); diff --git a/resources/views/layouts/indexthird.blade.php b/resources/views/layouts/indexthird.blade.php index 05a362c..869a55c 100644 --- a/resources/views/layouts/indexthird.blade.php +++ b/resources/views/layouts/indexthird.blade.php @@ -7,7 +7,7 @@ @include('includes.main.navigation') -
+
@yield('content')
diff --git a/resources/views/modal/marhun.blade.php b/resources/views/modal/marhun.blade.php index 8195a70..f4f8ecb 100644 --- a/resources/views/modal/marhun.blade.php +++ b/resources/views/modal/marhun.blade.php @@ -2,48 +2,50 @@
- +
-

Senarai Marhun

- +
Senarai Marhun
+
- +
- - - - - - - - - - - - - - - +
+
BilJenis MarhunBeratKaratNilai MarhunNota
dassaddassad
+ + + + + + + + + + + + + + - + - + - + - + - - -
BilJenis MarhunBeratKaratNilai MarhunNota
dassaddassaddassaddassaddassaddassaddassaddassaddassaddassad
-
+ + + +
+
- -
- -
+ +
+ +
-
-
+
+
\ No newline at end of file diff --git a/resources/views/pembayaran/result/berjayaportal.blade.php b/resources/views/pembayaran/result/berjayaportal.blade.php index 12dcbf2..6c905e6 100644 --- a/resources/views/pembayaran/result/berjayaportal.blade.php +++ b/resources/views/pembayaran/result/berjayaportal.blade.php @@ -2,6 +2,7 @@ @section('content') +Pembayaran Berjaya | Customer Portal
diff --git a/resources/views/pembayaran/result/gagalportal.blade.php b/resources/views/pembayaran/result/gagalportal.blade.php index 281d5ea..feebf20 100644 --- a/resources/views/pembayaran/result/gagalportal.blade.php +++ b/resources/views/pembayaran/result/gagalportal.blade.php @@ -2,6 +2,8 @@ @section('content') +Pembayaran Tidak Berjaya | Customer Portal +