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

569 Commits

Author SHA1 Message Date
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
Christian Arenas
9ae6fa8c64 Modify locationId in Marketing campaing seed 2017-06-14 15:10:49 +02:00
Christian Arenas
41654878a7 Add LocationId field to UserLocation and call GetAsync repository method from marketing controller 2017-06-13 18:01:24 +02:00
Christian Arenas
68dbc92172 Add LocationId field to UserLocation 2017-06-13 18:00:49 +02:00
Christian Arenas
794d366053 Merge branch 'feature/marketing-read-model-data' into marketingcampaign 
# Conflicts:
#	src/Services/Location/Locations.API/Infrastructure/Services/LocationsService.cs
#	src/Services/Location/Locations.API/Model/UserLocation.cs
 2017-06-13 17:38:07 +02:00
Ramón Tomás
9bf5670020 Created Marketing read data model 2017-06-13 17:31:37 +02:00
Christian Arenas
432994d113 Create GetCampaignByUserId in CampaignsController 2017-06-13 14:33:16 +02:00
Christian Arenas
4a60d97d4d Add RuleType in MarketingContext 2017-06-13 14:32:53 +02:00
Christian Arenas
8d170fe83f Modify RuleType class 2017-06-13 14:32:08 +02:00
Christian Arenas
e5a59a1bdf Merge branch 'feature/track-user-location-mongodb' into dev 
# Conflicts:
#	src/Services/Ordering/Ordering.API/Infrastructure/AutofacModules/MediatorModule.cs
 2017-06-13 11:26:47 +02:00
Christian Arenas
0b510994a4 Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0 2017-06-13 11:12:15 +02:00
Christian Arenas
a74c2942fc Add AllowAccessTokensViaBrowser in Identity server, we got an login error from xamarin 2017-06-12 20:19:23 +02:00
Christian Arenas
3a9093a741 Modify location.API change userId type from int to Guid 2017-06-12 20:18:52 +02:00
Ramón Tomás
4be61abdde Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
Ramón Tomás
4ed070dbed Merge from Dev 2017-06-12 11:06:17 +02:00
Christian Arenas
606f23e394 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
 2017-06-09 13:07:09 +02:00
Christian Arenas
41fe6fc03f Merge branch 'marketingcampaign' into dev 2017-06-09 12:51:31 +02:00
Christian Arenas
0586fe5abd add new migration 2017-06-09 12:50:26 +02:00
Ramón Tomás
0337932697 Merge locations feature branch 2017-06-09 12:43:46 +02:00
Ramón Tomás
ea6084db28 Added location.api integration tests 2017-06-09 12:16:57 +02:00
Christian Arenas
dfae447f68 Merge branch 'marketingcampaign' into dev 
# Conflicts:
#	eShopOnContainers-ServicesAndWebApps.sln
 2017-06-09 12:13:21 +02:00
Ramón Tomás
981f4e2730 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-06-08 17:45:21 +02:00
Ramón Tomás
3a10038d71 Fix bug antiforgery decryption issue when deploying in a k8s cluster 
Changed in-memory grant store in idsrv to persist in db
 2017-06-08 17:45:07 +02:00
Ramón Tomás
05bd964f2b Adapt Locations.api to nosql db 2017-06-08 17:33:55 +02:00
Ramón Tomás
27fd97b92e Merge from Dev 2017-06-07 17:54:53 +02:00
Ramón Tomás
8c0d41e4ad Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0 2017-06-06 19:20:42 +02:00
Christian Arenas
ce56a42bd1 Redesign marketing campaign api in two different controllers (campaigns/locations) 2017-06-06 14:18:46 +02:00
Christian Arenas
56c07aaafa Edit campaigns controller 2017-06-06 10:26:11 +02:00
Christian Arenas
3c81115603 Edit mapper methods 2017-06-05 23:20:46 +02:00
Ramón Tomás
375780e3a4 Merge branch 'dev' of https://github.com/dotnet-architecture/eShopOnContainers into dev 2017-06-05 21:54:13 +02:00
Ramón Tomás
41101164fa Persist identity grant store to db 
Persist machine Keys to Redis
 2017-06-05 21:54:03 +02:00
Christian Arenas
ea8d893d4e change the FakeCampaignDto private object to an GetFakeCampaignDto funtion 2017-06-05 19:36:09 +02:00
Christian Arenas
b5f90cf7b4 Create RuleType class to manage RuleTypeEnum 2017-06-03 01:00:55 +02:00
Christian Arenas
a8178fbbb4 remove unused dbset 2017-06-03 00:59:58 +02:00
Christian Arenas
385f1f094a fix error merge 2017-06-02 16:36:16 +02:00
Christian Arenas
82182e3184 cleanup 2017-06-02 16:35:21 +02:00
Christian Arenas
c349596ca7 Merge branch 'marketingcampaign' of https://github.com/dotnet-architecture/eShopOnContainers into marketingcampaign 
# Conflicts:
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
 2017-06-02 16:34:37 +02:00
Christian Arenas
6dcc6f84bc initialitze the list in constructor 2017-06-02 16:32:50 +02:00
Christian Arenas
4c59c5ebe4 Add migration folder 2017-06-02 16:32:24 +02:00
Christian Arenas
3440427da3 modify context 2017-06-02 16:31:48 +02:00