From 10bc02f6289758daaa2d27d0d78fbe3471b10a93 Mon Sep 17 00:00:00 2001 From: Amir Hamzan <62345746+amirhamzan@users.noreply.github.com> Date: Tue, 30 Nov 2021 13:02:50 +0800 Subject: [PATCH] add berjaya&gagal pembayaran --- app/Http/Controllers/BayaranController.php | 6 +- .../views/includes/analisaportal.blade.php | 10 +- .../includes/bayaran/pembayaransag.blade.php | 59 +++--- .../views/includes/rekod/rekodsag.blade.php | 6 +- .../views/pembayaran/result/berjaya.blade.php | 189 +++++++++--------- .../pembayaran/result/berjayaportal.blade.php | 89 +++++++++ .../pembayaran/result/gagalportal.blade.php | 57 ++++++ resources/views/semak/senaraisag.blade.php | 6 +- 8 files changed, 285 insertions(+), 137 deletions(-) create mode 100644 resources/views/pembayaran/result/berjayaportal.blade.php create mode 100644 resources/views/pembayaran/result/gagalportal.blade.php diff --git a/app/Http/Controllers/BayaranController.php b/app/Http/Controllers/BayaranController.php index 8c6ab7b..1c74fa0 100644 --- a/app/Http/Controllers/BayaranController.php +++ b/app/Http/Controllers/BayaranController.php @@ -338,11 +338,13 @@ class BayaranController extends Controller // dd($arraygadai,$arraycawangan); - return view('pembayaran.result.berjaya',compact('transactionOnline','arraycawangan','arraygadai')); + // return view('pembayaran.result.berjaya',compact('transactionOnline','arraycawangan','arraygadai')); + return view('pembayaran.result.berjayaportal',compact('transactionOnline','arraycawangan','arraygadai')); } public function failedPayment(){ - return view('pembayaran.result.gagal'); + // return view('pembayaran.result.gagal'); + return view('pembayaran.result.gagalportal'); } } diff --git a/resources/views/includes/analisaportal.blade.php b/resources/views/includes/analisaportal.blade.php index 48f03d0..39ad65f 100644 --- a/resources/views/includes/analisaportal.blade.php +++ b/resources/views/includes/analisaportal.blade.php @@ -112,7 +112,7 @@
Keseluruhan
-

Jumlah Bayaran

+

Jumlah Bayaran

- + diff --git a/resources/views/includes/bayaran/pembayaransag.blade.php b/resources/views/includes/bayaran/pembayaransag.blade.php index 22f5bec..fad4c55 100644 --- a/resources/views/includes/bayaran/pembayaransag.blade.php +++ b/resources/views/includes/bayaran/pembayaransag.blade.php @@ -17,13 +17,14 @@ -
-
+
+
-
-

Senarai Surat Gadaian

+
+

Senarai Surat Gadaian

+
@@ -54,7 +55,7 @@
-
Karat Harga (RM)
+
@@ -99,14 +100,14 @@ {{-- --}} - + - - - - - - + + + + + + @php $counter++; @endphp @@ -119,8 +120,8 @@
-
-
No.
+
+
@@ -129,7 +130,7 @@ - + @php $counter = 1;$jenisbayaran = 'tawarruq'; @endphp @@ -160,18 +161,17 @@ @@ -187,22 +187,19 @@ -
+
-
-

Ringkasan Pembayaran

+
+

Ringkasan Pembayaran

+
-
- -
-
- +
@@ -293,7 +290,7 @@ return false; } - let total = 0; + // let total = 0; $("select[name=sltbayaran]").change(function(e) { let selected = $('option:selected', this).attr('value'); diff --git a/resources/views/includes/rekod/rekodsag.blade.php b/resources/views/includes/rekod/rekodsag.blade.php index 1daaafe..6e57101 100644 --- a/resources/views/includes/rekod/rekodsag.blade.php +++ b/resources/views/includes/rekod/rekodsag.blade.php @@ -28,7 +28,7 @@
-
Ar-Rahn
+
Ar-Rahn
@@ -84,7 +84,7 @@
-
Tawarruq
+
Tawarruq
@@ -144,7 +144,7 @@
-
Penyata Terdahulu
+
Penyata Terdahulu
diff --git a/resources/views/pembayaran/result/berjaya.blade.php b/resources/views/pembayaran/result/berjaya.blade.php index 83eba12..112fd54 100644 --- a/resources/views/pembayaran/result/berjaya.blade.php +++ b/resources/views/pembayaran/result/berjaya.blade.php @@ -1,106 +1,109 @@ @extends('layouts.app') @section('content') - @include('layouts.headers.cards') - - - -
-
-
-
-
+@include('layouts.headers.cards') - -
-
+ + +
+
+
+
+
+ + +
+
+
+
+
+ +
+
+
+
+ +
+
+
+ @error('sltcawangan') + + @enderror + +
+ + +
+ +

Pembayaran Berjaya

+
+
Sebarang pembayaran akan dikemaskini selepas 1 Jam sebaik pembayaran dilakukan
+
+ +
+
NoB. Pembiayaan Tempoh KeuntunganBayaranBayaran
- - - - - - - + + + + +
+ + + + + + + + + + + @foreach($transactionOnline as $index=>$trans) + + + + + + + + @endforeach + + +
No RujukanCawanganBayaran (RM)StatusMuat Turun
{{ $trans['norujukan'] }}{{ $arraycawangan[$index]['namacaw'] }}{{ number_format($trans['total_payment'],2) }}{{ $trans['status'] }}Muat Turun
+ +
+ Laman Utama +
- -
-
-
-
- -
-
-
- @error('sltcawangan') - - @enderror - -
- - -
- -

Pembayaran Berjaya

-
-
Sebarang pembayaran akan dikemaskini selepas 1 Jam sebaik pembayaran dilakukan
-
-
- -
- - - - - - - - - - - - @foreach($transactionOnline as $index=>$trans) - - - - - - - - @endforeach - - -
No RujukanCawanganBayaran (RM)StatusMuat Turun
{{ $trans['norujukan'] }}{{ $arraycawangan[$index]['namacaw'] }}{{ number_format($trans['total_payment'],2) }}{{ $trans['status'] }}Muat Turun
-
- -
- Laman Utama -
-
-
-
-
-
- -
+ @endsection @push('js') - - + + @endpush \ No newline at end of file diff --git a/resources/views/pembayaran/result/berjayaportal.blade.php b/resources/views/pembayaran/result/berjayaportal.blade.php new file mode 100644 index 0000000..12dcbf2 --- /dev/null +++ b/resources/views/pembayaran/result/berjayaportal.blade.php @@ -0,0 +1,89 @@ +@extends('layouts.indexthird') + +@section('content') + + +
+
+
+
+ +
+
+
+ @error('sltcawangan') + + @enderror + +
+ + +
+ +

Pembayaran Berjaya

+
+
*Sebarang pembayaran akan dikemaskini selepas 1 Jam
+
+
+ +
+ + + + + + + + + + + + @foreach($transactionOnline as $index=>$trans) + + + + + + + + @endforeach + + +
No RujukanCawanganBayaran (RM)StatusResit Bayaran
{{ $trans['norujukan'] }}{{ $arraycawangan[$index]['namacaw'] }}{{ number_format($trans['total_payment'],2) }}{{ $trans['status'] }}
+
+ +
+ Laman Utama +
+
+
+
+
+
+ +
+ +@endsection + +@push('js') + + +@endpush \ No newline at end of file diff --git a/resources/views/pembayaran/result/gagalportal.blade.php b/resources/views/pembayaran/result/gagalportal.blade.php new file mode 100644 index 0000000..281d5ea --- /dev/null +++ b/resources/views/pembayaran/result/gagalportal.blade.php @@ -0,0 +1,57 @@ +@extends('layouts.indexthird') + +@section('content') + +
+
+
+
+ +
+
+
+ @error('sltcawangan') + + @enderror + +
+ + +
+ +

Pembayaran Tidak Berjaya

+
+
*Pembayaran tidak berjaya dilakukan oleh kerana sebab-sebab tertentu. Sila cuba lagi.
+
+
+ +
+ Laman Utama +
+
+
+
+
+
+ +
+ +@endsection \ No newline at end of file diff --git a/resources/views/semak/senaraisag.blade.php b/resources/views/semak/senaraisag.blade.php index 0d1157b..a4fbc7f 100644 --- a/resources/views/semak/senaraisag.blade.php +++ b/resources/views/semak/senaraisag.blade.php @@ -35,7 +35,7 @@
-

Ar-Rahn

+

Ar-Rahn

@@ -92,7 +92,7 @@
-

Tawarruq

+

Tawarruq

@@ -152,7 +152,7 @@
-

Penyata Terdahulu

+

Penyata Terdahulu