diff --git a/components/Header/Navigation/HeaderNavigation.vue b/components/Header/Navigation/HeaderNavigation.vue index 6b66c68..947f5a6 100644 --- a/components/Header/Navigation/HeaderNavigation.vue +++ b/components/Header/Navigation/HeaderNavigation.vue @@ -67,7 +67,7 @@ export default defineComponent({ currentCategory.value = category; }; - const hasChildren = (category: CategoryTree) => Boolean(category?.children); + const hasChildren = (category: CategoryTree) => Boolean(category?.children?.length); const setFocus = (event: MouseEvent & { target: HTMLElement }) => { focusedElement = event.target; diff --git a/modules/catalog/product/components/ProductAddReviewForm.vue b/modules/catalog/product/components/ProductAddReviewForm.vue index 92bedc9..173aa06 100644 --- a/modules/catalog/product/components/ProductAddReviewForm.vue +++ b/modules/catalog/product/components/ProductAddReviewForm.vue @@ -308,6 +308,10 @@ export default defineComponent({ margin-right: 0; margin-bottom: 0; } + textarea { + box-sizing: border-box; + width: 100%; + } } } } diff --git a/modules/catalog/product/getters/productGetters.ts b/modules/catalog/product/getters/productGetters.ts index 524255f..209f52e 100644 --- a/modules/catalog/product/getters/productGetters.ts +++ b/modules/catalog/product/getters/productGetters.ts @@ -92,11 +92,11 @@ export const getPrice = (product: ProductInterface): Price => { export const getGallery = (product: Product, maxGallerySize = 4): MediaGalleryItem[] => { const images = []; - if (!product?.media_gallery && !product?.configurable_product_options_selection?.media_gallery) { + if (!product?.media_gallery.length && !product?.configurable_product_options_selection?.media_gallery.length) { return images; } - const selectedGallery = product.configurable_product_options_selection?.media_gallery + const selectedGallery = product.configurable_product_options_selection?.media_gallery.length ? product.configurable_product_options_selection.media_gallery : product.media_gallery; diff --git a/modules/customer/pages/MyAccount/AddressesDetails/AddressEdit.vue b/modules/customer/pages/MyAccount/AddressesDetails/AddressEdit.vue index a7df3bb..2a93eef 100644 --- a/modules/customer/pages/MyAccount/AddressesDetails/AddressEdit.vue +++ b/modules/customer/pages/MyAccount/AddressesDetails/AddressEdit.vue @@ -69,10 +69,6 @@ export default defineComponent({ diff --git a/modules/customer/pages/MyAccount/AddressesDetails/AddressNew.vue b/modules/customer/pages/MyAccount/AddressesDetails/AddressNew.vue index 44fc40e..b7f0cd0 100644 --- a/modules/customer/pages/MyAccount/AddressesDetails/AddressNew.vue +++ b/modules/customer/pages/MyAccount/AddressesDetails/AddressNew.vue @@ -43,10 +43,5 @@ export default defineComponent({ diff --git a/modules/customer/pages/MyAccount/AddressesDetails/AddressesDetails.vue b/modules/customer/pages/MyAccount/AddressesDetails/AddressesDetails.vue index f5efb8c..f50f590 100644 --- a/modules/customer/pages/MyAccount/AddressesDetails/AddressesDetails.vue +++ b/modules/customer/pages/MyAccount/AddressesDetails/AddressesDetails.vue @@ -179,12 +179,7 @@ export default defineComponent({