From fb207eef2c9af8d3f3974bfb7e5180796a95bc5e Mon Sep 17 00:00:00 2001
From: anju j <jangidanjali50@gmail.com>
Date: Mon, 31 Jan 2022 13:06:22 +0530
Subject: [PATCH] added Order Information in myorders

---
 git_info.json                                 |  2 +-
 .../retailer/my-orders/ViewOrderTabs.vue      | 21 +++++++++++--------
 src/routes/retailer/boxed_order_history.vue   | 19 ++++++++++-------
 src/routes/retailer/my_orders.vue             |  1 +
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/git_info.json b/git_info.json
index 614380f..921358c 100644
--- a/git_info.json
+++ b/git_info.json
@@ -1 +1 @@
-{"branch_name":"dev","last_commit_date":"2022-01-28T11:20:43.000Z","last_commit_author":"anju j","last_commit_hash":"5c28f2497848f94839ca29240c484e0a47d538ca"}
\ No newline at end of file
+{"branch_name":"dev","last_commit_date":"2022-01-28T12:02:56.000Z","last_commit_author":"anju j","last_commit_hash":"defccce1421feadd75a814a2194b959e791fc6ee"}
\ No newline at end of file
diff --git a/src/components/retailer/my-orders/ViewOrderTabs.vue b/src/components/retailer/my-orders/ViewOrderTabs.vue
index 8b0c1b4..7030549 100644
--- a/src/components/retailer/my-orders/ViewOrderTabs.vue
+++ b/src/components/retailer/my-orders/ViewOrderTabs.vue
@@ -373,16 +373,16 @@
             </v-card>
       </v-tab-item>-->
     </v-tabs>
-    <v-col id="showInPrint">
+    <v-col >
       <h1 class="order-information-heading">Order Information</h1>
       <v-divider></v-divider>
       <v-row>
-        <v-col cols="12" v-if="viewOrderItem.extensionAttributes&&viewOrderItem.extensionAttributes.shippingAssignments">
+        <v-col cols="12" md="6" v-if="viewOrderItem.extensionAttributes&&viewOrderItem.extensionAttributes.shippingAssignments">
           <div
             v-for="(details,index) in viewOrderItem.extensionAttributes.shippingAssignments"
             v-bind:key="index"
           >
-            <p class="order-information-subheading">Shipping Address</p>
+            <p class="order-information-subheading"><b>Shipping Address</b></p>
 
             <p class="order-information-details" v-if="details.shipping&&details.shipping.address">
               {{details.shipping.address.firstname}}
@@ -403,13 +403,13 @@
             >T:{{details.shipping.address.telephone}}</p>
           </div>
         </v-col>
-        <v-col cols="12">
-          <p class="order-information-subheading">Shipping Method</p>
+        <v-col cols="12" md="6">
+          <p class="order-information-subheading"><b>Shipping Method</b></p>
           <p class="order-information-details">{{viewOrderItem.shippingDescription}}</p>
         </v-col>
 
-        <v-col cols="12" v-if="viewOrderItem.billingAddress">
-          <p class="order-information-subheading">Billing Address</p>
+        <v-col cols="12" md="6" v-if="viewOrderItem.billingAddress">
+          <p class="order-information-subheading"><b>Billing Address</b></p>
           <p class="order-information-details">
             {{viewOrderItem.billingAddress.firstname}}
             <span class="px-1"></span>
@@ -430,11 +430,13 @@
             class="order-information-details text-decoration-underline"
           >T:{{viewOrderItem.billingAddress.telephone}}</p>
         </v-col>
-        <v-col cols="12" v-if="viewOrderItem.payment">
-          <p class="order-information-subheading">Payment Method</p>
+        <v-col cols="12" md="6" v-if="viewOrderItem.payment">
+          <p class="order-information-subheading"><b>Payment Method</b></p>
           <p class="order-information-details">{{viewOrderItem.payment.additionalInformation[0]}}</p>
+          <v-divider></v-divider>
           <v-row>
             <v-col>
+              
               <p class="order-information-details-creditcard">
                 <b>Credit Card Type</b>
               </p>
@@ -445,6 +447,7 @@
               >{{viewOrderItem.payment.additionalInformation[8]}}</p>
             </v-col>
           </v-row>
+          <v-divider></v-divider>
           <v-row>
             <v-col>
               <p class="order-information-details-creditcard">
diff --git a/src/routes/retailer/boxed_order_history.vue b/src/routes/retailer/boxed_order_history.vue
index d61c451..e1da992 100644
--- a/src/routes/retailer/boxed_order_history.vue
+++ b/src/routes/retailer/boxed_order_history.vue
@@ -1,6 +1,6 @@
 <template>
   <v-container>
-    <div>
+    
       <div class="h3 my-5 py-5 body-font1">Order Management</div>
       <v-form>
         <v-row
@@ -138,18 +138,21 @@
           </v-col>
         </v-row>
       </v-form>
-    </div>
+ 
   </v-container>
-</template>
+</template>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             
 <script>
 import {createHelpers} from "vuex-map-fields";
 const {mapFields} = createHelpers({
   getterType:"orderlist/getField",
-  mutationType: "orderlist/updateField"
+  mutationType: "orderlist/updateField"                                                                                                                                                     
 })
 
 export default {
   name: "BoxedOrderHistoryPage",
+  components:{
+   
+  },
   data: () => ({
     date1: "",
     date2: "",
@@ -198,10 +201,10 @@ export default {
       return this.formatDate(this.date2);
     },
     ...mapFields([
-      "orderNumber",
-      // "createdDate",
-      // "toDate",
-      "purchaseOrderNumber"
+      // "orderNumber",
+      // // "createdDate",
+      // // "toDate",
+      // "purchaseOrderNumber"
     ])
   },
 
diff --git a/src/routes/retailer/my_orders.vue b/src/routes/retailer/my_orders.vue
index 6892c7c..5f8ea0f 100644
--- a/src/routes/retailer/my_orders.vue
+++ b/src/routes/retailer/my_orders.vue
@@ -99,6 +99,7 @@
           </v-hover>
         </v-col>
         <ViewOrderTabs :viewOrderItem="orderProduct" :productInvoice="productInvoice"></ViewOrderTabs>
+        
       </v-col>
     </v-row>
   </v-container>