Commit Graph

18 Commits

Author SHA1 Message Date
Aqeeb Imtiaz Harun 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
jack 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
Aqeeb Imtiaz Harun ba827bf27d fixed the issues that were pointed out except the pdf test 2018-05-24 12:16:37 +08:00
jack 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
jack 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
jack 3381ce1bd8 removed example test
addded verify sms code test
2018-05-22 19:55:04 +08:00
jack 70d455ac64 added send verification test 2018-05-22 18:11:24 +08:00
jack 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
Aqeeb Imtiaz Harun e6855eb844 added frontend & login function tested completely 2018-05-19 11:53:39 +08:00
Asif 6797f63383 contact approval and testing 2018-05-18 15:30:35 +08:00
Asif 20209f9e36 search company and id storing test 2018-05-16 16:23:04 +08:00
Aqeeb Imtiaz Harun f72645e2c2 Company Profile has been completed and tested 2018-05-16 09:57:03 +08:00
Aqeeb Imtiaz Harun 3d1509d784 Upload function testing 2018-05-15 15:23:18 +08:00
Aqeeb Imtiaz Harun 5a7066969a Test Company Information Page 2018-05-15 11:17:14 +08:00
Asif d31258cc82 contact controller model table 2018-05-07 14:38:40 +08:00
Asif 1e923a3368 contact controller model table 2018-05-07 14:36:48 +08:00
jack 456b5a8028 added twilio library
updated run laravel app after db started
temporary added login and register test
2018-04-25 22:09:11 +08:00
jack 407179f8f8 init 2018-04-16 15:37:03 +08:00