diff --git a/src/app/orders/orders.component.html b/src/app/orders/orders.component.html index e71decf..8073654 100644 --- a/src/app/orders/orders.component.html +++ b/src/app/orders/orders.component.html @@ -33,6 +33,15 @@ + + +
diff --git a/src/app/orders/orders.component.ts b/src/app/orders/orders.component.ts index c123cca..244ac10 100644 --- a/src/app/orders/orders.component.ts +++ b/src/app/orders/orders.component.ts @@ -3,6 +3,7 @@ import { OrderService } from '../services/order.service'; import * as moment from 'moment'; import { ICart } from '../cart/cart.page'; import { Router } from '@angular/router'; +import { ToastService } from '../services/toast.service'; @Component({ selector: 'app-orders', @@ -18,10 +19,12 @@ export class OrdersComponent implements OnInit { userCart: ICart = { orderedlist: [] }; + allOrderStatus: any = []; constructor( private orderService: OrderService, - private router: Router + private router: Router, + private toastService: ToastService ) { } ngOnInit() { @@ -30,9 +33,29 @@ export class OrdersComponent implements OnInit { this.orderService.getOrders(this.userInfo.id).then((resp: any)=> { this.userOrders = resp.reverse(); }, (err) => { - console.log(err); - }); - } + console.log(err); + this.toastService.presentToast("Failed to get orders"); + }); + + this.orderService.getAllOrderStatus().then((data) => { + console.log(data); + this.allOrderStatus = data; + }, (err) => { + console.log(err); + }) + } + + getOrderStatusName(id: number) { + try { + if (id) { + return this.allOrderStatus.find(status => status.orderstatus_id === id).orderStatus; + } else { + return '-'; + } + } catch { + return '-'; + } + } getFormattedDate(date, format) { return moment(date).format(format); diff --git a/src/app/services/order.service.ts b/src/app/services/order.service.ts index 99260e6..7404d89 100644 --- a/src/app/services/order.service.ts +++ b/src/app/services/order.service.ts @@ -18,6 +18,12 @@ export class OrderService { user_id: userId }; + cart.orderstatus = { + orderstatus_id: 6 + }; + + cart.soft_delete = false; + const httpOptions = { headers: new HttpHeaders({ 'Access-Control-Allow-Origin': '*', @@ -75,5 +81,17 @@ export class OrderService { }; return await this.http.get(URL + '/Payment/v1/Order/order_id/' + orderId, httpOptions).toPromise(); - } + } + + async getAllOrderStatus() { + const httpOptions = { + headers: new HttpHeaders({ + 'Access-Control-Allow-Origin': '*', + 'Content-Type': 'application/json', + 'Authorization': 'Bearer ' + localStorage.access_Token + }) + }; + + return await this.http.get(URL + '/api/maioraservice/orders/getallOrderStatus', httpOptions).toPromise(); + } }