03d84570fa
redo contact test, added contact factory
2018-07-02 16:50:18 +08:00
7a7e8fdcfe
remove warehouse factory file
2018-07-02 15:27:26 +08:00
8eebdcd093
added company, warehouse, contact seeder
2018-07-02 15:24:32 +08:00
e866d7eb0d
replaced dockerfile
2018-07-02 11:15:02 +08:00
426861e807
added seeder
2018-07-02 10:48:28 +08:00
020c3ce3b7
rollback dockerfile
2018-07-02 10:45:20 +08:00
26b5c0c9e5
added dockerfile
2018-07-02 10:30:53 +08:00
481d18211d
remove duplicate line of code
2018-06-29 14:55:55 +08:00
70cc220337
rename test
2018-06-29 11:04:37 +08:00
3adfc6d309
Merge branch 'asif/contact' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/warehouses
2018-06-27 10:00:44 +08:00
5c24c159c6
Merge branch 'asif/warehouses' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into asif/contact
...
# Conflicts:
# app/Http/Controllers/ContactController.php
# routes/api.php
2018-06-27 09:51:56 +08:00
4e0eb3528d
fixed warehouses FK relation error
2018-06-26 16:31:13 +08:00
23f8a4676b
Added the search and popup function
2018-06-26 14:42:57 +08:00
f6222c6253
bug fixing
2018-06-26 13:15:42 +08:00
3eb17d397b
fixed
2018-06-25 16:50:10 +08:00
0a93a6b9fe
redo deli info testing
2018-06-25 16:43:19 +08:00
48e033f436
bug fixing
2018-06-25 09:38:03 +08:00
7d51085dae
bug fixed
2018-06-21 15:24:45 +08:00
90286315f2
change to small letter
2018-06-20 12:02:45 +08:00
262238f839
remove contact function
2018-06-20 12:00:26 +08:00
238f21ec1b
remove contact function in company model
2018-06-20 11:57:32 +08:00
7b76f613ca
fix duplicated function for search company
2018-06-20 11:33:19 +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
256014c75b
fix conflict
2018-06-20 11:28:06 +08:00
262884f369
merged master
2018-06-20 11:26:23 +08:00
7fcf736886
remove unsed files
2018-06-20 11:12:56 +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
eee806bd6d
Added search function and frontend of add contacts
2018-06-12 13:45:51 +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
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
f58bd69d76
fixed database issue
2018-06-08 11:35:47 +08: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
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
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
Zain Fauzan Rofie Azizi
Aqeeb Imtiaz Harun
Jack Goh
Asif
jack