From d016c5b2976b89f840efe168379e06bbd4f804ef Mon Sep 17 00:00:00 2001
From: kimsanghoon1 <sanghoon01@uengine.org>
Date: Fri, 22 Nov 2019 15:59:01 +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    | 13 +++++++++++++
 src/components/order/OrderListNew.vue | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/components/order/OrderList.vue b/src/components/order/OrderList.vue
index 77e9fe3..63f8cd8 100644
--- a/src/components/order/OrderList.vue
+++ b/src/components/order/OrderList.vue
@@ -36,6 +36,18 @@
                 </v-chip>
             </template>
             <template v-slot:item.orderStatus="{ item }">
+                <v-chip :color="'green'"
+                        dark
+                        v-if="item.orderState == 'OrderPlaced'"
+                > 주문 완료
+                </v-chip>
+                <v-chip :color="'red'"
+                        dark
+                        v-else
+                > 주문 취소
+                </v-chip>
+            </template>
+            <template v-slot:item.orderAction="{ item }">
                 <v-btn
                         :color="'yellow'"
                         v-if="!item.deliveryCancelled"
@@ -90,6 +102,7 @@
                 {text: '결제금액', value: 'payment', sortable: false, align: 'center'},
                 {text: '배송상태', value: 'action', sortable: false, align: 'center'},
                 {text: '주문상태', value: 'orderStatus', sortable: false, align: 'center'},
+                {text: '주문취소', value: 'orderAction', sortable: false, align: 'center'},
             ],
             orderList: [],
             surveyList: [],
diff --git a/src/components/order/OrderListNew.vue b/src/components/order/OrderListNew.vue
index 2434dcd..6c453b3 100644
--- a/src/components/order/OrderListNew.vue
+++ b/src/components/order/OrderListNew.vue
@@ -33,6 +33,18 @@
                 </v-chip>
             </template>
             <template v-slot:item.orderStatus="{ item }">
+                <v-chip v-if="item.state == 'OrderPlaced'"
+                        color="green"
+                        dark
+                > {{ item.state }}
+                </v-chip>
+                <v-chip v-else
+                        color="red"
+                        dark
+                > {{ item.state }}
+                </v-chip>
+            </template>
+            <template v-slot:item.orderAction="{ item }">
                 <v-btn
                        :color="'yellow'"
                        v-if="item.deli && !(item.deli == 'DeliveryCancelled') "
@@ -68,7 +80,7 @@
                 {text: '결제금액', value: 'price', sortable: false, align: 'center'},
                 {text: '배송상태', value: 'delivery', sortable: false, align: 'center'},
                 {text: '주문상태', value: 'orderStatus', sortable: false, align: 'center'},
-                // {text: '결제시각', value: 'timestamp', align: 'center'},
+                {text: '주문취소', value: 'orderAction', sortable: false, align: 'center'},
             ],
             orderList: [],
             surveyList: [],