Jack Goh
77f861472a
updated dynamic switch pages on dummny table data
2018-06-19 17:10:34 +08:00
Jack Goh
7398ce73d6
updated timeout from 60 seconds to 10 minutes
2018-06-18 22:51:33 +08:00
Jack Goh
44563624ee
Merge branch 'fix/booking-integration' into 'master'
...
Fix/booking integration
See merge request CIEFWorldwideSdnBhd/exchange!19
2018-06-18 14:49:29 +00:00
Jack Goh
e7c63bb4e9
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration
...
# Conflicts:
# app/Http/Controllers/BookingController.php
# routes/api.php
2018-06-18 22:42:16 +08:00
Jack Goh
cc881cc5c7
added updatebankslip test
2018-06-18 22:39:15 +08:00
Jack Goh
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
Jack Goh
c303fb0c5f
added update transfer amount function
...
changed bankslip_url to file for upload user bankslip
2018-06-18 18:39:30 +08:00
Jack Goh
50492ef1a3
Merge branch 'too/verifybankslip' into 'master'
...
Approved user bankslip
See merge request CIEFWorldwideSdnBhd/exchange!17
2018-06-18 09:47:14 +00:00
Jack Goh
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
Too
39c30065f1
Approved user bankslip
2018-06-18 14:05:08 +08:00
Jack Goh
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
Jack Goh
83c05e1064
update get calculation rate
2018-06-18 11:18:21 +08:00
Jack Goh
d10837c068
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration
...
# Conflicts:
# app/Http/Controllers/BookingController.php
2018-06-18 11:16:38 +08:00
Jack Goh
2aaa11e98c
removed some comments, beautified the file
2018-06-18 11:14:12 +08:00
Jack Goh
857b9c5fde
update get caluclation for booking
2018-06-18 11:00:00 +08:00
Jack Goh
3d7016281b
fix loading button after get calculation
2018-06-18 10:26:29 +08:00
Jack Goh
b3f94ecc89
Merge branch 'too/cancelbooking' into 'master'
...
New Route for booking cancel. Fix bookingTest hardcoded link. Add Cancel…
See merge request CIEFWorldwideSdnBhd/exchange!16
2018-06-16 09:40:31 +00:00
Too
8f431ed090
New Route for booking cancel. Fix bookingTest hardcoded link. Add Cancel function to bookingcontroller. Get Latest Rate for bookingController@store.
2018-06-16 14:40:39 +08:00
Jack Goh
5eb4f46275
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration
2018-06-15 23:21:37 +08:00
Jack Goh
7299685a40
update calculation function in booking controller
2018-06-15 23:21:30 +08:00
Jack Goh
e3fb93fbae
Merge branch 'too/userbankslip' into 'master'
...
Too/userbankslip
See merge request CIEFWorldwideSdnBhd/exchange!14
2018-06-15 15:18:03 +00:00
Too
82b2c0104e
Remove unused bookingtest.php
2018-06-15 21:13:11 +08:00
Jack Goh
a449d4f30c
TBD calculation feature
...
updated bookingconfirmationTable frontend
2018-06-15 18:54:03 +08:00
Too
67b966f40f
add file checking in bookingtest. optimize some code.
2018-06-15 18:21:12 +08:00
Too
3060aa1c1f
Fix wrong variable name. Add auth check before upload bankslip and PO. Optimize some code stlye
2018-06-15 17:13:53 +08:00
Jack Goh
eeaffe9018
remove alert on form submission
2018-06-15 11:39:53 +08:00
Jack Goh
031cf4897f
added validation for input bank details
2018-06-15 11:07:52 +08:00
Too
0ca14574d4
fix conflit
2018-06-14 23:49:27 +08:00
Too
fb944428a5
fix conflit
2018-06-14 23:46:39 +08:00
Too
3b2b4617cc
Fix conflit
2018-06-14 23:02:24 +08:00
Jack Goh
c5a509e7b1
Merge branch 'fix/booking-frontend' into 'master'
...
Fix/booking frontend
See merge request CIEFWorldwideSdnBhd/exchange!15
2018-06-14 14:02:11 +00:00
Jack Goh
2c0b1a4a92
updated order complete title
2018-06-14 21:56:48 +08:00
Jack Goh
fdfc6aa278
updated copy right
...
updated onclick image open new tab
2018-06-14 21:54:09 +08:00
Jack Goh
5e0ce6319d
updated complete order plage
2018-06-14 21:50:41 +08:00
Jack Goh
6307381c0d
added submit po button function
2018-06-14 21:36:26 +08:00
Jack Goh
19d69adad2
added po complete page
2018-06-14 21:23:34 +08:00
Jack Goh
1f5d2db2b8
completed transfer frontend
...
completed upload po frontend
2018-06-14 18:54:00 +08:00
Jack Goh
ae0cbb9952
completed order confirmation page
2018-06-14 18:22:45 +08:00
Jack Goh
062350cc60
recommit last commit
2018-06-14 17:39:12 +08:00
Jack Goh
f47e9408a1
changed "bookings" folder name to "booking"
...
updated routes
2018-06-14 17:38:52 +08:00
Jack Goh
dc56029522
changed step two from "waiting payment" to "payment"
...
added few empty page component
updated confirmation routes
2018-06-14 17:35:37 +08:00
Jack Goh
415f8bb437
updated dynamic progress status
2018-06-14 17:25:54 +08:00
Jack Goh
9eed12bc3d
added switch case for booking status
...
TBD step 2-6 page
beautified code from home
2018-06-14 16:25:34 +08:00
Too
83dfca2ae1
fix conflit
2018-06-14 16:02:33 +08:00
Jack Goh
053ea0e874
added transfer amount and exchange amount to upload user bank slip
...
added complete steps for user
added empty get booking status
2018-06-14 15:32:24 +08:00
Too
5ce817cd33
remove duplicate getting banksli_url. add user bank slip into database in uploadbankslip. save image_url in uploadpurchaseorder
2018-06-14 15:08:00 +08:00
Jack Goh
274ebe3490
added progress tracker
2018-06-14 11:56:22 +08:00
Jack Goh
9ba6b2aba8
fix bookingconfirmation data
2018-06-14 11:35:45 +08:00
Jack Goh
09a2fe36e8
make booking number and status clickable
2018-06-14 11:26:12 +08:00
Jack Goh
a2b58b6d10
updated table structure
2018-06-14 10:45:21 +08:00