+
Regenerate Invoice
@@ -10,18 +11,35 @@
-
+
+
+
+ style=" fill:#000000;">
-
+ All Invoice
+ Pending Payment
+
+
@@ -32,60 +50,14 @@
+
+
+
+
+
+
+
Paid Invoice
-
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..ce31dec6
--- /dev/null
+++ b/resources/views/pages/wallet/transactions.blade.php
@@ -0,0 +1,5 @@
+
+
diff --git a/resources/assets/vue/components/wallets/elements/CustomerTransactionSectionComponent.vue b/resources/assets/vue/components/wallets/elements/CustomerTransactionSectionComponent.vue
new file mode 100644
index 00000000..25577b5c
--- /dev/null
+++ b/resources/assets/vue/components/wallets/elements/CustomerTransactionSectionComponent.vue
@@ -0,0 +1,151 @@
+
+
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
- Summary
-
-
-
-
-
-
-
-
-
- {{selectedInvoice.length}} Invoice Selected
-
-
-
-
-
-
-
-
- {{ invoice.bill_no }}
-
-
- MYR {{ invoice.amount.toFixed(2) }}
--
-
-
-
- Total Amount
-
-
- MYR {{ sumAmount }}
-
-
+
-
- Generate Summary Invoice
-
+
+
+
diff --git a/resources/assets/vue/components/wallets/elements/WalletComponent.vue b/resources/assets/vue/components/wallets/elements/WalletComponent.vue
new file mode 100644
index 00000000..f36f865f
--- /dev/null
+++ b/resources/assets/vue/components/wallets/elements/WalletComponent.vue
@@ -0,0 +1,103 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ Transaction History
+
+
+
+
+
+
+
+
+ Date
+ Description
+ Incoming
+ Outgoing
+ Balance
+
+
+ {{item.created_at}}
+
+ {{[5, 9].includes(parseFloat(item.type)) ? (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}
+ {{[1, 11].includes(parseFloat(item.type)) ? '- ' + (Math.round((parseFloat(item.amount) + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") : ''}}
+ {{remainingBalance(index)}}
+
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
+ Nothing To Show Here
+
+
+
+ There is no results found, Try adjusting your filters to find what you are looking for.
+
+
+
+
+
+
+
+
+
+
+
+ Top Up Records
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Nothing To Show Here
+
+
+
+ There is no results found, Try adjusting your filters to find what you are looking for.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/assets/vue/components/wallets/elements/WalletTopUpHistoryComponent.vue b/resources/assets/vue/components/wallets/elements/WalletTopUpHistoryComponent.vue
new file mode 100644
index 00000000..f827134d
--- /dev/null
+++ b/resources/assets/vue/components/wallets/elements/WalletTopUpHistoryComponent.vue
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Wallet Balance
+ MYR {{ wallet ? (Math.round((wallet.amount + Number.EPSILON) * 100) / 100).toFixed(2) : '0.00'}}
+
+
+
+
+
+ Reload
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue b/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
new file mode 100644
index 00000000..eaff3042
--- /dev/null
+++ b/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
@@ -0,0 +1,98 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Status
+ Pending Verification
+
+
+ Payment Amount
+
+ MYR {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+
+
+
+
+ Submitted On: {{ item.updated_at }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Status
+ Approved
+
+
+ Payment Amount
+
+ MYR {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+
+
+
+
+ Paid On: {{ item.updated_at }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Status
+
+ Rejected
+
+
+
+ Payment Amount
+
+ MYR {{(Math.round((item.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+
+
+
+
+ Rejected On: {{ item.updated_at }}
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
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..49a99f0d
--- /dev/null
+++ b/resources/assets/vue/components/wallets/elements/WalletsComponent.vue
@@ -0,0 +1,207 @@
+
+
+
+
+
+
+
+ Marking
+
+
+
+
+
+
+
+
+
+
+
+ Date
+
+
+
+
+ {{data.updated_at}}
+
+
+
+
+
+
+ Bill No
+
+
+
+
+ {{data.bill_no}}
+
+
+
+
+
+
+ Description
+
+
+
+
+
+
+
+
+
+
+
+ Amount
+
+
+
+
+ MYR {{(Math.round((data.amount + Number.EPSILON) * 100) / 100).toFixed(2).toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")}}
+
+
+
+
+
+
+
+ Payment Reference
+
+
+
+
+
+
+ Bz
+
+
+
+
+
+
+
diff --git a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
new file mode 100644
index 00000000..33738d60
--- /dev/null
+++ b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
@@ -0,0 +1,162 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resources/views/pages/payments_redirect.blade.php b/resources/views/pages/payments_redirect.blade.php
index 58285751..72cc8624 100644
--- a/resources/views/pages/payments_redirect.blade.php
+++ b/resources/views/pages/payments_redirect.blade.php
@@ -33,9 +33,16 @@
+
+
+
+
+
+
+
+
+
+
+
+ Credit
+
+
+
+
+ Debit
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ MYR
500
+ 500
+
+ MYR
1,000
+ 1,000
+
+ MYR
3,000
+ 3,000
+
+
+
+ MYR
5,000
+ 5,000
+
+ MYR
10,000
+ 10,000
+
+ MYR
50,000
+ 50,000
+
+
+
+
+
+ Reload Credit
+
+
+
+
+
+
+
+
+ You will be redirected to your bank to complete the payment of {{parameters.amount}} MYR for wallet credit top up. After clicking on the confirm button below. please follow your bank instruction to complete the payment
+
+
+
+
+
+
+
+
+
-
-
Back to Order
-
+ @if($marking)
+
+ Back to Order
+
+ @endif
+ @if($company_module_marking)
+
+ Back to Payment and Billing
+
+ @endif
+
\ No newline at end of file
diff --git a/resources/views/pages/wallet/wallets.blade.php b/resources/views/pages/wallet/wallets.blade.php
new file mode 100644
index 00000000..6abb1812
--- /dev/null
+++ b/resources/views/pages/wallet/wallets.blade.php
@@ -0,0 +1,124 @@
+
+@extends('layouts.base_portal')
+@section('inner_content')
+
+
+
+
+@endsection
\ No newline at end of file
diff --git a/routes/api.php b/routes/api.php
index 9073989a..d4deb70a 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -62,6 +62,8 @@ Route::group(['middleware' => 'api', 'prefix' => 'v1', 'as' => 'api.'], function
require __DIR__ . '/report.php';
+ require __DIR__ . '/wallet.php';
+
});
require __DIR__ . '/announcement.php';
diff --git a/routes/transaction.php b/routes/transaction.php
index 3d847135..667a3f68 100644
--- a/routes/transaction.php
+++ b/routes/transaction.php
@@ -16,6 +16,7 @@ Route::group(['prefix' => 'transactions', 'namespace' => 'Transactions', 'as' =>
Route::group(['prefix' => 'invoice', 'as' => 'invoice.'], function () {
route::post('/shipping-invoice/create', 'CreateShippingInvoiceTransactionController@create')->name('create');
+ route::post('/shipping-invoice/company/{company_module_id}/regenerate', 'RegenerateShippingInvoiceTransactionController@regenerate')->name('company.regenerate');
route::put('/shipping-invoice/{id}/update', 'UpdateShippingInvoiceTransactionController@update')->name('update');
route::put('/shipping-invoice/{id}/approve', 'ApproveShippingInvoiceTransactionController@approve')->name('approve');
});
diff --git a/routes/wallet.php b/routes/wallet.php
new file mode 100644
index 00000000..b93a1514
--- /dev/null
+++ b/routes/wallet.php
@@ -0,0 +1,18 @@
+ 'wallets', 'namespace' => 'Wallets', 'as' => 'wallet.'], function () {
+ Route::get('/', 'ListWalletController@list')->name('list');
+
+ Route::get('/company-module/{company_module_id}', 'FetchWalletByCompanyModuleController@fetch')->name('company_module.show');
+
+ Route::post('/create', 'CreateWalletController@create')->name('create');
+
+ Route::post('/topup', 'TopUpWalletController@topUp')->name('topup'); // user
+ Route::post('/credit', 'CreditWalletController@credit')->name('credit'); // admin +
+
+ Route::put('/{transaction_id}/update-status/{status}', 'UpdateStatusWalletController@updateStatus')->where('status', 'approve|reject')->name('approval');
+
+ Route::get('/reports', 'WalletReportController@walletsReport')->name('reports');
+});
diff --git a/routes/web.php b/routes/web.php
index a4619efc..cd05ba71 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -955,3 +955,10 @@ Route::get('/packing-lists/delete-duplicated', function(Request $request){
}
}
});
+
+Route::get('/wallet/{marking}/details', function ($marking) {
+ $connection = CompanyConnection::where('invitee_reference', $marking)->first();
+ $id = $connection->invitee->id;
+ return view('pages.wallet.index', ['id' => $id]);
+})->name('wallet.details');
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Top UP
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Payments
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Credit Note
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Debit Note
+
+
+
+
+
+
+
+
+
+
+
+
+