From 2cf211215c2a9a6f745eefa7b90dabad176d6ea6 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sun, 3 Oct 2021 10:29:42 +0800 Subject: [PATCH 1/5] fix --- resources/views/penyata/summary.blade.php | 32 +++++++++++++++++++---- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/resources/views/penyata/summary.blade.php b/resources/views/penyata/summary.blade.php index be957da..5ba47ec 100644 --- a/resources/views/penyata/summary.blade.php +++ b/resources/views/penyata/summary.blade.php @@ -131,10 +131,17 @@ cursor: pointer; } + .btn-sub:disabled{ + background-color: #8AA1B1; /* Green */ + color: white; + cursor: pointer; + } + .tablebayaran{ margin-left:auto; margin-right:auto; border-spacing:10px; + text-align: center; } input[type=text] { @@ -277,14 +284,15 @@ Norujukan Pembiayaan - Jumlah Pembiayaan - + Keuntungan + Bayaran - {{ $gad['norujukan'] }} + {{ $gad['norujukan'] }} {{ number_format($gad['bakihargajualan'],2) }} - - + {{ number_format($gad['bakiupah'],2) }} + + @@ -293,6 +301,20 @@ + From 3e52dfff32ecf1fb5c87bc91a8925500d23bbbfd Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 6 Oct 2021 10:11:21 +0800 Subject: [PATCH 2/5] fix skit2 --- app/Http/Controllers/ProfileController.php | 2 +- app/Providers/RouteServiceProvider.php | 2 + resources/views/auth/login.blade.php | 4 +- .../views/auth/slides/slidespage.blade.php | 12 - resources/views/pembayaran/checkout.blade.php | 205 ++++++++++++------ .../views/pembayaran/senaraibayaran.blade.php | 204 +++++++++++------ resources/views/profile/edit.blade.php | 4 +- routes/web.php | 2 + 8 files changed, 294 insertions(+), 141 deletions(-) diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 63379bb..fb2e29d 100644 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -32,7 +32,7 @@ class ProfileController extends Controller auth()->user()->update($request->all()); - return back()->withStatus(__('Profile successfully updated.')); + return back()->withStatus(__('Berjaya dikemaskini.')); } /** diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 3bd3c81..5d0a99e 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -44,6 +44,8 @@ class RouteServiceProvider extends ServiceProvider ->group(base_path('routes/api.php')); Route::middleware('web') + // ->middleware('cache.headers:private;must_revalidate;max_age=0;no_store;no_cache') // added this line + // ->middleware('cache.headers') ->namespace($this->namespace) ->group(base_path('routes/web.php')); }); diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 4dc2f94..0342064 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -10,8 +10,6 @@
- {{--

Portal rasmi ar-rahn pajak gadai.

--}} -
+ +
+ +
-
- - - - - - - - - - - - +
+
+
+
NoNo RujukanPembiayaanB. PembiayaanKeuntunganJumlah Telah DibayarBayaran
+ + + + + + + + + + + + + @php $counter = 1; @endphp + @foreach($arraybayar as $index=>$bayar) + @if($bayar['hargajualan'] == '') + @php + $koskeuntungan = Http::get(config('api.url') . '/api/upahbukantawarruq/' . $bayar['kodcaw'] . '/' . $bayar['norujukan'])->json(); + @endphp + + + + + + + + + + @php $counter++; @endphp + @endif + @endforeach + +
No.No RujukanPembiayaanTempoh SimpanUpah telah bayarUpah semasaBayaran
+ {{ $counter }} + + {{ $bayar['norujukan'] }} + + {{ number_format($bayar['pinjaman'],2) }} + + {{ number_format($bayar['tempoh'],2) }} + + {{ number_format($bayar['telahbayar'],2) }} + + {{ number_format($koskeuntungan,2) }} + + + + + +
+
+ - @foreach($arraybayar as $index=>$bayar) - +
+ +
+ + - - - - - - - + + + + + + - - @endforeach -
- {{ $loop->iteration }} - - {{ $bayar['norujukan'] }} - - {{ $bayar['pinjaman'] }} - - {{ $bayar['bakipjm'] }} - - @php - $upahtawarruq = Http::get(config('api.url') . '/api/upahtawarruq/'. $bayar['kodcaw'] . '/' . $bayar['norujukan'])->json(); - @endphp - {{ $upahtawarruq }} - - @php - $ansuranbayar = Http::get(config('api.url') . '/api/transaction/' . $bayar['norujukan'])->json(); - $totalansuran = 0; - - if($ansuranbayar == '') - { - $totalansuran = 0; - }else{ - foreach($ansuranbayar as $index1=>$ans) - { - $totalansuran += $ans['duit_masuk']; - } - } - @endphp - - {{ $totalansuran }} - - - - - - NoNo RujukanPembiayaanB. PembiayaanKeuntunganBayaran
+ + @php $counter = 1; @endphp + @foreach($arraybayar as $index=>$bayar) + @if($bayar['hargajualan'] != '') + + + + {{ $counter }} + + + {{ $bayar['norujukan'] }} + + + {{ number_format($bayar['pinjaman'],2) }} + + + {{ number_format($bayar['bakipjm'],2) }} + + + @php + $upahtawarruq = Http::get(config('api.url') . '/api/upahtawarruq/'. $bayar['kodcaw'] . '/' . $bayar['norujukan'])->json(); + @endphp + {{ $upahtawarruq }} + + + + + + + + + + @php $counter++; @endphp + @endif + @endforeach + +
+ + +
+ @@ -134,7 +192,18 @@
- + +
+ +
+ RM 0.00 +
+
+
+ +
+
+
@@ -146,7 +215,7 @@
- +
@@ -197,6 +266,18 @@ } }); + var selepastawarruqtable = $('#selepas_tawarruq').DataTable({ + "bLengthChange": false, + "bFilter": false, + "bInfo": false, + language: { + 'paginate': { + 'previous': '', + 'next': '' + } + } + }); + function validateform() { return false; diff --git a/resources/views/pembayaran/senaraibayaran.blade.php b/resources/views/pembayaran/senaraibayaran.blade.php index 8874f82..b3ff404 100644 --- a/resources/views/pembayaran/senaraibayaran.blade.php +++ b/resources/views/pembayaran/senaraibayaran.blade.php @@ -57,74 +57,144 @@

Pembayaran SAG

+ +
+ +
+ @csrf - -
- - - - - - - - - - - - - - - - @foreach($belum_tebus as $index=>$bt) - @if($bt['hargajualan'] != '') - - - - - - - - - - - - @endif - @endforeach - -
No RujukanPembiayaanKeuntunganNilai MarhunBeratMarhunJBGKadar UpahTindakan
-
-
- @php - $marhun = Http::get(config('api.url') . '/api/marhun/' . $bt['norujukan'] )->json(); - @endphp - {{ $bt['norujukan'] }} +
+
+
+
+
+ + + + + + + + + + + + + @foreach($belum_tebus as $index=>$bt) + @if($bt['hargajualan'] == '') + @php + $koskeuntungan = Http::get(config('api.url') . '/api/upahbukantawarruq/' . $bt['kodcaw'] . '/' . $bt['norujukan'])->json(); + @endphp + + + + + + + + + @endif + @endforeach + +
No RujukanPembiayaanTempoh SimpanUpah telah bayarUpah semasaTindakan
+
+
+ @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) }} + + +
-
- {{ number_format($bt['pinjaman'],2) }} - - {{ number_format($bt['bakiupah'],2) }} - - {{ number_format($bt['nilaimarhun'],2) }} - - {{ number_format($bt['berat'],2) }} - - {{ $bt['marhun'] }} - - {{ number_format($bt['jbg'],2) }} - - {{ number_format($bt['kadarupah'],2) }} - - -
+
+ + +
+ + + + + + + + + + + + + @foreach($belum_tebus as $index=>$bt) + @if($bt['hargajualan'] != '') + @php + $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 + + + + + + + + + @endif + @endforeach + +
No RujukanPembiayaanB. PembiayaanKeuntungan (6bulan)KeuntunganTindakan
+
+
+ @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) }} + + {{ number_format($bt['bakiupah'],2) }} + + {{ number_format($koskeuntungan,2) }} + + +
+
+
+
+
+
-
- -
+ +
- + + +
@@ -145,6 +215,18 @@ } }); + var selepastawarruqtable = $('#selepas_tawarruq').DataTable({ + "bLengthChange": false, + "bFilter": true, + "bInfo": false, + language: { + 'paginate': { + 'previous': '', + 'next': '' + } + } + }); + $("input[type='checkbox'][name='chkboxsag[]']").click(function () { var count = parseInt($('#totalsag').text()); if ($(this).is(':checked')) { diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php index 8017317..8248fda 100644 --- a/resources/views/profile/edit.blade.php +++ b/resources/views/profile/edit.blade.php @@ -9,7 +9,7 @@
-
+ {{--
@@ -64,7 +64,7 @@
-
+
--}}
diff --git a/routes/web.php b/routes/web.php index 2421a6b..26b3df9 100644 --- a/routes/web.php +++ b/routes/web.php @@ -58,6 +58,8 @@ Route::group(['middleware' => 'auth','verified'], function () { Route::post('/paymentaction', 'App\Http\Controllers\BayaranController@PembayaranAction')->name('payment.action'); Route::post('/paymentengine', 'App\Http\Controllers\BayaranController@PembayaranEngine')->name('payment.engine'); Route::get('/resit', 'App\Http\Controllers\BayaranController@ResitBayaran')->name('action.resit'); + Route::get('profile', ['as' => 'profile.edit', 'uses' => 'App\Http\Controllers\ProfileController@edit']); + Route::put('profile', ['as' => 'profile.update', 'uses' => 'App\Http\Controllers\ProfileController@update']); }); From 226cad3816efecf3c994a5d6e1cf71b92ed8c5da Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Thu, 7 Oct 2021 00:39:46 +0800 Subject: [PATCH 3/5] fix checkout --- resources/views/pembayaran/checkout.blade.php | 49 +++++++++++++------ 1 file changed, 35 insertions(+), 14 deletions(-) diff --git a/resources/views/pembayaran/checkout.blade.php b/resources/views/pembayaran/checkout.blade.php index 3c45651..8c79e1f 100644 --- a/resources/views/pembayaran/checkout.blade.php +++ b/resources/views/pembayaran/checkout.blade.php @@ -101,7 +101,14 @@ {{ number_format($koskeuntungan,2) }} - + + + + @@ -153,7 +160,7 @@ {{ $upahtawarruq }} - + @@ -196,7 +203,7 @@
- RM 0.00 + RM 0.00
@@ -207,7 +214,7 @@
- RM 0.00 + RM 0.00
@@ -219,7 +226,7 @@
- RM 0.00 + RM 0.00
@@ -289,12 +296,17 @@ let upah = $(this).data('upah'); let bakipinjam = $(this).data('bakipjm'); + let jenis = $(this).data('jenis'); + let nm = $(this).data('nm'); // let hiddenbayaran = $('.bayaran').val('sadas'); let bayar = Number(this.value); - if(bayar > bakipinjam){ + let errorlebih = (nm * 0.01); + + console.log(errorlebih); + if(bayar < parseFloat(errorlebih)){ $("#bayarsbmt").prop('disabled', false); Swal.fire( 'Amaran!', @@ -303,12 +315,12 @@ ) $(this).val(upah); $(this).closest('tr').find('.bayaran').val(upah); - calculateall(); + calculateall(jenis); return false; } $(this).closest('tr').find('.bayaran').val(this.value); - calculateall(); + calculateall(jenis); // total = total + bayar; @@ -317,16 +329,25 @@ }); - function calculateall() + function calculateall(jenis) { var $row = $(this).closest('tr'); + var sumarrahn = 0; + var sumtawarruq = 0; var sum = 0; - $('#belum_tawarruq').find('input[name=txtbayaran]').each(function() { - sum += parseFloat(this.value) || 0; - }); - - $("#spanbayaran").text(sum.toFixed(2)); + $('#belum_tawarruq').find('input[name=txtbayaranarrahn]').each(function() { + sumarrahn += parseFloat(this.value) || 0; + + $('#selepas_tawarruq').find('input[name=txtbayarantawarruq]').each(function() { + sumtawarruq += parseFloat(this.value) || 0; + }); + + + sum = sumarrahn + sumtawarruq; + + $("#spanbayaranarrahn").text(sumarrahn.toFixed(2)); + $("#spanbayarantawarruq").text(sumtawarruq.toFixed(2)); $('#spanjumlah').text(formatter.format(sum)); } From 6c27a477a50a61f2ef22bc0c61a4e2aa9fc02aa9 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Fri, 8 Oct 2021 01:01:39 +0800 Subject: [PATCH 4/5] fix skit2 --- public/argon/js/main.js | 3 + resources/views/dashboard.blade.php | 8 +- resources/views/layouts/app.blade.php | 2 + resources/views/pembayaran/checkout.blade.php | 104 +++++++++++++----- 4 files changed, 85 insertions(+), 32 deletions(-) create mode 100644 public/argon/js/main.js diff --git a/public/argon/js/main.js b/public/argon/js/main.js new file mode 100644 index 0000000..df0cc9d --- /dev/null +++ b/public/argon/js/main.js @@ -0,0 +1,3 @@ +function loadingbtn(){ + console.log('asdsasa'); +} \ No newline at end of file diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 7791d10..9c102b0 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -31,7 +31,7 @@
-
+
@@ -49,7 +49,7 @@
-
+
@@ -66,7 +66,7 @@
-
+
@@ -84,7 +84,7 @@
-
+
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 7d31666..890978e 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -31,6 +31,7 @@ + @@ -41,6 +42,7 @@ @@ -208,6 +259,13 @@
@include('layouts.navbars.navbar') @yield('content') + + +
@guest() diff --git a/resources/views/layouts/navbars/navs/auth.blade.php b/resources/views/layouts/navbars/navs/auth.blade.php index e971d6e..d15663c 100644 --- a/resources/views/layouts/navbars/navs/auth.blade.php +++ b/resources/views/layouts/navbars/navs/auth.blade.php @@ -13,7 +13,7 @@ @endphp
- {{ (Auth::user()->first_time_login === 0) ? 'Selamat datang untuk pertama kali!' : 'Log masuk terakhir pada ' . $logDate }} + {{ (Auth::user()->first_time_login === 0) ? 'Selamat datang untuk pertama kali!' : 'Log masuk terakhir pada ' . $logDate }} MYT
diff --git a/resources/views/layouts/navbars/sidebar.blade.php b/resources/views/layouts/navbars/sidebar.blade.php index f1be030..6e41498 100644 --- a/resources/views/layouts/navbars/sidebar.blade.php +++ b/resources/views/layouts/navbars/sidebar.blade.php @@ -79,8 +79,13 @@
- {{--
- New - Filters -
--}}
@@ -30,7 +26,6 @@
- {{-- onsubmit="return validateform()" --}}
@csrf @@ -76,7 +71,7 @@ - @php $counter = 1; @endphp + @php $counter = 1;$jenisbayaran = 'arrahn'; @endphp @foreach($arraybayar as $index=>$bayar) @if($bayar['hargajualan'] == '') @php @@ -111,6 +106,9 @@ + + + @@ -137,7 +135,7 @@ Bayaran - @php $counter = 1; @endphp + @php $counter = 1;$jenisbayaran = 'tawarruq'; @endphp @foreach($arraybayar as $index=>$bayar) @if($bayar['hargajualan'] != '') @@ -171,6 +169,7 @@ + @@ -256,7 +255,7 @@
- +
@@ -341,12 +340,12 @@ 'error' ) $(this).val(upah); - $(this).closest('tr').find('input[name=txtbayaranhidden]').val(upah); + $(this).closest('tr').find('.bayaran').val(upah); calculateall(jenis); return false; } - $(this).closest('tr').find('input[name=txtbayaranhidden]').val(this.value); + $(this).closest('tr').find('.bayaran').val(this.value); calculateall(jenis); }); @@ -369,12 +368,12 @@ 'error' ) $(this).val(upah); - $(this).closest('tr').find('input[name=txtbayaranhidden]').val(upah); + $(this).closest('tr').find('.bayaran').val(upah); calculateall(jenis); return false; } - $(this).closest('tr').find('input[name=txtbayaranhidden]').val(this.value); + $(this).closest('tr').find('.bayaran').val(this.value); calculateall(jenis); }); @@ -402,8 +401,3 @@ @endsection -{{-- -@push('js') - - -@endpush --}} \ No newline at end of file diff --git a/resources/views/pembayaran/resit/resit_baru.blade.php b/resources/views/pembayaran/resit/resit_baru.blade.php index 41bd715..5e41fbb 100644 --- a/resources/views/pembayaran/resit/resit_baru.blade.php +++ b/resources/views/pembayaran/resit/resit_baru.blade.php @@ -50,6 +50,7 @@

Resit Bayaran

+ {{-- {{ dd($payment_details) }} --}} @@ -61,7 +62,7 @@ - + @@ -69,7 +70,7 @@ - + @@ -80,6 +81,13 @@
Nama Pelanggan
Masa Transaksi: {{ date('d/m/Y - h:i:s',strtotime($date)) }}: {{ date('d/m/Y - h:i A',strtotime($payment_details['paid_at'])) }}
Harga Jualan
Bayaran: RM {{ number_format($payment_details['bayaran'],2) }}: RM {{ number_format($payment_details['total_payment'],2) }}
Baki Harga Jualan: Berjaya
+
+
Sebarang pembayaran akan dikemaskini selepas 1 Jam sebaik pembayaran dilakukan
+
Nota: Resit ini adalah cetakan komputer dan tandatangan tidak diperlukan.
+
+
+ +
@@ -92,4 +100,16 @@

FPX provider by ANSI Systems Sdn Bhd

-
\ No newline at end of file +
+ \ No newline at end of file diff --git a/resources/views/pembayaran/resit/resit_baru_sebelum.blade.php b/resources/views/pembayaran/resit/resit_baru_sebelum.blade.php new file mode 100644 index 0000000..6daad94 --- /dev/null +++ b/resources/views/pembayaran/resit/resit_baru_sebelum.blade.php @@ -0,0 +1,115 @@ + + + + + + +Permodalan Kelantan Berhad | Pembayaran Ansuran + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

+
+
+
+
+

Permodalan Kelantan Berhad

+
+
+
+
+
+
+

+
+
+

Resit Bayaran

+
+
+ {{-- {{ dd($payment_details) }} --}} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Nama Pelanggan: {{ $customer_details['nama'] }}
No Rujukan: {{ $payment_details['norujukan'] }}
Masa Transaksi: {{ date('d/m/Y - h:i:s',strtotime($payment_details['paid_at'])) }}
JBG: {{ number_format($jbg,2) }}
Upah semasa: RM {{ number_format($koskeuntungan,2) }}
Bayaran: RM {{ number_format($payment_details['total_payment'],2) }}
Status Payment: Berjaya
+
+
Sebarang pembayaran akan dikemaskini selepas 1 Jam sebaik pembayaran dilakukan
+
Nota: Resit ini adalah cetakan komputer dan tandatangan tidak diperlukan.
+
+
+ +
+
+
+
+
+
+
+
+ bizappay +
+

FPX provider by ANSI Systems Sdn Bhd

+
+
+
+ \ 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 2f5a413..83eba12 100644 --- a/resources/views/pembayaran/result/berjaya.blade.php +++ b/resources/views/pembayaran/result/berjaya.blade.php @@ -14,7 +14,7 @@
@@ -52,25 +52,34 @@
-

Senarai Berjaya

+ +
+ +

Pembayaran Berjaya

+
+
Sebarang pembayaran akan dikemaskini selepas 1 Jam sebaik pembayaran dilakukan
+
+
- - - - + + + + + - @foreach($arraybayaran as $index=>$arb) + @foreach($transactionOnline as $index=>$trans) - - - - + + + + + @endforeach @@ -78,8 +87,10 @@
No RujukanKodcawBayaranMuat TurunNo RujukanCawanganBayaran (RM)StatusMuat Turun
{{ $arb['norujukan'] }}{{ $arb['kodcaw'] }}{{ $arb['bayaran'] }}Muat Turun{{ $trans['norujukan'] }}{{ $arraycawangan[$index]['namacaw'] }}{{ number_format($trans['total_payment'],2) }}{{ $trans['status'] }}Muat Turun
- Laman Utama -
+
+ Laman Utama +
+
diff --git a/resources/views/pembayaran/result/gagal.blade.php b/resources/views/pembayaran/result/gagal.blade.php index a04ba72..d34d67f 100644 --- a/resources/views/pembayaran/result/gagal.blade.php +++ b/resources/views/pembayaran/result/gagal.blade.php @@ -14,7 +14,7 @@
@@ -26,7 +26,7 @@
-
+
@@ -51,25 +51,20 @@ @enderror
- - @csrf -
- - + + +
+ +

Pembayaran Tidak Berjaya

+
+
Pembayaran tidak berjaya dilakukan oleh kerana sebab-sebab tertentu! Sila cuba lagi.
+
+
+ +
+ Laman Utama +
- - - -
@@ -78,8 +73,3 @@
@endsection - -@push('js') - - -@endpush \ No newline at end of file diff --git a/resources/views/pembayaran/senaraibayaran.blade.php b/resources/views/pembayaran/senaraibayaran.blade.php index b3ff404..e25b393 100644 --- a/resources/views/pembayaran/senaraibayaran.blade.php +++ b/resources/views/pembayaran/senaraibayaran.blade.php @@ -190,7 +190,7 @@
- +
diff --git a/resources/views/pembayaran/senaraibayaranv2.blade.php b/resources/views/pembayaran/senaraibayaranv2.blade.php deleted file mode 100644 index 7a99b8d..0000000 --- a/resources/views/pembayaran/senaraibayaranv2.blade.php +++ /dev/null @@ -1,499 +0,0 @@ - - - - - - - - - - Argon Dashboard - Free Dashboard for Bootstrap 4 - - - - - - - - - - - - - - - -
- - - - -
-
-
-
-
- - -
- {{--
- New - Filters -
--}} -
-
-
-
- -
-
-
-
- -
-

Senarai SAG

-
- -
- - - - - - - - - - - @foreach($belum_tebus as $index=>$bt) - - - - - - - @endforeach - -
No RujukanPembiayaanStatusTindakan
-
-
- {{ $bt['norujukan'] }} -
-
- 		- {{ number_format($bt['pinjaman'],2) }} - - - - belum tebus - - - -
-
- -
- -
-
-
-
- -
- -
- -
-
- - - - {{-- - - - - - - - --}} - - - \ No newline at end of file diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php index 8248fda..19056d2 100644 --- a/resources/views/profile/edit.blade.php +++ b/resources/views/profile/edit.blade.php @@ -9,165 +9,132 @@
- {{--
-
-
-
-
- - - -
-
-
-
-
- {{ __('Connect') }} - {{ __('Message') }} -
-
-
-
-
-
-
- 22 - {{ __('Friends') }} -
-
- 10 - {{ __('Photos') }} -
-
- 89 - {{ __('Comments') }} -
-
-
-
-
-

- {{ auth()->user()->name }}, 27 -

-
- {{ __('Bucharest, Romania') }} -
-
- {{ __('Solution Manager - Creative Tim Officer') }} -
-
- {{ __('University of Computer Science') }} -
-
-

{{ __('Ryan — the name taken by Melbourne-raised, Brooklyn-based Nick Murphy — writes, performs and records all of his own music.') }}

- {{ __('Show more') }} -
-
-
-
--}} -
-
-
+
+
+ {{--
-

{{ __('Edit Profile') }}

+

{{ __('Ubah Profil') }}

-
+
--}}
-
- @csrf - @method('put') -
{{ __('User information') }}
- - @if (session('status')) - - @endif - - -
-
- - - - @if ($errors->has('name')) - - {{ $errors->first('name') }} - - @endif -
-
- - - - @if ($errors->has('email')) - - {{ $errors->first('email') }} - - @endif -
- -
- +
+ +
+ +
+
+ + + @csrf + @method('put') + + + +
{{ __('Maklumat Peribadi') }}
+ + @if (session('status')) + + @endif + + +
+
+ + + + @if ($errors->has('name')) + + {{ $errors->first('name') }} + + @endif +
+
+ + + + @if ($errors->has('email')) + + {{ $errors->first('email') }} + + @endif +
+ +
+ +
+
- -
-
- @csrf - @method('put') + -
{{ __('Password') }}
+
- @if (session('password_status')) - - @endif + + @csrf + @method('put') -
-
- - - - @if ($errors->has('old_password')) - - {{ $errors->first('old_password') }} - +
{{ __('Password') }}
+ + @if (session('password_status')) + @endif -
-
- - - - @if ($errors->has('password')) - - {{ $errors->first('password') }} - - @endif -
-
- - -
-
- -
+
+
+ + + + @if ($errors->has('old_password')) + + {{ $errors->first('old_password') }} + + @endif +
+
+ + + + @if ($errors->has('password')) + + {{ $errors->first('password') }} + + @endif +
+
+ + +
+ +
+ +
+
+
- +
- @include('layouts.footers.auth') + {{-- @include('layouts.footers.auth') --}}
@endsection diff --git a/resources/views/semak/semaksag3.blade.php b/resources/views/semak/semaksag3.blade.php deleted file mode 100644 index bdfadf3..0000000 --- a/resources/views/semak/semaksag3.blade.php +++ /dev/null @@ -1,82 +0,0 @@ -@extends('layouts.app') - -@section('content') - @include('layouts.headers.cards') - -
-
-
-
- - -
- {{--
- New - Filters -
--}} -
-
-
- - -
-
-
-
- -
-

Semak Butiran SAG

-
-
-
- -
- - -
-
- - -
- - Semak - - -
-
-
-
-
- -
-
- - @endsection - - @push('js') - - - - - - - @endpush \ No newline at end of file diff --git a/resources/views/users/partials/header.blade.php b/resources/views/users/partials/header.blade.php index 4ed2f6b..626a650 100644 --- a/resources/views/users/partials/header.blade.php +++ b/resources/views/users/partials/header.blade.php @@ -1,14 +1,11 @@ -
+
- +
-
-

{{ $title }}

- @if (isset($description) && $description) -

{{ $description }}

- @endif +
+
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php deleted file mode 100644 index d60bef8..0000000 --- a/resources/views/welcome.blade.php +++ /dev/null @@ -1,22 +0,0 @@ -@extends('layouts.app', ['class' => 'bg-default']) - -@section('content') -
-
-
-
-
-

{{ __('Welcome to Argon Dashboard FREE Laravel Live Preview.') }}

-
-
-
-
-
- - - -
-
- -
-@endsection diff --git a/routes/web.php b/routes/web.php index 26b3df9..995642d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -56,7 +56,15 @@ Route::group(['middleware' => 'auth','verified'], function () { Route::get('/penyata/{norujukan}', 'App\Http\Controllers\SemakController@Penyata')->name('penyata.show'); Route::get('/penyata/summary/{norujukan}', 'App\Http\Controllers\SemakController@PenyataSummary')->name('penyata.summary'); Route::post('/paymentaction', 'App\Http\Controllers\BayaranController@PembayaranAction')->name('payment.action'); + + //Pembayaran Engine Route::post('/paymentengine', 'App\Http\Controllers\BayaranController@PembayaranEngine')->name('payment.engine'); + Route::get('/pembayaran/response', 'App\Http\Controllers\BayaranController@response')->name('pay.paymentStatus'); + Route::get('/pembayaran/backend', 'App\Http\Controllers\BayaranController@callback')->name('pay.callback'); + Route::get('pembayaran/berjaya',['as'=>'pay.success','uses'=>'App\Http\Controllers\BayaranController@successPayment']); + Route::get('pembayaran/gagal',['as'=>'pay.failed','uses'=>'App\Http\Controllers\BayaranController@failedPayment']); + + Route::get('/resit', 'App\Http\Controllers\BayaranController@ResitBayaran')->name('action.resit'); Route::get('profile', ['as' => 'profile.edit', 'uses' => 'App\Http\Controllers\ProfileController@edit']); Route::put('profile', ['as' => 'profile.update', 'uses' => 'App\Http\Controllers\ProfileController@update']);