cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 12:24:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
205 Commits 33 Branches 0 Tags
ee59dc69d5bd60ebff8a2348c89ef20612f619a3
Commit Graph

76 Commits

Author SHA1 Message Date
Jack Goh ee59dc69d5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend 2018-06-26 14:41:45 +08:00
Too dec9ba9405 fix typo add_eta_ser_bank_slip_table. remove eta from bookingcontroller 2018-06-26 12:28:17 +08:00
Jack Goh 852c64f35b completed display user bankslip in verification frontend 2018-06-26 12:27:09 +08:00
Too 0a6bd2c405 Add eta 2018-06-26 12:17:12 +08:00
Jack Goh 20923d8f4a updated upload path 2018-06-26 12:07:27 +08:00
Too 3129da5df4 get_time_limit 2018-06-25 18:16:20 +08:00
Jack Goh 1683f5bed5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend 
# Conflicts:
#	app/Http/Controllers/BookingController.php
 2018-06-25 16:57:20 +08:00
Jack Goh b715663d47 updated adminshow function 2018-06-25 16:56:36 +08:00
Jack Goh 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
Too 9aea239c52 add handle for exceed credit limit 2018-06-25 16:03:24 +08:00
Jack Goh 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
Jack Goh bf40262994 added admin booking list controller 2018-06-23 00:40:50 +08:00
Jack Goh b9c0bc53fd added booking table to admin home 
integrate booking list to admin home
 2018-06-21 17:35:08 +08:00
Jack Goh aaf0decd97 removed amount from uploadpo 
added confirmpo after user upload their po
completed uploadpo integration
 2018-06-21 15:48:24 +08:00
Jack Goh de7161369c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into bug/bookinglist-timeout-countdown 2018-06-21 14:48:48 +08:00
Too 453852c7ea rename image_url to image_path in user_bank_slip,invoice,purchase_order 2018-06-21 14:36:33 +08:00
Jack Goh 3c263b56ea fix 404 not found for upload user bankslip 
added display term on booking table
 2018-06-21 14:31:53 +08:00
Too de45782ae3 fix conflit with master 2018-06-21 13:26:18 +08:00
Too db7e30ea95 add upload invoice and test 2018-06-21 13:15:36 +08:00
Jack Goh 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
Jack Goh 5a4c4b14ee updated create booking status to 2 2018-06-21 10:58:47 +08:00
Jack Goh 6bbf271a36 added status tracking in booking 2018-06-21 10:58:16 +08:00
Jack Goh a650879977 completed list booking 
TBD implement status feature
 2018-06-21 10:43:52 +08:00
Jack Goh 7eb8c7bafc create booking with rate 2018-06-20 22:55:29 +08:00
Jack Goh 385372e3dd added rate to booking table 2018-06-20 22:54:31 +08:00
Jack Goh a30fd2a0b1 added booking list controller 2018-06-20 22:21:45 +08:00
Jack Goh bc637adcab Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange 
# Conflicts:
#	routes/api.php
 2018-06-20 18:41:31 +08:00
Jack Goh 498fafd502 added booking lists controller and routes 2018-06-20 18:39:55 +08:00
Too b1843c0b9b Revert back unnessary changes during debug 2018-06-20 02:04:05 +08:00
Too 3f2d9fbfb8 Add controller and table for marking 2018-06-20 00:38:32 +08:00
Too 95f4f25dd3 Add test for settingcredit and rate 2018-06-19 18:56:31 +08:00
Too 6a025a6bac Fix conflit of variable name with master branch. 2018-06-19 13:32:09 +08:00
Too a019ae2616 Fix conflit 2018-06-19 02:52:21 +08:00
Too 64d8ffed7c Fix variable name 2018-06-19 00:15:28 +08:00
Jack Goh 7398ce73d6 updated timeout from 60 seconds to 10 minutes 2018-06-18 22:51:33 +08: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 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
Too 012fef948e Reject user bank slip with reason. Add migration for userbankslip. 2018-06-18 18:57:27 +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 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 857b9c5fde update get caluclation for booking 2018-06-18 11:00:00 +08: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 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