From 229405c00407be7d4751b7752e413ad633d9ec8c Mon Sep 17 00:00:00 2001 From: Amir Hamzan <62345746+amirhamzan@users.noreply.github.com> Date: Sun, 23 Jan 2022 11:46:01 +0800 Subject: [PATCH 1/3] fix session modal --- resources/views/includes/main/head.blade.php | 4 ++-- resources/views/modal/sessionmodal.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/includes/main/head.blade.php b/resources/views/includes/main/head.blade.php index 4b3f3bd..424d0d7 100644 --- a/resources/views/includes/main/head.blade.php +++ b/resources/views/includes/main/head.blade.php @@ -59,7 +59,7 @@ @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 a0f5b91..0169bf9 100644 --- a/resources/views/includes/bayaran/pembayaransag.blade.php +++ b/resources/views/includes/bayaran/pembayaransag.blade.php @@ -6,6 +6,10 @@ .not-allowed { cursor: not-allowed; } + + .card-header { + padding: 1rem !important; + } Bayar SAG | Customer Portal @@ -26,7 +30,7 @@
-
+

Senarai Surat Gadaian

@@ -233,7 +237,7 @@
-
+

Ringkasan Pembayaran

diff --git a/resources/views/includes/bayaran/senaraibayaransag.blade.php b/resources/views/includes/bayaran/senaraibayaransag.blade.php index 1fe2c60..7f67013 100644 --- a/resources/views/includes/bayaran/senaraibayaransag.blade.php +++ b/resources/views/includes/bayaran/senaraibayaransag.blade.php @@ -36,7 +36,7 @@
-{{-- +{{--
@@ -58,92 +58,94 @@ @csrf
- - Maksimum 3 SAG dibenarkan dalam satu transaksi . -
- - - - - - - - - - - - - - @foreach($belum_tebus as $index=>$bt) - @if($bt['hargajualan'] != '') - @php - $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(); +
+ Maksimum 3 SAG dibenarkan dalam satu transaksi . +
+
+
#Ar-RahnNo RujukanPembiayaan AsalBaki PembiayaanKeuntungan SemasaStatus
+ + + + + + + + + + + + + @foreach($belum_tebus as $index=>$bt) + @if($bt['hargajualan'] != '') + @php + $searchonline = Http::get(config('api.url') . '/portal/searchsagonline/',['norujukan' => $bt['norujukan']])->json(); - 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.' + $searchLelong = Http::get(config('api.url').'/api/search/lelong',[ + 'kodcaw' => $bt['kodcaw'], + 'norujukan' => $bt['norujukan'] + ])->json(); - } - } + 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.' - $koskeuntungan = Http::get(config('api.url') . '/api/upahtawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json(); - $keuntungan_1bln = $bt['pinjaman'] * ($bt['kadarupah'] / 100); - $ten_percent = floatval($bt['nilaimarhun']) * 0.1; - $baki_pinjaman = floatval($bt['bakipjm']); - $max_bayaran = $baki_pinjaman - $ten_percent; + } + } + + $koskeuntungan = Http::get(config('api.url') . '/api/upahtawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json(); + $keuntungan_1bln = $bt['pinjaman'] * ($bt['kadarupah'] / 100); + $ten_percent = floatval($bt['nilaimarhun']) * 0.1; + $baki_pinjaman = floatval($bt['bakipjm']); + $max_bayaran = $baki_pinjaman - $ten_percent; + @endphp + + + - - + - - - - - + {{ $bt['norujukan'] }} + + + + + + + -
#Ar-RahnNo RujukanPembiayaan AsalBaki PembiayaanKeuntungan SemasaStatus
+ + {{-- --}} + + @php + $namacawangan = Http::get(config('api.url') . '/api/cawangan/detail/' . $bt['kodcaw'] )->json(); + echo ucwords(strtolower(substr($namacawangan[0]['namacaw'],8))); @endphp -
- - {{-- --}} - + +
+
@php - $namacawangan = Http::get(config('api.url') . '/api/cawangan/detail/' . $bt['kodcaw'] )->json(); - echo ucwords(strtolower(substr($namacawangan[0]['namacaw'],8))); + $marhun = Http::get(config('api.url') . '/api/marhun/' . $bt['norujukan'] )->json(); @endphp - -
-
-
- @php - $marhun = Http::get(config('api.url') . '/api/marhun/' . $bt['norujukan'] )->json(); - @endphp - {{ $bt['norujukan'] }} -
-
- 		- {{ number_format($bt['pinjaman'],2) }} - - {{ number_format($bt['bakipjm'],2) }} - - {{ is_numeric($koskeuntungan) ? number_format($koskeuntungan,2) : $koskeuntungan }} - - @if($bt['taglel'] === 1) - Akan Dilelong - @endif -
+ {{ number_format($bt['pinjaman'],2) }} + + {{ number_format($bt['bakipjm'],2) }} + + {{ is_numeric($koskeuntungan) ? number_format($koskeuntungan,2) : $koskeuntungan }} + + @if($bt['taglel'] === 1) + Akan Dilelong @endif - @endforeach -
-
-
+ + + @endif + @endforeach + + +
+
@@ -174,18 +176,15 @@ // }); var selepastawarruqtable = $('#selepas_tawarruq').DataTable({ - "bLengthChange": false, "bFilter": true, - "paging" : true, - "pagingType": "simple", language: { 'paginate': { - 'previous': '', + 'previous': '', 'next': '' } }, - "scrollX": true, - "pageLength": 10 + "pageLength": 10, + "scrollX": true }); $("input[type='checkbox'][name='chkboxsag[]']").click(function() { @@ -193,10 +192,9 @@ if ($(this).is(':checked')) { var total = count + 1; - if(total <= 3) - { + if (total <= 3) { $('#totalsag').text(total); - }else{ + } else { $(this).prop('checked', false); } } else { diff --git a/resources/views/includes/main/footercontent.blade.php b/resources/views/includes/main/footercontent.blade.php new file mode 100644 index 0000000..681d5f2 --- /dev/null +++ b/resources/views/includes/main/footercontent.blade.php @@ -0,0 +1,113 @@ +
+
+ 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. +
    • + +
+
+
+
+
+
Hubungi Kami
+
    +
  • + + 09-741 4343 +
    • +
  • + + 09-741 4342 +
    • +
  • + + pkb@pkb.net.my +
    • + +
+
+
+
+
+
Khidmat Pelanggan
+
    +
  • + Hotline : 1300-22-4343 +
    • + +
+
+
+ +
+
+

+ Hak Milik © + Koperasi Permodalan Kelantan Berhad +

+
+
+ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/views/includes/main/footerdark.blade.php b/resources/views/includes/main/footerdark.blade.php index 04c35f7..c3cb00d 100644 --- a/resources/views/includes/main/footerdark.blade.php +++ b/resources/views/includes/main/footerdark.blade.php @@ -1,189 +1,22 @@ + + - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/resources/views/includes/main/footerwhite.blade.php b/resources/views/includes/main/footerwhite.blade.php index 2fda6fd..fc1f900 100644 --- a/resources/views/includes/main/footerwhite.blade.php +++ b/resources/views/includes/main/footerwhite.blade.php @@ -1,119 +1,7 @@
-
-
- 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. -
    • - -
-
-
-
-
-
Hubungi Kami
-
    -
  • - - 09-741 4343 -
    • -
  • - - 09-741 4342 -
    • -
  • - - pkb@pkb.net.my -
    • - -
-
-
-
-
-
Khidmat Pelanggan
-
    -
  • - Hotline : 1300-22-4343 -
    • - -
-
-
- -
-
-

- Hak Milik © - Koperasi Permodalan Kelantan Berhad -

-
-
+ @include('includes.main.footercontent')
-
- - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/resources/views/includes/main/head.blade.php b/resources/views/includes/main/head.blade.php index bcd7068..8dec2f3 100644 --- a/resources/views/includes/main/head.blade.php +++ b/resources/views/includes/main/head.blade.php @@ -14,7 +14,7 @@ - + @@ -59,7 +59,7 @@