Commit Graph

67 Commits

Author SHA1 Message Date
Zain Fauzan Rofie Azizi 683fcd1bf1 rename decsion item model, file 2018-07-12 14:44:43 +08:00
Zain Fauzan Rofie Azizi bd73f0b447 fixed undefine variable 2018-07-05 15:58:23 +08:00
Zain Fauzan Rofie Azizi 750a6e0db9 bug fixing 2018-07-04 15:42:58 +08:00
Zain Fauzan Rofie Azizi 04d4f5c521 rename warehouse arrangement routes, controller 2018-07-04 10:38:34 +08:00
Zain Fauzan Rofie Azizi 7a23b4ed3c merged conflict 2018-06-28 17:11:56 +08:00
Zain Fauzan Rofie Azizi 93a5e93ce2 added fk for wrn, added user inetrgration 2018-06-27 11:22:34 +08:00
Jack Goh 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
Zain Fauzan Rofie Azizi 5fecbf8ade fix seeding for testing 2018-06-12 15:23:17 +08:00
Zain Fauzan Rofie Azizi 8037733f2e fixed merged conflict 2018-06-12 09:54:54 +08:00
Zain Fauzan Rofie Azizi f463d0b6b2 completed the user intergration 2018-06-12 09:49:24 +08:00
Aqeeb Imtiaz Harun c7b8cd76c0 added country code added to the front end 2018-06-06 16:03:05 +08:00
Aqeeb Imtiaz Harun 670eb012ed added alternative bootstrap alert to frontends during the signup process 2018-06-06 09:53:26 +08:00
Zain Fauzan Rofie Azizi 12e071d260 fix merge problem, create factory, fix controller problem in SO and WRN, setup a testing database 2018-05-31 15:59:59 +08:00
jack d1023faeb4 fix update profile error
fix update profile frontend unauthorize
2018-05-31 09:56:15 +08:00
Zain Fauzan Rofie Azizi 2f7ceb77c1 ongoing testing 2018-05-30 11:12:59 +08:00
Zain Fauzan Rofie Azizi ef9aff6868 testing 2018-05-30 11:05:01 +08:00
Aqeeb Imtiaz Harun 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
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
Zain Fauzan Rofie Azizi 371006887b completed PUT request 2018-05-28 16:40:47 +08:00
jack ff4e7764d5 added relationship for company and user 2018-05-26 09:37:56 +08:00
Zain Fauzan Rofie Azizi ea95e8767d completed POST,PUT,GET,DELETE 2018-05-24 16:55:58 +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
Zain Fauzan Rofie Azizi bd5d0076fe added upload image for wrni, and POST for wrn wrni 2018-05-23 16:00:51 +08:00
jack 2bf4eb2b05 remove companycontroller index function 2018-05-23 12:20:44 +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 45dea363ec changed route and controller name from verifyUser to verifyPhone 2018-05-23 11:21:16 +08:00
Zain Fauzan Rofie Azizi d140ecf10f added image upload for wrn 2018-05-23 11:19:13 +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
Zain Fauzan Rofie Azizi 8c8c66572c added testing for shipping order and shipping order item 2018-05-23 09:41:53 +08:00
Zain Fauzan Rofie Azizi cbcd538eda ongoing controller 2018-05-23 08:56:58 +08:00
jack f333b68dff fix conflict 2018-05-22 20:26:45 +08:00
jack 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
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
Zain Fauzan Rofie Azizi 32db666e09 completed multiple item order 2018-05-22 09:12:38 +08:00
Zain Fauzan Rofie Azizi 302238047d completed add multiple item 2018-05-21 17:12:01 +08:00
Zain Fauzan Rofie Azizi 0969c8647b can insert both so and soitem into db, but have an error 2018-05-21 17:01:07 +08:00
Aqeeb Imtiaz Harun e6855eb844 added frontend & login function tested completely 2018-05-19 11:53:39 +08:00
Zain Fauzan Rofie Azizi 137b9dc576 remove id at store, rename cancel order 2018-05-17 09:18:03 +08:00
Zain Fauzan Rofie Azizi 4a96a75890 new migration 2018-05-17 09:03:58 +08:00
Zain Fauzan Rofie Azizi 88605f2ec4 ongoing task 2018-05-16 14:32:54 +08:00
Aqeeb Imtiaz Harun f72645e2c2 Company Profile has been completed and tested 2018-05-16 09:57:03 +08:00
Aqeeb Imtiaz Harun 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
jack d8c4ea1bcd added update role in update profile 2018-05-14 17:12:59 +08:00
Zain Fauzan Rofie Azizi 6057f48d9e updated controller for both SO and SOitem 2018-05-14 15:00:12 +08:00
Zain Fauzan Rofie Azizi 182ac3e653 added PUT, DELETE, GET 2018-05-14 00:14:23 +08:00
Zain Fauzan Rofie Azizi 796373e671 added POST for so 2018-05-13 23:38:19 +08:00
Zain Fauzan Rofie Azizi 9162d86512 added migration, model, controller 2018-05-07 16:24:59 +08:00
Aqeeb Imtiaz Harun 2da890f36e added file upload for both company profile picture and registration certificate 2018-05-07 11:11:57 +08:00