1786 Commits

Author SHA1 Message Date
Eduard Tomas
bc89bc1ec4 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnAzure into dev 2017-06-16 12:14:33 +02:00
Eduard Tomas
9979f1af96 Deploy storage 2017-06-16 12:14:29 +02:00
Christian Arenas
c88ece26e6 Change condition in Campaign from and to 2017-06-16 12:09:48 +02:00
Christian Arenas
a146fd3239 Remove campaign test images and add new two images and change the name campaign seed 2017-06-16 11:44:51 +02:00
Christian Arenas
278083ae8e Check when list is null and campaign details doesn't exist 2017-06-16 10:13:26 +02:00
Christian Arenas
ff790afe56 remove fake campaing test in CampaignsController 2017-06-16 09:14:17 +02:00
Christian Arenas
e80c5efdd3 Add details view and add marketing scope in mvc project and identity config 2017-06-16 01:20:03 +02:00
Christian Arenas
91de998506 modify parameter type 2017-06-15 19:26:38 +02:00
Christian Arenas
cd1a091b6f Add polly to marketing api 2017-06-15 19:26:24 +02:00
Christian Arenas
ed7dfc7cb5 Modify PictureUri name 2017-06-15 19:25:08 +02:00
Christian Arenas
08a45f2c35 Create Campaign view model and modify CampaignDTO 2017-06-15 19:24:33 +02:00
Christian Arenas
6a315764a8 Create view for index campaing and his controller method 2017-06-15 19:23:57 +02:00
Christian Arenas
46db196633 Remove url from test 2017-06-15 19:23:33 +02:00
Christian Arenas
b764aebcd1 Add campaign service methods 2017-06-15 19:23:10 +02:00
Christian Arenas
5208296b97 Add url to docker-compose 2017-06-15 19:22:47 +02:00
Christian Arenas
a894e22b74 Add Campaigns.components style 2017-06-15 19:22:28 +02:00
Christian Arenas
31423eebcb Add test pics (not demo pics) and PicController 2017-06-15 19:16:26 +02:00
Christian Arenas
08b4f9187a Add Name property and rename Url to PictureUri 2017-06-15 19:14:16 +02:00
Ramón Tomás
d6c6582b51 Merge from Master 2017-06-15 08:54:29 +02:00
Ramón Tomás
2ad485015f Merge from Master 2017-06-15 08:54:29 +02:00
Christian Arenas
6b9a519332 Add Campaigns items in header list 2017-06-15 02:22:48 +02:00
Christian Arenas
5d4023649f Create CampaignsController 2017-06-15 02:22:24 +02:00
Christian Arenas
b840ebd7f6 Add campaignDTO 2017-06-15 02:22:07 +02:00
Christian Arenas
710e16455a Add get all campaigns by user id url 2017-06-15 02:21:46 +02:00
Christian Arenas
fdc15fb4f9 Add index campaign view 2017-06-15 02:21:03 +02:00
Christian Arenas
870ac403af Add Marketing endpoint 2017-06-15 02:20:33 +02:00
Christian Arenas
6168b52db8 Add campaign Service 2017-06-15 02:20:02 +02:00
Christian Arenas
9c2df21ab0 Merge branch 'marketingcampaign' into dev 2017-06-15 00:55:28 +02:00
Christian Arenas
1d46ba3a15 Merge branch 'marketingcampaign' into dev 2017-06-15 00:55:28 +02:00
Christian Arenas
dd3237245d Modify CreatedAtAction parameter, It has an error 2017-06-15 00:52:18 +02:00
Christian Arenas
a89918c581 Modify CreatedAtAction parameter, It has an error 2017-06-15 00:52:18 +02:00
Christian Arenas
523d27a49f Add GetLocationByCampaignAndLocationRuleId route name 2017-06-14 18:25:46 +02:00
Christian Arenas
0a2cd15d61 Add GetLocationByCampaignAndLocationRuleId route name 2017-06-14 18:25:46 +02:00
Ramón Tomás
a9c185a41a Updated number of products in catalog stock
Orders list ordered
Refresh orders list periodically
Fix bug SPA basket not dropped after creating order
2017-06-14 16:38:27 +02:00
Ramón Tomás
5f28f8f710 Updated number of products in catalog stock
Orders list ordered
Refresh orders list periodically
Fix bug SPA basket not dropped after creating order
2017-06-14 16:38:27 +02:00
Christian Arenas
b3e5362865 Merge branch 'feature/marketing-read-model-data' into marketingcampaign
# Conflicts:
#	src/Services/Location/Locations.API/Model/Locations.cs
2017-06-14 16:26:28 +02:00
Christian Arenas
aae16d095e Merge branch 'feature/marketing-read-model-data' into marketingcampaign
# Conflicts:
#	src/Services/Location/Locations.API/Model/Locations.cs
2017-06-14 16:26:28 +02:00
Christian Arenas
4ba9d66423 Add new environment variables values to appsettings 2017-06-14 16:21:46 +02:00
Christian Arenas
b7cce14734 Add new environment variables values to appsettings 2017-06-14 16:21:46 +02:00
Christian Arenas
ec59ace1ea Add LocationId to Locations Model 2017-06-14 15:24:56 +02:00
Christian Arenas
6c354a2c3d Add LocationId to Locations Model 2017-06-14 15:24:56 +02:00
Christian Arenas
0ffa9cb981 Create a LocationId in data read model and change the affected modification 2017-06-14 15:22:49 +02:00
Christian Arenas
f1ccc24c85 Create a LocationId in data read model and change the affected modification 2017-06-14 15:22:49 +02:00
Christian Arenas
13a201ba67 Implement GetCampaignsByUserId in CampaignsController calling a data read model from mongo repository 2017-06-14 15:14:37 +02:00
Christian Arenas
d2b004a9a9 Implement GetCampaignsByUserId in CampaignsController calling a data read model from mongo repository 2017-06-14 15:14:37 +02:00
Christian Arenas
0024a23801 Add functional test: Check The user has an location campaign 2017-06-14 15:12:40 +02:00
Christian Arenas
4e320f813a Add functional test: Check The user has an location campaign 2017-06-14 15:12:40 +02:00
Christian Arenas
9ae6fa8c64 Modify locationId in Marketing campaing seed 2017-06-14 15:10:49 +02:00
Christian Arenas
24c8e93888 Modify locationId in Marketing campaing seed 2017-06-14 15:10:49 +02:00
David Britch
6fd960d403 Added cover image. 2017-06-14 10:31:54 +01:00