Skip to content

Commit 8d14869

Browse files
author
PLAINCONCEPTS\lruiz
committed
1 parent a6acdab commit 8d14869

2 files changed

Lines changed: 26 additions & 14 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div class="alert alert-warning" role="alert">&nbsp;{{errorMessage}}</div>
88
</div>
99
</div>
10-
10+
1111
<article class="esh-basket-titles row">
1212
<section class="esh-basket-title col-xs-3">Product</section>
1313
<section class="esh-basket-title col-xs-3 hidden-lg-down"></section>
@@ -25,7 +25,8 @@
2525
<section class="esh-basket-item esh-basket-item--middle col-xs-3">{{item.productName}}</section>
2626
<section class="esh-basket-item esh-basket-item--middle col-xs-2">$ {{item.unitPrice | number:'.2-2'}}</section>
2727
<section class="esh-basket-item esh-basket-item--middle col-xs-2">
28-
<input class="esh-basket-input"
28+
<input id="quantity"
29+
class="esh-basket-input"
2930
type="number"
3031
min="1"
3132
[(ngModel)]="item.quantity"

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

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { Component, OnInit } from '@angular/core';
2-
import { Router } from '@angular/router';
1+
import { Component, OnInit } from '@angular/core';
2+
import { Router } from '@angular/router';
33

44
import 'rxjs/Rx';
55
import { Observable } from 'rxjs/Observable';
66
import 'rxjs/add/observable/throw';
77

8-
import { BasketService } from './basket.service';
9-
import { IBasket } from '../shared/models/basket.model';
10-
import { IBasketItem } from '../shared/models/basketItem.model';
8+
import { BasketService } from './basket.service';
9+
import { IBasket } from '../shared/models/basket.model';
10+
import { IBasketItem } from '../shared/models/basketItem.model';
1111
import { BasketWrapperService } from '../shared/services/basket.wrapper.service';
1212

1313
@Component({
@@ -34,16 +34,27 @@ export class BasketComponent implements OnInit {
3434
this.service.setBasket(this.basket).subscribe(x => console.log('basket updated: ' + x));
3535
}
3636

37-
update(event: any) {
38-
this.service.setBasket(this.basket).catch((errMessage) => {
39-
this.errorMessages = errMessage.messages;
40-
return Observable.throw(errMessage);
41-
}).subscribe(x => console.log('basket updated: ' + x));
37+
update(event: any): Observable<boolean> {
38+
let setBasketObservable = this.service.setBasket(this.basket);
39+
setBasketObservable
40+
.subscribe(
41+
x => {
42+
this.errorMessages = [];
43+
console.log('basket updated: ' + x);
44+
},
45+
errMessage => this.errorMessages = errMessage.messages);
46+
return setBasketObservable;
4247
}
4348

4449
checkOut(event: any) {
45-
this.basketwrapper.basket = this.basket;
46-
this.router.navigate(['order']);
50+
this.update(event)
51+
.subscribe(
52+
x => {
53+
this.errorMessages = [];
54+
this.basketwrapper.basket = this.basket;
55+
this.router.navigate(['order'],
56+
errMessage => this.errorMessages = errMessage.messages);
57+
});
4758
}
4859

4960
private calculateTotalPrice() {

0 commit comments

Comments
 (0)