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
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
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
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
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
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
ff4e7764d5
added relationship for company and user
2018-05-26 09:37:56 +08:00
ba827bf27d
fixed the issues that were pointed out except the pdf test
2018-05-24 12:16:37 +08:00
2bf4eb2b05
remove companycontroller index function
2018-05-23 12:20:44 +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
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
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
3381ce1bd8
removed example test
...
addded verify sms code test
2018-05-22 19:55:04 +08:00
70d455ac64
added send verification test
2018-05-22 18:11:24 +08:00
98113c0544
Merge branch 'Aqeeb/company' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into Aqeeb/company
...
# Conflicts:
# Dockerfile
# composer.json
# composer.lock
# config/app.php
2018-05-22 17:19:15 +08:00
32db666e09
completed multiple item order
2018-05-22 09:12:38 +08:00
302238047d
completed add multiple item
2018-05-21 17:12:01 +08:00
0969c8647b
can insert both so and soitem into db, but have an error
2018-05-21 17:01:07 +08:00
e6855eb844
added frontend & login function tested completely
2018-05-19 11:53:39 +08:00
137b9dc576
remove id at store, rename cancel order
2018-05-17 09:18:03 +08:00
f72645e2c2
Company Profile has been completed and tested
2018-05-16 09:57:03 +08:00
a1ebdb9767
added the upload functions for both company image and registration certificate, stored under /storage/app directory
2018-05-15 10:36:41 +08:00
d8c4ea1bcd
added update role in update profile
2018-05-14 17:12:59 +08:00
6057f48d9e
updated controller for both SO and SOitem
2018-05-14 15:00:12 +08:00
182ac3e653
added PUT, DELETE, GET
2018-05-14 00:14:23 +08:00
796373e671
added POST for so
2018-05-13 23:38:19 +08:00
9162d86512
added migration, model, controller
2018-05-07 16:24:59 +08:00
2da890f36e
added file upload for both company profile picture and registration certificate
2018-05-07 11:11:57 +08:00
19f97d0662
added unit testing
2018-05-04 16:13:51 +08:00
6c5e0b6e0e
added the image upload for company profile
2018-05-02 16:34:39 +08:00
838e5150a3
added reset password method
2018-04-27 10:30:18 +08:00
Jack Goh
Zain Fauzan Rofie Azizi
Aqeeb Imtiaz Harun
jack