diff --git a/git_info.json b/git_info.json index caa7c53..a1d256f 100644 --- a/git_info.json +++ b/git_info.json @@ -1 +1 @@ -{"branch_name":"dev","last_commit_date":"2022-02-03T07:51:08.000Z","last_commit_author":"rakesh","last_commit_hash":"d5f0c96eb734aa04ebb26447e10f4b25a34a6f05"} \ No newline at end of file +{"branch_name":"dev","last_commit_date":"2022-02-05T10:19:06.000Z","last_commit_author":"anjujangid","last_commit_hash":"74d3d0c4faa541b6dfdfa28e187885658ae11448"} \ No newline at end of file diff --git a/src/routes/retailer/boxed_order_history.vue b/src/routes/retailer/boxed_order_history.vue index c02ca7c..084ddea 100644 --- a/src/routes/retailer/boxed_order_history.vue +++ b/src/routes/retailer/boxed_order_history.vue @@ -145,6 +145,9 @@ + diff --git a/src/services/product.service.js b/src/services/product.service.js index 894cee3..f9dcb47 100644 --- a/src/services/product.service.js +++ b/src/services/product.service.js @@ -676,7 +676,7 @@ export const doFetchProductTags = wrapRequest((sku) => { }) -export const doFetchOrderHistory = wrapRequest(() => { +export const doFetchOrderHistory = wrapRequest((customerId) => { const requestOptions = { method: 'GET', headers: { @@ -684,6 +684,5 @@ export const doFetchOrderHistory = wrapRequest(() => { 'Access-Control-Allow-Origin': '*', } }; - 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 + return fetch(`${vueAppMagenotApiUrl}/rest/crn_retailer/V1/crorders?searchCriteria[filter_groups][0][filters][0][field]=customer_id&searchCriteria[filter_groups][0][filters][0][value]=${customerId}&searchCriteria[filter_groups][0][filters][0][condition_type]=eq&searchCriteria[pageSize]=100&searchCriteria[currentPage]=1&searchCriteria[sortOrders][0][field]=created_at&searchCriteria[sortOrders][0][direction]=DESC`, requestOptions) +}); diff --git a/src/stores/retailer/orderlist.js b/src/stores/retailer/orderlist.js index c3981b1..b0cc172 100644 --- a/src/stores/retailer/orderlist.js +++ b/src/stores/retailer/orderlist.js @@ -1,3 +1,5 @@ + +/* eslint-disable no-alert, no-console , no-debugger */ import { doFetchOrderHistory } from '@/services/product.service'; import { getField, updateField } from 'vuex-map-fields'; import humps from 'lodash-humps'; @@ -7,7 +9,7 @@ export const orderlist = { state: { inProgress: true, OrderHistory: {}, - + // orderNumber: "", // createdDate: "", // toDate: "", @@ -28,17 +30,17 @@ export const orderlist = { // } , setOrderHistory(state, orderhistorydata) { state.OrderHistory = orderhistorydata - } + }, }, actions: { searchOrder: ({ commit }, orderItem) => { commit('SetOrderlist', orderItem); }, - fetchOrderList: async ({ commit }) => { + fetchOrderList: async ({ commit },customerId) => { try { commit('inProgress', true); - let OrderHistory = await doFetchOrderHistory(); + let OrderHistory = await doFetchOrderHistory(customerId); if (OrderHistory) { commit('inProgress', false); commit('setOrderHistory', humps(OrderHistory)); @@ -48,7 +50,9 @@ export const orderlist = { commit('inProgress', false); throw error } - } + }, + + } }