diff --git a/package-lock.json b/package-lock.json index 59c177c..9463ca8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -40,7 +40,7 @@ "typescript": "~5.4.0", "unplugin-vue-components": "^0.27.3", "vite": "^5.4.11", - "vue-tsc": "^2.0.11" + "vue-tsc": "2.0.11" } }, "node_modules/@antfu/utils": { @@ -1627,12 +1627,12 @@ } }, "node_modules/@vue/language-core": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.19.tgz", - "integrity": "sha512-A9EGOnvb51jOvnCYoRLnMP+CcoPlbZVxI9gZXE/y2GksRWM6j/PrLEIC++pnosWTN08tFpJgxhSS//E9v/Sg+Q==", + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-2.0.11.tgz", + "integrity": "sha512-5ivg8Vem/yckzXI3L3n0mdKBPRcHSlsGt6/dpbEx42PcH3MIHAjSAJBYvENXeWJxv2ClQc8BS2mH1Ho2U7jZig==", "dev": true, "dependencies": { - "@volar/language-core": "~2.2.4", + "@volar/language-core": "~2.2.0-alpha.6", "@vue/compiler-dom": "^3.4.0", "@vue/shared": "^3.4.0", "computeds": "^0.0.1", @@ -4036,13 +4036,13 @@ } }, "node_modules/vue-tsc": { - "version": "2.0.19", - "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.0.19.tgz", - "integrity": "sha512-JWay5Zt2/871iodGF72cELIbcAoPyhJxq56mPPh+M2K7IwI688FMrFKc/+DvB05wDWEuCPexQJ6L10zSwzzapg==", + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-2.0.11.tgz", + "integrity": "sha512-dl5MEU4VGZdQFGBnKfPpAfV3SQmBDWs9o4YhUPvDmwk+zmb/RprzFJK2sagR6EWazogZhXENvykd3wBXWS9kng==", "dev": true, "dependencies": { - "@volar/typescript": "~2.2.4", - "@vue/language-core": "2.0.19", + "@volar/typescript": "~2.2.0-alpha.6", + "@vue/language-core": "2.0.11", "semver": "^7.5.4" }, "bin": { diff --git a/src/components/SummaryComponent.vue b/src/components/SummaryComponent.vue index 07b6037..1a97c07 100644 --- a/src/components/SummaryComponent.vue +++ b/src/components/SummaryComponent.vue @@ -7,6 +7,7 @@ import { onBeforeUnmount, onMounted, ref, watch } from 'vue' import { useCategoriesStore } from '@/stores/categories.store' import type { Order, OrderProduct, Product } from '@/main' import { useRoutesStore } from '@/stores/routes.store' +import { bool } from 'yup' const ordersStore = useOrdersStore() const categoriesStore = useCategoriesStore() @@ -27,6 +28,7 @@ const orderByRouteAndNipRef = ref>>(new Map>) const activeButton = ref(null) + const watchSearchDate = watch(searchDate, async (oldSearchDate, newSeatchDate) => { if (oldSearchDate != newSeatchDate) { await fetchOrders() @@ -129,7 +131,6 @@ function groupByNip() { Number(Number(existingProduct.MZE_TwrIlosc) + Number(element.MZE_TwrIlosc)).toFixed(2) ) existingProduct.suma = Number(Number(existingProduct.MZE_TwrIlosc) * Number(existingProduct.MZE_TwrCena)).toFixed(2) - } else { element.MZE_TwrCena = String(Number(element.MZE_TwrCena).toFixed(2)) element.MZE_TwrIlosc = String(Number(element.MZE_TwrIlosc).toFixed(2)) @@ -162,11 +163,23 @@ onMounted(async () => { console.log(ordersByRoute.value) }); + onBeforeUnmount(async function() { const siteControlStore = useSiteControlStore(); await siteControlStore.newOrder(false); }) +function hasNonEmptyUwagi(item: any): boolean { + let found = false; + item.orders.forEach(order => { + if(order.MZN_Uwagi) { + found = true; + } + }) + + return found; +} +