From 58afd10a22ecd03e39fe8562de836e440170e9c3 Mon Sep 17 00:00:00 2001
From: kj1352 <nikhilkj24@gmail.com>
Date: Tue, 25 Feb 2020 20:29:50 +0530
Subject: [PATCH] Orders list correction complete

---
 src/app/cart/cart.page.html          |  4 ++--
 src/app/cart/cart.page.ts            | 13 +++++++++----
 src/app/orders/orders.component.html | 14 +++++++++++---
 src/app/orders/orders.component.scss |  6 +++++-
 src/app/orders/orders.component.ts   |  5 ++---
 src/app/services/order.service.ts    |  2 +-
 6 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/app/cart/cart.page.html b/src/app/cart/cart.page.html
index 893ee7b..4056187 100644
--- a/src/app/cart/cart.page.html
+++ b/src/app/cart/cart.page.html
@@ -28,11 +28,11 @@
                 </li>
                 <li>
                     <label> Pickup Time </label>
-    				<ion-item class="time-holder" (click)="hideMenuButton()">
+    				<ion-item class="time-holder">
     					{{ getFormatterDateTime(item.pickup_time, 'hh:mm a') }}
     					<a> Schedule time </a>
     					<ion-datetime displayFormat="hh:mm a" [(ngModel)]="item.pickup_time"
-    					placeholder="Select Date" (ionChange)="showMenuButton()"></ion-datetime>
+    					placeholder="Select Date"></ion-datetime>
     				</ion-item>
                 </li>
             </ul>
diff --git a/src/app/cart/cart.page.ts b/src/app/cart/cart.page.ts
index d8f4bea..35f141b 100644
--- a/src/app/cart/cart.page.ts
+++ b/src/app/cart/cart.page.ts
@@ -44,7 +44,13 @@ export class CartPage implements OnInit {
 		private router: Router
     ) { }
 
-    ngOnInit() {}
+    ngOnInit() {
+		this.hideMenuButton();
+	}
+
+	ngOnDestroy() {
+		this.showMenuButton();
+	}
 
     ionViewDidEnter() {
 		this.fetchCartItems();
@@ -82,9 +88,7 @@ export class CartPage implements OnInit {
     }
 
     showMenuButton() {
-        setTimeout(() => {
-            document.querySelector('.menu-icon-holder').classList.remove('hide');
-        }, 1000);
+        document.querySelector('.menu-icon-holder').classList.remove('hide');
     }
 
     checkIfTimeFeasible(oldTime, newTime) {
@@ -138,6 +142,7 @@ export class CartPage implements OnInit {
     }
 
     back() {
+		this.showMenuButton();
 		this.storeData();
         this.location.back();
     }
diff --git a/src/app/orders/orders.component.html b/src/app/orders/orders.component.html
index ca43c2f..ed15219 100644
--- a/src/app/orders/orders.component.html
+++ b/src/app/orders/orders.component.html
@@ -5,16 +5,24 @@
 
 <ul class="orders">
 	<li *ngFor="let userOrder of userOrders" class="order" (click)="selected_order = order">
-		<div *ngFor="let order of userOrder.orderedlist">
+		<div class="order-mall" *ngFor="let order of userOrder.orderedlist">
 			<div class="heading"> Order ID: {{ order.orderedlist_id }} </div>
 			<div class="time-details">
 				Pickup on {{ getFormattedDate(order.pickup_time, 'DD MMMM YYYY @ hh:mm A') }}
 			</div>
+			<div class="time-details">
+				<p>
+					<strong>Mall:</strong> {{ order.mall_name }}
+				</p>
+				<p>
+					<strong>Outlet:</strong> {{ order.outlet_name }}
+				</p>
+			</div>
 
 			<ul class="ordered-items">
 				<li *ngFor="let item of order.menuitems">
 					<div class="order-item-details">
-						<label class="name"> {{ item.menu_item_name }} </label>
+						<label class="name"> {{ item.menu_item_name }} x {{ item.item_quantity }} </label>
 					</div>
 				</li>
 			</ul>
@@ -22,7 +30,7 @@
 				<li>
 					<div class="order-item-details">
 						<label class="name"> <strong> TOTAL </strong> </label>
-						<label class="time"> <strong> &#8377;  </strong> </label>
+						<label class="time"> <strong> &#8377; {{ order.total_price }} </strong> </label>
 					</div>
 				</li>
 			</ul>
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();
 	}
 }