From 1faab8eae6afb5209b33e70dbea18b06051d5a61 Mon Sep 17 00:00:00 2001
From: kj1352 <nikhilkj24@gmail.com>
Date: Mon, 17 Feb 2020 19:22:13 +0530
Subject: [PATCH] Create order API connection tested and completed

---
 src/app/cart/cart.page.html                   |  4 ++--
 src/app/cart/cart.page.ts                     | 17 ++++++++++-------
 src/app/outlet-details/outlet-details.page.ts |  4 ++--
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/app/cart/cart.page.html b/src/app/cart/cart.page.html
index 1bff000..893ee7b 100644
--- a/src/app/cart/cart.page.html
+++ b/src/app/cart/cart.page.html
@@ -41,9 +41,9 @@
                 <li>
                     <label> Quantity </label>
                     <div class="quantity-scale-holder">
-                        <button (click)="decrementCartCount(item.outlet_id, item.item_id, item.mall_id)"> <ion-icon name="remove"></ion-icon> </button>
+                        <button (click)="decrementCartCount(item.outlet_id, item.menuitem_id, item.mall_id)"> <ion-icon name="remove"></ion-icon> </button>
                         <div class="quantity"> {{ item.quantity }} </div>
-                        <button (click)="incrementCartCount(item.outlet_id, item.item_id, item.mall_id)"> <ion-icon name="add"></ion-icon> </button>
+                        <button (click)="incrementCartCount(item.outlet_id, item.menuitem_id, item.mall_id)"> <ion-icon name="add"></ion-icon> </button>
                     </div>
                 </li>
                 <li>
diff --git a/src/app/cart/cart.page.ts b/src/app/cart/cart.page.ts
index 154fe7f..282ff98 100644
--- a/src/app/cart/cart.page.ts
+++ b/src/app/cart/cart.page.ts
@@ -9,7 +9,7 @@ export type ICart = {
     orderedlist: Array<{
         mall_id: number,
         outlet_id: number,
-        item_id: number,
+        menuitem_id: number,
         quantity: number,
         pickup_time: string,
         take_away: boolean,
@@ -124,7 +124,7 @@ export class CartPage implements OnInit {
 
         if (outlet) {
             return outletitem = outlet.menuitems.find((menu) => {
-                return menu.menuitem_id === item.item_id;
+                return menu.menuitem_id === item.menuitem_id;
             });
         }
     }
@@ -152,7 +152,7 @@ export class CartPage implements OnInit {
 		let item: any;
 
 		item = this.userCart.orderedlist.find((order) => {
-			return order.item_id === itemId && order.outlet_id === outletId && order.mall_id === tempMallId;
+			return order.menuitem_id === itemId && order.outlet_id === outletId && order.mall_id === tempMallId;
 		});
 
 		return item? item.quantity: 0;
@@ -163,7 +163,7 @@ export class CartPage implements OnInit {
 
 		if (outletitem) {
 			let i = this.userCart.orderedlist.findIndex((order) => {
-				return order.item_id === itemId && order.outlet_id === outletId && order.mall_id === tempMallId;
+				return order.menuitem_id === itemId && order.outlet_id === outletId && order.mall_id === tempMallId;
 			});
 
 			this.userCart.orderedlist[i].quantity += 1;
@@ -176,7 +176,7 @@ export class CartPage implements OnInit {
 
 		if (outletitem) {
 			let i = this.userCart.orderedlist.findIndex((order) => {
-				return order.item_id === itemId && order.outlet_id === outletId && order.mall_id === tempMallId;
+				return order.menuitem_id === itemId && order.outlet_id === outletId && order.mall_id === tempMallId;
 			});
 
 			if (this.userCart.orderedlist[i].quantity > 1) {
@@ -215,7 +215,7 @@ export class CartPage implements OnInit {
 			this.userCart.orderedlist.push({
 	            mall_id: tempMallId,
 	            outlet_id: outletId,
-	            item_id: itemId,
+	            menuitem_id: itemId,
 	            quantity: 1,
 	            pickup_time: moment().add(moment.duration(outletitem.wait_duration).asMinutes(), 'minutes').format(),
 	            take_away: true,
@@ -237,7 +237,10 @@ export class CartPage implements OnInit {
 	}
 
 	placeOrder() {
-		this.orderService.createOrder(this.userCart).then((resp) => {
+		this.orderService.createOrder({
+			soft_delete: false,
+			orderedlist: this.userCart.orderedlist
+		}).then((resp) => {
 			console.log(resp);
 		}, (err) => {
 			console.log(err);
diff --git a/src/app/outlet-details/outlet-details.page.ts b/src/app/outlet-details/outlet-details.page.ts
index 3af950f..7819a9b 100644
--- a/src/app/outlet-details/outlet-details.page.ts
+++ b/src/app/outlet-details/outlet-details.page.ts
@@ -58,7 +58,7 @@ export class OutletDetailsPage implements OnInit {
         this.userCart.orderedlist.push({
             mall_id: this.mallId,
             outlet_id: this.outlet_details.outlet_id,
-            item_id: item.menuitem_id,
+            menuitem_id: item.menuitem_id,
             quantity: 1,
             pickup_time: moment().add(moment.duration(item.wait_duration).asMinutes(), 'minutes').format(),
             take_away: true,
@@ -70,7 +70,7 @@ export class OutletDetailsPage implements OnInit {
 
     isItemPresentInCart(itemId: number) {
         let item = this.userCart.orderedlist.find((order) => {
-            return order.item_id === itemId;
+            return order.menuitem_id === itemId;
         });
 
         return item ? true : false;