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

created filter data for date in order page

This commit is contained in:
anjujangid 2022-02-16 11:23:00 +05:30
parent e987740c1e
commit f2f7e950c2
4 changed files with 160 additions and 104 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-14T10:30:18.000Z","last_commit_author":"anjujangid","last_commit_hash":"8c3f940308bc510defde9f95c815bd081f6b15b0"} {"branch_name":"dev","last_commit_date":"2022-02-14T11:33:50.000Z","last_commit_author":"rakesh","last_commit_hash":"e987740c1e4d0da4278211e6f4ff1e9eb2bc3d40"}

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

@ -24,25 +24,26 @@
<v-menu <v-menu
v-model="menu1" v-model="menu1"
:close-on-content-click="false" :close-on-content-click="false"
:nudge-right="40"
transition="scale-transition" transition="scale-transition"
offset-y offset-y
min-width="auto"
> >
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<v-text-field <v-text-field
v-model="createdDate" v-model="dateAtFormatted"
label="Created From" label="Created From"
persistent-hint persistent-hint
readonly
v-bind="attrs"
v-on="on"
outlined outlined
hide-details hide-details
dense dense
readonly
v-bind="attrs"
v-on="on"
></v-text-field> ></v-text-field>
</template> </template>
<v-date-picker <v-date-picker
v-model="date1" v-model="createdFrom"
no-title
@input="menu1 = false" @input="menu1 = false"
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
@ -54,25 +55,26 @@
<v-menu <v-menu
v-model="menu2" v-model="menu2"
:close-on-content-click="false" :close-on-content-click="false"
:nudge-right="40"
transition="scale-transition" transition="scale-transition"
offset-y offset-y
min-width="auto"
> >
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, attrs }">
<v-text-field <v-text-field
v-model="toDate" v-model=" dateToFormatted"
label="To" label="To"
persistent-hint persistent-hint
readonly
v-bind="attrs"
v-on="on"
outlined outlined
hide-details hide-details
dense dense
readonly
v-bind="attrs"
v-on="on"
></v-text-field> ></v-text-field>
</template> </template>
<v-date-picker <v-date-picker
v-model="date2" v-model="createdTo"
no-title
@input="menu2 = false" @input="menu2 = false"
></v-date-picker> ></v-date-picker>
</v-menu> </v-menu>
@ -114,7 +116,6 @@
<v-col cols="12" sm="12" md="6" lg="3"> <v-col cols="12" sm="12" md="6" lg="3">
<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: 'CartProducts' }" :to="{ name: 'CartProducts' }"
> >
@ -129,59 +130,68 @@
</v-hover> </v-hover>
</v-col> </v-col>
<v-col cols="12" sm="12" md="12" lg="12"> <v-col cols="12" sm="12" md="12" lg="12">
<v-row class="mt-12" justify="center" v-if="inProgress"> <v-row class="mt-12" justify="center" v-if="inProgress">
<v-progress-circular :size="60" color="primary" indeterminate></v-progress-circular> <v-progress-circular
</v-row> :size="60"
<v-row no-gutters v-else> color="primary"
<v-col> indeterminate
></v-progress-circular>
</v-row>
<v-row no-gutters v-else>
<v-col>
<v-data-table <v-data-table
:headers="headers" :headers="headers"
:items="OrderHistory" :items="OrderHistory"
:items-per-page="10" :items-per-page="10"
class="elevation-1 pt-5" class="elevation-1 pt-5"
> >
<template v-slot:item.date="{ item }"> <template v-slot:item.date="{ item }">
<span>{{ isoStringToNormalDate(item.updatedAt) }}</span> <span>{{ isoStringToNormalDate(item.updatedAt) }}</span>
</template> </template>
<template v-slot:item.order="{ item }"> <template v-slot:item.order="{ item }">
<span>{{ item.incrementId }}</span> <span>{{ item.incrementId }}</span>
</template> </template>
<template v-slot:item.retailername="{ item }"> <template v-slot:item.retailername="{ item }">
<span>{{ userInfo.firstname + '' + userInfo.lastname }}</span> <span>{{ userInfo.firstname + "" + userInfo.lastname }}</span>
</template> </template>
<template v-slot:item.salesrepname="{ item }"> <template v-slot:item.salesrepname="{ item }">
<span>{{ userInfo.firstname + '' + userInfo.lastname }}</span> <span>{{ userInfo.firstname + "" + userInfo.lastname }}</span>
</template> </template>
<template v-slot:item.status="{ item }"> <template v-slot:item.status="{ item }">
<span>{{ item.status }}</span> <span>{{ item.status }}</span>
</template> </template>
<template v-slot:item.POnumber="{ item }"> <template v-slot:item.POnumber="{ item }">
<span>{{ item.payment.poNumber }}</span> <span>{{ item.payment.poNumber }}</span>
</template> </template>
<template v-slot:item.action="{ item }"> <template v-slot:item.action="{ item }">
<v-hover v-slot:default="{ hover }"> <v-hover v-slot:default="{ hover }">
<router-link <router-link
:class=" :class="
hover ? 'content-link-hover-color' : 'secondary--text' hover ? 'content-link-hover-color' : 'secondary--text'
" "
to to
@click.native="viewMyOrder(item.items[0].orderId)" @click.native="viewMyOrder(item.items[0].orderId)"
class="ls-n009 text-decoration-none body myorders-route-link" class="
>View Order</router-link ls-n009
> text-decoration-none
</v-hover> body
</template> myorders-route-link
</v-data-table> "
</v-col> >View Order</router-link
</v-row> >
</v-hover>
</template>
</v-data-table>
</v-col>
</v-row>
</v-col> </v-col>
</v-row> </v-row>
</v-form> </v-form>
</v-container> </v-container>
</template> </template>
<script> <script>
/* eslint-disable no-alert, no-console , no-debugger */ /* eslint-disable no-alert, no-console , no-debugger */
import { createHelpers } from "vuex-map-fields"; import { createHelpers } from "vuex-map-fields";
const { mapFields } = createHelpers({ const { mapFields } = createHelpers({
getterType: "orderlist/getField", getterType: "orderlist/getField",
@ -192,10 +202,10 @@ export default {
name: "BoxedOrderHistoryPage", name: "BoxedOrderHistoryPage",
components: {}, components: {},
data: () => ({ data: () => ({
date1: "",
date2: "",
menu1: false, menu1: false,
menu2: false, menu2: false,
dateAtFormatted:"",
dateToFormatted:"",
headers: [ headers: [
{ text: "Date", value: "date" }, { text: "Date", value: "date" },
{ text: "Order #", value: "order" }, { text: "Order #", value: "order" },
@ -204,16 +214,9 @@ export default {
{ text: "Status", value: "status" }, { text: "Status", value: "status" },
{ text: "PO Number", value: "POnumber" }, { text: "PO Number", value: "POnumber" },
{ text: "Action", value: "action" }, { text: "Action", value: "action" },
], ],
}), }),
computed: { computed: {
createdDate() {
return this.formatDate(this.date1);
},
toDate() {
return this.formatDate(this.date2);
},
OrderHistory() { OrderHistory() {
return this.$store.state.orderlist.OrderHistory.items; return this.$store.state.orderlist.OrderHistory.items;
}, },
@ -221,11 +224,10 @@ export default {
return this.$store.state.accountOne.one; return this.$store.state.accountOne.one;
}, },
inProgress() { inProgress() {
return this.$store.state.orderlist.inProgress; return this.$store.state.orderlist.inProgress;
}, },
...mapFields(["orderNumber"]), ...mapFields(["orderNumber","createdFrom","createdTo"]),
}, },
methods: { methods: {
@ -250,33 +252,32 @@ export default {
let tmp = new Date(newDateTime).toLocaleDateString().split("/"); let tmp = new Date(newDateTime).toLocaleDateString().split("/");
return (date = tmp[1] + "/" + tmp[0] + "/" + tmp[2]); return (date = tmp[1] + "/" + tmp[0] + "/" + tmp[2]);
}, },
searchOrder() { // searchOrder() {
this.$store.dispatch("orderlist/fetchSearchOrder"); // this.$store.dispatch("orderlist/fetchSearchOrder");
}, // },
reset(){ reset() {
this.$store.dispatch("orderlist/fetchReset",this.userInfo.id); this.$store.dispatch("orderlist/fetchReset", this.userInfo.id);
}, },
orderlistApi() { orderlistApi() {
if(this.userInfo && this.userInfo.id) if (this.userInfo && this.userInfo.id) {
{ this.$store.dispatch("orderlist/fetchOrderList", this.userInfo.id);
this.$store.dispatch("orderlist/fetchOrderList",this.userInfo.id);
} }
},
}, },
watch: {
userInfo() {
this.orderlistApi();
},
createdFrom () {
this.dateAtFormatted = this.formatDate(this.createdFrom)
},
createdTo () {
this.dateToFormatted = this.formatDate(this.createdTo)
},
}, },
watch: created() {
{ this.orderlistApi();
userInfo()
{
this.orderlistApi();
}
}, },
created()
{
this.orderlistApi();
}
}; };
</script> </script>
<style src="./boxed_order_history.scss" lang="scss" scoped/> <style src="./boxed_order_history.scss" lang="scss" scoped/>

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

@ -677,10 +677,30 @@ export const doFetchProductTags = wrapRequest((sku) => {
export const doFetchOrderHistory = wrapRequest((obj) => { export const doFetchOrderHistory = wrapRequest((obj) => {
debugger
let query = ""; 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`; 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){ 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 = `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`
}
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`
} }
const requestOptions = { const requestOptions = {
method: 'GET', method: 'GET',

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

@ -11,9 +11,9 @@ export const orderlist = {
OrderHistory: {}, OrderHistory: {},
customerId: "", customerId: "",
orderNumber: "" orderNumber: "",
// createdDate: "", createdFrom: "",
// toDate: "", createdTo: "",
// purchaseOrderNumber: "", // purchaseOrderNumber: "",
}, },
@ -32,10 +32,43 @@ export const orderlist = {
}, },
actions: { actions: {
fetchOrderList: async ({state, commit },customerId) => { fetchOrderList: async ({ state, commit }, customerId) => {
debugger
try { try {
commit('inProgress', true); commit('inProgress', true);
let OrderHistory = await doFetchOrderHistory({customerId:customerId,incrementId:state.orderNumber});
let createdTo = state.createdTo
if(createdTo){
// 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{
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,
createdAt: state.createdFrom,
createdTo: state.createdTo
});
if (OrderHistory) { if (OrderHistory) {
commit('inProgress', false); commit('inProgress', false);
commit('setOrderHistory', humps(OrderHistory)); commit('setOrderHistory', humps(OrderHistory));
@ -46,11 +79,13 @@ export const orderlist = {
throw error throw error
} }
}, },
fetchReset: async ({state,commit },customerId) => { fetchReset: async ({ state, commit }, customerId) => {
try { try {
state.orderNumber=""; state.orderNumber = "";
state.createdFrom = "";
state.createdTo = "";
commit('inProgress', true); commit('inProgress', true);
let orderHistory = await doFetchOrderHistory({customerId:customerId,incrementId:state.orderNumber}); let orderHistory = await doFetchOrderHistory({ customerId: customerId, incrementId: state.orderNumber,createdAt: state.createdFrom,createdTo: state.createdTo });
if (orderHistory) { if (orderHistory) {
commit('inProgress', false); commit('inProgress', false);