3245497378
fix conflict
2018-06-20 17:19:58 +08:00
a7970e2d72
fix conflict
2018-06-20 17:17:22 +08:00
95f4f25dd3
Add test for settingcredit and rate
2018-06-19 18:56:31 +08:00
a5633b7754
supplier booking
2018-06-19 17:26:37 +08: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
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
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
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
857b9c5fde
update get caluclation for booking
2018-06-18 11:00:00 +08: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
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
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
83dfca2ae1
fix conflit
2018-06-14 16:02:33 +08:00
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
a3cb5344ee
updated readme
2018-06-12 09:46:42 +08:00
929266a09c
updated only booking belongs to user can update or delete the booking
...
phpfmt booking controller
removed example test
moved booking test to feature
2018-06-07 17:30:54 +08:00
6e54771ca2
upload po test
2018-06-05 10:15:43 +08:00
d7025b7f86
update logic
2018-05-31 10:38:45 +08:00
cc3ea574f8
add logic, test
2018-05-30 16:33:11 +08:00
7381252c57
fix discussion 2
2018-05-30 13:24:22 +08:00
11ccbd6a91
fix discussion
2018-05-30 12:24:30 +08:00
4210cdc19d
upload purchase order
2018-05-28 17:24:13 +08:00
5c1a4d28c4
customer booking bank slip
2018-05-28 10:58:40 +08:00
54f79b74dc
new booking controller update
2018-05-24 15:45:55 +08:00
7e0a0aefa9
booking controller update
2018-05-24 15:14:33 +08:00
90e88039f4
add verification status
2018-05-22 17:29:12 +08:00
8f3a6d82e5
updated booking to create for current user
...
updated test to pass
2018-05-19 16:11:19 +08:00
315ed64520
added booking seeder
...
updated booking controller
added test for booking
2018-05-19 12:33:48 +08:00
18d2ba4543
input data inside database using seeder
2018-05-17 15:13:29 +08:00
204af7cf5e
merge master
2018-05-15 12:35:52 +08:00
bc6f948314
added unit testing
2018-05-15 10:59:26 +08:00
0a13822716
update api and controller
2018-05-02 11:13:14 +08:00
021a5e46b4
update controller
2018-04-24 15:03:01 +08:00
8e3e4cc4d1
added migration, model
2018-04-23 14:54:06 +08:00
Nazri Hamzah
Too
Jack Goh
jack
Mohd Arief