changes in BoxedOrderHistoryPage's path and added fetch api
This commit is contained in:
parent
ce10ce4d3c
commit
d1c2677c55
|
@ -1 +1 @@
|
||||||
{"branch_name":"dev","last_commit_date":"2022-01-28T12:02:56.000Z","last_commit_author":"anju j","last_commit_hash":"defccce1421feadd75a814a2194b959e791fc6ee"}
|
{"branch_name":"dev","last_commit_date":"2022-01-31T07:37:00.000Z","last_commit_author":"anju j","last_commit_hash":"ce10ce4d3c26014ce905b601c5f23e67e91887b5"}
|
|
@ -16,7 +16,7 @@ export default [
|
||||||
children: [
|
children: [
|
||||||
|
|
||||||
{
|
{
|
||||||
path: 'order',
|
path: '/b2b/:id',
|
||||||
name: 'BoxedOrderHistoryPage',
|
name: 'BoxedOrderHistoryPage',
|
||||||
component: () => import(/* webpackChunkName: "meModule" */ '@/routes/retailer/boxed_order_history.vue'),
|
component: () => import(/* webpackChunkName: "meModule" */ '@/routes/retailer/boxed_order_history.vue'),
|
||||||
meta: {
|
meta: {
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
<v-hover v-slot:default="{ hover }">
|
<v-hover v-slot:default="{ hover }">
|
||||||
<router-link
|
<router-link
|
||||||
class="text-decoration-none"
|
class="text-decoration-none"
|
||||||
:to="{ name: 'BoxedOrderHistoryPage' }"
|
:to="{ name: 'BoxedOrderHistoryPage' ,params: {id:'order'}}"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
:class="hover ? 'primary--text' : 'black--text'"
|
:class="hover ? 'primary--text' : 'black--text'"
|
||||||
|
|
|
@ -138,6 +138,7 @@
|
||||||
</v-col>
|
</v-col>
|
||||||
</v-row>
|
</v-row>
|
||||||
</v-form>
|
</v-form>
|
||||||
|
<p>{{OrderHistory}}</p>
|
||||||
|
|
||||||
</v-container>
|
</v-container>
|
||||||
</template>
|
</template>
|
||||||
|
@ -205,6 +206,8 @@ export default {
|
||||||
// // "createdDate",
|
// // "createdDate",
|
||||||
// // "toDate",
|
// // "toDate",
|
||||||
// "purchaseOrderNumber"
|
// "purchaseOrderNumber"
|
||||||
|
"OrderHistory"
|
||||||
|
|
||||||
])
|
])
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -224,9 +227,11 @@ export default {
|
||||||
},
|
},
|
||||||
searchOrder(value){
|
searchOrder(value){
|
||||||
value.preventDeafult();
|
value.preventDeafult();
|
||||||
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
created(){
|
||||||
|
this.$store.dispatch("orderlist/fetchOrderList")
|
||||||
|
}
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
<style src="./boxed_order_history.scss" lang="scss" scoped/>
|
<style src="./boxed_order_history.scss" lang="scss" scoped/>
|
||||||
|
|
|
@ -39,7 +39,7 @@ const resetAuthUser = function() {
|
||||||
const authHeader = function() {
|
const authHeader = function() {
|
||||||
const userAuth = getAuthUser();
|
const userAuth = getAuthUser();
|
||||||
if (userAuth) {
|
if (userAuth) {
|
||||||
return { 'Authorization': 'Bearer ' + userAuth };
|
return { 'Authorization': userAuth };
|
||||||
} else {
|
} else {
|
||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
//import { authHeader } from './auth';
|
import { authHeader } from './auth';
|
||||||
import { wrapRequest } from './nav';
|
import { wrapRequest } from './nav';
|
||||||
/* eslint-disable no-alert, no-console , no-debugger */
|
/* 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', },
|
headers: { 'Content-type': 'application/json', 'Accept': 'application/vnd.pgrst.object+json', },
|
||||||
};
|
};
|
||||||
return fetch(`${imageLibApiUrl}/product?sku=eq.${sku}&select=tags,sku`, requestOptions);
|
return fetch(`${imageLibApiUrl}/product?sku=eq.${sku}&select=tags,sku`, requestOptions);
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
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)
|
||||||
|
|
||||||
|
});
|
|
@ -1,13 +1,16 @@
|
||||||
|
import { doFetchOrderHistory } from '@/services/product.service';
|
||||||
import { getField, updateField } from 'vuex-map-fields';
|
import { getField, updateField } from 'vuex-map-fields';
|
||||||
|
import humps from 'lodash-humps';
|
||||||
|
|
||||||
export const orderlist = {
|
export const orderlist = {
|
||||||
namespaced: true,
|
namespaced: true,
|
||||||
state: {
|
state: {
|
||||||
inprogress: false,
|
fetchInProgress: false,
|
||||||
orderNumber: "",
|
orderNumber: "",
|
||||||
createdDate: "",
|
createdDate: "",
|
||||||
toDate: "",
|
toDate: "",
|
||||||
purchaseOrderNumber: ""
|
purchaseOrderNumber: "",
|
||||||
|
OrderHistory :{},
|
||||||
|
|
||||||
},
|
},
|
||||||
getters: {
|
getters: {
|
||||||
|
@ -16,18 +19,31 @@ export const orderlist = {
|
||||||
},
|
},
|
||||||
mutations: {
|
mutations: {
|
||||||
updateField,
|
updateField,
|
||||||
inProgress(state, yesOrNo) {
|
fetchInProgress(state, yesOrNo) {
|
||||||
state.inProgress = yesOrNo
|
state.fetchInProgress = yesOrNo
|
||||||
},
|
},
|
||||||
// SetOrderlist(state, orderItem) {
|
// SetOrderlist(state, orderItem) {
|
||||||
// // console.log(state.orderNumber=orderItem)
|
// // console.log(state.orderNumber=orderItem)
|
||||||
// }
|
// } ,
|
||||||
|
setorderHistory(state,orderhistorydata) {
|
||||||
|
state.OrderHistory=orderhistorydata
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
actions: {
|
actions: {
|
||||||
searchOrder:({ commit }, orderItem) => {
|
searchOrder: ({ commit }, orderItem) => {
|
||||||
commit('SetOrderlist', orderItem);
|
commit('SetOrderlist', orderItem);
|
||||||
}
|
},
|
||||||
|
fetchOrderList: async ({ commit }) => {
|
||||||
|
let OrderHistory = await doFetchOrderHistory();
|
||||||
|
if ( OrderHistory) {
|
||||||
|
commit('setorderHistory', humps( OrderHistory));
|
||||||
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue