Commit Graph

112 Commits

Author SHA1 Message Date
Zain Fauzan Rofie Azizi 9e173e7591 added function to show the list of warehouse receive note list 2018-07-12 15:41:06 +08:00
Zain Fauzan Rofie Azizi f67ee93a80 return single data only rather than all data 2018-07-12 14:54:07 +08:00
Zain Fauzan Rofie Azizi bde5a53741 change to capital letter 2018-07-12 14:50:37 +08:00
Zain Fauzan Rofie Azizi 99760493cb rename path in decison model 2018-07-12 14:45:26 +08:00
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 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
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
Jack Goh 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
Asif 9d501e59b1 remove role|change button name|onclick redirect 2018-06-08 10:18:46 +08:00
Asif 082dd9a871 fixed personal info frontend 2018-06-08 09:42:28 +08:00
Jack Goh 956d1072fa Merge branch 'companyFrontend' into 'master'
Company frontend

See merge request CIEFWorldwideSdnBhd/izyim-api!10
2018-06-06 08:52:48 +00: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 9046d70b5c completed the testing for the wrn, fixing testing error for so 2018-06-04 14:03:35 +08:00
Aqeeb Imtiaz Harun e6b08a6cba added the company profile frontend integration 2018-06-01 09:58:27 +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 f4610f7596 merging with so 2018-05-30 16:33:16 +08:00
Zain Fauzan Rofie Azizi c43643c00f post test 2018-05-30 11:28:28 +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
Aqeeb Imtiaz Harun cdf6c67db3 update company profile frontend 2018-05-28 17:27:11 +08:00
Jack Goh 3ad7a029f4 Merge branch 'Aqeeb/company' into 'master'
Aqeeb/company

See merge request CIEFWorldwideSdnBhd/izyim-api!8
2018-05-28 09:15:48 +00: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
Jack Goh e838d36905 Merge branch 'jack/auth' into 'master'
Jack/auth

See merge request CIEFWorldwideSdnBhd/izyim-api!6
2018-05-28 09:02:54 +00:00
Zain Fauzan Rofie Azizi 371006887b completed PUT request 2018-05-28 16:40:47 +08:00
Aqeeb Imtiaz Harun b7f1fb9a6c Added company profile frontend 2018-05-28 13:51:03 +08:00
Aqeeb Imtiaz Harun 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
jack ff4e7764d5 added relationship for company and user 2018-05-26 09:37:56 +08:00
Jack Goh bc8be30692 Merge branch 'Aqeeb/company' into 'master'
Aqeeb/company

See merge request CIEFWorldwideSdnBhd/izyim-api!5
2018-05-26 01:27:32 +00: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
Aqeeb Imtiaz Harun 947d7ff15f Merge branch 'jack/auth' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into jack/auth 2018-05-23 13:54:45 +08:00
Aqeeb Imtiaz Harun 0a5745b95b added integration for request verification code page 2018-05-23 13:54:11 +08:00
jack 2bf4eb2b05 remove companycontroller index function 2018-05-23 12:20:44 +08:00
jack 3996157187 clean up routes 2018-05-23 12:18:19 +08:00
jack 1519a203a9 removed company routes from web 2018-05-23 12:17:12 +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 Goh a8425e7b95 Merge branch 'jack/auth' into 'master'
Jack/auth

See merge request CIEFWorldwideSdnBhd/izyim-api!7
2018-05-23 04:12:11 +00:00
jack ad68a93165 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim-api into jack/auth
# Conflicts:
#	Dockerfile
2018-05-23 11:59:42 +08:00