From 8b49add1be13992ab2d980a28685d21a7a19376f Mon Sep 17 00:00:00 2001 From: nishaMuhd Date: Tue, 18 Apr 2023 15:40:08 +0800 Subject: [PATCH] update link,ayat,colum pembayaran --- app/Notifications/ResetPassword.php | 6 +- app/Notifications/VerifyEmail.php | 6 +- public/argon/img/brand/arrahnpay3.png | Bin 0 -> 5802 bytes public/argon/img/brand/arrahnpay4.png | Bin 0 -> 3883 bytes resources/views/auth/forgotemail2.blade.php | 15 +- .../views/auth/passwords/email.blade.php | 16 +- .../auth/passwords/forgetpassword.blade.php | 12 +- .../auth/pertama-kali/firsttime2.blade.php | 17 +- resources/views/auth/termasyarat.blade.php | 2 +- .../includes/bayaran/pembayaransag.blade.php | 155 +++---- .../bayaran/pembayaransag001.blade.php | 416 ++++++++++++++++++ resources/views/includes/home.blade.php | 89 ++-- .../views/includes/login/index.blade.php | 7 +- .../includes/login/loginportal.blade.php | 14 +- .../includes/main/footercontent.blade.php | 2 +- .../views/includes/main/navigation.blade.php | 4 +- resources/views/modal/marhun.blade.php | 10 +- .../vendor/notifications/email.blade.php | 2 +- 18 files changed, 614 insertions(+), 159 deletions(-) create mode 100644 public/argon/img/brand/arrahnpay3.png create mode 100644 public/argon/img/brand/arrahnpay4.png create mode 100644 resources/views/includes/bayaran/pembayaransag001.blade.php diff --git a/app/Notifications/ResetPassword.php b/app/Notifications/ResetPassword.php index db60cd4..40f4f55 100644 --- a/app/Notifications/ResetPassword.php +++ b/app/Notifications/ResetPassword.php @@ -85,10 +85,10 @@ class ResetPassword extends Notification { return (new MailMessage) ->subject(Lang::get('Tetapan Semula Kata Laluan')) - ->line(Lang::get('Sila klik butang dibawah untuk menetapkan semula kata laluan akaun Customer Portal.')) + ->line(Lang::get('Sila klik butang di bawah untuk menetapkan semula kata laluan akaun ArrahnPay.')) ->action(Lang::get('Tetap Semula'), $url) - ->line(Lang::get('Pautan tetapan semula kata laluan ini akan berakhir dalam :count minit.', ['count' => config('auth.passwords.'.config('auth.defaults.passwords').'.expire')])) - ->line(Lang::get('Abaikan e-mel ini jika anda tidak membuat sebarang permohonan.')); + ->line(Lang::get('Pautan tetapan semula kata laluan ini akan berakhir dalam masa :count minit.', ['count' => config('auth.passwords.'.config('auth.defaults.passwords').'.expire')])) + ->line(Lang::get('Abaikan emel ini jika anda tidak membuat sebarang permohonan.')); } /** diff --git a/app/Notifications/VerifyEmail.php b/app/Notifications/VerifyEmail.php index 1f5ebe5..ba1a00d 100644 --- a/app/Notifications/VerifyEmail.php +++ b/app/Notifications/VerifyEmail.php @@ -62,10 +62,10 @@ class VerifyEmail extends Notification protected function buildMailMessage($url) { return (new MailMessage) - ->subject(Lang::get('Sahkan Alamat E-mel')) - ->line(Lang::get('Sila klik butang dibawah untuk pengesahan alamat e-mel akaun Customer Portal.')) + ->subject(Lang::get('Sahkan Alamat Emel')) + ->line(Lang::get('Sila klik butang di bawah untuk pengesahan alamat emel akaun ArrahnPay.')) ->action(Lang::get('Sahkan'), $url) - ->line(Lang::get('Abaikan e-mel ini jika anda tidak membuat sebarang permohonan.')); + ->line(Lang::get('Abaikan emel ini jika anda tidak membuat sebarang permohonan.')); } /** diff --git a/public/argon/img/brand/arrahnpay3.png b/public/argon/img/brand/arrahnpay3.png new file mode 100644 index 0000000000000000000000000000000000000000..ed34ad5d1710dbd0049130230b0f99e88697ad39 GIT binary patch literal 5802 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 literal 0 HcmV?d00001 diff --git a/public/argon/img/brand/arrahnpay4.png b/public/argon/img/brand/arrahnpay4.png new file mode 100644 index 0000000000000000000000000000000000000000..8244c433fbbb2011b7cfcd3b7ec394b924a40962 GIT binary patch literal 3883 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 diff --git a/resources/views/auth/termasyarat.blade.php b/resources/views/auth/termasyarat.blade.php index 67317a8..cc1dc90 100644 --- a/resources/views/auth/termasyarat.blade.php +++ b/resources/views/auth/termasyarat.blade.php @@ -274,7 +274,7 @@

E: Pelbagai

.

    -
  1. Terma dan Syarat ini akan akan ditadbir oleh undang-undang Malaysia dan kesemua pihak berkaitan bersetuju untuk berserah kepada bidang kuasa eksklusif mahkamah Malaysia.
    2. +
  2. Terma dan Syarat ini akan ditadbir oleh undang-undang Malaysia dan kesemua pihak berkaitan bersetuju untuk berserah kepada bidang kuasa eksklusif mahkamah Malaysia.
  3. Kecuali sebagaimana yang diperuntukkan sebaliknya dengan nyata di sini, tiada peruntukan Terma dan Syarat ini, nyata atau tersirat, dimaksudkan atau akan dianggap sebagai memberi hak, remedi, atau manfaat lain kepada pihak ketiga di bawah atau oleh sebab Terma dan Syarat
  4. Anda tidak boleh menggunakan atau merujuk kepada nama atau logo kami, atau merujuk kepada kami dengan apa jua cara:
  5. dalam apa-apa komunikasi kepada orang awam, termasuk komunikasi kepada pihak akhbar;
    6. diff --git a/resources/views/includes/bayaran/pembayaransag.blade.php b/resources/views/includes/bayaran/pembayaransag.blade.php index 17dd451..eb2b6ed 100644 --- a/resources/views/includes/bayaran/pembayaransag.blade.php +++ b/resources/views/includes/bayaran/pembayaransag.blade.php @@ -33,7 +33,7 @@
    -

    Senarai Surat Gadaian

    +

    Pembayaran

    @@ -43,23 +43,23 @@
    -
    +
    - - + + - - + - @php $counter = 1;$jenisbayaran = 'tawarruq'; @endphp + @php $counter = 1;$jenisbayaran = 'tawarruq'; $totalupahasal = 1; @endphp @foreach($arraybayar as $index=>$bayar) @if($bayar['hargajualan'] != '') @@ -70,37 +70,50 @@ + @php + + $t_matang = strtotime($bayar['t_matang']); + $t_akhir = date("d/m/Y", $t_matang); + + if($bayar['lelong_tawarruq'] == 0) + { + $t_matang = strtotime($bayar['t_matang1']); + $t_akhir = date("d/m/Y", $t_matang); + } + @endphp + @php $upahtawarruq = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/upahtawarruq/'. $bayar['kodcaw'] . '/' . $bayar['norujukan'])->json(); + $totalupahasal = $totalupahasal + $upahtawarruq; @endphp - + - @@ -112,62 +125,9 @@ - - - - - -
    -
    -
    -
    -
    -

    Ringkasan Pembayaran

    - -
    -
    -
    - -
    -
    -
    No
    Rujukan    		BayaranKeuntunganTarikh AkhirBayaran Baki
    Pembiayaan    		Pembiayaan AsalTempoh
    {{ $bayar['norujukan'] }} + {{ $t_akhir }} + + + - {{ number_format($bayar['bakipjm'],2) }} + +
    - - - - - - - - @php $counter = 1; - @endphp - - @foreach($arraybayar as $index=>$bayar) - @if($bayar['hargajualan'] != '') - - - - - - - - - @php - $counter++; - @endphp - @endif - @endforeach -
    No RujukanBayaran
    - {{ $bayar['norujukan'] }} - -

    0.00

    -
    -
    -
    - +
    @@ -176,23 +136,29 @@
    - +
    - RM 1.00 + RM {{ number_format($totalupahasal,2) }}
    *Jangan biarkan kotak bayaran ditinggalkan kosong, Sila masukkan amaun! +
    +
    + + +
    +
    +
    -
    - -
    - Batal + +
    + Batal 
    @@ -209,6 +175,16 @@ return false; } }); + + var test = document.getElementById('selepas_tawarruq'); + console.log(test); + + $('#selepas_tawarruq > tbody > tr').each(function() { + $(this).find("td:gt(0)").each(function(){ + // console.log($(this).html()); + console.log($("input[name=txtbayarantawarruq]").val()); + }); +}); }); const formatter = new Intl.NumberFormat('en-US', { @@ -310,17 +286,25 @@ }); - $("input[name=txtbayarantawarruq]").change(function(e) { - + // $("input[name=txtbayarantawarruq]").change(function(e) { + $("input[name=txtbayarantawarruq]").click(function(e) { + let upah = parseFloat($(this).data('upah').replace(",","")); let bakipinjam = $(this).data('bakipjm'); let jenis = $(this).data('jenis'); let nm = $(this).data('nm'); - let taglel = $(this).data('taglel'); - - let bayar = Number(this.value); - + let taglel = $(this).data('taglel'); + let bayar = Number(this.value); let errorlebih = (bakipinjam - (nm * 0.1) + upah); + + let upahasal = Number($(this).data('upah')); + let inputvalue = Number(this.value); + + // if (inputvalue > upahasal) { + var lebihbyr = inputvalue.toFixed(2) - upahasal.toFixed(2); + let bakipinjambaru = parseFloat(bakipinjam - lebihbyr.toFixed(2)); + $(this).closest('tr').find('.bakibaru').val(bakipinjambaru.toFixed(2)); + // } if (bayar > parseFloat(errorlebih)) { $("#bayarsbmt").prop('disabled', false); @@ -351,6 +335,7 @@ calculateall(jenis, taglel); }); + function calculateall(jenis, taglel) { var $row = $(this).closest('tr'); var sumarrahn = 0; diff --git a/resources/views/includes/bayaran/pembayaransag001.blade.php b/resources/views/includes/bayaran/pembayaransag001.blade.php new file mode 100644 index 0000000..17dd451 --- /dev/null +++ b/resources/views/includes/bayaran/pembayaransag001.blade.php @@ -0,0 +1,416 @@ +@extends('layouts.indexfifth') + +@section('content') + + + +Bayar SAG | Portal Pelanggan +
    + +
    + @csrf +
    +
    +
    +

    Home /Pembayaran /

    +

    Bayar SAG Pilihan

    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +

    Senarai Surat Gadaian

    + +
    + +
    +
    +
    +
    + + +
    + Klik 'Klik Di Sini' untuk Pilihan Bayaran
    + Amaun Semasa -> Amaun Keuntungan Semasa Sahaja.
    + Amaun Lain -> Amaun Ansuran Pembiayaan & Amaun Keuntungan Semasa, Sila Masukkan Amaun +
    + + + + + + + + + + + + @php $counter = 1;$jenisbayaran = 'tawarruq'; @endphp + @foreach($arraybayar as $index=>$bayar) + @if($bayar['hargajualan'] != '') + + + + + @php + $upahtawarruq = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/upahtawarruq/'. $bayar['kodcaw'] . '/' . $bayar['norujukan'])->json(); + @endphp + + + + + + + + + + + @php $counter++; @endphp + @endif + @endforeach +
    No
    Rujukan    		BayaranKeuntunganBaki
    Pembiayaan    		Pembiayaan AsalTempoh
    + {{ $bayar['norujukan'] }} + + + + + + + + + + + {{ $upahtawarruq }} + + {{ number_format($bayar['bakipjm'],2) }} + + {{ number_format($bayar['pinjaman'],2) }} + + {{ $bayar['tempoh'] }} +
    +
    +
    + +
    +
    +
    + + + +
    +
    +
    +
    +
    +

    Ringkasan Pembayaran

    + +
    +
    +
    + +
    +
    + + + + + + + + + @php $counter = 1; + @endphp + + @foreach($arraybayar as $index=>$bayar) + @if($bayar['hargajualan'] != '') + + + + + + + + + @php + $counter++; + @endphp + @endif + @endforeach +
    No RujukanBayaran
    + {{ $bayar['norujukan'] }} + +

    0.00

    +
    +
    +
    +
    +
    + +
    + +
    + RM 1.00 +
    +
    +
    +
    + +
    + +
    + RM 1.00 +
    +
    + + *Jangan biarkan kotak bayaran ditinggalkan kosong, Sila masukkan amaun! + +
    + +
    + + +
    + Batal + +
    +
    +
    +
    +
    + + + +@endsection diff --git a/resources/views/includes/home.blade.php b/resources/views/includes/home.blade.php index 4f1e2b6..35d53c6 100644 --- a/resources/views/includes/home.blade.php +++ b/resources/views/includes/home.blade.php @@ -90,7 +90,7 @@
    -
    Pembiayaan
    Semasa
    +
    Bil Pembiayaan
    Semasa
    {{ $bilangan }}
    @@ -108,7 +108,7 @@
    -
    Pembiayaan 6 Bulan Ke atas
    +
    Bil Pembiayaan 6 Bulan Ke atas
    {{ $sixmonths }}
    @@ -121,12 +121,32 @@
    + 0) { ?> +
    +
    +
    +
    +
    +
    Bil Pembiayaan
    Akan Dilelong
    + {{ $bilanganlelong }} +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    -
    Pembiayaan
    Akan Dilelong
    +
    Bil Pembiayaan
    Akan Dilelong
    {{ $bilanganlelong }}
    @@ -139,6 +159,7 @@
    +
    @@ -150,9 +171,9 @@ (Contoh: Tarikh Lelong: 21-02-2023, Pembayaran/Penebusan Hanya dibenarkan Sehingga Tarikh 18-02-2023 Sahaja)
    @@ -190,10 +211,10 @@ # No Rujukan - Keuntungan + Tempoh + T Akhir + Keuntungan Cawangan - Tempoh - T Lanjut {{-- Status --}} @@ -210,6 +231,7 @@ + "Swipe" ke kiri

    @@ -300,7 +322,7 @@ var hargaemastable = $('#harga_emas').DataTable({ }, success: function(marhun_ajax) { bil_count++; - $("#tablemarhun").append("" + bil_count + "" + marhun_ajax['descpt'] + "" + marhun['berat'] + "" + marhun['karat'] + "RM " + formatter.format(marhun['n_marhun']) + "" + marhun['nota'] + ""); + $("#tablemarhun").append("" + bil_count + "" + marhun_ajax['descpt'] + "" + marhun['berat'] + "" + marhun['karat'] + "RM" + formatter.format(marhun['n_marhun']) + "" + marhun['nota'] + ""); } }); }); @@ -366,9 +388,13 @@ var hargaemastable = $('#harga_emas').DataTable({ var empat = selepastawarruqtable.columns(3).header(); var tiga = selepastawarruqtable.columns(2).header(); + // var lima = selepastawarruqtable.columns(4).header(); + //$(empat).html('JBG'); - $(tiga).html('Keuntungan'); - $(empat).html('Cawangan'); + $(tiga).html('Tempoh'); + $(empat).html('T Akhir'); + // $(lima).html('T Lanjut'); + selepastawarruqtable.column( 4 ).visible( true ); selepastawarruqtable.column( 5 ).visible( true ); // selepastawarruqtable.column( 6 ).visible( true ); @@ -478,9 +504,10 @@ var hargaemastable = $('#harga_emas').DataTable({ var t_matang = new Date(ps.t_matang); var t_matang = '-'; + if(ps.lelong_tawarruq == 0) t_matang = new Date(ps.t_matang1).toLocaleDateString("en-GB"); - + // var statementlelong = ''; // if(ps.taglel == 0) // { @@ -492,10 +519,10 @@ var hargaemastable = $('#harga_emas').DataTable({ selepastawarruqtable.row.add([ ``, `${ps.norujukan}`, + ps.tempoh, + t_matang, formatter.format(ps.keuntungan), namacawangan, - ps.tempoh, - t_matang, // statementlelong ]).draw(); @@ -515,8 +542,8 @@ var hargaemastable = $('#harga_emas').DataTable({ var empat = selepastawarruqtable.columns(3).header(); var tiga = selepastawarruqtable.columns(2).header(); //$(empat).html('JBG'); - $(tiga).html('Keuntungan'); - $(empat).html('Cawangan'); + $(tiga).html('Tempoh'); + $(empat).html('T Akhir'); selepastawarruqtable.column( 4 ).visible( true ); selepastawarruqtable.column( 5 ).visible( true ); // selepastawarruqtable.column( 6 ).visible( true ); @@ -633,8 +660,14 @@ var hargaemastable = $('#harga_emas').DataTable({ let marh = JSON.stringify(marhun[0]); var t_matang = '-'; - if(ps.lelong_tawarruq == 0) + if(ps.lelong_tawarruq == 0) { + t_matang = new Date(ps.t_matang1).toLocaleDateString("en-GB"); + + } else { + + } + // var statementlelong = ''; @@ -648,10 +681,10 @@ var hargaemastable = $('#harga_emas').DataTable({ selepastawarruqtable.row.add([ ``, `${ps.norujukan}`, + ps.tempoh, + t_matang, formatter.format(ps.keuntungan), namacawangan, - ps.tempoh, - t_matang // statementlelong ]).draw(); @@ -668,8 +701,8 @@ var hargaemastable = $('#harga_emas').DataTable({ var empat = selepastawarruqtable.columns(3).header(); var tiga = selepastawarruqtable.columns(2).header(); - $(empat).html('T Lelong'); - $(tiga).html('Cawangan'); + $(empat).html('Cawangan'); + $(tiga).html('T Lelong'); // selepastawarruqtable.column( 3 ).visible( true ); //selepastawarruqtable.column( 2 ).visible( false ); @@ -775,8 +808,8 @@ var hargaemastable = $('#harga_emas').DataTable({ selepastawarruqtable.row.add([ ``, `${lelong.norujukan}`, - namacawangan, tarikhlelong = new Date(lelong.t_lelong).toLocaleDateString("en-GB"), + namacawangan, '', '', '' @@ -797,11 +830,11 @@ var hargaemastable = $('#harga_emas').DataTable({ let berat = $(e).data('berat'); let nm = $(e).data('nm'); - $('#pembiayaan').text('RM ' + formatter.format(pinjaman)); - $('#bpembiayaan').text('RM ' + formatter.format(bakipjm)); - $('#nm').text('RM ' + formatter.format(nm)); + $('#pembiayaan').text('RM' + formatter.format(pinjaman)); + $('#bpembiayaan').text('RM' + formatter.format(bakipjm)); + $('#nm').text('RM' + formatter.format(nm)); $('#berat').text(berat + 'g'); - $('#koskeun').text('RM ' + formatter.format(upah12)); + $('#koskeun').text('RM' + formatter.format(upah12)); $.ajax({ method: 'get', @@ -827,7 +860,7 @@ var hargaemastable = $('#harga_emas').DataTable({ counter, date, // ''+date.toLocaleDateString()+'', - "RM " + formatter.format(bayaran['duit_masuk']), + "RM" + formatter.format(bayaran['duit_masuk']) + " " + "", ]).draw(); counter = counter + 1; diff --git a/resources/views/includes/login/index.blade.php b/resources/views/includes/login/index.blade.php index eb0343e..6a5eb82 100644 --- a/resources/views/includes/login/index.blade.php +++ b/resources/views/includes/login/index.blade.php @@ -51,12 +51,13 @@

    CUSTOMER PORTAL

    --> -
    +
    +
    @yield('content')
    @@ -71,7 +72,7 @@
    Hak Milik © Permodalan Kelantan Berhad
    diff --git a/resources/views/includes/login/loginportal.blade.php b/resources/views/includes/login/loginportal.blade.php index 50724de..79537ba 100644 --- a/resources/views/includes/login/loginportal.blade.php +++ b/resources/views/includes/login/loginportal.blade.php @@ -10,13 +10,13 @@ Log In | Portal Pelanggan - -
    Log-Masuk
    + +
    Log Masuk
    @csrf
    - +
    @if ($errors->has('email')) @@ -38,18 +38,18 @@
    - +
    - +

    Pertama Kali | Lupa Kata Laluan | - Lupa E-mel + Lupa Emel

    diff --git a/resources/views/includes/main/footercontent.blade.php b/resources/views/includes/main/footercontent.blade.php index 8f4e195..922141b 100644 --- a/resources/views/includes/main/footercontent.blade.php +++ b/resources/views/includes/main/footercontent.blade.php @@ -51,7 +51,7 @@

    Hak Milik © Permodalan Kelantan Berhad

    diff --git a/resources/views/includes/main/navigation.blade.php b/resources/views/includes/main/navigation.blade.php index 4a83ab6..6ddfefb 100644 --- a/resources/views/includes/main/navigation.blade.php +++ b/resources/views/includes/main/navigation.blade.php @@ -66,8 +66,8 @@
    diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php index ec6d175..b90668b 100644 --- a/resources/views/vendor/notifications/email.blade.php +++ b/resources/views/vendor/notifications/email.blade.php @@ -52,7 +52,7 @@ @slot('subcopy') @lang( "Jika anda menghadapi masalah untuk menekan butang \":actionText\", sila salin dan tampal \n". - 'pautan di bawah ke pelayar anda:', + "pautan di bawah ke pelayar anda:
    ", [ 'actionText' => $actionText, ]
-
+
+
Lupa Emel
@@ -157,12 +158,16 @@ BAYARAN PANTAS (SPARE)

- Log-Masuk + Pertama Kali + | + Log Masuk | Lupa Kata Laluan

- +

+ Terma Dan Syarat +

@@ -182,7 +187,7 @@
Hak Milik © Koperasi Permodalan Kelantan Berhad
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php index 9503e4e..ce87ede 100644 --- a/resources/views/auth/passwords/email.blade.php +++ b/resources/views/auth/passwords/email.blade.php @@ -26,7 +26,7 @@ Lupa Kata Laluan | Portal Pelanggan - +
Lupa Kata Laluan
@if (session('status')) @@ -35,11 +35,11 @@
--}} Koperasi Permodalan Kelantan Berhad