66b0c14f5e
Merge branch 'feature/admin-home-frontend' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
...
# Conflicts:
# app/Http/Controllers/BookingController.php
# database/seeds/DatabaseSeeder.php
# resources/assets/js/pages/admin/booking/verification.vue
2018-06-26 14:43:53 +08:00
5366353484
updated loading button param
2018-06-26 14:41:37 +08:00
ae85886365
updated user bankslip path in verification frontend
2018-06-26 12:12:02 +08:00
6f510c93cc
solved merge conflict
2018-06-26 10:40:35 +08:00
62d0d83cb6
attempt to fetch user bankslip
2018-06-25 17:34:34 +08:00
069883deeb
complete the admin setting navbar
2018-06-25 16:57:18 +08:00
2c6128c564
changed admin status default to 1
...
added show one booking for admin
added booking details for verification page
2018-06-25 16:41:31 +08:00
1e7f076335
updated booking status on upload user bankslip
...
revert back the correct routes for user
update user path names
2018-06-25 15:45:02 +08:00
bf40262994
added admin booking list controller
2018-06-23 00:40:50 +08:00
620e496f0e
update route.js
2018-06-22 16:53:14 +08:00
72f9aee7c8
solved conflict
2018-06-22 16:31:56 +08:00
bc49e39df7
added admin status to booking table
...
updated admin progress track steps
added dummy template in admin booking
2018-06-22 12:31:51 +08:00
1f757fc7b1
make changes in route.js
2018-06-22 11:33:07 +08:00
47b2c34bf9
update booking status redirection
2018-06-21 21:55:38 +08:00
8ff5abcc2b
updated routes name
2018-06-21 19:12:17 +08:00
401b016fe0
updated routes
2018-06-21 19:07:21 +08:00
81a8505fb1
added nessasary files for the admin pages
2018-06-21 18:02:08 +08:00
ee66f7614f
added admin progress track component
2018-06-21 17:51:47 +08:00
b9c0bc53fd
added booking table to admin home
...
integrate booking list to admin home
2018-06-21 17:35:08 +08:00
b5d8fd4e72
added bookingtable
2018-06-21 16:38:59 +08:00
9acf2a773e
fix admin routes on vuejs
2018-06-21 16:35:09 +08:00
aaf0decd97
removed amount from uploadpo
...
added confirmpo after user upload their po
completed uploadpo integration
2018-06-21 15:48:24 +08:00
46873c7107
added handlecountdowned function
2018-06-21 14:48:17 +08:00
3c263b56ea
fix 404 not found for upload user bankslip
...
added display term on booking table
2018-06-21 14:31:53 +08:00
23b024c2fb
fixed status description not found
...
removed timeout on home page
added timeout handling in upload user bankslip
2018-06-21 12:45:05 +08:00
a650879977
completed list booking
...
TBD implement status feature
2018-06-21 10:43:52 +08:00
385372e3dd
added rate to booking table
2018-06-20 22:54:31 +08:00
a30fd2a0b1
added booking list controller
2018-06-20 22:21:45 +08:00
498fafd502
added booking lists controller and routes
2018-06-20 18:39:55 +08:00
a7970e2d72
fix conflict
2018-06-20 17:17:22 +08:00
118ce0f819
fix tracking status number
2018-06-19 17:36:39 +08:00
f9e94cc148
added loading for upload user bankinslip
2018-06-19 17:33:17 +08:00
a5633b7754
supplier booking
2018-06-19 17:26:37 +08:00
77f861472a
updated dynamic switch pages on dummny table data
2018-06-19 17:10:34 +08:00
4a4e147072
fix running routes:cache error
...
fix UserBankSlip class not found
fix undefined book_id
added loading when confirm booking
added confirm booking success redirect with correct page
added error handling for upload user bankslip
completed upload user bankslip flow
2018-06-18 22:37:33 +08:00
c303fb0c5f
added update transfer amount function
...
changed bankslip_url to file for upload user bankslip
2018-06-18 18:39:30 +08:00
97062480d5
added get one booking function in controller
...
update routes with booking id pramas
fixed not found routes
fixed count down with real data
moved bookings routes into autenticated route
2018-06-18 17:34:20 +08:00
f201f33f28
update dockerfile with gd to fix test error
...
update create booking controller to accept rmb to myr only
2018-06-18 12:10:58 +08:00
2aaa11e98c
removed some comments, beautified the file
2018-06-18 11:14:12 +08:00
857b9c5fde
update get caluclation for booking
2018-06-18 11:00:00 +08:00
3d7016281b
fix loading button after get calculation
2018-06-18 10:26:29 +08:00
7299685a40
update calculation function in booking controller
2018-06-15 23:21:30 +08:00
a449d4f30c
TBD calculation feature
...
updated bookingconfirmationTable frontend
2018-06-15 18:54:03 +08:00
eeaffe9018
remove alert on form submission
2018-06-15 11:39:53 +08:00
031cf4897f
added validation for input bank details
2018-06-15 11:07:52 +08:00
2c0b1a4a92
updated order complete title
2018-06-14 21:56:48 +08:00
fdfc6aa278
updated copy right
...
updated onclick image open new tab
2018-06-14 21:54:09 +08:00
5e0ce6319d
updated complete order plage
2018-06-14 21:50:41 +08:00
6307381c0d
added submit po button function
2018-06-14 21:36:26 +08:00
19d69adad2
added po complete page
2018-06-14 21:23:34 +08:00
Jack Goh
Mohd Arief
Nazri Hamzah