e8b2b8009b
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into zain/shipping-order
...
# Conflicts:
# Dockerfile
# app/Http/Controllers/AuthController.php
# app/User.php
# database/factories/UserFactory.php
# database/migrations/2018_04_25_084609_change_email_to_mobile_from_user.php
# database/seeds/DatabaseSeeder.php
# public/home.html
# public/index.html
# public/profile-first-setup.html
# public/verify-code-number.html
# public/verify-phone-number.html
# routes/api.php
# routes/web.php
# tests/Feature/LoginTest.php
# tests/Feature/RegisterTest.php
2018-06-28 16:58:01 +08:00
94327b6a4d
updated docker
...
removed unused files
2018-06-28 16:51:21 +08:00
be09fcb3d2
fixed typo error
2018-06-27 11:25:10 +08:00
74fe5082a5
checkout
2018-06-26 16:13:39 +08:00
fb21c24093
test
2018-06-26 16:11:46 +08:00
1446590171
complete cancel ship order
2018-06-26 09:49:54 +08:00
efdf546885
solved some user id error, added fk id
2018-06-20 11:21:13 +08:00
49abcb4923
Merge branch 'zain/delivery-info' into 'master'
...
Zain/delivery info
See merge request CIEFWorldwideSdnBhd/izyim-api!4
2018-06-20 03:00:40 +00:00
f21c6c9ded
commeted out delivery info test TBD
...
added delivery info index to show lists of delivery info for the company
fixed delivery info show security
2018-06-20 11:00:15 +08:00
5fecbf8ade
fix seeding for testing
2018-06-12 15:23:17 +08:00
8037733f2e
fixed merged conflict
2018-06-12 09:54:54 +08:00
f463d0b6b2
completed the user intergration
2018-06-12 09:49:24 +08:00
576fdc2534
incomplete
2018-06-09 10:42:58 +08:00
c3b02ff4f8
Merge branch 'asif/fix-front' into 'master'
...
fixed personal info frontend
See merge request CIEFWorldwideSdnBhd/izyim-api!12
2018-06-08 03:42:05 +00:00
9d501e59b1
remove role|change button name|onclick redirect
2018-06-08 10:18:46 +08:00
082dd9a871
fixed personal info frontend
2018-06-08 09:42:28 +08:00
0226847eea
dropped order_id column in soitem table
2018-06-07 17:21:08 +08:00
18c05ecb7d
fixed group routes
2018-06-07 15:48:05 +08:00
59d9588fdc
updated codes
2018-06-07 11:03:46 +08:00
1361538f8b
solve multiple error
2018-06-07 09:55:43 +08:00
956d1072fa
Merge branch 'companyFrontend' into 'master'
...
Company frontend
See merge request CIEFWorldwideSdnBhd/izyim-api!10
2018-06-06 08:52:48 +00:00
c7b8cd76c0
added country code added to the front end
2018-06-06 16:03:05 +08:00
9619cab407
solved some functions error, empty function
2018-06-06 15:36:55 +08:00
670eb012ed
added alternative bootstrap alert to frontends during the signup process
2018-06-06 09:53:26 +08:00
e6b08a6cba
added the company profile frontend integration
2018-06-01 09:58:27 +08:00
d1023faeb4
fix update profile error
...
fix update profile frontend unauthorize
2018-05-31 09:56:15 +08:00
e3632fce8d
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into companyFrontend
...
# Conflicts:
# public/company-profile.html
2018-05-30 10:57:18 +08:00
cdf6c67db3
update company profile frontend
2018-05-28 17:27:11 +08:00
3ad7a029f4
Merge branch 'Aqeeb/company' into 'master'
...
Aqeeb/company
See merge request CIEFWorldwideSdnBhd/izyim-api!8
2018-05-28 09:15:48 +00:00
c64c526d98
updated docker to fix faker image error
...
updated on user phone verification, create a company profile
removed company store function
updated company with user relationship
added company factory
moved company routes into authenticated routes
updated company test
renamed "verify" routes to "verify-phone"
2018-05-28 17:14:09 +08:00
e838d36905
Merge branch 'jack/auth' into 'master'
...
Jack/auth
See merge request CIEFWorldwideSdnBhd/izyim-api!6
2018-05-28 09:02:54 +00:00
b7f1fb9a6c
Added company profile frontend
2018-05-28 13:51:03 +08:00
c589fd5431
done frontend integration: verify phone, verify code, first profile pages, company profile page is on going
2018-05-26 10:24:12 +08:00
ff4e7764d5
added relationship for company and user
2018-05-26 09:37:56 +08:00
bc8be30692
Merge branch 'Aqeeb/company' into 'master'
...
Aqeeb/company
See merge request CIEFWorldwideSdnBhd/izyim-api!5
2018-05-26 01:27:32 +00:00
ba827bf27d
fixed the issues that were pointed out except the pdf test
2018-05-24 12:16:37 +08:00
947d7ff15f
Merge branch 'jack/auth' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into jack/auth
2018-05-23 13:54:45 +08:00
0a5745b95b
added integration for request verification code page
2018-05-23 13:54:11 +08:00
2bf4eb2b05
remove companycontroller index function
2018-05-23 12:20:44 +08:00
3996157187
clean up routes
2018-05-23 12:18:19 +08:00
1519a203a9
removed company routes from web
2018-05-23 12:17:12 +08:00
3d00b6f040
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into Aqeeb/company
...
# Conflicts:
# routes/web.php
2018-05-23 12:16:36 +08:00
a8425e7b95
Merge branch 'jack/auth' into 'master'
...
Jack/auth
See merge request CIEFWorldwideSdnBhd/izyim-api!7
2018-05-23 04:12:11 +00:00
ad68a93165
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into jack/auth
...
# Conflicts:
# Dockerfile
2018-05-23 11:59:42 +08:00
45dea363ec
changed route and controller name from verifyUser to verifyPhone
2018-05-23 11:21:16 +08:00
587234f205
added auto seed on dockerup
...
updated jwt kernel from getuserfromtoken to autenticate
updated verify response from data.token to token
updated user factory
changed routes for update user profile to from PUT to PATCH
added register with actingAs user
added test update freightforwarder user
added test update importer user
2018-05-23 11:15:38 +08:00
8c8c66572c
added testing for shipping order and shipping order item
2018-05-23 09:41:53 +08:00
5909f50cd3
edit routes
2018-05-23 08:59:15 +08:00
f333b68dff
fix conflict
2018-05-22 20:26:45 +08:00
392cd42b5d
Merge branch 'jack/auth' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into jack/auth
...
# Conflicts:
# app/Http/Controllers/AuthController.php
# tests/Feature/LoginTest.php
# tests/Feature/RegisterTest.php
2018-05-22 19:57:15 +08:00
Jack Goh
Zain Fauzan Rofie Azizi
Asif
Aqeeb Imtiaz Harun
jack