diff --git a/.env b/.env
index 377be6c8..09362ce8 100755
--- a/.env
+++ b/.env
@@ -1,6 +1,6 @@
-VITE_APP_VERSION="1.2.46"
+VITE_APP_VERSION="1.2.47"
VITE_LANG_DEFAULT="it"
VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF"
-VITE_SERVICE_WORKER_FILE="sw-1.2.46.js"
+VITE_SERVICE_WORKER_FILE="sw-1.2.47.js"
VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a"
VITE_VUE_ROUTER_MODE="history"
\ No newline at end of file
diff --git a/.prettierrc b/.prettierrc
index 4a09c985..73fd2486 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,6 +1,6 @@
{
"singleAttributePerLine": true,
- "printWidth": 120,
+ "printWidth": 60,
"tabWidth": 2,
"useTabs": false,
"semi": true,
diff --git a/index.html b/index.html
index f0b99480..2e5cf3ff 100755
--- a/index.html
+++ b/index.html
@@ -10,7 +10,7 @@
-
+
diff --git a/package.json b/package.json
index e02df3ba..92027bbf 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "gruppomacro",
- "version": "1.2.46",
+ "version": "1.2.47",
"description": "Gruppo Macro",
"productName": "Gruppo Macro",
"author": "Surya",
@@ -9,20 +9,20 @@
"license": "MIT",
"type": "module",
"scripts": {
- "dev": "PORT=8089 APP_VERSION='1.2.46' quasar dev",
+ "dev": "PORT=8089 APP_VERSION='1.2.47' quasar dev",
"dev_noCheck": "SKIP_TSC=true quasar dev",
"build": "quasar build",
- "buildpwa": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
- "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
+ "buildpwa": "NODE_ENV=production APP_VERSION='1.2.47' quasar build -m pwa",
+ "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.47' quasar build -m pwa",
"type-check": "vue-tsc --noEmit",
"type-check:watch": "vue-tsc --noEmit --watch",
- "buildspa": "APP_VERSION='1.2.46' quasar build -m spa",
+ "buildspa": "APP_VERSION='1.2.47' 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.46' quasar dev -m pwa",
- "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.46' quasar dev",
+ "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.47' quasar dev -m pwa",
+ "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.47' 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 eb45632e..0d6573bc 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.46",
+ "version": "1.2.47",
"description": "Comunita Nuovo Mondo",
"productName": "ComunitaNuovoMondo",
"author": "Surya",
@@ -9,7 +9,7 @@
"license": "MIT",
"type": "module",
"scripts": {
- "dev": "PORT=8083 APP_VERSION='1.2.46' quasar dev",
+ "dev": "PORT=8083 APP_VERSION='1.2.47' 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.46' quasar dev -m pwa",
- "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.46' quasar dev",
+ "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.47' quasar dev -m pwa",
+ "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.47' 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 4abfa943..db3745e4 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.46",
+ "version": "1.2.47",
"description": "freeplanet",
"productName": "freeplanet",
"author": "Surya",
@@ -9,11 +9,11 @@
"license": "MIT",
"type": "module",
"scripts": {
- "dev": "PORT=8087 APP_VERSION='1.2.46' quasar dev",
+ "dev": "PORT=8087 APP_VERSION='1.2.47' quasar dev",
"dev_noCheck": "SKIP_TSC=true quasar dev",
"build": "quasar build",
- "buildpwa": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
- "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
+ "buildpwa": "NODE_ENV=production APP_VERSION='1.2.47' quasar build -m pwa",
+ "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.47' 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.46' quasar dev -m pwa",
- "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.46' quasar dev",
+ "pwa": "NODE_ENV=development PORT=8097 APP_VERSION='1.2.47' quasar dev -m pwa",
+ "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.47' 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 3aa70277..92985af4 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.46",
+ "version": "1.2.47",
"description": "Gruppo Macro",
"productName": "Gruppo Macro",
"author": "Surya",
@@ -9,20 +9,20 @@
"license": "MIT",
"type": "module",
"scripts": {
- "dev": "PORT=8089 APP_VERSION='1.2.46' quasar dev",
+ "dev": "PORT=8089 APP_VERSION='1.2.47' quasar dev",
"dev_noCheck": "SKIP_TSC=true quasar dev",
"build": "quasar build",
- "buildpwa": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
- "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
+ "buildpwa": "NODE_ENV=production APP_VERSION='1.2.47' quasar build -m pwa",
+ "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.47' quasar build -m pwa",
"type-check": "vue-tsc --noEmit",
"type-check:watch": "vue-tsc --noEmit --watch",
- "buildspa": "APP_VERSION='1.2.46' quasar build -m spa",
+ "buildspa": "APP_VERSION='1.2.47' 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.46' quasar dev -m pwa",
- "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.46' quasar dev",
+ "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.47' quasar dev -m pwa",
+ "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.47' 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 c8de1a3b..0e30ddc3 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.46",
+ "version": "1.2.47",
"description": "kolibrilab",
"productName": "kolibrilab",
"author": "Surya Paolo",
@@ -8,11 +8,11 @@
"keywords": [],
"license": "MIT",
"scripts": {
- "dev": "PORT=8083 APP_VERSION='1.2.46' quasar dev",
+ "dev": "PORT=8083 APP_VERSION='1.2.47' quasar dev",
"dev_noCheck": "SKIP_TSC=true quasar dev",
"build": "quasar build",
- "buildpwa": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
- "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
+ "buildpwa": "NODE_ENV=production APP_VERSION='1.2.47' quasar build -m pwa",
+ "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.47' 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.46' quasar dev -m pwa",
- "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.46' quasar dev",
+ "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.47' quasar dev -m pwa",
+ "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.47' 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 b68b24a5..2d9ee658 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.46",
+ "version": "1.2.47",
"description": "Nutriben",
"productName": "Nutriben",
"author": "Surya",
@@ -9,20 +9,20 @@
"license": "MIT",
"type": "module",
"scripts": {
- "dev": "PORT=8093 APP_VERSION='1.2.46' quasar dev",
+ "dev": "PORT=8093 APP_VERSION='1.2.47' quasar dev",
"dev_noCheck": "SKIP_TSC=true quasar dev",
"build": "quasar build",
- "buildpwa": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
- "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
+ "buildpwa": "NODE_ENV=production APP_VERSION='1.2.47' quasar build -m pwa",
+ "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.47' quasar build -m pwa",
"type-check": "vue-tsc --noEmit",
"type-check:watch": "vue-tsc --noEmit --watch",
- "buildspa": "APP_VERSION='1.2.46' quasar build -m spa",
+ "buildspa": "APP_VERSION='1.2.47' 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.46' quasar dev -m pwa",
- "spa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.46' quasar dev",
+ "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.47' quasar dev -m pwa",
+ "spa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.47' 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 6c4e531f..8000642e 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.46",
+ "version": "1.2.47",
"description": "PiuCheBuono",
"productName": "PiuCheBuono",
"author": "Surya",
@@ -9,11 +9,11 @@
"license": "MIT",
"type": "module",
"scripts": {
- "dev": "PORT=8085 APP_VERSION='1.2.46' quasar dev",
+ "dev": "PORT=8085 APP_VERSION='1.2.47' quasar dev",
"dev_noCheck": "SKIP_TSC=true quasar dev",
"build": "quasar build",
- "buildpwa": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
- "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
+ "buildpwa": "NODE_ENV=production APP_VERSION='1.2.47' quasar build -m pwa",
+ "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.47' 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.46' quasar dev -m pwa",
- "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.46' quasar dev",
+ "pwa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.47' quasar dev -m pwa",
+ "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.47' 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 cdb3d70b..ec154a2b 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.46",
+ "version": "1.2.47",
"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.46' PORT=8084 quasar dev",
+ "dev": "APP_VERSION='1.2.47' PORT=8084 quasar dev",
"dev_noCheck": "SKIP_TSC=true quasar dev",
"build": "quasar build",
- "buildpwa": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
- "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.46' quasar build -m pwa",
+ "buildpwa": "NODE_ENV=production APP_VERSION='1.2.47' quasar build -m pwa",
+ "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.47' 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.46' quasar dev -m pwa",
- "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.46' quasar dev",
+ "pwa": "NODE_ENV=development PORT=8094 APP_VERSION='1.2.47' quasar dev -m pwa",
+ "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.47' 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 8ae43cb1..be51264e 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.46';
+const VITE_APP_VERSION = '1.2.47';
// Costanti di configurazione
const DYNAMIC_CACHE = 'dynamic-cache-v2';
diff --git a/src/components/CModifTrafiletto/CModifTrafiletto.ts b/src/components/CModifTrafiletto/CModifTrafiletto.ts
index 3ee1f0c5..3922713f 100755
--- a/src/components/CModifTrafiletto/CModifTrafiletto.ts
+++ b/src/components/CModifTrafiletto/CModifTrafiletto.ts
@@ -51,9 +51,9 @@ export default defineComponent({
default: '',
},
type: {
- type: String,
+ type: Number,
required: false,
- default: '',
+ default: 0,
},
canModify: {
type: Boolean,
@@ -141,8 +141,12 @@ export default defineComponent({
position: 'top'
});
});
- };
+ }
+ function handleShowAndSave(payload: any) {
+ Savedb(payload);
+ updateproductmodif(payload);
+ }
onMounted(mounted)
@@ -162,7 +166,7 @@ export default defineComponent({
loading,
copyToClipboard,
myvalue,
- // refreshDataFromGM,
+ handleShowAndSave,
}
}
})
diff --git a/src/components/CModifTrafiletto/CModifTrafiletto.vue b/src/components/CModifTrafiletto/CModifTrafiletto.vue
index 5781c383..36ad376f 100755
--- a/src/components/CModifTrafiletto/CModifTrafiletto.vue
+++ b/src/components/CModifTrafiletto/CModifTrafiletto.vue
@@ -47,7 +47,7 @@
label="Copia la Risposta"
icon="content_copy"
@click="copyToClipboard"
- v-tooltip="'Copia negli appunti'"
+ tooltip="'Copia negli appunti'"
/>
@@ -60,8 +60,7 @@
:showButtons="true"
:canModify="canModify"
:hideTools="true"
- @update:value="updateproductmodif"
- @showandsave="Savedb"
+ @showandsave="handleShowAndSave"
:maxlength="maxlength"
>
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts
index 95f3ea2a..d20dcb77 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.ts
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts
@@ -975,9 +975,13 @@ export default defineComponent({
Savedb(myvalue.value, '')
}
-
onBeforeMount(mounted)
+ function handleShowAndSave(payload: any) {
+ Savedb(payload);
+ changevalRec(payload);
+ }
+
return {
myvalue,
@@ -1025,6 +1029,7 @@ export default defineComponent({
popupEditRef,
copyToClipboard,
updateValidazione,
+ handleShowAndSave,
}
}
})
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index 2961a1a2..6f8c4359 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -1230,8 +1230,7 @@
:showButtons="false"
:canModify="canModify"
:hideTools="true"
- @update:value="changevalRec"
- @showandsave="Savedb"
+ @showandsave="handleShowAndSave"
:maxlength="col.maxlength"
>
diff --git a/src/statics/lang/it.js b/src/statics/lang/it.js
index 48b0efb6..c2d4b671 100755
--- a/src/statics/lang/it.js
+++ b/src/statics/lang/it.js
@@ -1907,6 +1907,7 @@ const msg_it = {
code_add_to_cart: 'Aggiungi un codice al carrello',
qta_prenotate_in_attesa: '(Preordinate In attesa {qty})',
prodotti_trovati: 'Trovati {qta} su {qtatot}',
+ prodotti_trovati_qta: 'Trovati {qta}',
bloccati: 'Bloccati',
bookedGASQtyOrdered: 'Prenotate',
bookedGASQtyOrdered_str: 'Prenotati {qta} su {qtatot} {unit}',
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index 354ead4c..600d1ee0 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -552,6 +552,7 @@ export const colmypage = [
AddCol({ name: 'onlyif_logged', label_trans: 'pages.onlyif_logged', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'only_residenti', label_trans: 'pages.only_residenti', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'only_consiglio', label_trans: 'pages.only_consiglio', fieldtype: costanti.FieldType.boolean }),
+ AddCol({ name: 'only_admin', label_trans: 'pages.only_admin', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'imgback', label_trans: 'pages.imgback', fieldtype: costanti.FieldType.string }),
AddCol({ name: 'submenu', label_trans: 'pages.submenu', fieldtype: costanti.FieldType.boolean }),
AddCol({ name: 'l_par', label_trans: 'pages.l_par', fieldtype: costanti.FieldType.number }),
diff --git a/src/store/Products.ts b/src/store/Products.ts
index ca6ce562..ed68736a 100755
--- a/src/store/Products.ts
+++ b/src/store/Products.ts
@@ -830,7 +830,7 @@ export const useProducts = defineStore('Products', {
if (!id) {
return null;
}
- if (!this.products || forza) {
+ if (this.products.length === 0 || forza) {
// Se non lo carico all'avvio, allora fai la chiamata al server
prod = await this.loadProductById(id);
} else {
diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts
index e379c409..d9538596 100644
--- a/src/store/globalStore.ts
+++ b/src/store/globalStore.ts
@@ -724,6 +724,7 @@ export const useGlobalStore = defineStore('GlobalStore', {
inmenu: page.inmenu,
onlySocioResidente: page.only_residenti,
onlyConsiglio: page.only_consiglio,
+ onlyAdmin: page.only_admin,
color: page.color,
infooter: page.infooter,
onlyif_logged: page.onlyif_logged,
diff --git a/src/views/admin/dbopmacro/dbopmacro.vue b/src/views/admin/dbopmacro/dbopmacro.vue
index 767914c1..34b66350 100755
--- a/src/views/admin/dbopmacro/dbopmacro.vue
+++ b/src/views/admin/dbopmacro/dbopmacro.vue
@@ -67,6 +67,11 @@
color="negative"
@click="EseguiFunz('removeProductInfoWithoutDateUpdatedFromGM')"
>
+