39 Commits

Author SHA1 Message Date
PLAINCONCEPTS\lruiz
8d14869ca0 Fix bug #259 2017-08-23 11:06:50 +02:00
PLAINCONCEPTS\lruiz
a6acdabf85 Fix bug #283 2017-08-22 20:03:48 +02:00
PLAINCONCEPTS\lruiz
737bddadc2 Fix issue #259 2017-08-22 18:03:12 +02:00
Ramón Tomás
485505a7be Adapt changed Basket.Api url to Mvc and SPA apps 2017-07-12 12:43:15 +02:00
Ramón Tomás
84a2d500a7 Added alert when error ocurrs listing catalog products, orders and campaigns in SPA app 2017-07-11 13:48:07 +02:00
Christian Arenas
06cbab4731 Merge branch 'feature/marketing-details-azure-function' into dev
# Conflicts:
#	docker-compose.vs.debug.yml
#	docker-compose.vs.release.yml
#	eShopOnContainers-ServicesAndWebApps.sln
#	src/Services/Location/Locations.API/Startup.cs
#	src/Services/Marketing/Marketing.API/Controllers/CampaignsController.cs
#	src/Services/Marketing/Marketing.API/Marketing.API.csproj
#	src/Services/Marketing/Marketing.API/Startup.cs
#	src/Web/WebMVC/appsettings.json
#	src/Web/WebSPA/AppSettings.cs
#	test/Services/FunctionalTests/Services/Marketing/MarketingScenarios.cs
2017-07-07 11:56:57 +02:00
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
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
b28c650e06 Remove userId setting from xamarin app and remove userId parameter from GetCampaignsByUserId in Campaign API 2017-06-26 18:29:51 +02:00
Shaun Walker
a6cef8009c replace main banner in SPA app 2017-06-23 12:04:40 -07:00
Shaun Walker
632c023a3f strip quotes, fix image transparency, format price and amount 2017-06-22 17:26:57 -07:00
Shaun Walker
445101b376 data and UI customization enhancements 2017-06-20 12:54:32 -07:00
Ramón Tomás
847f145bc2 Update spa marketing campaign view 2017-06-19 10:21:29 +02:00
Ramón Tomás
9fee40e358 Created marketing campaigns view details 2017-06-19 09:46:48 +02:00
Ramón Tomás
249c7a5105 Display marketing campaign details SPA 2017-06-19 09:46:19 +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
8c2af8c048 Clean Basket event is launched once basket is converted to order and before starting creating order.
Change grace period time  to 1 minute
Remove unecessary clean basket methods on client
2017-05-24 16:09:03 +02:00
Ramón Tomás
afc247da67 Change SPA app to call basket for order checkout 2017-05-16 09:23:35 +02:00
Christian Arenas
9ae4d93a54 Add Order Description field 2017-05-11 16:04:35 +02:00
Ramón Tomás
fa048c22c1 Merge from Dev 2017-05-04 11:57:49 +02:00
RamonTC
9c6b54a7fc Merge pull request #167 from andrelmp/dev
Upgrade to angular-cli and Angular 4
2017-04-25 10:29:31 +02:00
Ramón Tomás
6c6532c0f4 Merge from Dev 2017-04-21 15:46:15 +02:00
Eduard Tomas
101fc58418 Solves error building SPA on linux host due to case error 2017-04-19 15:45:32 +02:00
André Passos
676ba796ae
Changes to make SPA compatible with angular-cli AOT
Signed-off-by: André Passos <andre-ap2@hotmail.com>
2017-04-17 10:00:51 -03:00
André Passos
fe1216d5d8
fix controller routes
Signed-off-by: André Passos <andre-ap2@hotmail.com>
2017-04-17 09:11:43 -03:00
Andre Passos
db1fa9fd5c update to angular-cli and angular 4 2017-04-13 13:06:22 -03:00
Charles Lowell
1eae6a9ea2 Merge branch 'master' 2017-04-11 12:20:39 -07:00
Cesar De la Torre
3ef6846fe0 Minor change in label 2017-04-08 12:06:51 -07:00
Cesar De la Torre
345e275a0e Minor change in label 2017-04-08 12:05:25 -07:00
Ramón Tomás
00f7226f30 Rename OrderingIntegrationEvent service methods
Remove clean basket instruction from SPA client
2017-04-05 11:07:26 +02:00
dsanz
53bdf6de04 Add error message in WebSPA when create order returns exception 2017-03-28 11:03:59 +02:00
Ramón Tomás
782a2e40d5 Fix issue no cardtpyeid submitted in SPA
Fix issue multiple order creation. Now the create order button is disabled until the request is processed
2017-03-27 17:21:50 +02:00
Cesar De la Torre
313976da80 Fixed bugs related to the Product Update and PriceChangedIntegrationEvent. It was updating only when the price was changing... additional refactoring performed, too. 2017-03-25 14:47:23 -07:00
Ramón Tomás
6f8512f434 Increased circuit breaker threshold
Fix lifescope issue with IHttpClient
Adapt circuit breaker to trigger its counter for no success http response
2017-03-22 12:24:55 +01:00
Charles Lowell
ed87b6b845 Use <base> to enable relative paths in WebSPA 2017-03-21 13:57:42 -07:00
DESKTOP-V1VLQ15\dsanz
0c4f8a49dd WebMVC and WebSPA show now a changed price in the basket list 2017-03-15 14:57:08 +01:00
etomas
12ecc78a18 Solves #112 2017-03-10 21:51:48 +01:00
etomas
f9b15481d1 Idempotent updates based on requestid 2017-03-03 12:03:31 +01:00
etomas
dc8ae55c7a Renaming WebSpa
Fixes #51
2017-02-22 09:16:31 +01:00