From af9190d76d986badc019e5bedcd7b10b06446e7b Mon Sep 17 00:00:00 2001
From: kimsanghoon1 <sanghoon01@uengine.org>
Date: Fri, 22 Nov 2019 16:21:27 +0900
Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EB=AC=B8=EC=83=81=ED=83=9C,=20?=
 =?UTF-8?q?=EB=B0=B0=EC=86=A1=EC=83=81=ED=83=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/order/OrderList.vue    | 2 +-
 src/components/order/OrderListNew.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/order/OrderList.vue b/src/components/order/OrderList.vue
index 8143883..f08a38c 100644
--- a/src/components/order/OrderList.vue
+++ b/src/components/order/OrderList.vue
@@ -50,7 +50,7 @@
             <template v-slot:item.orderAction="{ item }">
                 <v-btn
                         :color="'yellow'"
-                        v-if="!item.deliveryCancelled"
+                        v-if="!(item.orderState == 'OrderCancelled') && !item.deliveryCancelled"
                        @click="orderCancelled(item)"
                 > 주문취소
                 </v-btn>
diff --git a/src/components/order/OrderListNew.vue b/src/components/order/OrderListNew.vue
index 73ac553..433331c 100644
--- a/src/components/order/OrderListNew.vue
+++ b/src/components/order/OrderListNew.vue
@@ -47,7 +47,7 @@
             <template v-slot:item.orderAction="{ item }">
                 <v-btn
                        :color="'yellow'"
-                       v-if="!(item.deli == 'DeliveryCancelled') "
+                       v-if="!(item.state == 'OrderCancelled') && !(item.deli == 'DeliveryCancelled') "
                        @click="orderCancelled(item)"
                 > 주문취소
                 </v-btn>