From a6acdabf850dd0aa198ac63f1245fd80f8d53b0b Mon Sep 17 00:00:00 2001 From: "PLAINCONCEPTS\\lruiz" Date: Tue, 22 Aug 2017 20:03:48 +0200 Subject: [PATCH 1/3] Fix bug #283 --- .../Client/modules/shared/services/basket.wrapper.service.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Web/WebSPA/Client/modules/shared/services/basket.wrapper.service.ts b/src/Web/WebSPA/Client/modules/shared/services/basket.wrapper.service.ts index 3017a30f3..447fd9441 100644 --- a/src/Web/WebSPA/Client/modules/shared/services/basket.wrapper.service.ts +++ b/src/Web/WebSPA/Client/modules/shared/services/basket.wrapper.service.ts @@ -4,7 +4,8 @@ import { Subject } from 'rxjs/Subject'; import { ICatalogItem } from '../models/catalogItem.model'; import { IBasketItem } from '../models/basketItem.model'; import { IBasket } from '../models/basket.model'; -import { SecurityService } from '../services/security.service'; +import { SecurityService } from '../services/security.service'; +import { Guid } from '../../../guid'; @Injectable() export class BasketWrapperService { @@ -27,7 +28,7 @@ export class BasketWrapperService { productName: item.name, quantity: 1, unitPrice: item.price, - id: '', + id: Guid.newGuid(), oldUnitPrice: 0 }; From 8d14869ca0479907db89d11446a3f8030f379164 Mon Sep 17 00:00:00 2001 From: "PLAINCONCEPTS\\lruiz" Date: Wed, 23 Aug 2017 11:06:50 +0200 Subject: [PATCH 2/3] Fix bug #259 --- .../modules/basket/basket.component.html | 5 +-- .../Client/modules/basket/basket.component.ts | 35 ++++++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/Web/WebSPA/Client/modules/basket/basket.component.html b/src/Web/WebSPA/Client/modules/basket/basket.component.html index e700f622d..52aab2fe3 100644 --- a/src/Web/WebSPA/Client/modules/basket/basket.component.html +++ b/src/Web/WebSPA/Client/modules/basket/basket.component.html @@ -7,7 +7,7 @@ - +
Product
@@ -25,7 +25,8 @@
{{item.productName}}
$ {{item.unitPrice | number:'.2-2'}}
- console.log('basket updated: ' + x)); } - update(event: any) { - this.service.setBasket(this.basket).catch((errMessage) => { - this.errorMessages = errMessage.messages; - return Observable.throw(errMessage); - }).subscribe(x => console.log('basket updated: ' + x)); + update(event: any): Observable { + let setBasketObservable = this.service.setBasket(this.basket); + setBasketObservable + .subscribe( + x => { + this.errorMessages = []; + console.log('basket updated: ' + x); + }, + errMessage => this.errorMessages = errMessage.messages); + return setBasketObservable; } checkOut(event: any) { - this.basketwrapper.basket = this.basket; - this.router.navigate(['order']); + this.update(event) + .subscribe( + x => { + this.errorMessages = []; + this.basketwrapper.basket = this.basket; + this.router.navigate(['order'], + errMessage => this.errorMessages = errMessage.messages); + }); } private calculateTotalPrice() { From 5e1d3437591b78a821c6f4dfa52bd18dc2e90240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ram=C3=B3n=20Tom=C3=A1s?= Date: Wed, 23 Aug 2017 14:42:01 +0200 Subject: [PATCH 3/3] Added enhancement rabbitmq management console #246 --- docker-compose.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 253674b57..86931228e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -115,8 +115,9 @@ services: image: redis ports: - "6379:6379" - + rabbitmq: - image: rabbitmq + image: rabbitmq:3-management ports: + - "15672:15672" - "5672:5672" \ No newline at end of file