Order ID: {{ order.orderedlist_id }}
Pickup on {{ getFormattedDate(order.pickup_time, 'DD MMMM YYYY @ hh:mm A') }}
+
+
+ Mall: {{ order.mall_name }}
+
+
+ Outlet: {{ order.outlet_name }}
+
+
@@ -22,7 +30,7 @@
-
+
diff --git a/src/app/orders/orders.component.scss b/src/app/orders/orders.component.scss
index 550e2dc..7785cd0 100644
--- a/src/app/orders/orders.component.scss
+++ b/src/app/orders/orders.component.scss
@@ -27,11 +27,15 @@ ul.orders {
.order {
list-style: none;
- padding: 20px 5%;
color: var(--brand-dark-grey);
line-height: 1.6;
border-bottom: 1px solid #efefef;
+ .order-mall {
+ margin-bottom: 20px;
+ padding: 10px 5%;
+ }
+
&.expand {
.heading {
diff --git a/src/app/orders/orders.component.ts b/src/app/orders/orders.component.ts
index 4f0079f..292482f 100644
--- a/src/app/orders/orders.component.ts
+++ b/src/app/orders/orders.component.ts
@@ -17,9 +17,8 @@ export class OrdersComponent implements OnInit {
) { }
ngOnInit() {
- this.orderService.getOrders().then((resp)=> {
- this.userOrders = resp;
- console.log(this.userOrders)
+ this.orderService.getOrders().then((resp: any)=> {
+ this.userOrders = resp.reverse();
}, (err) => {
console.log(err);
});
diff --git a/src/app/services/order.service.ts b/src/app/services/order.service.ts
index 85c05e0..02933a4 100644
--- a/src/app/services/order.service.ts
+++ b/src/app/services/order.service.ts
@@ -32,6 +32,6 @@ export class OrderService {
})
};
- return await this.http.get(URL + '/api/maioraservice/mall/getallOrders', httpOptions).toPromise();
+ return await this.http.get(URL + '/api/maioraservice/orders/getallOrders', httpOptions).toPromise();
}
}