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

fixes new change

This commit is contained in:
rakesh 2023-05-12 18:55:20 +05:30
parent 9086ddedf3
commit 5bc495ccc5
4 changed files with 66 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -39,7 +39,7 @@
"vue3-google-map": "^0.14.0", "vue3-google-map": "^0.14.0",
"vue3-tel-input": "^1.0.4", "vue3-tel-input": "^1.0.4",
"vueperslides": "^2.8.2", "vueperslides": "^2.8.2",
"vuetify": "^3.0.0-beta.11", "vuetify": "^3.2.4",
"vuex": "^4.0.2", "vuex": "^4.0.2",
"vuex-map-fields": "^1.3.6" "vuex-map-fields": "^1.3.6"
}, },

4
src/plugins/vuetify/index.js
View File

@ -6,6 +6,7 @@ import { VDataTable } from 'vuetify/labs/VDataTable'
import * as labs from 'vuetify/labs/components' import * as labs from 'vuetify/labs/components'
import * as directives from 'vuetify/directives' import * as directives from 'vuetify/directives'
import theme from './theme' import theme from './theme'
import { VuetifyDateAdapter } from 'vuetify/labs/date/adapters/vuetify'
// Vuetify // Vuetify
@ -17,4 +18,7 @@ export default createVuetify({
VDataTable, VDataTable,
...labs, ...labs,
}, },
date: {
adapter: VuetifyDateAdapter,
},
}); });

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

@ -13,11 +13,11 @@
<v-col cols="12" sm="12" md="12" lg="12"> <v-col cols="12" sm="12" md="12" lg="12">
<v-text-field <v-text-field
label="Order Number" label="Order Number"
persistent-hint color="primary"
outlined variant="outlined"
hide-details hide-details
v-model="orderNumber" v-model="orderNumber"
dense density="compact"
></v-text-field> ></v-text-field>
</v-col> </v-col>
<v-col cols="12" sm="12" md="6" lg="5"> <v-col cols="12" sm="12" md="6" lg="5">
@ -29,16 +29,16 @@
offset-y offset-y
min-width="auto" min-width="auto"
> >
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, props }">
<v-text-field <v-text-field
v-model="dateAtFormatted" v-model="dateAtFormatted"
label="Created From" label="Created From"
persistent-hint variant="outlined"
outlined density="compact"
color="primary"
hide-details hide-details
dense
readonly readonly
v-bind="attrs" v-bind="props"
v-on="on" v-on="on"
></v-text-field> ></v-text-field>
</template> </template>
@ -49,7 +49,7 @@
</v-menu> </v-menu>
</v-col> </v-col>
<div class="pt-md-7">-</div> <div class="pt-7">-</div>
<v-col cols="12" sm="12" md="6" lg="5"> <v-col cols="12" sm="12" md="6" lg="5">
<v-menu <v-menu
@ -60,17 +60,18 @@
offset-y offset-y
min-width="auto" min-width="auto"
> >
<template v-slot:activator="{ on, attrs }"> <template v-slot:activator="{ on, props }">
<v-text-field <v-text-field
v-model=" dateToFormatted" v-model="dateToFormatted"
label="To" label="To"
persistent-hint variant="outlined"
outlined density="compact"
hide-details hide-details
dense color="primary"
readonly readonly
v-bind="attrs" v-bind="props"
v-on="on" v-on="on"
type="date"
></v-text-field> ></v-text-field>
</template> </template>
@ -90,12 +91,15 @@
v-model="purchaseOrderNumber" v-model="purchaseOrderNumber"
></v-text-field> ></v-text-field>
</v-col> --> </v-col> -->
<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="{ isHovering, props }">
<v-btn <v-btn
:class="hover ? 'white--text warning' : 'warning--text'" :class="isHovering ? 'text-white bg-warning ' : 'text-warning warning'"
class="width-250px" class="width-250px"
outlined variant="outlined"
v-bind="props"
@click="reset" @click="reset"
> >
Reset Reset
@ -103,11 +107,12 @@
</v-hover> </v-hover>
</v-col> </v-col>
<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="{ isHovering, props }">
<v-btn <v-btn
:class="hover ? 'white--text warning' : 'warning--text'" :class="isHovering ? 'text-white bg-warning ' : 'text-warning warning'"
class="width-250px" class="width-250px"
outlined v-bind="props"
variant="outlined"
@click.prevent="orderlistApi" @click.prevent="orderlistApi"
> >
Search Search
@ -115,15 +120,16 @@
</v-hover> </v-hover>
</v-col> </v-col>
<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="{ isHovering, props }">
<router-link <router-link
class="text-decoration-none" class="text-decoration-none"
:to="{ name: 'CartProducts' }" :to="{ name: 'CartProducts' }"
> >
<v-btn <v-btn
:class="hover ? 'white--text primary' : 'primary--text'" :class="isHovering ? 'text-white bg-primary ' : 'text-primary primary'"
variant="outlined"
class="width-250px" class="width-250px"
outlined v-bind="props"
> >
New Order New Order
</v-btn> </v-btn>
@ -147,39 +153,38 @@
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.value.updatedAt) }}</span>
</template> </template>
<template v-slot:item.order="{ item }"> <template v-slot:item.order="{ item }">
<span>{{ item.incrementId }}</span> <span>{{ item.value.incrementId }}</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.value.status }}</span>
</template> </template>
<template v-slot:item.POnumber="{ item }"> <template v-slot:item.POnumber="{ item }">
<span>{{ item.payment.poNumber }}</span> <span>{{ item.value.payment.poNumber }}</span>
</template>
<template v-slot:item.action="{ item }">
<v-hover v-slot:default="{ hover }">
<router-link
:class="
hover ? 'content-link-hover-color' : 'secondary--text'
"
to
@click.native="viewMyOrder(item.items[0].orderId)"
class="
ls-n009
text-decoration-none
body
myorders-route-link
"
>View Order</router-link
>
</v-hover>
</template> </template>
<template v-slot:item.actions={item}>
<v-hover v-slot="{ isHovering, props }">
<router-link
:class="isHovering ? 'content-link-hover-color' : 'text-primary'"
to
:variant="isHovering?'outlined':''"
v-bind="props"
@click.stop="viewMyOrder(item.value.items[0].orderId)"
class="ls-n009 text-decoration-none body myorders-route-link"
>View Order</router-link>
</v-hover>
</template>
</v-data-table> </v-data-table>
</v-col> </v-col>
</v-row> </v-row>
@ -206,12 +211,12 @@ export default {
dateAtFormatted:"", dateAtFormatted:"",
dateToFormatted:"", dateToFormatted:"",
headers: [ headers: [
{ text: "Date", value: "date" }, { title: "Date", key: "date" },
{ text: "Order #", value: "order" }, { title: "Order #", key: "order" },
{ text: "Sales Rep Name", value: "salesrepname" }, { title: "Sales Rep Name", key: "salesrepname" },
{ text: "Status", value: "status" }, { title: "Status", key: "status" },
{ text: "PO Number", value: "POnumber" }, { title: "PO Number", key: "POnumber" },
{ text: "Action", value: "action" }, { title: "Action", key: "actions" },
], ],
}), }),
computed: { computed: {

8
yarn.lock
View File

@ -3742,10 +3742,10 @@ vuetify-loader@^1.9.2:
file-loader "^6.2.0" file-loader "^6.2.0"
loader-utils "^2.0.0" loader-utils "^2.0.0"
vuetify@^3.0.0-beta.11: vuetify@^3.2.4:
version "3.1.15" version "3.2.4"
resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-3.1.15.tgz#aacee61d81dcaaeabaae44f68172de142dadd274" resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-3.2.4.tgz#e31e23305b23d2a08ccbb845e295ff07d4c1a71f"
integrity sha512-uxB4UCrP+hFyJaoSsVObAGBRD73qq5ga7HULepzGoMeUWap2H99mcqmMdN/a/Yp4ODK3gT8EcUeph3EgEcsArQ== integrity sha512-Lj3fXSTY/lLXpuzAM0n2B/9o7WKpHsqv2USanXyFVXbePsl9kx7XY4HPrMqTDEYRlY9AyMjF9ilTbkQ8IovPmQ==
vuex-map-fields@^1.3.6: vuex-map-fields@^1.3.6:
version "1.4.0" version "1.4.0"