From d1c2677c55582cb137b7c803f816d73db39449ba Mon Sep 17 00:00:00 2001
From: anju j <jangidanjali50@gmail.com>
Date: Wed, 2 Feb 2022 14:03:21 +0530
Subject: [PATCH] changes in BoxedOrderHistoryPage's path and added fetch api

---
 git_info.json                               |  2 +-
 src/multipages/retailer.routes.js           |  2 +-
 src/routes/retailer/account_dashboard.vue   |  2 +-
 src/routes/retailer/boxed_order_history.vue |  7 ++++-
 src/services/auth.js                        |  2 +-
 src/services/product.service.js             | 18 ++++++++++--
 src/stores/retailer/orderlist.js            | 32 +++++++++++++++------
 7 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/git_info.json b/git_info.json
index 921358c..b849151 100644
--- a/git_info.json
+++ b/git_info.json
@@ -1 +1 @@
-{"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
+{"branch_name":"dev","last_commit_date":"2022-01-31T07:37:00.000Z","last_commit_author":"anju j","last_commit_hash":"ce10ce4d3c26014ce905b601c5f23e67e91887b5"}
\ No newline at end of file
diff --git a/src/multipages/retailer.routes.js b/src/multipages/retailer.routes.js
index 21ccef0..b0ceb67 100644
--- a/src/multipages/retailer.routes.js
+++ b/src/multipages/retailer.routes.js
@@ -16,7 +16,7 @@ export default [
         children: [
             
             {
-                path: 'order',
+                path: '/b2b/:id',
                 name: 'BoxedOrderHistoryPage',
                 component: () => import(/* webpackChunkName: "meModule" */ '@/routes/retailer/boxed_order_history.vue'),
                 meta: {
diff --git a/src/routes/retailer/account_dashboard.vue b/src/routes/retailer/account_dashboard.vue
index 516a2b7..966f1fb 100644
--- a/src/routes/retailer/account_dashboard.vue
+++ b/src/routes/retailer/account_dashboard.vue
@@ -34,7 +34,7 @@
             <v-hover v-slot:default="{ hover }">
               <router-link
                 class="text-decoration-none"
-                :to="{ name: 'BoxedOrderHistoryPage' }"
+                :to="{ name: 'BoxedOrderHistoryPage' ,params: {id:'order'}}"
               >
                 <div
                   :class="hover ? 'primary--text' : 'black--text'"
diff --git a/src/routes/retailer/boxed_order_history.vue b/src/routes/retailer/boxed_order_history.vue
index e1da992..7355b2c 100644
--- a/src/routes/retailer/boxed_order_history.vue
+++ b/src/routes/retailer/boxed_order_history.vue
@@ -138,6 +138,7 @@
           </v-col>
         </v-row>
       </v-form>
+      <p>{{OrderHistory}}</p>
  
   </v-container>
 </template>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             
@@ -205,6 +206,8 @@ export default {
       // // "createdDate",
       // // "toDate",
       // "purchaseOrderNumber"
+      "OrderHistory"
+
     ])
   },
 
@@ -224,9 +227,11 @@ export default {
     },
     searchOrder(value){
       value.preventDeafult();
-
     }
   },
+ created(){
+   this.$store.dispatch("orderlist/fetchOrderList")
+  }
 };
 </script>
 <style src="./boxed_order_history.scss" lang="scss" scoped/>
diff --git a/src/services/auth.js b/src/services/auth.js
index 7fadd2e..5eff390 100644
--- a/src/services/auth.js
+++ b/src/services/auth.js
@@ -39,7 +39,7 @@ const resetAuthUser = function() {
 const authHeader = function() {
     const userAuth = getAuthUser();
     if (userAuth) {
-        return { 'Authorization': 'Bearer ' + userAuth };
+        return { 'Authorization':  userAuth };
     } else {
         return {};
     }
diff --git a/src/services/product.service.js b/src/services/product.service.js
index 070d13d..1d3d6b1 100644
--- a/src/services/product.service.js
+++ b/src/services/product.service.js
@@ -1,4 +1,4 @@
-//import { authHeader } from './auth';
+import { authHeader } from './auth';
 import { wrapRequest } from './nav';
 /* eslint-disable no-alert, no-console ,  no-debugger */
 
@@ -673,4 +673,18 @@ export const doFetchProductTags = wrapRequest((sku) => {
         headers: { 'Content-type': 'application/json', 'Accept': 'application/vnd.pgrst.object+json', },
     };
     return fetch(`${imageLibApiUrl}/product?sku=eq.${sku}&select=tags,sku`, requestOptions);
-})
\ No newline at end of file
+})
+
+
+export const doFetchOrderHistory = wrapRequest(() => {
+    const requestOptions = {
+        method: 'GET',
+        headers: {
+            'Content-type': 'application/json',
+            'Access-Control-Allow-Origin': '*',
+            ...authHeader()
+        }
+    };
+    return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crorders?searchCriteria[filter_groups][0][filters][0][field]=customer_id&searchCriteria[filter_groups][0][filters][0][value]=124160&searchCriteria[filter_groups][0][filters][0][condition_type]=eq&searchCriteria[filter_groups][1][filters][0][field]=status&searchCriteria[filter_groups][1][filters][0][value]=complete&searchCriteria[filter_groups][1][filters][0][condition_type]=eq&searchCriteria[pageSize]=10&searchCriteria[currentPage]=1&searchCriteria[sortOrders][0][field]=created_at&searchCriteria[sortOrders][0][direction]=DESC`, requestOptions)
+
+});
\ No newline at end of file
diff --git a/src/stores/retailer/orderlist.js b/src/stores/retailer/orderlist.js
index 9ad5d4d..f07c9c7 100644
--- a/src/stores/retailer/orderlist.js
+++ b/src/stores/retailer/orderlist.js
@@ -1,13 +1,16 @@
+import { doFetchOrderHistory } from '@/services/product.service';
 import { getField, updateField } from 'vuex-map-fields';
+import humps from 'lodash-humps';
 
 export const orderlist = {
     namespaced: true,
     state: {
-        inprogress: false,
+        fetchInProgress: false,
         orderNumber: "",
         createdDate: "",
         toDate: "",
-        purchaseOrderNumber: ""
+        purchaseOrderNumber: "",
+        OrderHistory :{},
 
     },
     getters: {
@@ -16,18 +19,31 @@ export const orderlist = {
     },
     mutations: {
         updateField,
-        inProgress(state, yesOrNo) {
-            state.inProgress = yesOrNo
+        fetchInProgress(state, yesOrNo) {
+            state.fetchInProgress = yesOrNo
         },
         // SetOrderlist(state, orderItem) {
         // // console.log(state.orderNumber=orderItem)
-        // }   
+        // }  ,
+        setorderHistory(state,orderhistorydata) {
+            state.OrderHistory=orderhistorydata
+        }
     },
 
     actions: {
-        searchOrder:({ commit }, orderItem) => {
+        searchOrder: ({ commit }, orderItem) => {
             commit('SetOrderlist', orderItem);
-        }
+        },
+        fetchOrderList: async ({ commit }) => {
+            let OrderHistory = await doFetchOrderHistory();
+            if ( OrderHistory) {
+                commit('setorderHistory', humps( OrderHistory));
+            }
+        },
     }
-
 }
+    
+    
+
+    
+