From d90b46c20669527063687927b5b85917a85a82cf Mon Sep 17 00:00:00 2001 From: Surya Paolo Date: Thu, 28 Dec 2023 00:50:42 +0100 Subject: [PATCH] - Aggiornamento template mail (tramite i campi in HTML) - Aggiornato Carrello --- src/common/shared_vuejs.ts | 12 +- src/components/CMyCart/CMyCart.ts | 6 + src/components/CMyCart/CMyCart.vue | 43 +++- src/components/CProductCard/CProductCard.ts | 65 ------ src/components/CProductCard/CProductCard.vue | 20 +- src/components/CSingleCart/CSingleCart.scss | 12 +- src/components/CSingleCart/CSingleCart.vue | 216 +++++++++++-------- src/components/CTitleBanner/CTitleBanner.vue | 2 +- src/components/MyHeader/MyHeader.scss | 4 + src/components/MyHeader/MyHeader.vue | 11 +- src/model/Products.ts | 5 + src/rootgen/admin/importdata/importdata.ts | 51 +++-- src/statics/lang/it.js | 7 +- src/store/Modules/fieldsTable.ts | 4 + src/store/Products.ts | 133 +++++++++--- upload/products/5600872803133.jpg | Bin 0 -> 27161 bytes upload/products/8017977043550.jpg | Bin 0 -> 124764 bytes 17 files changed, 354 insertions(+), 237 deletions(-) create mode 100644 upload/products/5600872803133.jpg create mode 100644 upload/products/8017977043550.jpg diff --git a/src/common/shared_vuejs.ts b/src/common/shared_vuejs.ts index 913d3596..e31f1675 100755 --- a/src/common/shared_vuejs.ts +++ b/src/common/shared_vuejs.ts @@ -33,28 +33,28 @@ export const shared_consts = { Units_Of_Measure_ListBox: [ { label: '[Nessuno]', - value: 0, short: '', + value: 0, }, { label: 'Grammi (g)', - value: 1, short: 'g', + value: 1, }, { label: 'Chili (kg)', + short: 'Kg', value: 2, - short: 'kg', }, { - label: 'Litri (l)', + label: 'Litri (L)', + short: 'L', value: 3, - short: 'lt', }, { label: 'Pezzi (p)', + short: 'p', value: 4, - short: 'pz', }, ], diff --git a/src/components/CMyCart/CMyCart.ts b/src/components/CMyCart/CMyCart.ts index 19e9dd37..7fbdec51 100755 --- a/src/components/CMyCart/CMyCart.ts +++ b/src/components/CMyCart/CMyCart.ts @@ -55,6 +55,10 @@ export default defineComponent({ products.loadOrders() } + function existsOrders() { + return products.getNumOrders() > 0 + } + onMounted(mounted) return { @@ -64,6 +68,8 @@ export default defineComponent({ numOrders, closecart, getnumItemsCart, + existsOrders, + globalStore, } }, }) diff --git a/src/components/CMyCart/CMyCart.vue b/src/components/CMyCart/CMyCart.vue index 7a5797d0..9009dd9e 100755 --- a/src/components/CMyCart/CMyCart.vue +++ b/src/components/CMyCart/CMyCart.vue @@ -4,23 +4,27 @@
- + {{ getnumItemsCart() }}
- Totale: € {{ - myTotalPrice ? myTotalPrice.toFixed(2) : 0 }} + Totale: + € {{ myTotalPrice ? myTotalPrice.toFixed(2) : 0 }}
- - - - +
@@ -28,12 +32,31 @@
- +
- +
+ + +
diff --git a/src/components/CProductCard/CProductCard.ts b/src/components/CProductCard/CProductCard.ts index edaa2af5..f276ba09 100755 --- a/src/components/CProductCard/CProductCard.ts +++ b/src/components/CProductCard/CProductCard.ts @@ -192,16 +192,6 @@ export default defineComponent({ return false } - function getQtyAvailable() { - let qty = myproduct.value.quantityAvailable! - return qty - } - - function getQtyBookableAvailable() { - let qty = myproduct.value.bookableAvailableQty! - return qty - } - function getQtyWarn() { if (myorder.quantity > 0) { return t('ecomm.di_cui_x_in_carrello', { qty: myorder.quantity }) @@ -274,55 +264,6 @@ export default defineComponent({ return 'myimgproduct centermydiv' } - function enableSubQty() { - let qty = myorder.quantity + myorder.quantitypreordered - return qty ? qty > 0 : false - } - - function enableAddQty() { - if (site.value.ecomm && site.value.ecomm.enablePreOrders) { - return (getQtyBookableAvailable() > 0 - && (myproduct.value.maxBookableQty === 0 - || (myorder.quantitypreordered + 1 < myproduct.value.maxBookableQty)) - ) - || (getQtyAvailable() > 0) - && (myproduct.value.maxBookableQty === 0 - || (myorder.quantity + 1 < myproduct.value.maxBookableQty )) - - } else { - return (getQtyAvailable() > 0) - && (myproduct.value.maxBookableQty === 0 - || (myorder.quantity + 1 < myproduct.value.maxBookableQty )) - } - - } - - function qtaNextAdd() { - let step = 1 - if (getQtyAvailable() > 0) { - if (myorder.quantity === 0) - step = myproduct.value.minBuyQty | 1 - } else { - if (myorder.quantitypreordered === 0) - step = myproduct.value.minBuyQty | 1 - } - - return step - } - - function qtaNextSub() { - let step = 1 - let minqta = myproduct.value.minBuyQty | 1 - if (getQtyAvailable() > 0) { - if (myorder.quantity === minqta) - step = minqta - } else { - if (myorder.quantitypreordered === minqta) - step = minqta - } - - return step - } function visuListDisponibili() { openlistorders.value = true @@ -362,9 +303,6 @@ export default defineComponent({ t, storeSelected, gasordineSelected, - enableSubQty, - enableAddQty, - getQtyAvailable, getQtyWarn, openlistorders, func_tools, @@ -375,12 +313,9 @@ export default defineComponent({ shared_consts, site, getQtyWarnPreOrdered, - getQtyBookableAvailable, listord, sumval, getGasordines, - qtaNextAdd, - qtaNextSub, } } }) diff --git a/src/components/CProductCard/CProductCard.vue b/src/components/CProductCard/CProductCard.vue index a49af567..ed955537 100755 --- a/src/components/CProductCard/CProductCard.vue +++ b/src/components/CProductCard/CProductCard.vue @@ -1,5 +1,5 @@