Commit Graph

344 Commits

Author SHA1 Message Date
Too dae26ccb83 add validation of registeration form 2018-07-03 22:27:26 +08:00
Too 07950c8252 fix register duplicate user error response message 2018-07-03 17:03:26 +08:00
Too 2726d8c71d git pull origin master 2018-07-02 23:25:49 +08:00
Too c964e702a3 fix register page submit button. Check duplicated user register. Fix typo in register page.Add Marking seeder. 2018-07-02 22:44:41 +08:00
Jack Goh 0afeb0d1ea Merge branch 'feature/booking-pagination' into 'master'
Feature/booking pagination

See merge request CIEFWorldwideSdnBhd/exchange!49
2018-07-02 08:52:34 +00:00
Mohd Arief 3e2170277a fix conflict 2018-07-02 16:46:52 +08:00
Jack Goh d3f8d1b190 Merge branch 'frontend/booking-confirm-error' into 'master'
Frontend/booking confirm button error

See merge request CIEFWorldwideSdnBhd/exchange!45
2018-07-02 07:35:33 +00:00
Mohd Arief 09181b22ee completed the pagination function for user booking list 2018-07-02 15:27:47 +08:00
Mouhamed Lamine 8fa5faec90 Merge conflict fix 2018-07-02 15:19:21 +08:00
Mouhamed Lamine b26c6a68da Merge conflict fix 2018-07-02 14:58:27 +08:00
Too fede18cc90 add marking 2018-07-02 11:16:15 +08:00
Too c5b8103142 add marking in form 2018-07-02 11:02:18 +08:00
Too 2c2c3928e9 remove username from controller and migration 2018-07-02 10:31:42 +08:00
Too e5b63e2c98 fix typo at confirm_password 2018-07-02 09:59:53 +08:00
Mouhamed Lamine Bah c47c507963 Update DatabaseSeeder.php 2018-07-02 01:56:04 +00:00
Too c1d7289564 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage 2018-07-02 09:55:37 +08:00
Too d232fad601 remove username and icon 2018-07-02 09:50:03 +08:00
Jack Goh e23d2ef346 Merge branch 'nazri/show-current-rate-api' into 'master'
nazri/show current rate api

See merge request CIEFWorldwideSdnBhd/exchange!47
2018-07-01 08:53:11 +00:00
Too b9b19f292d Show marking message when empty input 2018-07-01 01:18:07 +08:00
Too 5237f4d94c git pull origin master 2018-07-01 01:00:11 +08:00
Too 5151f9163f Register page, add marking input. Register page, change text to icon. Register page, add password visibility toggle function. 2018-07-01 00:56:21 +08:00
Nazri Hamzah 7a10f39e70 fix conflict 2018-06-30 16:16:08 +08:00
Nazri Hamzah 94b664bb45 show current rate api 2018-06-30 16:13:26 +08:00
Jack Goh 278d543bcf Merge branch 'integration/bookinginfo-allpage' into 'master'
Integration/bookinginfo allpage

See merge request CIEFWorldwideSdnBhd/exchange!46
2018-06-30 02:52:06 +00:00
Jack Goh 9d3e08889c fix booking status on upload invoice 2018-06-30 10:51:05 +08:00
Jack Goh 43809bc478 fix wrong update status on upload po
fix validation message for upload china bankslip
removed get po api on upload invoice
2018-06-30 10:47:35 +08:00
Jack Goh d827b0a1ba fix supplier booking required field validation
updated header text for transfer page
2018-06-30 10:33:40 +08:00
Jack Goh eec356f22d fix wrong timeout
fix seeder info to newer info
2018-06-30 10:29:03 +08:00
Jack Goh b36c133818 fix loading forever on upload china bankslip 2018-06-30 10:00:41 +08:00
Jack Goh d2fd140f74 fixed loading forever on upload chinabankslip 2018-06-30 09:55:54 +08:00
Jack Goh ca74cfae23 updated admin booking show function with user, china, po, invoice slip
removed one step from admin tracking
integrated admin booking complete
changed admin complete order component name
2018-06-29 19:18:54 +08:00
Jack Goh d80f048f5a added po and invoice into show booking return
integrated complete page frontend
integrated po page frontend
integrated po complete page frontend
removed ETA for transfer page frontend
2018-06-29 19:01:15 +08:00
Mouhamed Lamine 30a210324e booking confirm error 2018-06-29 18:21:08 +08:00
Mouhamed Lamine b212858eba commit before pull 2018-06-29 18:10:12 +08:00
Jack Goh 0a9dd6a338 added reject reason on user slip reject 2018-06-29 18:08:19 +08:00
Jack Goh 3d05dbb755 added chinabankslip return on show booking query
updated upload po page with booking info, china bankslip and user bankslip
2018-06-29 17:40:28 +08:00
Jack Goh 7aba4e2b05 fix edit supplier booking
fix done supplier booking report button loading
2018-06-29 15:48:26 +08:00
Jack Goh 9d0aadb5c3 added reject reason response for getting booking
updated bankslip reject screen for user
2018-06-29 15:37:44 +08:00
Jack Goh 0544e23ee6 fix timeout for rejected user bankslip
fix is_rejected able to accept again
2018-06-29 15:21:27 +08:00
Mohd Arief 9f9f72dbe5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking-pagination 2018-06-29 12:09:44 +08:00
Mohd Arief 6c5dd60654 update the booking controller 2018-06-29 12:09:01 +08:00
Jack Goh 691bd1c91a updated reject booking status
added reject reason on verification page
2018-06-29 11:05:27 +08:00
Jack Goh 71e6c3358f added reject reason dialog 2018-06-29 10:59:41 +08:00
Mouhamed Lamine 83d630de1e commit before pull 2018-06-29 10:57:57 +08:00
Jack Goh 79cad74ee0 Merge branch 'nazri/admin-frontend-setting-fix' into 'master'
Nazri/admin frontend setting fix

See merge request CIEFWorldwideSdnBhd/exchange!44
2018-06-29 01:32:00 +00:00
Nazri Hamzah d1d5aaf694 fixed bug admin setting frontend 2018-06-29 00:56:00 +08:00
Nazri Hamzah fe07b7cd64 first commit 2018-06-28 22:26:06 +08:00
Mouhamed Lamine 30816ba449 Commit before merge 2018-06-28 16:15:35 +08:00
Jack Goh 722dbacd00 updated home frontend to cope with pagination 2018-06-28 16:15:10 +08:00
Jack Goh f2784c47ed Merge branch 'integration/upload-invoice' into 'master'
Integration/upload invoice

See merge request CIEFWorldwideSdnBhd/exchange!43
2018-06-28 08:01:07 +00:00