From b9b30a1555fff35a9eaf8e126c6920750c3ca029 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Thu, 16 Dec 2021 20:24:10 +0800 Subject: [PATCH 1/2] update wallet ui at dashboard --- .../customerDashboardSectionComponent.vue | 31 +++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue index 8d48fc7e..2fc0ba02 100644 --- a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue @@ -536,8 +536,35 @@
- + +
+
+
+
+ +
MYR 0.00
+
+
+
+
+ Reload +
+
+ Transaction History +
+
+
+
+ + Transfer +
+
+ + Cash Out +
+
+
+
From 0579be05d8be6af0f5d83b1b09e4012953b73fb1 Mon Sep 17 00:00:00 2001 From: edmondlang Date: Mon, 10 Jan 2022 00:33:35 +0800 Subject: [PATCH 2/2] wallet updates --- .../CustomerProfileSectionComponent.vue | 5 + .../sections/WalletBalanceComponent.vue | 104 +++++++++++++++ .../customerDashboardSectionComponent.vue | 29 +---- resources/views/pages/wallet/index.blade.php | 4 + .../views/pages/wallet/transactions.blade.php | 121 ++++++++++++++++++ routes/web.php | 4 + 6 files changed, 239 insertions(+), 28 deletions(-) create mode 100644 resources/assets/vue/components/companies/sections/WalletBalanceComponent.vue create mode 100644 resources/views/pages/wallet/index.blade.php create mode 100644 resources/views/pages/wallet/transactions.blade.php diff --git a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue index 09876b9b..85502c97 100644 --- a/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/CustomerProfileSectionComponent.vue @@ -139,6 +139,11 @@
+
+
+ +
+
diff --git a/resources/assets/vue/components/companies/sections/WalletBalanceComponent.vue b/resources/assets/vue/components/companies/sections/WalletBalanceComponent.vue new file mode 100644 index 00000000..dd100288 --- /dev/null +++ b/resources/assets/vue/components/companies/sections/WalletBalanceComponent.vue @@ -0,0 +1,104 @@ + + + \ No newline at end of file diff --git a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue index 2fc0ba02..f399c533 100644 --- a/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue +++ b/resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue @@ -537,34 +537,7 @@
-
-
-
-
- -
MYR 0.00
-
-
-
-
- Reload -
-
- Transaction History -
-
-
-
- - Transfer -
-
- - Cash Out -
-
-
-
+
diff --git a/resources/views/pages/wallet/index.blade.php b/resources/views/pages/wallet/index.blade.php new file mode 100644 index 00000000..7a9b49ef --- /dev/null +++ b/resources/views/pages/wallet/index.blade.php @@ -0,0 +1,4 @@ +@extends('layouts.base_portal') +@section('inner_content') + @include('pages.wallet.transactions') +@endsection diff --git a/resources/views/pages/wallet/transactions.blade.php b/resources/views/pages/wallet/transactions.blade.php new file mode 100644 index 00000000..8fcb3a8a --- /dev/null +++ b/resources/views/pages/wallet/transactions.blade.php @@ -0,0 +1,121 @@ +
+
+
+
+
Transaction History
+
+
+ +
+
Date
+
Description
+
Incoming
+
Outgoing
+
Balance
+
+ +
+
25/11/2015
+
Payment to bill #121221121
+
+
2,123
+
12,123
+
+ +
+
115/11/2015
+
Top Up
+
1,234
+
+
14,246
+
+
+
+ +
+
+
+
+
Top Up Records
+
+
+ + +
+
+
+
+
+
+
+
+
+
Payment Method Success
+
+
+

$123,123

+
+
+
+
+ 12-03-2021 +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
Payment Method Failed
+
+
+

$123,123

+
+
+
+
+ 12-03-2021 +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
Payment Method Processing
+
+
+

$123,123

+
+
+
+
+ 12-03-2021 +
+
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/routes/web.php b/routes/web.php index 84e1f2c1..23b4499c 100644 --- a/routes/web.php +++ b/routes/web.php @@ -75,6 +75,10 @@ Route::get('/transfer/merge/{marking}', function ($marking) { return view('pages.bookings.merge', ['marking' => $marking]); })->name('booking.merge'); +Route::get('/wallet-transactions', function () { + return view('pages.wallet.index'); +})->name('wallet.transactions'); + Route::get('/test', function(){ // Auth::login(User::findOrFail(1));