diff --git a/.env.production b/.env.production index b6e48097..806a4a4b 100644 --- a/.env.production +++ b/.env.production @@ -9,3 +9,5 @@ DIRECTORY_LOCAL="myprojplanet_vite" DIRECTORY_SERVER="/var/www/nodejs_piuchebuono_server" SERVERDIR_WEBSITE="/var/www/gruppomacro.app" SERVERPW_WEBSITE="pwdadmin@1AOK" +PORT_SPA="8089" +PORT_PWA="8099" \ No newline at end of file diff --git a/.gitignore b/.gitignore index 9834a8b9..75ded8bf 100755 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ upload/ ._upload scripts/localhost.pem scripts/localhost-key.pem +scripts/_ALL_SITES/ \ No newline at end of file diff --git a/index.html b/index.html index 5355e096..e69af298 100755 --- a/index.html +++ b/index.html @@ -10,7 +10,7 @@ - + diff --git a/package.json b/package.json index 89ab143d..c1ed96ac 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "gruppomacro", - "version": "1.2.32", + "version": "1.2.33", "description": "Gruppo Macro", "productName": "Gruppo Macro", "author": "Surya", @@ -9,20 +9,20 @@ "license": "MIT", "type": "module", "scripts": { - "dev": "PORT=8089 APP_VERSION='1.2.32' quasar dev", + "dev": "PORT=8089 APP_VERSION='1.2.33' quasar dev", "dev_noCheck": "SKIP_TSC=true quasar dev", "build": "quasar build", - "buildpwa": "NODE_ENV=production APP_VERSION='1.2.32' quasar build -m pwa", - "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.32' quasar build -m pwa", + "buildpwa": "NODE_ENV=production APP_VERSION='1.2.33' quasar build -m pwa", + "buildpwatest": "NODE_ENV=production APP_VERSION='1.2.33' quasar build -m pwa", "type-check": "vue-tsc --noEmit", "type-check:watch": "vue-tsc --noEmit --watch", - "buildspa": "APP_VERSION='1.2.32' quasar build -m spa", + "buildspa": "APP_VERSION='1.2.33' 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.32' quasar dev -m pwa", - "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.32' quasar dev", + "pwa": "NODE_ENV=development PORT=8099 APP_VERSION='1.2.33' quasar dev -m pwa", + "spa": "NODE_ENV=development PORT=8089 APP_VERSION='1.2.33' quasar dev", "debug": "quasar dev --mode debug", "test": "echo \"No test specified\" && exit 0", "generate-sw": "workbox generateSW workbox-config.js", diff --git a/public/fonts/AGaramondPro Regular.otf b/public/fonts/AGaramondPro Regular.otf new file mode 100755 index 00000000..db89cfed Binary files /dev/null and b/public/fonts/AGaramondPro Regular.otf differ diff --git a/public/fonts/DIN Pro Condensed Bold Italic.otf b/public/fonts/DIN Pro Condensed Bold Italic.otf new file mode 100644 index 00000000..81447cf0 Binary files /dev/null and b/public/fonts/DIN Pro Condensed Bold Italic.otf differ diff --git a/public/fonts/DIN Pro Condensed Medium Italic.otf b/public/fonts/DIN Pro Condensed Medium Italic.otf new file mode 100644 index 00000000..5d50d16c Binary files /dev/null and b/public/fonts/DIN Pro Condensed Medium Italic.otf differ diff --git a/public/fonts/DIN Pro Condensed Regular.otf b/public/fonts/DIN Pro Condensed Regular.otf new file mode 100644 index 00000000..8bcf37af Binary files /dev/null and b/public/fonts/DIN Pro Condensed Regular.otf differ diff --git a/public/fonts/DINPro-BoldItalic.otf b/public/fonts/DINPro-BoldItalic.otf new file mode 100644 index 00000000..76c99de8 Binary files /dev/null and b/public/fonts/DINPro-BoldItalic.otf differ diff --git a/public/fonts/DINPro-CondBlack.otf b/public/fonts/DINPro-CondBlack.otf new file mode 100755 index 00000000..cbcc768f Binary files /dev/null and b/public/fonts/DINPro-CondBlack.otf differ diff --git a/public/fonts/DINPro-CondensedBold.otf b/public/fonts/DINPro-CondensedBold.otf new file mode 100644 index 00000000..81501d57 Binary files /dev/null and b/public/fonts/DINPro-CondensedBold.otf differ diff --git a/public/fonts/DINPro-Medium.otf b/public/fonts/DINPro-Medium.otf new file mode 100644 index 00000000..6f771ab6 Binary files /dev/null and b/public/fonts/DINPro-Medium.otf differ diff --git a/public/fonts/DINPro.otf b/public/fonts/DINPro.otf new file mode 100644 index 00000000..e6e44b10 Binary files /dev/null and b/public/fonts/DINPro.otf differ diff --git a/public/fonts/font_maps.ttf b/public/fonts/font_maps.ttf new file mode 100644 index 00000000..5c26ed5a Binary files /dev/null and b/public/fonts/font_maps.ttf differ diff --git a/public/fonts/font_maps.woff b/public/fonts/font_maps.woff new file mode 100644 index 00000000..a886dcf1 Binary files /dev/null and b/public/fonts/font_maps.woff differ diff --git a/public/fonts/gogocarto.woff b/public/fonts/gogocarto.woff new file mode 100644 index 00000000..c31a3b6e Binary files /dev/null and b/public/fonts/gogocarto.woff differ diff --git a/scripts/now.txt b/scripts/now.txt index 1e23559a..3b39ebd8 100644 --- a/scripts/now.txt +++ b/scripts/now.txt @@ -1 +1 @@ -TERMINA DI LAVORARE SU riso.app: (Sovrascrivo!) +TERMINA DI LAVORARE SU piuchebuono.app: (Sovrascrivo!) diff --git a/src-pwa/custom-service-worker.js b/src-pwa/custom-service-worker.js index d3bb3d1e..63c8b854 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.32"; +const VITE_APP_VERSION = "1.2.33"; // Costanti di configurazione const DYNAMIC_CACHE = 'dynamic-cache-v2'; diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 39b90cbd..3c14014d 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -2392,13 +2392,13 @@ export const shared_consts = { ORDINAMENTO_CATALOGHI_PUBBLICO: [ { label: '[Nessuno]', value: '' }, { label: 'Alfabetico', value: 'name' }, - { label: 'Data di Pubblicazione', value: 'date_pub_ts' }, + { label: 'Data di Pubblicazione', value: 'date_pub' }, ], ORDINAMENTO_CATALOGHI: [ { label: '[Nessuno]', value: '' }, { label: 'Alfabetico', value: 'name' }, - { label: 'Data di Pubblicazione', value: 'date_pub_ts' }, + { label: 'Data di Pubblicazione', value: 'date_pub' }, { label: 'Totale Venduti', value: 'totVen' }, { label: 'Totale Fatturati', value: 'totFat' }, { label: 'Venduti Ultimi 3 Mesi', value: 'vLast3M' }, @@ -2406,6 +2406,7 @@ export const shared_consts = { { label: 'Venduti Ultimo Anno', value: 'vLastY' }, { label: 'Venduti Ultimi 2 Anni', value: 'vLast2Y' }, { label: 'Fatturati Ultimi 3 Mesi', value: 'fatLast3M' }, + { label: 'Fatturati Ultimi 6 Mesi', value: 'fatLast6M' }, { label: 'Data Ultimo Ordine', value: 'dataUltimoOrdine' }, ], @@ -2473,6 +2474,7 @@ export const shared_consts = { CmdQueryMs: { GET: 0, SET: 1, + UPDATE: 2, }, SCHEDA_PRODOTTO: { diff --git a/src/components/CCatalogoCard/CCatalogoCard.ts b/src/components/CCatalogoCard/CCatalogoCard.ts index c4496a0f..77ce9f29 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.ts +++ b/src/components/CCatalogoCard/CCatalogoCard.ts @@ -115,7 +115,9 @@ export default defineComponent({ const apriSchedaPDF = ref(false) const visufromgm = ref(false) + const updatelocaldb = ref(false) const updatefromgm = ref(false) + const updatetogm = ref(false) const showQtaDisponibile = ref(false) const field_updated_fromGM = ref('') @@ -312,7 +314,7 @@ export default defineComponent({ if (carica) { myproduct.value = null; - updateproductmodif() + updateproductmodif(null) } // products.updateQuantityAvailable(myproduct.value._id) @@ -334,9 +336,9 @@ export default defineComponent({ console.log('CCATALOGOCARD: updateproductmodif') try { if (element?._id) { - myproduct.value = await products.getProductById(element?._id) + myproduct.value = await products.getProductById(element?._id, true) } else { - myproduct.value = await products.getProductById(props.id) + myproduct.value = await products.getProductById(props.id, true) } updateLabel() @@ -627,8 +629,8 @@ export default defineComponent({ function isProductBestseller() { try { - //return myproduct.value!.productInfo.rank1Y! > 0 && (myproduct.value!.productInfo.rank1Y! < props.scheda.etichette?.bestseller?.primiNInClassifica!) - return myproduct.value!.indiceRanking! > 0 && (myproduct.value!.indiceRanking! < props.scheda.etichette?.bestseller?.primiNInClassifica) + // diventa un bestseller quando il rank6M è tra i primi 10 ordinandoli per rank6M + return myproduct.value!.productInfo.rank6M! > 0 && (myproduct.value!.productInfo.rank6M!) } catch (e) { return false } @@ -643,6 +645,19 @@ export default defineComponent({ } async function refreshDataFromGM() { + if (myproduct.value) { + loading.value = true + updatefromgm.value = true + field_updated_fromGM.value = '' + const ris = await globalStore.updateLocalDbFromGM_T_Web_Articoli(myproduct.value.productInfo.sku!) + if (ris) { + field_updated_fromGM.value = t('dbgm.updateLocalDb_OK') + + await updateproduct(false) + tools.showPositiveNotif($q, t('dbgm.updateLocalDb_OK')) + } + loading.value = false + } } async function refreshFieldFromGM(field: string) { @@ -653,7 +668,6 @@ export default defineComponent({ field_updated_fromGM.value = await globalStore.getGM_FieldOf_T_Web_Articoli(myproduct.value.productInfo.sku!, field, shared_consts.CmdQueryMs.GET) loading.value = false } - } onMounted(mounted) @@ -728,8 +742,10 @@ export default defineComponent({ showQtaDisponibile, field_updated_fromGM, refreshFieldFromGM, + updatetogm, refreshDataFromGM, loading, + updatelocaldb, } } }) diff --git a/src/components/CCatalogoCard/CCatalogoCard.vue b/src/components/CCatalogoCard/CCatalogoCard.vue index c436fff6..b9ad0a31 100755 --- a/src/components/CCatalogoCard/CCatalogoCard.vue +++ b/src/components/CCatalogoCard/CCatalogoCard.vue @@ -154,7 +154,7 @@ /> - Aggiorna da GM + Carica da GM @@ -575,6 +576,8 @@ @updateproductmodif="updateproductmodif" > + + updateFieldToGM + + + + Aggiorna su GM: + + + + + + + +
+ +
+
+
+
diff --git a/src/components/CContainerCatalogoCard/CContainerCatalogoCard.ts b/src/components/CContainerCatalogoCard/CContainerCatalogoCard.ts index 78d8ac7f..211d6c49 100755 --- a/src/components/CContainerCatalogoCard/CContainerCatalogoCard.ts +++ b/src/components/CContainerCatalogoCard/CContainerCatalogoCard.ts @@ -106,6 +106,7 @@ export default defineComponent({ } function updateproductmodif(element: IProduct) { + console.log('CCONTAIER: updateproductmodif') emit('updateproductmodif', element) } diff --git a/src/components/CLabel/CLabel.vue b/src/components/CLabel/CLabel.vue index 3f506e19..1300e364 100755 --- a/src/components/CLabel/CLabel.vue +++ b/src/components/CLabel/CLabel.vue @@ -1,29 +1,45 @@