diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue
index 99a8f7ff..8e5c634b 100644
--- a/resources/assets/js/components/LocaleDropdown.vue
+++ b/resources/assets/js/components/LocaleDropdown.vue
@@ -25,8 +25,8 @@
Update Rate
Complete Order
- Transaction History
- Upload Supplier Bank Slip to System
+ Transaction History
+ Upload Supplier Bank Slip to System
@@ -51,14 +51,14 @@
-
+
Rate Successfully Updated
OK
-
+
diff --git a/resources/assets/js/pages/admin/complete-order.vue b/resources/assets/js/pages/admin/complete-order.vue
index e9681fad..7c5f05f8 100644
--- a/resources/assets/js/pages/admin/complete-order.vue
+++ b/resources/assets/js/pages/admin/complete-order.vue
@@ -7,11 +7,9 @@
-
-
diff --git a/resources/assets/js/pages/admin/transaction-history.vue b/resources/assets/js/pages/admin/transaction-history.vue
new file mode 100644
index 00000000..6eaa4c36
--- /dev/null
+++ b/resources/assets/js/pages/admin/transaction-history.vue
@@ -0,0 +1,32 @@
+
+
+
Transaction History
+
+
+
+
+
+
+
+
+
+
+ Export to ExcelPrint
+
+
+
+
+
+
+
+
diff --git a/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue b/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue
new file mode 100644
index 00000000..7f853d77
--- /dev/null
+++ b/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue
@@ -0,0 +1,61 @@
+
+
+
Uploaded Supplier Bank Slip
+
+ Add New
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Click to upload
+
+
+
+
+
+
+ Cancel
+ Submit
+
+
+
+
+
+ Bank Slip Successfully Updated
+
+ Close
+
+
+
+
+
+
+
+
+
diff --git a/resources/assets/js/pages/settings/admin-credit-setting.vue b/resources/assets/js/pages/settings/admin-credit-setting.vue
index 61ce1b53..28f334a2 100644
--- a/resources/assets/js/pages/settings/admin-credit-setting.vue
+++ b/resources/assets/js/pages/settings/admin-credit-setting.vue
@@ -7,28 +7,28 @@
Hours
Minutes
Seconds
- Update Time Limit
+ Update Time Limit
-
+
Time limit for customer bank slip submission is updated
Credit Limit for RMB :
- Update Credit Limit
+ Update Credit Limit
-
+
Credit limit for Customer Booking is updated
@@ -38,8 +38,8 @@
export default {
data() {
return {
- dialogVisible: false,
- dialogVisible1: false
+ TimeLimitDialogVisible: false,
+ CreditLimitDialogVisible: false
};
},
};
diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js
index 988d3878..ead49491 100644
--- a/resources/assets/js/router/routes.js
+++ b/resources/assets/js/router/routes.js
@@ -33,6 +33,8 @@ const UploadInvoice = () => import('~/pages/admin/booking/uploadInvoice').then(m
// Admin pages
const AdminHome = () => import('~/pages/admin/home').then(m => m.default || m)
const CompleteOrder = () => import('~/pages/admin/complete-order').then(m => m.default || m)
+const TransactionHistory = () => import('~/pages/admin/transaction-history').then(m => m.default || m)
+const UploadSupplierBankSlip = () => import('~/pages/admin/upload-supplier-bank-slip').then(m => m.default || m)
export default [
{ path: '/', name: 'welcome', component: Welcome },
@@ -73,5 +75,7 @@ export default [
// Admin pages
{ path: '/admin', name: 'admin.home', component: AdminHome },
{ path: '/admin/complete-order', name: 'admin.complete-order', component: CompleteOrder },
+ { path: '/admin/transaction-history', name: 'admin.transaction-history', component: TransactionHistory },
+ { path: '/admin/upload-supplier-bank-slip', name: 'admin.upload-supplier-bank-sli', component: UploadSupplierBankSlip },
{ path: '*', name: 'notfound', component: NotFound }
]