diff --git a/package.json b/package.json
index fafb153..5568959 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
"vue3-google-map": "^0.14.0",
"vue3-tel-input": "^1.0.4",
"vueperslides": "^2.8.2",
- "vuetify": "^3.0.0-beta.11",
+ "vuetify": "^3.2.4",
"vuex": "^4.0.2",
"vuex-map-fields": "^1.3.6"
},
diff --git a/src/plugins/vuetify/index.js b/src/plugins/vuetify/index.js
index 00e1be8..5dc4fe7 100644
--- a/src/plugins/vuetify/index.js
+++ b/src/plugins/vuetify/index.js
@@ -6,6 +6,7 @@ import { VDataTable } from 'vuetify/labs/VDataTable'
import * as labs from 'vuetify/labs/components'
import * as directives from 'vuetify/directives'
import theme from './theme'
+import { VuetifyDateAdapter } from 'vuetify/labs/date/adapters/vuetify'
// Vuetify
@@ -17,4 +18,7 @@ export default createVuetify({
VDataTable,
...labs,
},
+ date: {
+ adapter: VuetifyDateAdapter,
+ },
});
diff --git a/src/routes/retailer/boxed_order_history.vue b/src/routes/retailer/boxed_order_history.vue
index e98210a..db599a7 100644
--- a/src/routes/retailer/boxed_order_history.vue
+++ b/src/routes/retailer/boxed_order_history.vue
@@ -13,11 +13,11 @@
@@ -29,16 +29,16 @@
offset-y
min-width="auto"
>
-
+
@@ -49,7 +49,7 @@
-
-
+ -
-
+
@@ -90,12 +91,15 @@
v-model="purchaseOrderNumber"
>
-->
+
+
-
+
Reset
@@ -103,11 +107,12 @@
-
+
Search
@@ -115,15 +120,16 @@
-
+
New Order
@@ -147,39 +153,38 @@
class="elevation-1 pt-5"
>
- {{ isoStringToNormalDate(item.updatedAt) }}
+ {{ isoStringToNormalDate(item.value.updatedAt) }}
- {{ item.incrementId }}
+ {{ item.value.incrementId }}
{{ userInfo.firstname + "" + userInfo.lastname }}
- {{ item.status }}
+ {{ item.value.status }}
- {{ item.payment.poNumber }}
-
-
-
- View Order
-
+ {{ item.value.payment.poNumber }}
+
+
+
+
+ View Order
+
+
+
+
+
@@ -206,12 +211,12 @@ export default {
dateAtFormatted:"",
dateToFormatted:"",
headers: [
- { text: "Date", value: "date" },
- { text: "Order #", value: "order" },
- { text: "Sales Rep Name", value: "salesrepname" },
- { text: "Status", value: "status" },
- { text: "PO Number", value: "POnumber" },
- { text: "Action", value: "action" },
+ { title: "Date", key: "date" },
+ { title: "Order #", key: "order" },
+ { title: "Sales Rep Name", key: "salesrepname" },
+ { title: "Status", key: "status" },
+ { title: "PO Number", key: "POnumber" },
+ { title: "Action", key: "actions" },
],
}),
computed: {
diff --git a/yarn.lock b/yarn.lock
index 33bda4d..62a27b8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3742,10 +3742,10 @@ vuetify-loader@^1.9.2:
file-loader "^6.2.0"
loader-utils "^2.0.0"
-vuetify@^3.0.0-beta.11:
- version "3.1.15"
- resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-3.1.15.tgz#aacee61d81dcaaeabaae44f68172de142dadd274"
- integrity sha512-uxB4UCrP+hFyJaoSsVObAGBRD73qq5ga7HULepzGoMeUWap2H99mcqmMdN/a/Yp4ODK3gT8EcUeph3EgEcsArQ==
+vuetify@^3.2.4:
+ version "3.2.4"
+ resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-3.2.4.tgz#e31e23305b23d2a08ccbb845e295ff07d4c1a71f"
+ integrity sha512-Lj3fXSTY/lLXpuzAM0n2B/9o7WKpHsqv2USanXyFVXbePsl9kx7XY4HPrMqTDEYRlY9AyMjF9ilTbkQ8IovPmQ==
vuex-map-fields@^1.3.6:
version "1.4.0"