48e033f436
bug fixing
2018-06-25 09:38:03 +08:00
c59fb24537
Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/warehouses
...
# Conflicts:
# app/Http/Controllers/CompanyController.php
# package-lock.json
# routes/api.php
2018-06-20 11:32:02 +08:00
262884f369
merged master
2018-06-20 11:26:23 +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
3c1f2c522d
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/contact
...
# Conflicts:
# Dockerfile
# app/Company.php
# app/Http/Controllers/CompanyController.php
# app/Http/Kernel.php
# app/User.php
# composer.json
# composer.lock
# config/app.php
# package-lock.json
# routes/api.php
# tests/TestCase.php
2018-06-12 09:28:51 +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
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
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
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
20209f9e36
search company and id storing test
2018-05-16 16:23:04 +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
c0dab3c496
contact migration
2018-05-14 16:23:56 +08:00
47c12e5e97
added user seeder
...
added example to get user info
2018-05-14 15:29:24 +08:00
d31258cc82
contact controller model table
2018-05-07 14:38:40 +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
c8883c3e4c
contact-list
2018-05-03 10:51:31 +08:00
6c5e0b6e0e
added the image upload for company profile
2018-05-02 16:34:39 +08:00
21ef45e6a4
added put post update show
2018-04-27 17:38:02 +08:00
838e5150a3
added reset password method
2018-04-27 10:30:18 +08:00
b4c257b2d0
added role based user management
...
added send reset link method
updated jwt expire to one week
added seeder
2018-04-26 17:18:53 +08:00
c6b5c0d3f2
added create company
...
added update company
2018-04-26 16:43:40 +08:00
3b00c6aba7
added update company
...
added create company
2018-04-26 16:43:19 +08:00
4c5c65c289
added POST,GET,PUT,DELETE controller
2018-04-26 16:27:15 +08:00
a85e58af54
added phone verification
2018-04-26 11:44:04 +08:00
b166712039
added vendor to dockerignore
...
added doctrine for renaming database column
changed email to phone number
added confirm_password upon signup
2018-04-25 17:44:18 +08:00
3314e3eb33
company migration
2018-04-24 14:19:14 +08:00
2c6921ea3f
edit cotroller
2018-04-23 15:55:46 +08:00
4a8a075414
added migration, model, and controller
2018-04-23 14:47:34 +08:00
737c7da54f
added verification
2018-04-23 11:49:26 +08:00
407179f8f8
init
2018-04-16 15:37:03 +08:00
Zain Fauzan Rofie Azizi
Jack Goh
Aqeeb Imtiaz Harun
jack
Asif