diff --git a/src/components/CMyCart/CMyCart.vue b/src/components/CMyCart/CMyCart.vue index 730be054..7a5797d0 100755 --- a/src/components/CMyCart/CMyCart.vue +++ b/src/components/CMyCart/CMyCart.vue @@ -10,17 +10,15 @@
- Totale: € {{ myTotalPrice ? myTotalPrice.toFixed(2) : 0 }} + Totale: € {{ + myTotalPrice ? myTotalPrice.toFixed(2) : 0 }}
- +
@@ -29,10 +27,13 @@ {{ $t('ecomm.carrello_vuoto') }}
- +
+ + +
+ diff --git a/src/components/CProductCard/CProductCard.scss b/src/components/CProductCard/CProductCard.scss index c5714358..1d173abc 100755 --- a/src/components/CProductCard/CProductCard.scss +++ b/src/components/CProductCard/CProductCard.scss @@ -6,15 +6,20 @@ font-size: 0.9rem; } -.centeritems{ +.centeritems { place-content: center; } -.prod_price{ +.prod_price { font-size: 1.25rem; } -.prod_disp{ +.prod_disp { + font-size: 1.2rem; +} + + +.prod_preorder{ font-size: 1.2rem; } @@ -22,13 +27,13 @@ font-size: 1.2rem; } -.prod_qtywarn{ +.prod_qtywarn { padding-left: 10px; font-size: 1rem; color: grey; } -.totali{ +.totali { font-weight: bold; font-size: 1.2rem; } @@ -36,4 +41,9 @@ .prod_sconti { font-size: 1.1rem; color: blue; +} + +.product_code { + font-size: 0.75rem; + color: gray; } \ No newline at end of file diff --git a/src/components/CProductCard/CProductCard.ts b/src/components/CProductCard/CProductCard.ts index 83b0a44b..7a60817a 100755 --- a/src/components/CProductCard/CProductCard.ts +++ b/src/components/CProductCard/CProductCard.ts @@ -79,48 +79,15 @@ export default defineComponent({ return 'fas fa-heart' } } - function addtoCart(add: boolean) { + async function addtoCart(add: boolean) { if (!userStore.isLogged) { tools.showNeutralNotif($q, t('ecomm.area_personale')) globalStore.rightDrawerOpen = true return false } - - - if (myproduct.value) { - products.addToCart({ product: myproduct.value, order: myorder, addqty: add }).then((ris: any) => { - let strprod = t('ecomm.prodotto') - - let msg = '' - console.log('ris', ris) - if (ris === null || ris.myord == null) { - msg = t('ecomm.error_cart') - tools.showNegativeNotif($q, msg) - return - } else { - - let qta = ris.myord.quantity + ris.myord.quantitypreordered - if (qta > 1 || qta === 0) - strprod = t('ecomm.prodotti') - - if (qta === 0) { - msg = t('ecomm.prodotto_tolto') - } else { - msg = t('ecomm.prod_sul_carrello', { strprod, qty: qta }) - } - - } - - updateproduct() - - if (ris === null || ris.myord.quantity === 0) - tools.showNotif($q, msg) - else - tools.showPositiveNotif($q, msg) - - }) - } + + await products.addtoCartBase({ $q, t, code: myproduct.value.code!, order: myorder, addqty: add }) } function getnumstore() { @@ -146,7 +113,7 @@ export default defineComponent({ } function updateproduct() { - myproduct.value = products.getProduct(props.code) + myproduct.value = products.getProductByCode(props.code) // products.updateQuantityAvailable(myproduct.value._id) } @@ -214,7 +181,7 @@ export default defineComponent({ // console.log('Load', myproduct.value.name) // console.log('created Cproductcard', code) - arrordersCart.value = products.getOrdersCartByIdProduct(myproduct.value._id) + arrordersCart.value = products.getOrdersCartInAttesaByIdProduct(myproduct.value._id) if (!!myproduct.value) { if (myproduct.value.storehouses && myproduct.value.storehouses.length === 1) { @@ -246,7 +213,7 @@ export default defineComponent({ } function enableAddQty() { - if (site.value.ecomm!.enablePreOrders) { + if (site.value.ecomm && site.value.ecomm.enablePreOrders) { return true } else { return getQtyAvailable() > 0 diff --git a/src/components/CProductCard/CProductCard.vue b/src/components/CProductCard/CProductCard.vue index 69e18183..9e774f2e 100755 --- a/src/components/CProductCard/CProductCard.vue +++ b/src/components/CProductCard/CProductCard.vue @@ -25,6 +25,9 @@
{{ myproduct.name }}
+
+   {{$t('ecomm.codice')}}: {{ myproduct.code }} +
diff --git a/src/components/CSingleCart/CSingleCart.scss b/src/components/CSingleCart/CSingleCart.scss index 4f761b1c..bade4da9 100755 --- a/src/components/CSingleCart/CSingleCart.scss +++ b/src/components/CSingleCart/CSingleCart.scss @@ -15,7 +15,19 @@ width: 50px; } -.ordine_scontato_barrato{ - text-decoration: line-through; +.ordine_scontato{ color: gray; + font-size: 0.85rem; +} +.barrato { + text-decoration: line-through; +} +.ordine_scontato_nuovo{ + font-size: 1.1rem; + font-weight: bold; +} +.ordine_scritta_sconto{ + font-style: italic; + color: green; + font-weight: bold; } \ No newline at end of file diff --git a/src/components/CSingleCart/CSingleCart.ts b/src/components/CSingleCart/CSingleCart.ts index c630c6fd..c7cf123f 100755 --- a/src/components/CSingleCart/CSingleCart.ts +++ b/src/components/CSingleCart/CSingleCart.ts @@ -89,11 +89,16 @@ export default defineComponent({ products.removeFromCart({ order: order.value }) } + function getRisparmio(): string { + return ((order.value.price * order.value.quantity) - order.value.TotalPriceProduct).toFixed(2) + } + return { myimgclass, addsubqty, removeFromCard, isApplicatoSconto, + getRisparmio, } }, }) diff --git a/src/components/CSingleCart/CSingleCart.vue b/src/components/CSingleCart/CSingleCart.vue index d78dc4f7..ae745d84 100755 --- a/src/components/CSingleCart/CSingleCart.vue +++ b/src/components/CSingleCart/CSingleCart.vue @@ -1,5 +1,5 @@ diff --git a/src/views/ecommerce/productsList/productsList.vue b/src/views/ecommerce/productsList/productsList.vue index 9720420f..e6aff2bd 100755 --- a/src/views/ecommerce/productsList/productsList.vue +++ b/src/views/ecommerce/productsList/productsList.vue @@ -9,7 +9,7 @@