diff --git a/resources/assets/vue/components/wallets/elements/WalletTopUpHistoryComponent.vue b/resources/assets/vue/components/wallets/elements/WalletTopUpHistoryComponent.vue index 64250573..2f58caab 100644 --- a/resources/assets/vue/components/wallets/elements/WalletTopUpHistoryComponent.vue +++ b/resources/assets/vue/components/wallets/elements/WalletTopUpHistoryComponent.vue @@ -22,6 +22,15 @@ +
+ +
+
Customer Marking
+
+ Marking & Link +
+
+
@@ -29,7 +38,7 @@
-
+
diff --git a/resources/assets/vue/components/wallets/elements/WalletsComponent.vue b/resources/assets/vue/components/wallets/elements/WalletsComponent.vue new file mode 100644 index 00000000..8f0daa9c --- /dev/null +++ b/resources/assets/vue/components/wallets/elements/WalletsComponent.vue @@ -0,0 +1,178 @@ + + + diff --git a/resources/views/pages/wallet/transactions.blade.php b/resources/views/pages/wallet/transactions.blade.php index 96c7ecc5..eec36547 100644 --- a/resources/views/pages/wallet/transactions.blade.php +++ b/resources/views/pages/wallet/transactions.blade.php @@ -106,7 +106,6 @@
-
diff --git a/resources/views/pages/wallet/wallets.blade.php b/resources/views/pages/wallet/wallets.blade.php new file mode 100644 index 00000000..1a876a4f --- /dev/null +++ b/resources/views/pages/wallet/wallets.blade.php @@ -0,0 +1,54 @@ + +@extends('layouts.base_portal') +@section('inner_content') +
+
+ +
+
+
+
+
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
+
+
+ +
+
+
+
+
+
+@endsection \ No newline at end of file diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php index c20312df..06dcccb9 100644 --- a/resources/views/partials/header.blade.php +++ b/resources/views/partials/header.blade.php @@ -51,6 +51,11 @@
customers
+
+ +
Wallets
+
+
Bank Accounts
diff --git a/routes/web.php b/routes/web.php index a48b26d2..0f730893 100644 --- a/routes/web.php +++ b/routes/web.php @@ -75,13 +75,16 @@ Route::get('/transfer/merge/{marking}', function ($marking) { return view('pages.bookings.merge', ['marking' => $marking]); })->name('booking.merge'); -Route::get('/wallet-transactions', function () { Route::get('/online_payment/redirect', 'Billplz\CallbackBillplzController@callback')->name('online_payment.redirect'); Route::get('/wallet/{marking}/details', function () { return view('pages.wallet.index'); })->name('wallet.details'); +Route::get('/wallets', function () { + return view('pages.wallet.wallets'); +})->name('wallet.wallets'); + Route::get('/test', function(){ // Auth::login(User::findOrFail(1));