Fix bug #259
This commit is contained in:
parent
a6acdabf85
commit
8d14869ca0
@ -7,7 +7,7 @@
|
|||||||
<div class="alert alert-warning" role="alert"> {{errorMessage}}</div>
|
<div class="alert alert-warning" role="alert"> {{errorMessage}}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<article class="esh-basket-titles row">
|
<article class="esh-basket-titles row">
|
||||||
<section class="esh-basket-title col-xs-3">Product</section>
|
<section class="esh-basket-title col-xs-3">Product</section>
|
||||||
<section class="esh-basket-title col-xs-3 hidden-lg-down"></section>
|
<section class="esh-basket-title col-xs-3 hidden-lg-down"></section>
|
||||||
@ -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-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">$ {{item.unitPrice | number:'.2-2'}}</section>
|
||||||
<section class="esh-basket-item esh-basket-item--middle col-xs-2">
|
<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"
|
type="number"
|
||||||
min="1"
|
min="1"
|
||||||
[(ngModel)]="item.quantity"
|
[(ngModel)]="item.quantity"
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
import { Component, OnInit } from '@angular/core';
|
import { Component, OnInit } from '@angular/core';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
|
|
||||||
import 'rxjs/Rx';
|
import 'rxjs/Rx';
|
||||||
import { Observable } from 'rxjs/Observable';
|
import { Observable } from 'rxjs/Observable';
|
||||||
import 'rxjs/add/observable/throw';
|
import 'rxjs/add/observable/throw';
|
||||||
|
|
||||||
import { BasketService } from './basket.service';
|
import { BasketService } from './basket.service';
|
||||||
import { IBasket } from '../shared/models/basket.model';
|
import { IBasket } from '../shared/models/basket.model';
|
||||||
import { IBasketItem } from '../shared/models/basketItem.model';
|
import { IBasketItem } from '../shared/models/basketItem.model';
|
||||||
import { BasketWrapperService } from '../shared/services/basket.wrapper.service';
|
import { BasketWrapperService } from '../shared/services/basket.wrapper.service';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@ -34,16 +34,27 @@ export class BasketComponent implements OnInit {
|
|||||||
this.service.setBasket(this.basket).subscribe(x => console.log('basket updated: ' + x));
|
this.service.setBasket(this.basket).subscribe(x => console.log('basket updated: ' + x));
|
||||||
}
|
}
|
||||||
|
|
||||||
update(event: any) {
|
update(event: any): Observable<boolean> {
|
||||||
this.service.setBasket(this.basket).catch((errMessage) => {
|
let setBasketObservable = this.service.setBasket(this.basket);
|
||||||
this.errorMessages = errMessage.messages;
|
setBasketObservable
|
||||||
return Observable.throw(errMessage);
|
.subscribe(
|
||||||
}).subscribe(x => console.log('basket updated: ' + x));
|
x => {
|
||||||
|
this.errorMessages = [];
|
||||||
|
console.log('basket updated: ' + x);
|
||||||
|
},
|
||||||
|
errMessage => this.errorMessages = errMessage.messages);
|
||||||
|
return setBasketObservable;
|
||||||
}
|
}
|
||||||
|
|
||||||
checkOut(event: any) {
|
checkOut(event: any) {
|
||||||
this.basketwrapper.basket = this.basket;
|
this.update(event)
|
||||||
this.router.navigate(['order']);
|
.subscribe(
|
||||||
|
x => {
|
||||||
|
this.errorMessages = [];
|
||||||
|
this.basketwrapper.basket = this.basket;
|
||||||
|
this.router.navigate(['order'],
|
||||||
|
errMessage => this.errorMessages = errMessage.messages);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private calculateTotalPrice() {
|
private calculateTotalPrice() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user