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
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
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
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
ba827bf27d
fixed the issues that were pointed out except the pdf test
2018-05-24 12:16:37 +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
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
e6855eb844
added frontend & login function tested completely
2018-05-19 11:53:39 +08:00
6797f63383
contact approval and testing
2018-05-18 15:30:35 +08:00
20209f9e36
search company and id storing test
2018-05-16 16:23:04 +08:00
f72645e2c2
Company Profile has been completed and tested
2018-05-16 09:57:03 +08:00
3d1509d784
Upload function testing
2018-05-15 15:23:18 +08:00
5a7066969a
Test Company Information Page
2018-05-15 11:17:14 +08:00
d31258cc82
contact controller model table
2018-05-07 14:38:40 +08:00
1e923a3368
contact controller model table
2018-05-07 14:36:48 +08:00
f7d468e2d5
remove slash
2018-05-04 16:19:21 +08:00
19f97d0662
added unit testing
2018-05-04 16:13:51 +08:00
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
407179f8f8
init
2018-04-16 15:37:03 +08:00
Jack Goh
Zain Fauzan Rofie Azizi
Aqeeb Imtiaz Harun
jack
Asif