2707 Commits

Author SHA1 Message Date
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
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
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
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
1881ed14ef 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
251cfa0845 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
Christian Arenas
be5cfe7399 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
Ramón Tomás
4b8723f723 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
358227aa44 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
6613a9e1eb 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
2ae6744c8e 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
a56a795981 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
d529c104b3 Fix issue Autofac IAsyncRequestHandler not registered with Mediatr 3.0 2017-06-13 11:12:15 +02:00
Christian Arenas
19647d8b7d Add userIsLogged contiditon in view for fake location 2017-06-12 20:22:38 +02:00
Christian Arenas
2283a9d12b Add userIsLogged contiditon in view for fake location 2017-06-12 20:22:38 +02:00
Christian Arenas
dde8e686fc Add token when call location api 2017-06-12 20:21:45 +02:00
Christian Arenas
3b5d081086 Add token when call location api 2017-06-12 20:21:45 +02:00
Christian Arenas
c84b4707e3 Add locations to allow scopes to dictionary 2017-06-12 20:20:46 +02:00
Christian Arenas
ef8f14a212 Add locations to allow scopes to dictionary 2017-06-12 20:20:46 +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
4458e57734 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
Christian Arenas
c9332396c5 Modify location.API change userId type from int to Guid 2017-06-12 20:18:52 +02:00
David Britch
d3ea7ec853 Refactored TokenService into IdentityService. 2017-06-12 13:35:19 +01:00
David Britch
bfdac24771 Refactored TokenService into IdentityService. 2017-06-12 13:35:19 +01:00
Ramón Tomás
4be61abdde Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
Ramón Tomás
152bc9fd01 Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
David Britch
5db62c14b9 Merge pull request #211 from dotnet-architecture/xamarin
Xamarin client hybrid authentication flow
2017-06-12 11:14:20 +01:00
David Britch
96a1a55426 Merge pull request #211 from dotnet-architecture/xamarin
Xamarin client hybrid authentication flow
2017-06-12 11:14:20 +01:00
David Britch
7ee48876a7 LoginViewModel now stores the correct access token as an application setting. 2017-06-12 11:00:43 +01:00
David Britch
99bb40261d LoginViewModel now stores the correct access token as an application setting. 2017-06-12 11:00:43 +01:00
David Britch
a93cf0105c Updated Xamarin client to use the hybrid authentication flow. 2017-06-12 10:16:07 +01:00