db7e30ea95
add upload invoice and test
2018-06-21 13:15:36 +08:00
93d866f432
Revert back changes during debug. Remove Auto login after register.
2018-06-20 17:30:53 +08:00
e6d58004bc
fix error response code
2018-06-20 17:04:50 +08:00
e3c104f902
Done checking marking before register user
2018-06-20 16:57:47 +08:00
3959c8c8b2
pull from master
2018-06-20 15:56:08 +08:00
6e51b18058
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerwithmarking
2018-06-20 15:54:36 +08:00
a2dad37758
Check marking before create user
2018-06-20 15:43:04 +08:00
40d6eb7ead
Merge branch 'too/marking' into 'master'
...
Too/marking
See merge request CIEFWorldwideSdnBhd/exchange!22
2018-06-20 00:50:07 +00:00
01f6c78619
Merge branch 'too/adminmiddleware' into 'master'
...
Add admin auth middleware
See merge request CIEFWorldwideSdnBhd/exchange!20
2018-06-20 00:48:46 +00:00
b1843c0b9b
Revert back unnessary changes during debug
2018-06-20 02:04:05 +08:00
3f2d9fbfb8
Add controller and table for marking
2018-06-20 00:38:32 +08:00
95f4f25dd3
Add test for settingcredit and rate
2018-06-19 18:56:31 +08:00
1b39ee8bda
Add admin auth middleware
2018-06-19 16:46:32 +08:00
5cb3d6a33d
Merge branch 'too/rejectuserbankslip' into 'master'
...
Reject user bank slip with reason. Add migration for userbankslip.
See merge request CIEFWorldwideSdnBhd/exchange!18
2018-06-19 06:21:38 +00:00
6a025a6bac
Fix conflit of variable name with master branch.
2018-06-19 13:32:09 +08:00
a019ae2616
Fix conflit
2018-06-19 02:52:21 +08:00
64d8ffed7c
Fix variable name
2018-06-19 00:15:28 +08:00
7398ce73d6
updated timeout from 60 seconds to 10 minutes
2018-06-18 22:51:33 +08:00
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
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
cc881cc5c7
added updatebankslip test
2018-06-18 22:39:15 +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
012fef948e
Reject user bank slip with reason. Add migration for userbankslip.
2018-06-18 18:57:27 +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
50492ef1a3
Merge branch 'too/verifybankslip' into 'master'
...
Approved user bankslip
See merge request CIEFWorldwideSdnBhd/exchange!17
2018-06-18 09:47:14 +00: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
39c30065f1
Approved user bankslip
2018-06-18 14:05:08 +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
83c05e1064
update get calculation rate
2018-06-18 11:18:21 +08:00
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
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
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
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
5eb4f46275
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration
2018-06-15 23:21:37 +08:00
7299685a40
update calculation function in booking controller
2018-06-15 23:21:30 +08:00
e3fb93fbae
Merge branch 'too/userbankslip' into 'master'
...
Too/userbankslip
See merge request CIEFWorldwideSdnBhd/exchange!14
2018-06-15 15:18:03 +00:00
82b2c0104e
Remove unused bookingtest.php
2018-06-15 21:13:11 +08:00
a449d4f30c
TBD calculation feature
...
updated bookingconfirmationTable frontend
2018-06-15 18:54:03 +08:00
67b966f40f
add file checking in bookingtest. optimize some code.
2018-06-15 18:21:12 +08:00
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
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
0ca14574d4
fix conflit
2018-06-14 23:49:27 +08:00
fb944428a5
fix conflit
2018-06-14 23:46:39 +08:00
3b2b4617cc
Fix conflit
2018-06-14 23:02:24 +08:00
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
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
Too
Jack Goh