sidharth.kothari
/
retailer-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

This commit is contained in:
rakesh 2022-02-16 14:05:12 +05:30
parent 8100579231
commit f387e947a5
4 changed files with 24 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git_info.json
View File

@ -1 +1 @@
{"branch_name":"dev","last_commit_date":"2022-02-16T06:31:09.000Z","last_commit_author":"anjujangid","last_commit_hash":"19d58cff7a503d3ffb27b38c96bb5bd7ab0385d5"}
{"branch_name":"dev","last_commit_date":"2022-02-16T07:16:41.000Z","last_commit_author":"anjujangid","last_commit_hash":"81005792316765eb143e3e6adafeabc98eb93f1f"}

5
src/routes/retailer/boxed_order_history.vue
View File

@ -71,6 +71,7 @@
readonly
v-bind="attrs"
v-on="on"
:disabled="!createdFrom"
></v-text-field>
</template>
<v-date-picker
@ -151,9 +152,7 @@
<template v-slot:item.order="{ item }">
<span>{{ item.incrementId }}</span>
</template>
<template v-slot:item.retailername="{ item }">
<span>{{ userInfo.firstname + "" + userInfo.lastname }}</span>
</template>
<template v-slot:item.salesrepname="{ item }">
<span>{{ userInfo.firstname + "" + userInfo.lastname }}</span>
</template>

22
src/services/product.service.js
View File

@ -677,31 +677,21 @@ export const doFetchProductTags = wrapRequest((sku) => {
export const doFetchOrderHistory = wrapRequest((obj) => {
debugger
let query = "";
query = `searchCriteria[pageSize]=5000&searchCriteria[currentPage]=1&searchCriteria[sortOrders][0][field]=created_at&searchCriteria[sortOrders][0][direction]=DESC&searchCriteria[filter_groups][0][filters][0][field]=customer_id&searchCriteria[filter_groups][0][filters][0][value]=${obj.customerId}&searchCriteria[filter_groups][0][filters][0][condition_type]=eq`;
if(obj.incrementId){
query = `searchCriteria[filter_groups][1][filters][0][field]=increment_id&searchCriteria[filter_groups][1][filters][0][value]=${obj.incrementId}&searchCriteria[filter_groups][1][filters][0][condition_type]=eq`
query = query +`&searchCriteria[filter_groups][1][filters][0][field]=increment_id&searchCriteria[filter_groups][1][filters][0][value]=${obj.incrementId}&searchCriteria[filter_groups][1][filters][0][condition_type]=eq`
}
if(obj.createdAt){
query = `searchCriteria[filter_groups][2][filters][0][field]=created_at&
searchCriteria[filter_groups][2][filters][0][value]=${obj.createdAt}&searchCriteria[filter_groups][2][filters][0][condition_type]=gteq`
query = query+`&searchCriteria[filter_groups][2][filters][0][value]=${obj.createdAt}&searchCriteria[filter_groups][2][filters][0][condition_type]=gteq&searchCriteria[filter_groups][2][filters][0][field]=created_at`
}
if(obj.createdTo ){
query = `searchCriteria[filter_groups][3][filters][0][field]=created_at&searchCriteria[filter_groups][3][filters][0][value]=${obj.createdTo}&searchCriteria[filter_groups][3][filters][0][condition_type]=lteq`
}
if(obj.createdAt && obj.createdTo ){
query = `searchCriteria[filter_groups][2][filters][0][value]=${obj.createdAt}&searchCriteria[filter_groups][2][filters][0][condition_type]=gteq&searchCriteria[filter_groups][3][filters][0][field]=created_at&searchCriteria[filter_groups][3][filters][0][value]=${obj.createdTo}&searchCriteria[filter_groups][3][filters][0][condition_type]=lteq&searchCriteria[filter_groups][2][filters][0][field]=created_at`
}
if(obj.createdAt && obj.createdTo && obj.incrementId ){
query = `searchCriteria[filter_groups][1][filters][0][field]=increment_id&searchCriteria[filter_groups][1][filters][0][value]=${obj.incrementId}&searchCriteria[filter_groups][1][filters][0][condition_type]=eq
&searchCriteria[filter_groups][2][filters][0][value]=${obj.createdAt}&searchCriteria[filter_groups][2][filters][0][condition_type]=gteq&searchCriteria[filter_groups][3][filters][0][field]=created_at&searchCriteria[filter_groups][3][filters][0][value]=${obj.createdTo}&searchCriteria[filter_groups][3][filters][0][condition_type]=lteq&searchCriteria[filter_groups][2][filters][0][field]=created_at`
}
if(obj.incrementId && obj.createdAt ){
query = `searchCriteria[filter_groups][1][filters][0][field]=increment_id&searchCriteria[filter_groups][1][filters][0][value]=${obj.incrementId}&searchCriteria[filter_groups][1][filters][0][condition_type]=eq&searchCriteria[filter_groups][2][filters][0][field]=created_at&
searchCriteria[filter_groups][2][filters][0][value]=${obj.createdAt}&searchCriteria[filter_groups][2][filters][0][condition_type]=gteq`
query = query+`&searchCriteria[filter_groups][3][filters][0][field]=created_at&searchCriteria[filter_groups][3][filters][0][value]=${obj.createdTo}&searchCriteria[filter_groups][3][filters][0][condition_type]=lteq`
}
const requestOptions = {
method: 'GET',
headers: {

41
src/stores/retailer/orderlist.js
View File

@ -30,41 +30,23 @@ export const orderlist = {
state.OrderHistory = orderhistorydata
},
},
/* eslint-disable no-alert, no-console , no-debugger */
actions: {
fetchOrderList: async ({ state, commit }, customerId) => {
debugger
try {
//let newDateTo='';
if(state.createdTo)
{
debugger
}
commit('inProgress', true);
let createdTo = state.createdTo
if(createdTo){
console.log(createdTo,"full value")
// let date = new Date(Date.now()+(3600 * 1000 *24));
// console.log(date)
// let To= date.getFullYear()+"-"+date.getDay()+"-"+date.getDate()
// console.log(To+"too")
// console.log(state.createdTo)
// // console.log( createdTo.setDate(createdTo.getDate() + 1),"full value")
// // console.log( state.createdTo,"full value")
// let createdTo = new Date();
// createdTo.setDate(createdTo.getDate() + 1);
// console.log( createdTo.setDate(createdTo.getDate() + 1),"full value")
}
else{
console.log(createdTo,"null value")
// let createdTo = new Date();
// console.log(createdTo.setDate(createdTo.getDate() + 1)," null value")
// createdTo.setDate(createdTo.getDate() + 1);
}
let OrderHistory = await doFetchOrderHistory({
customerId: customerId,
incrementId: state.orderNumber,
@ -77,6 +59,7 @@ export const orderlist = {
}
}
catch (error) {
commit('setOrderHistory', []);
commit('inProgress', false);
throw error
}