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

263 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
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
Shaun Walker
632c023a3f strip quotes, fix image transparency, format price and amount 2017-06-22 17:26:57 -07:00
Shaun Walker
9229a8d0fd support for additional CatalogItem properties 2017-06-21 15:27:12 -07:00
Eduard Tomas
4069a3a048 Catalog.API nuget updated 2017-06-21 19:36:33 +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
Shaun Walker
445101b376 data and UI customization enhancements 2017-06-20 12:54:32 -07: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
4be61abdde Merge new creation ordering workflow 2017-06-12 13:52:23 +02:00
Ramón Tomás
d657428e78 Merge from Dev 2017-06-02 13:22:40 +02:00
Eduard Tomas
b42fe3527a Resilience enhancements. 
MVC app now waits other containers
 2017-06-01 14:32:22 +02:00
Christian Arenas
39e69ee4e0 Merge branch 'servicebus' into dev 
# Conflicts:
#	docker-compose.override.yml
#	src/Services/Catalog/Catalog.API/CatalogSettings.cs
#	src/Services/Catalog/Catalog.API/settings.json
 2017-05-30 18:47:34 +02:00
Christian Arenas
18167186c9 Apply EventBusConnectionChanges 2017-05-30 17:59:57 +02:00
Christian Arenas
83ae0d48fc remove ServiceBusConnectionString variable from appsettings.json 2017-05-30 17:56:36 +02:00
Christian Arenas
7694602be2 Rename property PictureFile to PictureFileName in Migration Designer 2017-05-30 17:53:15 +02:00
Christian Arenas
1a385a2179 Add AzureStorageEnabled environment variable to get the origin of the product image from PicBaseUrl environment variable 2017-05-30 17:16:17 +02:00
Christian Arenas
45ed8a60ad Add PictureFileName field for saving the name of the file. PictureUri will be the url of the image (api or azure storage) 2017-05-30 17:14:28 +02:00
Ramón Tomás
9d5cde2057 #2412-Create Location Microservice 2017-05-30 15:01:58 +02:00
Christian Arenas
41a6814293 Add new connection string 2017-05-29 10:12:07 +02:00
Cesar De la Torre
4410e455e0 Updates to target .NET Core 1.1.2 - Version changes at every .csproj file, dockerfile and the docker-compose.ci.build.yml file for building from the CLI. 2017-05-25 17:01:10 -07:00
Christian Arenas
ed0e548e2d minor naming 2017-05-26 01:35:44 +02:00
Christian Arenas
e454940801 environment variable renaming 2017-05-24 19:23:14 +02:00
Christian Arenas
9a100c9a27 Remove retry policy from DefaultServiceBusPersisterConnection parameter 2017-05-24 18:59:29 +02:00
Christian Arenas
04b35492c3 Add SubscriptionClientName EnvironmentVariable 2017-05-24 16:25:41 +02:00
Christian Arenas
3acd556c5c - Declare new ServiceBus instance with "AzureServiceBus" boolean condition DI 
- Add ServiceBusConnection and AzureServiceBus variables in settings
- Add EventBusServiceBus dependencies
 2017-05-24 15:33:05 +02:00
igorsych
4790981e80 swagger/ui to swagger url fix 2017-05-23 16:39:22 +03:00
igorsych
9e75504690 Newtonsoft.Json and MediatR with fixes of all based on MediatR classes 
also from csproj files excluded direct specification of runtime to make compile happy if on a system we have higher version.
 2017-05-19 18:03:05 +03:00
igorsych
c1320f4445 swagger update https://github.com/domaindrivendev/Swashbuckle.AspNetCore 2017-05-19 08:11:32 +03:00
igorsych
c5778a04f3 .NET core packages update 2017-05-19 08:11:18 +03:00
Ramón Tomás
87e57b9a44 Merge from Dev 2017-05-18 15:39:31 +02:00
Christian Arenas
45fff656d0 - Remove unused IntegrationCommands folders 
- minor name changes
 2017-05-18 12:03:17 +02:00
Christian Arenas
dc7b1098dd - Change Integration Command to Integration Events 
- Rename OrderStockNotConfirmedIntegrationEvent to OrderStockRejectedIntegrationEvent
 2017-05-18 11:43:19 +02:00
Christian Arenas
0ee173cd34 naming changes 2017-05-17 11:57:02 +02:00
Christian Arenas
f3b6444e63 minor changes 2017-05-17 00:40:40 +02:00
Christian Arenas
66ad6b756c Add stockunit to products in CatalogContextSeed 2017-05-16 15:07:30 +02:00
Christian Arenas
6bff2c6313 Change property name 2017-05-16 15:07:08 +02:00
Christian Arenas
db41124d78 Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign 
# Conflicts:
#	src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
 2017-05-16 11:11:09 +02:00
Christian Arenas
0ac19b8b37 Fix bad namespace from CommandHandler 2017-05-15 19:18:00 +02:00
Christian Arenas
830d0597d7 Add OrderStockConfirmed and ProductPriceChanged IntegrationEvent 2017-05-15 19:05:47 +02:00
Eduard Tomas
7fc63fe196 Messagebus dispatch messages in its own scope 2017-05-11 13:44:38 +02:00
Christian Arenas
9a6ad2cc85 Continue implementing OrderStockConfirmed events 2017-05-10 19:48:36 +02:00
Christian Arenas
61cc09edbd Add ConfirmOrderStockIntegrationEvent implementation 2017-05-09 18:35:59 +02:00
Christian Arenas
e0d67bf884 Add catalog product migration 2017-05-09 15:29:00 +02:00
Christian Arenas
ac53528f89 Modify CatalogItem for stocking 2017-05-09 14:20:17 +02:00