Merge branch 'dev' into netcore2

docker-compose.yml

@@ -108,6 +108,7 @@ services:
       - "6379:6379"
       
   rabbitmq:
-    image: rabbitmq
+    image: rabbitmq:3-management
     ports:
+      - "15672:15672"
       - "5672:5672"

src/Web/WebSPA/Client/modules/basket/basket.component.html

@@ -25,7 +25,8 @@
                 <section class="esh-basket-item esh-basket-item--middle col-xs-3">{{item.productName}}</section>
                 <section class="esh-basket-item esh-basket-item--middle col-xs-2">$ {{item.unitPrice | number:'.2-2'}}</section>
                 <section class="esh-basket-item esh-basket-item--middle col-xs-2">
-                    <input class="esh-basket-input"
+                    <input id="quantity"
+                           class="esh-basket-input"
                            type="number"
                            min="1"
                            [(ngModel)]="item.quantity"

src/Web/WebSPA/Client/modules/basket/basket.component.ts

@@ -34,16 +34,27 @@ export class BasketComponent implements OnInit {
         this.service.setBasket(this.basket).subscribe(x => 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<boolean> {
+        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.update(event)
+            .subscribe(
+                x => {
+                    this.errorMessages = [];
                     this.basketwrapper.basket = this.basket;
-        this.router.navigate(['order']);
+                    this.router.navigate(['order'],
+                errMessage => this.errorMessages = errMessage.messages);
+        });
     }
 
     private calculateTotalPrice() {

src/Web/WebSPA/Client/modules/shared/services/basket.wrapper.service.ts

@@ -5,6 +5,7 @@ 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 { 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
             };