ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,254 Commits 36 Branches 19 Tags 655 MiB
Commit Graph

1258 Commits

Author SHA1 Message Date
Ramón Tomás
525040b9b6 Created Azure functions for details campaign 
Adapt MVC app to azure function details campaign
Adapt SPA app to azure function details campaign
 2017-06-30 16:31:22 +02:00
Ramón Tomás
f993463856 Implemented service bus for marketing.api locations.api graceperiodProcess payment.api 2017-06-30 08:59:26 +02:00
Eduard Tomas
d65a112535 References updated to preview-2 
code adjustements to work with preview-2
 2017-06-29 18:36:57 +02:00
Eduard Tomas
10d03a68e3 Merge remote-tracking branch 'eShopOnAzure/dev' into dev 
# Conflicts:
#	docker-compose.override.yml
#	src/Services/Catalog/Catalog.API/CatalogSettings.cs
#	src/Services/Catalog/Catalog.API/Controllers/CatalogController.cs
#	src/Services/Catalog/Catalog.API/Controllers/PicController.cs
#	src/Services/Catalog/Catalog.API/Infrastructure/CatalogContextSeed.cs
#	src/Services/Catalog/Catalog.API/settings.json
#	src/Services/Ordering/Ordering.API/Startup.cs
 2017-06-28 12:40:21 +02:00
Eduard Tomas
96c3f5c2bc Merge remote-tracking branch 'origin/feature/data-and-ui-customization-v2' into dev 
# Conflicts:
#	docker-compose.override.yml
#	src/Web/WebMVC/WebMVC.csproj
#	src/Web/WebMVC/wwwroot/css/shared/components/identity/identity.css
#	src/Web/WebMVC/wwwroot/css/site.min.css
#	src/Web/WebSPA/AppSettings.cs
 2017-06-28 12:20:20 +02:00
Christian Arenas
699ec0001d Create IdentityService in marketing API 2017-06-26 18:31:04 +02:00
Christian Arenas
b28c650e06 Remove userId setting from xamarin app and remove userId parameter from GetCampaignsByUserId in Campaign API 2017-06-26 18:29:51 +02:00
Ramón Tomás
a56f99f684 Fix merge 2017-06-26 18:05:02 +02:00
Ramón Tomás
a3e63c11aa Merge from eShopOnContainers Dev 2017-06-26 13:51:49 +02:00
Shaun Walker
18b91ee5f1 minor fixes to data and UI customization 2017-06-23 11:49:25 -07:00
Eduard Tomas
65bcf48246 Dealing with auth and package versions issues between 1.1 and 2.0 2017-06-23 18:45:20 +02:00
Eduard Tomas
c28b693db9 Dockerfile of Payment.API upgraded to v2 2017-06-23 10:55:48 +02:00
Shaun Walker
632c023a3f strip quotes, fix image transparency, format price and amount 2017-06-22 17:26:57 -07:00
Eduard Tomas
6b466a2c66 Fixing NetStandard.Library versions 2017-06-22 16:15:58 +02:00
Shaun Walker
9229a8d0fd support for additional CatalogItem properties 2017-06-21 15:27:12 -07:00
Eduard Tomas
286b8e4344 Unwanted fwk reference in GracePeriodManager 2017-06-21 19:57:36 +02:00
Eduard Tomas
17dc20077d Payment.API nuget updated 2017-06-21 19:50:01 +02:00
Eduard Tomas
3c2ce4d7a7 Ordering.API nuget update 2017-06-21 19:48:13 +02:00
Eduard Tomas
706423cc8d Marketing.API nuget updated 2017-06-21 19:43:02 +02:00
Eduard Tomas
4303cbae89 Locations.API nuget updated 2017-06-21 19:39:47 +02:00
Eduard Tomas
4069a3a048 Catalog.API nuget updated 2017-06-21 19:36:33 +02:00
Eduard Tomas
ea129609d5 Basket.API nuget updated 2017-06-21 19:33:24 +02:00
Eduard Tomas
5d383dbaad GracePeriodManager nuget updated 2017-06-21 19:10:12 +02:00
Eduard Tomas
56902a5549 [WIP] Projects & Dockerfile migrated to 2.0 
Lots of things to address yet, because nuget packages are still on 1.1
 2017-06-21 19:03:48 +02:00
Christian Arenas
a65254e385 Merge branch 'feature/track-user-location-mongodb' into dev 2017-06-21 11:48:38 +02:00
Christian Arenas
123cd9e1c1 Add point of union from the polygon 2017-06-21 11:47:34 +02:00
Christian Arenas
cae44bcbba Add Barcelona location seed 2017-06-21 11:06:33 +02:00
Shaun Walker
445101b376 data and UI customization enhancements 2017-06-20 12:54:32 -07:00
Ramón Tomás
e1a007edfa Merge display marketing campaigns feature for SPA app 2017-06-19 16:58:26 +02:00
Ramón Tomás
9d76e79e53 Merge from marketing banner mvc 2017-06-19 09:50:07 +02:00
Ramón Tomás
9fee40e358 Created marketing campaigns view details 2017-06-19 09:46:48 +02:00
Christian Arenas
b36a05b64b Optimize query 2017-06-19 09:41:24 +02:00
Christian Arenas
ed97efaf61 Check when the user doesn't have any location in database 2017-06-19 00:34:00 +02:00
Christian Arenas
db4403b75c Add Pagination to Campaign View 
(cherry picked from commit 86e40512352a44021ea69ed948062d0b510141cf)
 2017-06-16 16:51:35 +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
e80c5efdd3 Add details view and add marketing scope in mvc project and identity config 2017-06-16 01:20:03 +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
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
Christian Arenas
9c2df21ab0 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
523d27a49f 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
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
ec59ace1ea 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
13a201ba67 Implement GetCampaignsByUserId in CampaignsController calling a data read model from mongo repository 2017-06-14 15:14:37 +02:00