diff --git a/.env.prod.pcb b/.env.prod.pcb index b9ba0995..cad45730 100644 --- a/.env.prod.pcb +++ b/.env.prod.pcb @@ -4,6 +4,7 @@ APP_ID="17" DIRECTORY_LOCAL=newfreeplanet DIRECTORY_SERVER=freeplanet_serverside SERVERDIR_WEBSITE="/var/customers/webs/paolouser/piuchebuono.app/" +SERVERPW_WEBSITE=pwdadmin@1AOK APP_URL="https://piuchebuono.app" URL_FACEBOOK="" PROVA_PAOLO="" diff --git a/4012824400047.jpg b/4012824400047.jpg deleted file mode 100644 index 250fe70d..00000000 Binary files a/4012824400047.jpg and /dev/null differ diff --git a/4012824400092.jpg b/4012824400092.jpg deleted file mode 100644 index f9ec8532..00000000 Binary files a/4012824400092.jpg and /dev/null differ diff --git a/B00001.jpg b/B00001.jpg deleted file mode 100644 index a2e34a2e..00000000 Binary files a/B00001.jpg and /dev/null differ diff --git a/B00002.jpg b/B00002.jpg deleted file mode 100644 index 82a4a5e2..00000000 Binary files a/B00002.jpg and /dev/null differ diff --git a/B00003.jpg b/B00003.jpg deleted file mode 100644 index 1f37b6a0..00000000 Binary files a/B00003.jpg and /dev/null differ diff --git a/public/images/piuchebuono.jpg b/public/images/piuchebuono.jpg new file mode 100644 index 00000000..88e9bab0 Binary files /dev/null and b/public/images/piuchebuono.jpg differ diff --git a/src/components/CMyValueDb/CMyValueDb.vue b/src/components/CMyValueDb/CMyValueDb.vue index f968129e..7225d928 100755 --- a/src/components/CMyValueDb/CMyValueDb.vue +++ b/src/components/CMyValueDb/CMyValueDb.vue @@ -2,7 +2,7 @@
-
+
- - - - - - - {{ t('ecomm.bloccati') }}: - - - {{ products.getQtyBloccataAvailable(myproduct) }} - - - - (): ICatProd[] => { - return state.catprods + getCatProds: (state: IProductsState) => (cosa: number): ICatProd[] => { + if (cosa === shared_consts.PROD.GAS) + return state.catprods_gas + else if (cosa === shared_consts.PROD.GAS) + return state.catprods + else + return [...state.catprods, ...state.catprods_gas] + }, getNumProdTot: (state: IProductsState) => (): number => { @@ -125,7 +132,7 @@ export const useProducts = defineStore('Products', { const hasGasOrdines = rec.idGasordine if ((cosa === shared_consts.PROD.GAS && hasGasOrdines) || - (cosa === shared_consts.PROD.BOTTEGA && ((!hasGasOrdines || (hasGasOrdines && rec.idGasordine))))) { + (cosa === shared_consts.PROD.BOTTEGA && (!hasGasOrdines))) { return true; } @@ -1026,6 +1033,11 @@ export const useProducts = defineStore('Products', { return arrprod.length }, + getNumQtaTutti() { + const arrprod = this.getProducts(shared_consts.PROD.TUTTI) + return arrprod.length + }, + getNumQtaBottega() { const arrprod = this.getProducts(shared_consts.PROD.BOTTEGA) return arrprod.length diff --git a/src/store/globalStore.ts b/src/store/globalStore.ts index c503532d..a89c3311 100644 --- a/src/store/globalStore.ts +++ b/src/store/globalStore.ts @@ -327,6 +327,7 @@ export const useGlobalStore = defineStore('GlobalStore', { else if (table === 'departments') ris = state.departments else if (table === 'categorys') ris = state.categories else if (table === 'catprods') ris = Products.catprods + else if (table === 'catprods_gas') ris = Products.catprods_gas else if (table === 'sharewithus') ris = state.sharewithus else if (table === 'paymenttypes') ris = state.paymenttypes else if (table === 'circuits') ris = circuitStore.listcircuits @@ -1553,6 +1554,7 @@ export const useGlobalStore = defineStore('GlobalStore', { this.providers = (res.data.providers) ? [...res.data.providers] : [] Products.catprods = (res.data.catprods) ? [...res.data.catprods] : [] + Products.catprods_gas = (res.data.catprods_gas) ? [...res.data.catprods_gas] : [] this.gasordines = (res.data.gasordines) ? [...res.data.gasordines] : [] this.scontisticas = (res.data.scontisticas) ? [...res.data.scontisticas] : [] diff --git a/src/views/ecommerce/cash/cash.ts b/src/views/ecommerce/cash/cash.ts index 3aefa8ef..17214fcc 100755 --- a/src/views/ecommerce/cash/cash.ts +++ b/src/views/ecommerce/cash/cash.ts @@ -79,13 +79,13 @@ export default defineComponent({ async function mounted() { loadpage.value = false await productStore.loadProducts() - cosa.value = tools.getCookie(tools.COOK_COSA_PRODOTTI, shared_consts.PROD.BOTTEGA, true) + cosa.value = tools.getCookie(tools.COOK_COSA_PRODOTTI, shared_consts.PROD.TUTTI, true) // Inizializza loadpage.value = true } function getCatProds() { - let arrcat = productStore.getCatProds() + let arrcat = productStore.getCatProds(cosa.value) let riscat: any = [{ label: 'Tutti', value: '', icon: undefined, color: undefined }] for (const rec of arrcat) { riscat.push({ label: rec.name, value: rec._id, icon: rec.icon, color: rec.color }) diff --git a/src/views/ecommerce/cash/cash.vue b/src/views/ecommerce/cash/cash.vue index faee3995..2759427e 100755 --- a/src/views/ecommerce/cash/cash.vue +++ b/src/views/ecommerce/cash/cash.vue @@ -16,10 +16,20 @@ dense toggle-color="purple" :options="[ + { value: shared_consts.PROD.TUTTI, slot: 'tutti' }, { value: shared_consts.PROD.BOTTEGA, slot: 'bottega' }, { value: shared_consts.PROD.GAS, slot: 'gas' }, ]" > + +