diff --git a/.env b/.env index 89477bb5..1a565784 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -VITE_APP_VERSION="1.2.53" +VITE_APP_VERSION="1.2.54" VITE_LANG_DEFAULT="it" VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -VITE_SERVICE_WORKER_FILE="sw-1.2.53.js" +VITE_SERVICE_WORKER_FILE="sw-1.2.54.js" VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" VITE_VUE_ROUTER_MODE="history" \ No newline at end of file diff --git a/index.html b/index.html index 06cf6ca1..171e14b8 100755 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - + diff --git a/package.json b/package.json index 97143b03..831d3731 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.2.53", + "version": "1.2.54", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.53' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.54' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.53' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.54' quasar build -m spa", "lint": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\"", "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.53' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.53' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.54' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.54' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/comunitanuovomondo.app/package.json b/scripts/_ALL_SITES/comunitanuovomondo.app/package.json index c23ebfbe..2e523880 100755 --- a/scripts/_ALL_SITES/comunitanuovomondo.app/package.json +++ b/scripts/_ALL_SITES/comunitanuovomondo.app/package.json @@ -1,6 +1,6 @@ { "name": "cnm", - "version": "1.2.53", + "version": "1.2.54", "description": "Comunita Nuovo Mondo", "productName": "ComunitaNuovoMondo", "author": "Surya", @@ -9,7 +9,7 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.53' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.54' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", "buildpwa": "NODE_ENV=production quasar build -m pwa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.53' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.53' quasar dev", + "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.54' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.54' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/freeplanet.app/package.json b/scripts/_ALL_SITES/freeplanet.app/package.json index 22bbf914..4d714f5d 100755 --- a/scripts/_ALL_SITES/freeplanet.app/package.json +++ b/scripts/_ALL_SITES/freeplanet.app/package.json @@ -1,6 +1,6 @@ { "name": "freeplanet", - "version": "1.2.53", + "version": "1.2.54", "description": "freeplanet", "productName": "freeplanet", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8087 APP_VERSION='1.2.53' quasar dev", + "dev": "PORT=8087 APP_VERSION='1.2.54' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8097 APP_VERSION='1.2.53' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.53' quasar dev", + "pwa": "NODE_ENV=development PORT=8097 APP_VERSION='1.2.54' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.54' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/gruppomacro.app/package.json b/scripts/_ALL_SITES/gruppomacro.app/package.json index b33eee15..c0831d2b 100755 --- a/scripts/_ALL_SITES/gruppomacro.app/package.json +++ b/scripts/_ALL_SITES/gruppomacro.app/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.2.53", + "version": "1.2.54", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.53' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.54' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.53' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.54' quasar build -m spa", "lint": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\"", "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.53' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.53' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.54' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.54' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/kolibrilab.it/package.json b/scripts/_ALL_SITES/kolibrilab.it/package.json index fd7a6eae..74c1b1b4 100755 --- a/scripts/_ALL_SITES/kolibrilab.it/package.json +++ b/scripts/_ALL_SITES/kolibrilab.it/package.json @@ -1,6 +1,6 @@ { "name": "kolibrilab", - "version": "1.2.53", + "version": "1.2.54", "description": "kolibrilab", "productName": "kolibrilab", "author": "Surya Paolo", @@ -8,11 +8,11 @@ "keywords": [], "license": "MIT", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.53' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.54' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -20,8 +20,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint --ext .ts,.vue --ignore-path .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.53' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.53' quasar dev", + "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.54' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.54' quasar dev", "spanorefresh": "NODE_ENV=development NODE_OPTIONS=--max_old_space_size=4096 DEBUG=v8:* quasar dev -m spa", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js" diff --git a/scripts/_ALL_SITES/nutriben-naturopatia.it/package.json b/scripts/_ALL_SITES/nutriben-naturopatia.it/package.json index 6f0014bf..91a144f1 100755 --- a/scripts/_ALL_SITES/nutriben-naturopatia.it/package.json +++ b/scripts/_ALL_SITES/nutriben-naturopatia.it/package.json @@ -1,6 +1,6 @@ { "name": "nutriben", - "version": "1.2.53", + "version": "1.2.54", "description": "Nutriben", "productName": "Nutriben", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8093 APP_VERSION='1.2.53' quasar dev", + "dev": "PORT=8093 APP_VERSION='1.2.54' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.53' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.54' quasar build -m spa", "lint": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\"", "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.53' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.53' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.54' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.54' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/piuchebuono.app/package.json b/scripts/_ALL_SITES/piuchebuono.app/package.json index b11a6387..23d7149c 100755 --- a/scripts/_ALL_SITES/piuchebuono.app/package.json +++ b/scripts/_ALL_SITES/piuchebuono.app/package.json @@ -1,6 +1,6 @@ { "name": "piuchebuono", - "version": "1.2.53", + "version": "1.2.54", "description": "PiuCheBuono", "productName": "PiuCheBuono", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8085 APP_VERSION='1.2.53' quasar dev", + "dev": "PORT=8085 APP_VERSION='1.2.54' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.53' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.53' quasar dev", + "pwa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.54' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.54' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/scripts/_ALL_SITES/riso.app/package.json b/scripts/_ALL_SITES/riso.app/package.json index f8c610ac..56849d15 100755 --- a/scripts/_ALL_SITES/riso.app/package.json +++ b/scripts/_ALL_SITES/riso.app/package.json @@ -1,6 +1,6 @@ { "name": "riso", - "version": "1.2.53", + "version": "1.2.54", "description": "Siamo la Rete Italiana di Scambio Orizzontale, abbiamo creato questa piattaforma per metterla al servizio di chi vuole riscoprire il valore della condivisione e della cooperazione. Valori semplici e profondi che ci aiutano a ritrovare il Senso della Vita, perduto in questa società consumista, e riporti quei Sani Pricìpi Naturali ed Umani di Fratellanza che intere popolazioni antiche conoscevano bene.", "productName": "Riso", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "APP_VERSION='1.2.53' PORT=8084 quasar dev", + "dev": "APP_VERSION='1.2.54' PORT=8084 quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.53' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.54' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", "buildspa": "quasar build -m spa", @@ -21,8 +21,8 @@ "lintfile": "eslint --ext .js,.ts,.vue --ignore-path .gitignore ./ > file.out.txt", "lintfileNoJS": "eslint --ext .ts,.vue --ignore-path .gitignore ./ > file.out.txt", "fix": "eslint -c ./eslint.config.js \"./src*/**/*.{ts,js,cjs,mjs,vue}\" --ignore-pattern .gitignore ./ --fix > file.out.txt", - "pwa": "NODE_ENV=development PORT=8094 APP_VERSION='1.2.53' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.53' quasar dev", + "pwa": "NODE_ENV=development PORT=8094 APP_VERSION='1.2.54' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.54' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index d38c1403..93055c14 100755 --- a/src-pwa/custom-service-worker.js +++ b/src-pwa/custom-service-worker.js @@ -3,7 +3,7 @@ /* global workbox */ /* global cfgenv */ -const VITE_APP_VERSION = '1.2.53'; +const VITE_APP_VERSION = '1.2.54'; // Costanti di configurazione const DYNAMIC_CACHE = 'dynamic-cache-v2'; diff --git a/src/components/CCart/CCart.scss b/src/components/CCart/CCart.scss index 248ef8de..b9f8eeaa 100755 --- a/src/components/CCart/CCart.scss +++ b/src/components/CCart/CCart.scss @@ -23,33 +23,3 @@ $heightBtn: 100%; color: #d9534f; /* Rosso */ font-weight: bold; /* Testo in grassetto */ } - -.sconto-label{ - font-weight: bold; - margin-left: 5px; -} - -.sconto-text{ - font-weight: bold; - font-size: 1rem; -} - -.table { - margin: auto; - border-collapse: collapse; -} - -.table td { - padding: 8px; - text-align: right; - vertical-align: middle; -} - -.label { - font-weight: bold; -} - -.value { - font-size: 1.2em; - text-align: right; -} diff --git a/src/components/CCart/CCart.ts b/src/components/CCart/CCart.ts index bff4fe77..b28c6d28 100755 --- a/src/components/CCart/CCart.ts +++ b/src/components/CCart/CCart.ts @@ -125,13 +125,6 @@ export default defineComponent({ } }); - const myTotalPriceCalc = computed((): string => { - if (productStore.cart && productStore.cart.totalPriceCalc) { - return productStore.cart.totalPriceCalc.toFixed(2); - } else { - return '0'; - } - }); const totalPriceIntero = computed((): string => { if (productStore.cart && productStore.cart.totalPriceIntero) { return productStore.cart.totalPriceIntero.toFixed(2); @@ -402,7 +395,6 @@ export default defineComponent({ completeOrder, getNumItems, myTotalPrice, - myTotalPriceCalc, totalPriceIntero, getItemsCart, getNote, diff --git a/src/components/CCart/CCart.vue b/src/components/CCart/CCart.vue index ce36c142..428f8153 100755 --- a/src/components/CCart/CCart.vue +++ b/src/components/CCart/CCart.vue @@ -33,19 +33,19 @@ v-if="totalPriceIntero" class="q-mr-sm" > - +
- + - + - +
{{ $t('ecomm.prezzointero') }}:{{ $t('ecomm.prezzointero') }}: € {{ totalPriceIntero }}
{{ $t('ecomm.sconto_appl') }}:{{ $t('ecomm.sconto_appl') }}:
{{ $t('ecomm.totale_scontato') }}:€ {{ myTotalPrice }}€ {{ myTotalPrice }}
diff --git a/src/components/CCatalogList/CCatalogList.ts b/src/components/CCatalogList/CCatalogList.ts index bdaac6f9..06de9966 100755 --- a/src/components/CCatalogList/CCatalogList.ts +++ b/src/components/CCatalogList/CCatalogList.ts @@ -1,23 +1,29 @@ import { computed, - provide, defineComponent, onBeforeMount, onBeforeUnmount, onMounted, ref, toRef, toRefs, watch, -} from 'vue' + provide, + defineComponent, + onBeforeMount, + onBeforeUnmount, + onMounted, + ref, + toRef, + toRefs, + watch, +} from 'vue'; -import { tools } from '@tools' -import { CMyFieldDb } from '@src/components/CMyFieldDb' -import { costanti } from '@costanti' -import { useGlobalStore } from '@store/globalStore' -import { useUserStore } from '@store/UserStore' +import { tools } from '@tools'; +import { CMyFieldDb } from '@src/components/CMyFieldDb'; +import { costanti } from '@costanti'; +import { useGlobalStore } from '@store/globalStore'; +import { useUserStore } from '@store/UserStore'; -import { CTitlePage } from '@src/components/CTitlePage' -import { CGridTableRec } from '@src/components/CGridTableRec' -import type { IColGridTable, ISearchList } from 'model'; -import { IMyBacheca, IMySkill, ISkill } from 'model' -import { shared_consts } from '@src/common/shared_vuejs' -import { useI18n } from 'vue-i18n' -import { toolsext } from '@store/Modules/toolsext' -import { fieldsTable } from '@store/Modules/fieldsTable' -import { useQuasar } from 'quasar' +import { CTitlePage } from '@src/components/CTitlePage'; +import { CGridTableRec } from '@src/components/CGridTableRec'; +import type { ICatalog, IColGridTable, ISearchList } from 'model'; +import { useI18n } from 'vue-i18n'; +import { toolsext } from '@store/Modules/toolsext'; +import { fieldsTable } from '@store/Modules/fieldsTable'; +import { useQuasar } from 'quasar'; export default defineComponent({ name: 'CCatalogList', @@ -70,33 +76,37 @@ export default defineComponent({ }, }, components: { - CMyFieldDb, CGridTableRec, CTitlePage, + CMyFieldDb, + CGridTableRec, + CTitlePage, }, setup(props, { attrs, slots, emit }) { - const { t } = useI18n() - const $q = useQuasar() - const globalStore = useGlobalStore() - const userStore = useUserStore() + const { t } = useI18n(); + const $q = useQuasar(); + const globalStore = useGlobalStore(); + const userStore = useUserStore(); - const table = ref('catalogs') + const table = ref('catalogs'); - const arrfilterand: any = ref([]) - const filtercustom: any = ref([]) + const arrfilterand: any = ref([]); + const filtercustom: any = ref([]); - const search = ref('') - const myrecfiltertoggle = ref(tools.FILTER_ALL) + const search = ref(''); + const myrecfiltertoggle = ref(tools.FILTER_ALL); - const prop_colkey = ref('') - const col_title = ref('') - const col_footer = ref('') - const col_tabfooter = ref('') + const prop_colkey = ref(''); + const col_title = ref(''); + const col_footer = ref(''); + const col_tabfooter = ref(''); - const strextra = ref('') - const myoptions = ref([]) + const strextra = ref(''); + const myoptions = ref([]); + const newCatalog = ref({}); - const col = ref([]) + const col = ref([]); - const myCatRef = ref(null) + const myCatRef = ref(null); + const showFormAddNewCatalog = ref(false); /* const idSectorServizi = computed(() => { @@ -113,78 +123,100 @@ export default defineComponent({ */ - function updatefilter(value: any) { // } - - watch(() => myrecfiltertoggle.value, (value: any, oldval: any) => { - updatefilter(value) - }, - ) + watch( + () => myrecfiltertoggle.value, + (value: any, oldval: any) => { + updatefilter(value); + } + ); const mypagination = computed(() => { - return { sortBy: 'title', descending: false, page: 1, rowsNumber: 0, rowsPerPage: 10 } - }) + return { + sortBy: 'title', + descending: false, + page: 1, + rowsNumber: 0, + rowsPerPage: 10, + }; + }); const showType = computed(() => { - return costanti.SHOW_MYCARD - }) + return costanti.SHOW_MYCARD; + }); const hint = computed(() => { - return 'digita un Argomento o Catalogo da cercare' - }) + return 'digita un Argomento o Catalogo da cercare'; + }); const visuType = computed(() => { - return false // $q.screen.gt.xs - }) + return false; // $q.screen.gt.xs + }); const noMsgRecord = computed(() => { - return 'Nessun dato trovato con i filtri selezionati' - }) - + return 'Nessun dato trovato con i filtri selezionati'; + }); function mounted() { + const obj = tools.getParamsByTable(table.value); - const obj = tools.getParamsByTable(table.value) + prop_colkey.value = obj.prop_colkey; + col_title.value = obj.col_title; + col_footer.value = obj.col_footer; + col_tabfooter.value = obj.col_tabfooter; + filtercustom.value = []; - prop_colkey.value = obj.prop_colkey - col_title.value = obj.col_title - col_footer.value = obj.col_footer - col_tabfooter.value = obj.col_tabfooter - - filtercustom.value = [] - - col.value = fieldsTable.getArrColsByTable(table.value) + col.value = fieldsTable.getArrColsByTable(table.value); } - - function mySortFieldsAvailable() { if (table.value === toolsext.TABUSER) { - return userStore.getSortFieldsAvailable() + return userStore.getSortFieldsAvailable(); } - return [] + return []; } - - function doSearch() { // } function clickButtBar(item: any) { if (myCatRef.value) { - myCatRef.value.clickButtBar(item) + myCatRef.value.clickButtBar(item); } // emit('clickButtBar', item) } - onMounted(mounted) + function addNewCatalog() { + // Aggiungi un nuovo catalogo + showFormAddNewCatalog.value = true; + } + + function addNewCatalogSave() { + // Salva catalogo + } + + function checkPathExist() { + const mypageexist = globalStore.mypage.find( + (myrec) => myrec.path.toLowerCase() === newCatalog.path.toLowerCase() + ); + if (mypageexist) { + $q.notify({ + message: `La pagina ${newCatalog.path} esiste già`, + color: 'red', + position: 'top', + }); + return; + } + } + + onMounted(mounted); return { t, @@ -211,6 +243,12 @@ export default defineComponent({ clickButtBar, myCatRef, table, - } + addNewCatalog, + showFormAddNewCatalog, + addNewCatalogSave, + newCatalog, + checkPathExist, + globalStore, + }; }, -}) +}); diff --git a/src/components/CCatalogList/CCatalogList.vue b/src/components/CCatalogList/CCatalogList.vue index 96bac320..0756be95 100755 --- a/src/components/CCatalogList/CCatalogList.vue +++ b/src/components/CCatalogList/CCatalogList.vue @@ -1,5 +1,16 @@ diff --git a/src/components/CCatalogoCard/CCatalogoCard.vue b/src/components/CCatalogoCard/CCatalogoCard.vue index ace09809..f556a13f 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.vue +++ b/src/components/CCatalogoCard/CCatalogoCard.vue @@ -56,7 +56,8 @@ 'flex', // Classi comuni 'image-container', { 'shadow-2': options.in_3d && !optcatalogo.pdf }, // Classe condizionale - scheda.testo_right_attaccato.font?.posiz_text === costanti.POSIZ_TESTO.IN_BASSO + scheda.testo_right_attaccato.font?.posiz_text === + costanti.POSIZ_TESTO.IN_BASSO ? '' : 'flex flex-row', // Layout flessibile ]" @@ -83,7 +84,7 @@ ), }" > -
+
+ @click.stop.prevent="naviga(`/product/` + myproduct._id)" + > + +
+
+ + +
+
+ + +
+
- Visualizza dati Estrapolati (dal WEB Esterno) + Visualizza dati Estrapolati (dal WEB Esterno) @@ -392,7 +422,9 @@ /> - Visualizza su GM (con le Quantità in Magazzino) + Visualizza su GM (con le Quantità in Magazzino) @@ -410,14 +442,19 @@ :idPage="idPage" >
@@ -475,7 +534,10 @@
@@ -623,7 +707,9 @@
- {{ tools.getNomeUtenteEUsernameByRecUser(ordcart.user) }} + {{ + tools.getNomeUtenteEUsernameByRecUser(ordcart.user) + }} {{ shared_consts.getStatusStr(ordcart.status) }} @@ -635,7 +721,8 @@ > {{ singleord.order.quantity }} @@ -707,7 +796,9 @@ diff --git a/src/components/CMyCart/CMyCart.ts b/src/components/CMyCart/CMyCart.ts index c87046f0..1155a354 100755 --- a/src/components/CMyCart/CMyCart.ts +++ b/src/components/CMyCart/CMyCart.ts @@ -1,17 +1,16 @@ -import { ref, onMounted, onBeforeMount, PropType, reactive, watch } from 'vue' -import { CCardState } from '../CCardState' +import { ref, onMounted, onBeforeMount, PropType, reactive, watch } from 'vue'; +import { CCardState } from '../CCardState'; -import { computed, defineComponent } from 'vue' -import { useGlobalStore } from '@store/globalStore' -import { useProducts } from '@store/Products' -import { CCopyBtn } from '@src/components/CCopyBtn' -import { CSingleCart } from '@src/components/CSingleCart' -import { CTitleBanner } from '@src/components/CTitleBanner' +import { computed, defineComponent } from 'vue'; +import { useGlobalStore } from '@store/globalStore'; +import { useProducts } from '@store/Products'; +import { CCopyBtn } from '@src/components/CCopyBtn'; +import { CSingleCart } from '@src/components/CSingleCart'; +import { CTitleBanner } from '@src/components/CTitleBanner'; -import { useI18n } from 'vue-i18n' - -import MixinUsers from '../../mixins/mixin-users' +import { useI18n } from 'vue-i18n'; +import MixinUsers from '../../mixins/mixin-users'; export default defineComponent({ name: 'CMyCart', @@ -19,55 +18,63 @@ export default defineComponent({ components: { CTitleBanner, CCardState, CCopyBtn, CSingleCart }, setup() { - const globalStore = useGlobalStore() - const products = useProducts() - const { t } = useI18n() + const globalStore = useGlobalStore(); + const productStore = useProducts(); + const { t } = useI18n(); - const { getnumItemsCart } = MixinUsers() + const { getnumItemsCart } = MixinUsers(); - const myCart = computed(() => products.cart) + const myCart = computed(() => productStore.cart); const myTotalPrice = computed(() => { - if (products.cart) { - return products.cart.totalPrice + if (productStore.cart) { + return productStore.cart.totalPrice.toFixed(2); } else { - return 0 + return 0; } - }) + }); + + const totalPriceIntero = computed((): string => { + if (productStore.cart && productStore.cart.totalPriceIntero) { + return productStore.cart.totalPriceIntero.toFixed(2); + } else { + return '0'; + } + }); const ordersCart = computed(() => { - if (!!products.cart) { - return products.cart.items + if (!!productStore.cart) { + return productStore.cart.items; } else { - return null + return null; } - }) + }); const numOrders = computed(() => { - if (!!products.cart && products.cart.items) { - return products.cart.items.length + if (!!productStore.cart && productStore.cart.items) { + return productStore.cart.items.length; } else { - return 0 + return 0; } - }) - + }); function closecart() { - globalStore.rightCartOpen = false + globalStore.rightCartOpen = false; } function mounted() { - products.loadOrders() + productStore.loadOrders(); } function existsOrders() { - return products.getNumOrders() > 0 + return productStore.getNumOrders() > 0; } - onMounted(mounted) + onMounted(mounted); return { myCart, myTotalPrice, + totalPriceIntero, ordersCart, numOrders, closecart, @@ -75,6 +82,6 @@ export default defineComponent({ existsOrders, globalStore, t, - } + }; }, -}) +}); diff --git a/src/components/CMyCart/CMyCart.vue b/src/components/CMyCart/CMyCart.vue index 2bd2eae4..79610e12 100755 --- a/src/components/CMyCart/CMyCart.vue +++ b/src/components/CMyCart/CMyCart.vue @@ -3,7 +3,13 @@
- +
-
- Totale: - € {{ myTotalPrice ? myTotalPrice.toFixed(2) : 0 }} +
+ + + + + + + + + + + + + + + + + + + + + +
{{ $t('ecomm.prezzointero') }}: + € {{ totalPriceIntero }} +
{{ $t('ecomm.sconto_appl') }}: +
+ + {{ myCart.descr_sconto }} + +
+
{{ $t('ecomm.codice_sconto') }}: + + +
{{ $t('ecomm.totale_scontato') }}:€ {{ myTotalPrice }}
-
- +
+ +
-
+
{{ $t('ecomm.carrello_vuoto') }}
-
+
- +