From 1298184b2ed45b8ad37e6ef5b8e0a9567e2f4733 Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Mon, 16 Jun 2025 19:36:48 +0200 Subject: [PATCH] - Corretta query di estrapolazione libri su GM (Marco) - aggiornato bestseller su fatlast1Y - non mostrare piu i libri che non hanno l'immagine (sul catalogo). - metti online i compressi --- .env | 4 +- _LIMBO/QueryFdevCatalogo.sql | 234 ++++++++++++++++++ _LIMBO/queryoriginale.sql | 113 +++++++++ index.html | 2 +- package.json | 14 +- .../comunitanuovomondo.app/package.json | 8 +- .../_ALL_SITES/freeplanet.app/package.json | 12 +- .../_ALL_SITES/gruppomacro.app/package.json | 14 +- scripts/_ALL_SITES/kolibrilab.it/package.json | 12 +- .../nutriben-naturopatia.it/package.json | 14 +- .../_ALL_SITES/piuchebuono.app/package.json | 12 +- scripts/_ALL_SITES/riso.app/package.json | 12 +- src-pwa/custom-service-worker.js | 2 +- src/components/CCatalogoCard/CCatalogoCard.ts | 2 +- src/components/CMyEditElem/CMyEditElem.vue | 3 - src/model/GlobalStore.ts | 1 + src/model/Products.ts | 1 + src/store/Modules/tools.ts | 9 +- src/views/admin/dbopmacro/dbopmacro.vue | 5 + src/views/ecommerce/catalogo/catalogo.ts | 22 +- .../raccoltacataloghi/raccoltacataloghi.ts | 1 + 21 files changed, 432 insertions(+), 65 deletions(-) create mode 100644 _LIMBO/QueryFdevCatalogo.sql create mode 100644 _LIMBO/queryoriginale.sql diff --git a/.env b/.env index e9ed0f81..4f9058c9 100755 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ -VITE_APP_VERSION="1.2.56" +VITE_APP_VERSION="1.2.57" VITE_LANG_DEFAULT="it" VITE_PAO_APP_ID="KKPPAA5KJK435J3KSS9F9D8S9F8SD98F9SDF" -VITE_SERVICE_WORKER_FILE="sw-1.2.56.js" +VITE_SERVICE_WORKER_FILE="sw-1.2.57.js" VITE_PROJECT_ID_MAIN="5cc0a13fe5c9d156728f400a" VITE_VUE_ROUTER_MODE="history" \ No newline at end of file diff --git a/_LIMBO/QueryFdevCatalogo.sql b/_LIMBO/QueryFdevCatalogo.sql new file mode 100644 index 00000000..1c54b91c --- /dev/null +++ b/_LIMBO/QueryFdevCatalogo.sql @@ -0,0 +1,234 @@ +SELECT T.* + + ,i.DescrizioneTipologia + ,f.DescrizioneStatoProdotto + ,n.DescrizioneFormato + ,y.DescrizioneCollana + ,z.AutoriCompleti + ,i2.DescrArgomento + ,z3.CasaEditrice + ,q.QtaDisponibile +FROM + T_WEB_Articoli T + WITH (noLock) + +RIGHT JOIN + ( SELECT IdArticolo, + MAX(DataOra) AS data + FROM + T_WEB_Articoli + GROUP BY + IdArticolo ) b +ON + T.IdArticolo = b.IdArticolo +AND T.DataOra = b.data + +RIGHT JOIN + ( SELECT + e.IdStatoProdotto, + e.Descrizione as DescrizioneStatoProdotto + FROM + T_WEB_StatiProdotto e + JOIN + ( + SELECT + IdStatoProdotto, + MAX(DataOra) as data1 + FROM + T_WEB_StatiProdotto + GROUP BY + IdStatoProdotto ) c + ON + e.IdStatoProdotto = c.IdStatoProdotto + AND e.DataOra = c.data1 ) f +ON + T.IdStatoProdotto = f.IdStatoProdotto +RIGHT JOIN + ( + SELECT + g.IdTipologia, + g.Descrizione as DescrizioneTipologia + FROM + T_WEB_Tipologie g + JOIN + ( + SELECT + IdTipologia, + MAX(DataOra) as data1 + FROM + T_WEB_Tipologie + GROUP BY + IdTipologia ) h + ON + g.IdTipologia = h.IdTipologia + AND g.DataOra = h.data1 ) i +ON + T.IdTipologia = i.IdTipologia +RIGHT JOIN + ( + SELECT + l.IdTipoFormato, + l.Descrizione as DescrizioneFormato + FROM + T_WEB_TipiFormato l + JOIN + ( + SELECT + IdTipoFormato, + MAX(DataOra) as data1 + FROM + T_WEB_TipiFormato + GROUP BY + IdTipoFormato ) m + ON + l.IdTipoFormato = m.IdTipoFormato + AND l.DataOra = m.data1 ) n +ON + T.IdTipoFormato = n.IdTipoFormato +RIGHT JOIN + ( + SELECT + v.IdCollana, + v.Descrizione as DescrizioneCollana + FROM + T_WEB_Collane v + INNER JOIN + ( + SELECT + IdCollana, + MAX(ID) as MaxID + FROM + T_WEB_Collane + GROUP BY + IdCollana ) x + ON + v.IdCollana = x.IdCollana + AND v.ID = x.MaxID ) y +ON + T.IdCollana = y.IdCollana +RIGHT JOIN + ( + SELECT + g2.IdArgomento, + g2.Descrizione as DescrArgomento + FROM + T_WEB_Argomenti g2 + INNER JOIN + ( + SELECT + IdArgomento, + MAX(DataOra) as data12 + FROM + T_WEB_Argomenti + GROUP BY + IdArgomento ) h + ON + g2.IdArgomento = h.IdArgomento + AND g2.DataOra = h.data12 ) i2 +ON + T.ListaArgomenti = i2.IdArgomento +RIGHT JOIN ( SELECT + o.Codice, + o.QtaDisponibile + FROM + T_WEB_Disponibile o + JOIN + ( + SELECT + Codice, + MAX(DataOra) as data1 + FROM + T_WEB_Disponibile + GROUP BY + Codice ) p + ON + o.Codice = p.Codice + AND o.DataOra = p.data1 ) q + ON + T.IdArticolo = q.Codice + RIGHT JOIN + ( + SELECT + a3.IdMarchioEditoriale, + a3.Descrizione as CasaEditrice + FROM + T_WEB_MarchiEditoriali a3 + JOIN + ( + SELECT + IdMarchioEditoriale, + MAX(DataOra) as maxData + FROM + T_WEB_MarchiEditoriali + GROUP BY + IdMarchioEditoriale ) aa3 + ON + a3.IdMarchioEditoriale = aa3.IdMarchioEditoriale + AND a3.DataOra = aa3.maxData ) z3 + ON + T.IdMarchioEditoriale = z3.IdMarchioEditoriale +RIGHT JOIN + ( + SELECT T1.IdArticolo, STUFF(( + SELECT + ',' + ISNULL(A2.AutoreCompleto, '') + FROM + ( + SELECT + CAST('' + REPLACE(T1.ListaAutori, ',', '') + '' AS XML) AS DataXML ) X + CROSS APPLY + X.DataXML.nodes('/root/x') AS A(x) + CROSS APPLY + ( + SELECT + TRY_CAST(LTRIM(RTRIM(A.x.value('.', 'VARCHAR(100)'))) AS INT) AS AutoreID ) CA + LEFT JOIN + ( + SELECT + a.IdAutore, + CONCAT(a.Nome, ' ', a.Cognome) AS AutoreCompleto + FROM + T_WEB_Autori a + RIGHT JOIN + ( + SELECT + IdAutore, + MAX(DataOra) AS maxData + FROM + T_WEB_Autori + GROUP BY + IdAutore ) aa + ON + a.IdAutore = aa.IdAutore + AND a.DataOra = aa.maxData + ) A2 + ON + CA.AutoreID = A2.IdAutore FOR XML PATH(''), + TYPE ).value('.', 'NVARCHAR(MAX)') , + 1 , + 1 , + '') AS AutoriCompleti + FROM T_WEB_Articoli T1 + WHERE t1.DataOra = (select max(DataOra) AS DataOra from T_web_articoli As h WHERE h.IdArticolo = T1.IdArticolo) + + GROUP BY T1.IdArticolo, T1.ListaAutori ) z ON T.IdArticolo = z.IdArticolo + WHERE + ( + DescrizioneStatoProdotto = 'In commercio' + OR DescrizioneStatoProdotto = 'Prossima uscita/pubblicazione' + OR DescrizioneStatoProdotto = 'Prossima uscita' + OR DescrizioneStatoProdotto = 'In prevendita' + OR DescrizioneStatoProdotto = '2023 in commercio') + AND ( + DescrizioneTipologia = 'Libri' + OR DescrizioneTipologia = 'Cartolibro' + OR DescrizioneTipologia = 'Carte') + AND ( + Ean13 NOT LIKE 'USATO%') +ORDER BY T.IdArticolo DESC, Id DESC + + + + + + diff --git a/_LIMBO/queryoriginale.sql b/_LIMBO/queryoriginale.sql new file mode 100644 index 00000000..4c6bc3e1 --- /dev/null +++ b/_LIMBO/queryoriginale.sql @@ -0,0 +1,113 @@ +SELECT TOP 10000 + T.* + + ,i.DescrizioneTipologia + ,f.DescrizioneStatoProdotto + ,n.DescrizioneFormato + ,y.DescrizioneCollana + ,z.AutoriCompleti + ,i2.DescrArgomento + ,z3.CasaEditrice ,q.QtaDisponibile FROM T_WEB_Articoli T + JOIN( + SELECT IdArticolo, MAX(DataOra) AS data + FROM T_WEB_Articoli + GROUP BY IdArticolo + ) b ON T.IdArticolo = b.IdArticolo AND T.DataOra = b.data LEFT JOIN( + SELECT e.IdStatoProdotto, e.Descrizione as DescrizioneStatoProdotto + FROM T_WEB_StatiProdotto e + JOIN( + SELECT IdStatoProdotto, MAX(DataOra) as data1 + FROM T_WEB_StatiProdotto + GROUP BY IdStatoProdotto + ) c ON e.IdStatoProdotto = c.IdStatoProdotto AND e.DataOra = c.data1 + ) f ON T.IdStatoProdotto = f.IdStatoProdotto + LEFT JOIN( + SELECT g.IdTipologia, g.Descrizione as DescrizioneTipologia + FROM T_WEB_Tipologie g + JOIN( + SELECT IdTipologia, MAX(DataOra) as data1 + FROM T_WEB_Tipologie + GROUP BY IdTipologia + ) h ON g.IdTipologia = h.IdTipologia AND g.DataOra = h.data1 + ) i ON T.IdTipologia = i.IdTipologia + LEFT JOIN( + SELECT l.IdTipoFormato, l.Descrizione as DescrizioneFormato + FROM T_WEB_TipiFormato l + JOIN( + SELECT IdTipoFormato, MAX(DataOra) as data1 + FROM T_WEB_TipiFormato + GROUP BY IdTipoFormato + ) m ON l.IdTipoFormato = m.IdTipoFormato AND l.DataOra = m.data1 + ) n ON T.IdTipoFormato = n.IdTipoFormato + LEFT JOIN( + SELECT v.IdCollana, v.Descrizione as DescrizioneCollana + FROM T_WEB_Collane v + INNER JOIN( + SELECT IdCollana, MAX(ID) as MaxID + FROM T_WEB_Collane + GROUP BY IdCollana + ) x ON v.IdCollana = x.IdCollana AND v.ID = x.MaxID + ) y ON T.IdCollana = y.IdCollana + LEFT JOIN( + SELECT g2.IdArgomento, g2.Descrizione as DescrArgomento + FROM T_WEB_Argomenti g2 + INNER JOIN( + SELECT IdArgomento, MAX(DataOra) as data12 + FROM T_WEB_Argomenti + GROUP BY IdArgomento + ) h ON g2.IdArgomento = h.IdArgomento AND g2.DataOra = h.data12 + ) i2 ON T.ListaArgomenti = i2.IdArgomento + LEFT JOIN( + SELECT + T1.IdArticolo, + STUFF(( + SELECT ',' + ISNULL(A2.AutoreCompleto, '') + FROM( + SELECT CAST('' + REPLACE(T1.ListaAutori, ',', '') + '' AS XML) AS DataXML + ) X + CROSS APPLY X.DataXML.nodes('/root/x') AS A(x) + CROSS APPLY( + SELECT TRY_CAST(LTRIM(RTRIM(A.x.value('.', 'VARCHAR(100)'))) AS INT) AS AutoreID + ) CA + JOIN( + SELECT a.IdAutore, CONCAT(a.Nome, ' ', a.Cognome) AS AutoreCompleto + FROM T_WEB_Autori a + JOIN( + SELECT IdAutore, MAX(DataOra) AS maxData + FROM T_WEB_Autori + GROUP BY IdAutore + ) aa ON a.IdAutore = aa.IdAutore AND a.DataOra = aa.maxData + ) A2 ON CA.AutoreID = A2.IdAutore + FOR XML PATH(''), TYPE + ).value('.', 'NVARCHAR(MAX)'), 1, 1, '') AS AutoriCompleti + FROM T_WEB_Articoli T1 + GROUP BY T1.IdArticolo, T1.ListaAutori + ) z ON T.IdArticolo = z.IdArticolo + LEFT JOIN( + SELECT a3.IdMarchioEditoriale, a3.Descrizione as CasaEditrice + FROM T_WEB_MarchiEditoriali a3 + JOIN( + SELECT IdMarchioEditoriale, MAX(DataOra) as maxData + FROM T_WEB_MarchiEditoriali + GROUP BY IdMarchioEditoriale + ) aa3 ON a3.IdMarchioEditoriale = aa3.IdMarchioEditoriale AND a3.DataOra = aa3.maxData + ) z3 ON T.IdMarchioEditoriale = z3.IdMarchioEditoriale LEFT JOIN( + SELECT o.Codice, o.QtaDisponibile + FROM T_WEB_Disponibile o + JOIN( + SELECT Codice, MAX(DataOra) as data1 + FROM T_WEB_Disponibile + GROUP BY Codice + ) p ON o.Codice = p.Codice AND o.DataOra = p.data1 + ) q ON T.IdArticolo = q.Codice WHERE + (DescrizioneStatoProdotto = 'In commercio' OR + DescrizioneStatoProdotto = 'Prossima uscita/pubblicazione' OR + DescrizioneStatoProdotto = 'Prossima uscita' OR + DescrizioneStatoProdotto = 'In prevendita' OR + DescrizioneStatoProdotto = '2023 in commercio') + AND + (DescrizioneTipologia = 'Libri' OR + DescrizioneTipologia = 'Cartolibro' OR + DescrizioneTipologia = 'Carte') + AND + (Ean13 NOT LIKE 'USATO%') \ No newline at end of file diff --git a/index.html b/index.html index 9767fcef..8f211017 100755 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - + diff --git a/package.json b/package.json index a236f3de..b88e8d3f 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.2.56", + "version": "1.2.57", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.56' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.57' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.57' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.57' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.56' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.57' 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.56' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.56' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.57' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.57' 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 8a0933fc..38f96642 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.56", + "version": "1.2.57", "description": "Comunita Nuovo Mondo", "productName": "ComunitaNuovoMondo", "author": "Surya", @@ -9,7 +9,7 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.56' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.57' 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.56' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.56' quasar dev", + "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.57' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.57' 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 444647e2..5aa410ce 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.56", + "version": "1.2.57", "description": "freeplanet", "productName": "freeplanet", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8087 APP_VERSION='1.2.56' quasar dev", + "dev": "PORT=8087 APP_VERSION='1.2.57' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.57' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.57' 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.56' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.56' quasar dev", + "pwa": "NODE_ENV=development PORT=8097 APP_VERSION='1.2.57' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8087 APP_VERSION='1.2.57' 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 37275782..7de981c3 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.56", + "version": "1.2.57", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.56' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.57' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.57' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.57' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.56' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.57' 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.56' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.56' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.57' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.57' 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 a7e101e5..a7a6c9f3 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.56", + "version": "1.2.57", "description": "kolibrilab", "productName": "kolibrilab", "author": "Surya Paolo", @@ -8,11 +8,11 @@ "keywords": [], "license": "MIT", "scripts": { - "dev": "PORT=8083 APP_VERSION='1.2.56' quasar dev", + "dev": "PORT=8083 APP_VERSION='1.2.57' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.57' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.57' 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.56' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.56' quasar dev", + "pwa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.57' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8083 APP_VERSION='1.2.57' 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 7a929a30..bbe6b0b2 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.56", + "version": "1.2.57", "description": "Nutriben", "productName": "Nutriben", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8093 APP_VERSION='1.2.56' quasar dev", + "dev": "PORT=8093 APP_VERSION='1.2.57' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.57' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.57' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.56' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.57' 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.56' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.56' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.57' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8093 APP_VERSION='1.2.57' 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 ebd5a464..dfcbf808 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.56", + "version": "1.2.57", "description": "PiuCheBuono", "productName": "PiuCheBuono", "author": "Surya", @@ -9,11 +9,11 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8085 APP_VERSION='1.2.56' quasar dev", + "dev": "PORT=8085 APP_VERSION='1.2.57' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.57' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.57' 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.56' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.56' quasar dev", + "pwa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.57' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8085 APP_VERSION='1.2.57' 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 9d989d65..268a91d3 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.56", + "version": "1.2.57", "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.56' PORT=8084 quasar dev", + "dev": "APP_VERSION='1.2.57' PORT=8084 quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.56' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.57' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.57' 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.56' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.56' quasar dev", + "pwa": "NODE_ENV=development PORT=8094 APP_VERSION='1.2.57' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8084 APP_VERSION='1.2.57' 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 bbb23891..f553cce2 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.56'; +const VITE_APP_VERSION = '1.2.57'; // Costanti di configurazione const DYNAMIC_CACHE = 'dynamic-cache-v2'; diff --git a/src/components/CCatalogoCard/CCatalogoCard.ts b/src/components/CCatalogoCard/CCatalogoCard.ts index fa659167..d967a000 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.ts +++ b/src/components/CCatalogoCard/CCatalogoCard.ts @@ -657,7 +657,7 @@ export default defineComponent({ const numfatturati = props.scheda.etichette?.bestseller?.quantiFattRaggiunti ?? 50; - return myproduct.value!.productInfo.fatLast6M > numfatturati; + return myproduct.value!.productInfo.fatLast1Y > numfatturati; } } catch (e) { return false; diff --git a/src/components/CMyEditElem/CMyEditElem.vue b/src/components/CMyEditElem/CMyEditElem.vue index 0c73e206..832053ab 100755 --- a/src/components/CMyEditElem/CMyEditElem.vue +++ b/src/components/CMyEditElem/CMyEditElem.vue @@ -2015,9 +2015,6 @@ map-options > - LL: {{Products.getFilePathByLinkIdTemplate( - recscheda.scheda.linkIdTemplate - )}} +