From b622d81d940b170b40d067dfa5185dc30fb6ff1e Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Wed, 13 Jun 2018 18:27:36 +0800 Subject: [PATCH 01/22] added prevent user from book if amount is empty fixed some variable duplication added getcalculationvalue function --- resources/assets/js/middleware/auth.js | 8 +- resources/assets/js/pages/auth/login.vue | 16 +- resources/assets/js/pages/auth/register.vue | 5 +- resources/assets/js/pages/home.vue | 521 ++++++++++---------- resources/assets/js/pages/upload.vue | 108 ++-- 5 files changed, 329 insertions(+), 329 deletions(-) diff --git a/resources/assets/js/middleware/auth.js b/resources/assets/js/middleware/auth.js index 1302a8b7..138da317 100644 --- a/resources/assets/js/middleware/auth.js +++ b/resources/assets/js/middleware/auth.js @@ -3,11 +3,9 @@ import store from '~/store' export default async (to, from, next) => { if (!store.getters['auth/check']) { next({ name: 'login' }) - } - else if (store.getters['auth/user'].role == "admin"){ - next({ name : 'admin.home' }) - } - else { + } else if (store.getters['auth/user'].role == 'admin') { + next({ name: 'admin.home' }) + } else { next() } } diff --git a/resources/assets/js/pages/auth/login.vue b/resources/assets/js/pages/auth/login.vue index 8af30930..fe8b159c 100644 --- a/resources/assets/js/pages/auth/login.vue +++ b/resources/assets/js/pages/auth/login.vue @@ -81,11 +81,11 @@ export default { methods: { async login () { const loading = this.$loading({ - lock: true, - text: 'Logging in', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }); + lock: true, + text: 'Logging in', + spinner: 'el-icon-loading', + background: 'rgba(0, 0, 0, 0.7)' + }) // Submit the form. const { data } = await this.form.post('/api/login') @@ -100,11 +100,11 @@ export default { await this.$store.dispatch('auth/fetchUser') // Redirect home. - if(store.getters['auth/user'].role === 'admin'){ - loading.close(); + if (store.getters['auth/user'].role === 'admin') { + loading.close() this.$router.push({ name: 'admin.home' }) } - loading.close(); + loading.close() this.$router.push({ name: 'home' }) } } diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue index be69fc71..9792e4ec 100644 --- a/resources/assets/js/pages/auth/register.vue +++ b/resources/assets/js/pages/auth/register.vue @@ -96,10 +96,9 @@ export default { await this.$store.dispatch('auth/updateUser', { user: data }) // Redirect home. - if(store.getters['auth/user'].role === 'admin'){ + if (store.getters['auth/user'].role === 'admin') { this.$router.push({ name: 'admin.home' }) - } - else{ + } else { this.$router.push({ name: 'home' }) } } diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index 69b59a57..58567b36 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -2,285 +2,294 @@ - + -
-
- - -
+ +
+ I need : + + + + +
+ - +
+ +
+ +
- -
- -
-
-
Cash/Bank Transfer
 -
Cheque
 -
BA
 - + +
+ +
+
+
Cash/Bank Transfer
 +
Cheque
 +
BA
 + - -
-
X1 :
 -
1.56
 -
1.64
 -
1.62
 - + +
+
X1 :
 +
1.56
 +
1.64
 +
1.62
 + - -
-
-
- Book
 -
- Book
 -
- Book
 - + +
+
+
+ Book
 +
+ Book
 +
+ Book
 + -
- -
-
X2 :
 -
1.56
 -
1.64
 -
1.62
 - +
+ +
+
X2 :
 +
1.56
 +
1.64
 +
1.62
 + - -
-
-
- Book
 -
- Book
 -
- Book
 - - + +
+
+
+ Book
 +
+ Book
 +
+ Book
 + + - - -
- - - - - - - - - - - -
- - - Cancel - Book Now - - - + + +
+ + + + + + + + + + + +
+ + + Cancel + Book Now + + + + - - + + - - - - - - - - - - Confirm - - - - -

-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + Confirm + + + + +

+
+ + + +
+ + + + + + + + + + + + + + + +
- + - - \ No newline at end of file + diff --git a/resources/assets/js/pages/upload.vue b/resources/assets/js/pages/upload.vue index 9b391033..1371285e 100644 --- a/resources/assets/js/pages/upload.vue +++ b/resources/assets/js/pages/upload.vue @@ -1,84 +1,78 @@ - - - - - +} + From fde70b744f3ade37d8dd0b39e07c21205cb329b8 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Wed, 13 Jun 2018 21:50:06 +0800 Subject: [PATCH 02/22] fix login loading screen --- resources/assets/js/pages/auth/login.vue | 17 +++++++++++------ resources/assets/js/pages/home.vue | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/resources/assets/js/pages/auth/login.vue b/resources/assets/js/pages/auth/login.vue index fe8b159c..054eb81f 100644 --- a/resources/assets/js/pages/auth/login.vue +++ b/resources/assets/js/pages/auth/login.vue @@ -80,6 +80,12 @@ export default { methods: { async login () { + + // Submit the form. + const { data } = await this.form.post('/api/login') + + + // Add loading screen const loading = this.$loading({ lock: true, text: 'Logging in', @@ -87,25 +93,24 @@ export default { background: 'rgba(0, 0, 0, 0.7)' }) - // Submit the form. - const { data } = await this.form.post('/api/login') - // Save the token. this.$store.dispatch('auth/saveToken', { token: data.token, - remember: this.remember + remember: this.remember, }) // Fetch the user. await this.$store.dispatch('auth/fetchUser') + + // Redirect home. if (store.getters['auth/user'].role === 'admin') { - loading.close() this.$router.push({ name: 'admin.home' }) + loading.close() } - loading.close() this.$router.push({ name: 'home' }) + loading.close() } } } diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index 58567b36..c9e88e0d 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -16,7 +16,7 @@
-
+
From c0b9e446d5ba100bd2437037683776a1bbe8dc4b Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Wed, 13 Jun 2018 22:17:01 +0800 Subject: [PATCH 03/22] changed upload to upload-user-bankslip --- .../pages/{upload.vue => bookings/uploadUserBankSlip.vue} | 8 +++++++- resources/assets/js/router/routes.js | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) rename resources/assets/js/pages/{upload.vue => bookings/uploadUserBankSlip.vue} (92%) diff --git a/resources/assets/js/pages/upload.vue b/resources/assets/js/pages/bookings/uploadUserBankSlip.vue similarity index 92% rename from resources/assets/js/pages/upload.vue rename to resources/assets/js/pages/bookings/uploadUserBankSlip.vue index 1371285e..1015544f 100644 --- a/resources/assets/js/pages/upload.vue +++ b/resources/assets/js/pages/bookings/uploadUserBankSlip.vue @@ -35,7 +35,9 @@
Submit - Upload Later + + Upload Later +
@@ -72,6 +74,10 @@ export default { }, startTimer () { this.start = true + }, + + uploadLater(){ + } } } diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js index b7e4448c..83f40751 100644 --- a/resources/assets/js/router/routes.js +++ b/resources/assets/js/router/routes.js @@ -6,7 +6,7 @@ const PasswordReset = () => import('~/pages/auth/password/reset').then(m => m.de const NotFound = () => import('~/pages/errors/404').then(m => m.default || m) const Home = () => import('~/pages/home').then(m => m.default || m) -const Upload = () => import('~/pages/upload').then(m => m.default || m) +const Upload = () => import('~/pages/bookings/uploadUserBankSlip').then(m => m.default || m) const Settings = () => import('~/pages/settings/index').then(m => m.default || m) const SettingsProfile = () => import('~/pages/settings/profile').then(m => m.default || m) const SettingsPassword = () => import('~/pages/settings/password').then(m => m.default || m) @@ -22,7 +22,7 @@ export default [ { path: '/password/reset/:token', name: 'password.reset', component: PasswordReset }, { path: '/home', name: 'home', component: Home }, - { path: '/upload', name: 'upload', component: Upload }, + { path: '/upload-user-bankslip', name: 'upload', component: Upload }, { path: '/settings', component: Settings, children: [ From b867474445322615e83379a831dac7ca46738f9f Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Wed, 13 Jun 2018 22:23:36 +0800 Subject: [PATCH 04/22] updated link for upload later --- resources/assets/js/pages/home.vue | 49 ++++++++++++++-------------- resources/assets/js/router/routes.js | 2 +- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index c9e88e0d..2ac33157 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -106,7 +106,7 @@ - Confirm + Confirm @@ -256,32 +256,33 @@ export default { this.dialogFormVisible1 = true }, createBooking: function () { + this.$router.push({ name: 'booking.user.upload' }) // this.dialogFormVisible1 = true - let newBooking = { - amount: this.booking.amount, - account_name: this.booking.account_name, - bank_name: this.booking.bank_name, - bank_branch: this.booking.bank_branch, - account_num: this.booking.account_num, - term: this.term - } - console.log(newBooking) - axios.post('api/booking', newBooking) - .then((response) => { - console.log(response) + // let newBooking = { + // amount: this.booking.amount, + // account_name: this.booking.account_name, + // bank_name: this.booking.bank_name, + // bank_branch: this.booking.bank_branch, + // account_num: this.booking.account_num, + // term: this.term + // } + // console.log(newBooking) + // axios.post('api/booking', newBooking) + // .then((response) => { + // console.log(response) - // this code to insert the input data into the database (success) - // this.Booking.amount = amount; - // this.Booking.account_name = account_name; - // this.Booking.bank_name = bank_name; - // this.Booking.branch = bank_branch; - // this.Booking.account_num = account_num; - // this.term = term; - }) - .catch((error) => { - console.log(error) - }) + // // this code to insert the input data into the database (success) + // // this.Booking.amount = amount; + // // this.Booking.account_name = account_name; + // // this.Booking.bank_name = bank_name; + // // this.Booking.branch = bank_branch; + // // this.Booking.account_num = account_num; + // // this.term = term; + // }) + // .catch((error) => { + // console.log(error) + // }) }, BookingList () { axios.get('api/booking') diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js index 83f40751..a4dd912d 100644 --- a/resources/assets/js/router/routes.js +++ b/resources/assets/js/router/routes.js @@ -22,7 +22,7 @@ export default [ { path: '/password/reset/:token', name: 'password.reset', component: PasswordReset }, { path: '/home', name: 'home', component: Home }, - { path: '/upload-user-bankslip', name: 'upload', component: Upload }, + { path: '/upload-user-bankslip', name: 'booking.user.upload', component: Upload }, { path: '/settings', component: Settings, children: [ From 5d1e7ffd7b3731cd4b8da01fe0f0023959fc79c6 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Thu, 14 Jun 2018 10:09:30 +0800 Subject: [PATCH 05/22] added tooltips for X1 and X2 --- resources/assets/js/pages/home.vue | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index 2ac33157..8ced4af5 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -31,7 +31,12 @@ -
+ + +
+ + +
X1 :
1.56
1.64
 @@ -51,7 +56,11 @@
-
+ + +
+ +
X2 :
1.56
1.64
 From a2b58b6d10759f92fb6af2697d79b6cbf9b83fca Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Thu, 14 Jun 2018 10:45:21 +0800 Subject: [PATCH 06/22] updated table structure --- .../js/pages/bookings/uploadUserBankSlip.vue | 14 ++- resources/assets/js/pages/home.vue | 104 ++++++------------ 2 files changed, 42 insertions(+), 76 deletions(-) diff --git a/resources/assets/js/pages/bookings/uploadUserBankSlip.vue b/resources/assets/js/pages/bookings/uploadUserBankSlip.vue index 1015544f..733f0998 100644 --- a/resources/assets/js/pages/bookings/uploadUserBankSlip.vue +++ b/resources/assets/js/pages/bookings/uploadUserBankSlip.vue @@ -34,7 +34,7 @@ -->
- Submit + Submit Upload Later @@ -69,6 +69,15 @@ export default { this.dialogImageUrl = file.url this.dialogVisible = true }, + submitUserSlip(){ + this.$message({ + showClose: true, + message: 'Your bankinslip has been submitted, please wait admin to approve.', + type: 'success', + duration: 5000, + }); + this.$router.push({ name: 'home' }) + }, handleTimeExpire () { alert('Time is up!') }, @@ -76,9 +85,6 @@ export default { this.start = true }, - uploadLater(){ - - } } } diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index 8ced4af5..13a7c6f6 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -107,7 +107,7 @@ - + @@ -126,25 +126,31 @@
- - - + + + - - - - + + + + - - - - - + + + + +
@@ -176,69 +182,23 @@ export default { label2: 'MYR' }], value: 'RMB', - value2: '', - input: '', dialogFormVisible: false, dialogFormVisible1: false, formLabelWidth: '0px', - tableData1: [{ - data1: 'Order Number :', - data2: '001' - }, { - data1: 'Date :', - data2: '25/5/2018' - }, { - data1: 'Customer Marking :', - data2: 'CIEF/150ECE' - }, { - data1: '', - data2: '' - }, { - data1: 'Payment Method :', - data2: 'Cash/Bank Transfer' - }, { - data1: '', - data2: '' - }, { - data1: 'CNY/RMB :', - data2: 'CNY 120,500.00' - }, { - data1: '+ Service Charge :', - data2: 'CNY 20.00' - }, { - data1: '/ RATE :', - data2: '1.63' - }, { - data1: '', - data2: 'MYR 73,848.04' - }, { - data1: '+ GST 6% :', - data2: 'MYR 4,430.88' - }, { - data1: '', - data2: 'MYR 78,278.92' - }, { - data1: '', - data2: '' - }, { - data1: 'China Beneficiary Acc :', - data2: '' - }, { - data1: '', - data2: 'PENDING' - }, { - data1: '', - data2: '' - }, { - data1: 'Bank In Amount :', - data2: 'MYR 78,278.92' - }, { - data1: '', - data2: '' + bookingData: [{ + date: 'Order Number :', + booking_no: '001', + rate: '123', + amount: 'amount', + transfer_amount: '123', + status: 'timeout', + timeout: 'timeout' }] } }, methods: { + // TODO fetch booking data on load + formatter (row, column) { return row.address }, From 09a2fe36e8d1f825d07e6cdd24ebd1673718998c Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Thu, 14 Jun 2018 11:26:12 +0800 Subject: [PATCH 07/22] make booking number and status clickable --- resources/assets/js/pages/home.vue | 46 +++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 11 deletions(-) diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index 13a7c6f6..77959fe2 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -127,19 +127,37 @@
- + + {{scope.row.booking_no}} + + + - + - + + + + - + - + From 9ba6b2aba88027311f2334b7391ebfb1b370eddd Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Thu, 14 Jun 2018 11:35:45 +0800 Subject: [PATCH 08/22] fix bookingconfirmation data --- resources/assets/js/pages/home.vue | 63 ++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index 77959fe2..6a75e97d 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -107,7 +107,7 @@ - + @@ -126,7 +126,7 @@
- + @@ -207,15 +207,70 @@ export default { dialogFormVisible: false, dialogFormVisible1: false, formLabelWidth: '0px', - bookingData: [{ + bookingTable: [{ date: '12/1/2018', booking_no: '001', rate: '1.23', amount: 'RM 1000', transfer_amount: 'RMB 10000', status: '(1/6)', - status_desc: 'Waiting admin to confirm', + status_desc: 'Waiting for payment', timeout: '56:00:00' + }], + bookingConfirmTable: [{ + data1: 'Order Number :', + data2: '001' + }, { + data1: 'Date :', + data2: '25/5/2018' + }, { + data1: 'Customer Marking :', + data2: 'CIEF/150ECE' + }, { + data1: '', + data2: '' + }, { + data1: 'Payment Method :', + data2: 'Cash/Bank Transfer' + }, { + data1: '', + data2: '' + }, { + data1: 'CNY/RMB :', + data2: 'CNY 120,500.00' + }, { + data1: '+ Service Charge :', + data2: 'CNY 20.00' + }, { + data1: '/ RATE :', + data2: '1.63' + }, { + data1: '', + data2: 'MYR 73,848.04' + }, { + data1: '+ GST 6% :', + data2: 'MYR 4,430.88' + }, { + data1: '', + data2: 'MYR 78,278.92' + }, { + data1: '', + data2: '' + }, { + data1: 'China Beneficiary Acc :', + data2: '' + }, { + data1: '', + data2: 'PENDING' + }, { + data1: '', + data2: '' + }, { + data1: 'Bank In Amount :', + data2: 'MYR 78,278.92' + }, { + data1: '', + data2: '' }] } }, From 274ebe34902b2737790176040da8c0d3117492e2 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Thu, 14 Jun 2018 11:56:22 +0800 Subject: [PATCH 09/22] added progress tracker --- .../assets/js/components/ProgressTrack.vue | 108 ++++++++++++++++++ .../js/pages/bookings/uploadUserBankSlip.vue | 5 +- 2 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 resources/assets/js/components/ProgressTrack.vue diff --git a/resources/assets/js/components/ProgressTrack.vue b/resources/assets/js/components/ProgressTrack.vue new file mode 100644 index 00000000..93a12925 --- /dev/null +++ b/resources/assets/js/components/ProgressTrack.vue @@ -0,0 +1,108 @@ + + + + \ No newline at end of file diff --git a/resources/assets/js/pages/bookings/uploadUserBankSlip.vue b/resources/assets/js/pages/bookings/uploadUserBankSlip.vue index 733f0998..6434dd26 100644 --- a/resources/assets/js/pages/bookings/uploadUserBankSlip.vue +++ b/resources/assets/js/pages/bookings/uploadUserBankSlip.vue @@ -1,5 +1,6 @@