0a6bd2c405
Add eta
2018-06-26 12:17:12 +08:00
efb5f21567
Merge branch 'feature/user-uploadpo-frontend' into 'master'
...
removed amount from uploadpo
See merge request CIEFWorldwideSdnBhd/exchange!26
2018-06-21 07:49:10 +00:00
aaf0decd97
removed amount from uploadpo
...
added confirmpo after user upload their po
completed uploadpo integration
2018-06-21 15:48:24 +08:00
c4e85d0e6d
Merge branch 'bug/bookinglist-timeout-countdown' into 'master'
...
Bug/bookinglist timeout countdown
See merge request CIEFWorldwideSdnBhd/exchange!25
2018-06-21 07:05:48 +00:00
1e6d38646e
update ignore file
2018-06-21 15:05:16 +08:00
de7161369c
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into bug/bookinglist-timeout-countdown
2018-06-21 14:48:48 +08:00
46873c7107
added handlecountdowned function
2018-06-21 14:48:17 +08:00
b405f05369
Merge branch 'too/uploadinvoice' into 'master'
...
Too/uploadinvoice
See merge request CIEFWorldwideSdnBhd/exchange!24
2018-06-21 06:40:54 +00:00
453852c7ea
rename image_url to image_path in user_bank_slip,invoice,purchase_order
2018-06-21 14:36:33 +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
de45782ae3
fix conflit with master
2018-06-21 13:26:18 +08:00
db7e30ea95
add upload invoice and test
2018-06-21 13:15:36 +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
5a4c4b14ee
updated create booking status to 2
2018-06-21 10:58:47 +08:00
6bbf271a36
added status tracking in booking
2018-06-21 10:58:16 +08:00
d06b8ac359
added status column to booking table
2018-06-21 10:49:45 +08:00
a650879977
completed list booking
...
TBD implement status feature
2018-06-21 10:43:52 +08:00
7eb8c7bafc
create booking with rate
2018-06-20 22:55:29 +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
bc637adcab
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange
...
# Conflicts:
# routes/api.php
2018-06-20 18:41:31 +08:00
498fafd502
added booking lists controller and routes
2018-06-20 18:39:55 +08:00
c3558eb39b
Merge branch 'too/registerwithmarking' into 'master'
...
Too/registerwithmarking
See merge request CIEFWorldwideSdnBhd/exchange!23
2018-06-20 09:37:21 +00: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
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
77f861472a
updated dynamic switch pages on dummny table data
2018-06-19 17:10:34 +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
Too
Jack Goh