8716 Commits

Author SHA1 Message Date
Milos Jovanov
4dbab088df [HIMA-14] FE: implemented checkout dialog
- Added modal service for dialogs
- Created dialog for checkout
- Created dialog for shopping cart feedback
2019-02-05 07:38:10 +01:00
Eraldo Hasanaj
abf59b0b4e Migrated processes to ngxs 2019-02-04 18:14:53 +01:00
Lorenz Hilpert
1b802dbdf9 Merged in HIMA-38 (pull request #12)
- Product mapping update
2019-02-04 16:34:13 +00:00
Lorenz Hilpert
66a254867d - Product mapping update 2019-02-04 17:31:27 +01:00
Eraldo Hasanaj
e4203a047b Merge branch 'development' into ngrx-to-ngxs 2019-02-04 15:57:32 +01:00
Eraldo Hasanaj
de3cb87224 Merge branch 'HIMA-38' into development 2019-02-04 15:46:12 +01:00
Eraldo Hasanaj
d802761690 Migrating process model to ngxs store 2019-02-04 15:45:15 +01:00
Lorenz Hilpert
075d2e5afa Update Product Model and Mapping 2019-02-04 15:31:13 +01:00
Lorenz Hilpert
f04e9527d9 Fix Breaking Changes after CatService Backend Update 2019-02-04 15:22:38 +01:00
Eraldo Hasanaj
b764e05ffa Merge branch 'development' into ngrx-to-ngxs 2019-02-04 14:57:54 +01:00
Lorenz Hilpert
261a66286a Merged in HIMA-38 (pull request #11)
- Added InfoDTO
2019-02-04 13:56:59 +00:00
Eraldo Hasanaj
22efbed4d3 working to migrate from ngrx to ngxs 2019-02-04 14:56:31 +01:00
Lorenz Hilpert
1e620a5805 Merge branch 'development' into HIMA-38 2019-02-04 13:58:15 +01:00
Lorenz Hilpert
01612d1e9c - Added InfoDTO
- Added FeedDTO.emphasize property
- Updated Mock Data
2019-02-04 13:57:32 +01:00
Eraldo Hasanaj
55f9be7092 [HIMA-26] Added FeedMockService to app.module 2019-02-04 13:38:32 +01:00
Lorenz Hilpert
b708934b3b [HIMA-39] - Added FeedMockService 2019-02-04 13:08:54 +01:00
Lorenz Hilpert
c6ab91f74d Merge branch 'development' into HIMA-38 2019-02-04 12:49:44 +01:00
Eraldo Hasanaj
4858b39304 Merge conflicts at feed.effects 2019-02-04 12:39:31 +01:00
Eraldo Hasanaj
89ddaf56dc [HIMA-13] Added mapper function for product type icons 2019-02-04 12:36:32 +01:00
Lorenz Hilpert
ae57e7b604 - FeedServiceModule.forRoot added enpoint string
- Import Fix in feed.effect and feed.action
2019-02-04 12:36:20 +01:00
Eraldo Hasanaj
dff615ff17 organise imports 2019-02-04 11:25:08 +01:00
Eraldo Hasanaj
84d233b914 Added action and reducer for feed 2019-02-03 20:50:16 +01:00
Eraldo Hasanaj
c8bc014fc4 Changed search service to call the actual backend 2019-02-01 17:40:24 +01:00
Eraldo Hasanaj
2cbc8adb94 [HIMA-10] Updated the design parameters acording to the QA comments 2019-02-01 16:20:27 +01:00
Eraldo Hasanaj
5a8771bb83 fixed content body height 2019-02-01 15:18:24 +01:00
Lorenz Hilpert
64cc098788 Merged in HIMA-38 (pull request #9)
HIMA-38
2019-02-01 13:25:22 +00:00
Lorenz Hilpert
d333a71bad Merge remote-tracking branch 'origin/development' into HIMA-38 2019-02-01 14:11:38 +01:00
Eraldo Hasanaj
ffefa34a52 [HIMA-10] Created functionality when there is any active process and the user starts searching products, an active process will be created automatically 2019-02-01 14:03:52 +01:00
Lorenz Hilpert
610ca63aca - Added feed-service build to bitbucket-pipelines.yml 2019-02-01 12:45:37 +01:00
Lorenz Hilpert
371021ab29 - Added Barrel Files
- Updated publich_api.ts
2019-02-01 12:44:44 +01:00
Lorenz Hilpert
d66c951547 [HIMA-39]
- Added new library feed-service
- initial FeedService
- DTOs
- Models
2019-02-01 12:43:07 +01:00
Lorenz Hilpert
c7870c9446 - Updated UnitTest for CatSearchService
- Changed ApiResponse and PagedApiResponse from class to interface
2019-02-01 12:41:16 +01:00
Eraldo Hasanaj
fbf2a97f05 Merge branch 'development' of https://bitbucket.org/umwerk/instore-ma-app into development 2019-02-01 12:08:35 +01:00
Eraldo Hasanaj
66dc4705ae [HIMA-23] Changed the resolution on the logo, changed the height of the header component, fixed the distances of the header elements & changed add-process icon with sympli resource 2019-02-01 12:02:44 +01:00
Lorenz Hilpert
4358c2db55 ProductCardComponent display product image 2019-02-01 10:41:10 +01:00
Lorenz Hilpert
96a006c619 Fix Import Issues in FilterService and ProductService 2019-01-31 17:48:41 +01:00
Lorenz Hilpert
5f71f2772a Merged in HIMA-38 (pull request #8)
- Import Fix
2019-01-31 16:39:54 +00:00
Lorenz Hilpert
79f06808ad Merge branch 'development' into HIMA-38 2019-01-31 17:19:59 +01:00
Lorenz Hilpert
75b96287a4 - Import Fix
- ProductService.searchItems => throw error when response.error is true
- Added ean to Product Model
2019-01-31 17:16:04 +01:00
Eraldo Hasanaj
91d024bc5b added build cat-service module to pipeline for master branch 2019-01-31 16:37:37 +01:00
Eraldo Hasanaj
5242179254 added build cat-service module to pipeline 2019-01-31 16:03:52 +01:00
Eraldo Hasanaj
14f98bcc95 fixed router to public at menu.component 2019-01-31 15:55:57 +01:00
Eraldo Hasanaj
446b815301 Merged HIMA-38 to development 2019-01-31 15:35:45 +01:00
Lorenz Hilpert
9d41f75e76 update itemFormatMap 2019-01-31 15:28:13 +01:00
Lorenz Hilpert
8ae445316b Created ProductMapping Service and Moved the mapping function to ProductMapping.fromitemDto() 2019-01-31 15:21:50 +01:00
Eraldo Hasanaj
9924207c21 [HIMA-10] Changed general font for application to Open Sans & added lower navigation 2019-01-31 15:11:25 +01:00
Lorenz Hilpert
5a851bb816 Update Mapping for ItemDTO to Product 2019-01-31 15:10:31 +01:00
Eraldo Hasanaj
579d038b91 fixed import of car-service on filter service & product service 2019-01-31 14:47:27 +01:00
Lorenz Hilpert
e06a4658a6 Merged in HIMA-38 (pull request #6)
HIMA-38
2019-01-31 13:38:53 +00:00
Lorenz Hilpert
1f2faef28a Uncomment CatSearchMockService 2019-01-31 13:41:29 +01:00