Browse Source

Show order status for each order

master
kj1352 5 years ago
parent
commit
d14a71fb4c
3 changed files with 55 additions and 5 deletions
  1. +9
    -0
      src/app/orders/orders.component.html
  2. +27
    -4
      src/app/orders/orders.component.ts
  3. +19
    -1
      src/app/services/order.service.ts

+ 9
- 0
src/app/orders/orders.component.html View File

@@ -33,6 +33,15 @@
<label class="time"> <strong> &#8377; {{ order.total_price }} </strong> </label> <label class="time"> <strong> &#8377; {{ order.total_price }} </strong> </label>
</div> </div>
</li> </li>
</ul>
<ul class="ordered-items">
<li>
<div class="order-item-details">
<label class="name"> <strong> STATUS </strong> </label>
<label class="time"> <strong> {{ getOrderStatusName(userOrder.orderstatus.orderstatus_id) }} </strong> </label>
</div>
</li>
</ul> </ul>


<p class="note"> <p class="note">


+ 27
- 4
src/app/orders/orders.component.ts View File

@@ -3,6 +3,7 @@ import { OrderService } from '../services/order.service';
import * as moment from 'moment'; import * as moment from 'moment';
import { ICart } from '../cart/cart.page'; import { ICart } from '../cart/cart.page';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { ToastService } from '../services/toast.service';


@Component({ @Component({
selector: 'app-orders', selector: 'app-orders',
@@ -18,10 +19,12 @@ export class OrdersComponent implements OnInit {
userCart: ICart = { userCart: ICart = {
orderedlist: [] orderedlist: []
}; };
allOrderStatus: any = [];


constructor( constructor(
private orderService: OrderService, private orderService: OrderService,
private router: Router
private router: Router,
private toastService: ToastService
) { } ) { }


ngOnInit() { ngOnInit() {
@@ -30,9 +33,29 @@ export class OrdersComponent implements OnInit {
this.orderService.getOrders(this.userInfo.id).then((resp: any)=> { this.orderService.getOrders(this.userInfo.id).then((resp: any)=> {
this.userOrders = resp.reverse(); this.userOrders = resp.reverse();
}, (err) => { }, (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) { getFormattedDate(date, format) {
return moment(date).format(format); return moment(date).format(format);


+ 19
- 1
src/app/services/order.service.ts View File

@@ -18,6 +18,12 @@ export class OrderService {
user_id: userId user_id: userId
}; };


cart.orderstatus = {
orderstatus_id: 6
};

cart.soft_delete = false;

const httpOptions = { const httpOptions = {
headers: new HttpHeaders({ headers: new HttpHeaders({
'Access-Control-Allow-Origin': '*', '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(); 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();
}
} }

Loading…
Cancel
Save