diff --git a/storefront/components/Basic/Table/Table.tsx b/storefront/components/Basic/Table/Table.tsx index 1ff7fd57bb..250b6a0eb1 100644 --- a/storefront/components/Basic/Table/Table.tsx +++ b/storefront/components/Basic/Table/Table.tsx @@ -3,11 +3,12 @@ import { twMergeCustom } from 'utils/twMerge'; type TableProps = { head?: ReactNode; + tableClassName?: string; }; -export const Table: FC = ({ head, children, className }) => ( +export const Table: FC = ({ head, children, className, tableClassName }) => (
- +
{!!head && {head}} {children}
diff --git a/storefront/components/Blocks/Skeleton/SkeletonManager.tsx b/storefront/components/Blocks/Skeleton/SkeletonManager.tsx index ec2d0f2446..c1504add34 100644 --- a/storefront/components/Blocks/Skeleton/SkeletonManager.tsx +++ b/storefront/components/Blocks/Skeleton/SkeletonManager.tsx @@ -4,6 +4,7 @@ import { SkeletonPageBlogCategory } from './SkeletonPageBlogCategory'; import { SkeletonPageCart } from './SkeletonPageCart'; import { SkeletonPageComparison } from './SkeletonPageComparison'; import { SkeletonPageConfirmation } from './SkeletonPageConfirmation'; +import { SkeletonPageContact } from './SkeletonPageContact'; import { SkeletonPageContactInformation } from './SkeletonPageContactInformation'; import { SkeletonPageHome } from './SkeletonPageHome'; import { SkeletonPageOrder } from './SkeletonPageOrder'; @@ -91,6 +92,8 @@ export const SkeletonManager: FC = ({ return ; case 'order-confirmation': return ; + case 'contact': + return ; default: return null; } diff --git a/storefront/components/Blocks/Skeleton/SkeletonPageContact.tsx b/storefront/components/Blocks/Skeleton/SkeletonPageContact.tsx new file mode 100644 index 0000000000..3fe34eb979 --- /dev/null +++ b/storefront/components/Blocks/Skeleton/SkeletonPageContact.tsx @@ -0,0 +1,13 @@ +import { Webline } from 'components/Layout/Webline/Webline'; +import Skeleton from 'react-loading-skeleton'; + +export const SkeletonPageContact: FC = () => ( +
+ + + + + + +
+); diff --git a/storefront/components/Layout/Header/MenuIconic/MenuIconicPlaceholder.tsx b/storefront/components/Layout/Header/MenuIconic/MenuIconicPlaceholder.tsx index d6a0bcfd7b..080c4020ea 100644 --- a/storefront/components/Layout/Header/MenuIconic/MenuIconicPlaceholder.tsx +++ b/storefront/components/Layout/Header/MenuIconic/MenuIconicPlaceholder.tsx @@ -10,7 +10,7 @@ import { twJoin } from 'tailwind-merge'; import { getInternationalizedStaticUrls } from 'utils/staticUrls/getInternationalizedStaticUrls'; const placeholderItemTwClass = - 'flex items-center justify-center py-4 px-3 gap-2 rounded-tr-none text-sm text-linkInverted no-underline'; + 'flex items-center justify-center py-4 px-3 gap-2 rounded-tr-none text-sm text-linkInverted no-underline hover:!text-linkInvertedHovered hover:!no-underline'; export const MenuIconicPlaceholder: FC = () => { const { t } = useTranslation(); diff --git a/storefront/components/Pages/BlogArticle/BlogArticleDetailContent.tsx b/storefront/components/Pages/BlogArticle/BlogArticleDetailContent.tsx index 4b38dc8936..b84dad1ef1 100644 --- a/storefront/components/Pages/BlogArticle/BlogArticleDetailContent.tsx +++ b/storefront/components/Pages/BlogArticle/BlogArticleDetailContent.tsx @@ -2,6 +2,7 @@ import { Image } from 'components/Basic/Image/Image'; import { GrapesJsParser } from 'components/Basic/UserText/GrapesJsParser'; import { BlogLayout } from 'components/Layout/BlogLayout'; import { ArticleTitle } from 'components/Pages/Article/ArticleTitle'; +import { TIDs } from 'cypress/tids'; import { TypeBlogArticleDetailFragment } from 'graphql/requests/articlesInterface/blogArticles/fragments/BlogArticleDetailFragment.generated'; import { useFormatDate } from 'utils/formatting/useFormatDate'; @@ -29,7 +30,10 @@ export const BlogArticleDetailContent: FC = ({ bl
)} -
+
{formatDate(blogArticle.publishDate, 'l')}
diff --git a/storefront/components/Pages/Customer/OrderDetailContent.tsx b/storefront/components/Pages/Customer/OrderDetailContent.tsx index 82c266e88c..d2bdf8dfb8 100644 --- a/storefront/components/Pages/Customer/OrderDetailContent.tsx +++ b/storefront/components/Pages/Customer/OrderDetailContent.tsx @@ -42,13 +42,10 @@ export const OrderDetailContent: FC = ({ order }) => {
- - + +
{t('Basic information')} - {!!order.trackingNumber && {t('Tracking package')}} - {!!order.note && {t('Your note')}} - {t('Payment information')} @@ -59,8 +56,15 @@ export const OrderDetailContent: FC = ({ order }) => { + +
- {!!order.trackingNumber && ( + {!!order.trackingNumber && ( + + + {t('Tracking package')} + +
{t('Package number')} @@ -73,10 +77,15 @@ export const OrderDetailContent: FC = ({ order }) => { )}
- )} - - {!!order.note && {order.note}} +
+
+ )} + + + {t('Payment information')} + +
{t('Status')} @@ -85,18 +94,33 @@ export const OrderDetailContent: FC = ({ order }) => {
+
-
-
- {!order.isPaid && order.payment.type === PaymentTypeEnum.GoPay && ( + + {!order.isPaid && order.payment.type === PaymentTypeEnum.GoPay && ( +
+
- )} +
-
+ )} + + + + {!!order.note && ( + + + {t('Your note')} + + + {order.note} + +
+ )}
@@ -220,37 +244,39 @@ export const OrderDetailContent: FC = ({ order }) => {
{t('Your purchase')}
-
- {t('Product name')} - {t('Price per piece incl. VAT')} - {t('Amount')} - {t('VAT')} - {t('Total price excl. VAT')} - {t('Total price incl. VAT')} - - } - > - {order.items.map((item, index) => ( - - {item.name} - {formatPrice(item.unitPrice.priceWithVat)} - - {item.quantity} {item.unit} - - {parseFloat(item.vatRate)} % - {formatPrice(item.totalPrice.priceWithoutVat)} - {formatPrice(item.totalPrice.priceWithVat)} - - ))} - - - {t('Total price including VAT')}: {formatPrice(order.totalPrice.priceWithVat)} - - -
+
+ + {t('Product name')} + {t('Price per piece incl. VAT')} + {t('Amount')} + {t('VAT')} + {t('Total price excl. VAT')} + {t('Total price incl. VAT')} + + } + > + {order.items.map((item, index) => ( + + {item.name} + {formatPrice(item.unitPrice.priceWithVat)} + + {item.quantity} {item.unit} + + {parseFloat(item.vatRate)} % + + {formatPrice(item.totalPrice.priceWithoutVat)} + + {formatPrice(item.totalPrice.priceWithVat)} + + ))} +
+
+
+ {t('Total price including VAT')}: {formatPrice(order.totalPrice.priceWithVat)} +
)}
diff --git a/storefront/components/Pages/Customer/Orders/OrderItem.tsx b/storefront/components/Pages/Customer/Orders/OrderItem.tsx index 9a8fc9d307..3dfba21073 100644 --- a/storefront/components/Pages/Customer/Orders/OrderItem.tsx +++ b/storefront/components/Pages/Customer/Orders/OrderItem.tsx @@ -34,7 +34,7 @@ export const OrderItem: FC = ({ order, addOrderItemsToEmptyCart,
{order.isPaid ? ( @@ -173,7 +173,9 @@ const OrderItemRowInfo: FC = ({ title, value, rowValueCla return (
{title} - {value} + + {value} +
); }; diff --git a/storefront/components/Pages/StoreDetail/StoreDetailContent.tsx b/storefront/components/Pages/StoreDetail/StoreDetailContent.tsx index 75a2f70153..64a30c5e9e 100644 --- a/storefront/components/Pages/StoreDetail/StoreDetailContent.tsx +++ b/storefront/components/Pages/StoreDetail/StoreDetailContent.tsx @@ -1,9 +1,9 @@ import { GoogleMap } from 'components/Basic/GoogleMap/GoogleMap'; import { ChatIcon } from 'components/Basic/Icon/ChatIcon'; import { Image } from 'components/Basic/Image/Image'; +import { LabelLink } from 'components/Basic/LabelLink/LabelLink'; import { OpeningHours } from 'components/Blocks/OpeningHours/OpeningHours'; import { OpeningStatus } from 'components/Blocks/OpeningHours/OpeningStatus'; -import { SimpleNavigationListItem } from 'components/Blocks/SimpleNavigation/SimpleNavigationListItem'; import { Webline } from 'components/Layout/Webline/Webline'; import { useDomainConfig } from 'components/providers/DomainConfigProvider'; import { TypeStoreDetailFragment } from 'graphql/requests/stores/fragments/StoreDetailFragment.generated'; @@ -79,14 +79,10 @@ export const StoreDetailContent: FC = ({ store }) => { )}
- , - name: t('Do you have any questions?'), - slug: contactUrl, - }} - /> + + + {t('Do you have any questions?')} +
diff --git a/storefront/cypress/e2e/visits/simpleVisitsWithScreenshots.cy.ts b/storefront/cypress/e2e/visits/simpleVisitsWithScreenshots.cy.ts index 6008d1392b..90151fe94e 100644 --- a/storefront/cypress/e2e/visits/simpleVisitsWithScreenshots.cy.ts +++ b/storefront/cypress/e2e/visits/simpleVisitsWithScreenshots.cy.ts @@ -1,3 +1,4 @@ +import { changeBlogArticleDynamicPartsToStaticDemodata } from './visitsSupport'; import { url } from 'fixtures/demodata'; import { initializePersistStoreInLocalStorageToDefaultValues, takeSnapshotAndCompare } from 'support'; import { TIDs } from 'tids'; @@ -53,6 +54,7 @@ describe('Simple page visit tests with screenshots', () => { it('blog article detail visit with screenshot', function () { cy.visitAndWaitForStableAndInteractiveDOM(url.blogArticleGrapesJs); + changeBlogArticleDynamicPartsToStaticDemodata(); takeSnapshotAndCompare(this.test?.title, 'blog article detail', { blackout: [{ tid: TIDs.product_list_item_image }, { tid: TIDs.footer_social_links }], }); diff --git a/storefront/cypress/e2e/visits/visitsSupport.ts b/storefront/cypress/e2e/visits/visitsSupport.ts new file mode 100644 index 0000000000..9273c7d726 --- /dev/null +++ b/storefront/cypress/e2e/visits/visitsSupport.ts @@ -0,0 +1,7 @@ +import { blogArticle } from 'fixtures/demodata'; +import { changeElementText } from 'support'; +import { TIDs } from 'tids'; + +export const changeBlogArticleDynamicPartsToStaticDemodata = () => { + changeElementText(TIDs.blog_article_publication_date, blogArticle.publicationDate, false); +}; diff --git a/storefront/cypress/fixtures/demodata.ts b/storefront/cypress/fixtures/demodata.ts index e716965163..777c4d164f 100644 --- a/storefront/cypress/fixtures/demodata.ts +++ b/storefront/cypress/fixtures/demodata.ts @@ -53,6 +53,10 @@ export const order = { creationDate: '10/26/1999 10:10 AM', }; +export const blogArticle = { + publicationDate: '10/26/1999', +}; + export const payment = { creditCard: { uuid: '808f7a8a-6143-538e-a46d-3803519ecf00', diff --git a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as logged-in user (transport to home, cash on delivery) and check it in order detail (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as logged-in user (transport to home, cash on delivery) and check it in order detail (order detail).png index f47a197aba..699c502b68 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as logged-in user (transport to home, cash on delivery) and check it in order detail (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as logged-in user (transport to home, cash on delivery) and check it in order detail (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user (PPL, credit cart) and check it in order detail (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user (PPL, credit cart) and check it in order detail (order detail).png index 8917f5361b..ec010d05b3 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user (PPL, credit cart) and check it in order detail (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user (PPL, credit cart) and check it in order detail (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user (personal collection, cash) and check it in order detail (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user (personal collection, cash) and check it in order detail (order detail).png index 9360123f92..58ba48c5b9 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user (personal collection, cash) and check it in order detail (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user (personal collection, cash) and check it in order detail (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user (transport to home, cash on delivery) and check it in order detail (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user (transport to home, cash on delivery) and check it in order detail (order detail).png index afa26567fb..765d929195 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user (transport to home, cash on delivery) and check it in order detail (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user (transport to home, cash on delivery) and check it in order detail (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user with a registered email (transport to home, cash on delivery) and check it in order detail (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user with a registered email (transport to home, cash on delivery) and check it in order detail (order detail).png index 8a5dd05cd7..0b69be0f3d 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user with a registered email (transport to home, cash on delivery) and check it in order detail (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order as unlogged user with a registered email (transport to home, cash on delivery) and check it in order detail (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order with promo code and check it in order detail (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order with promo code and check it in order detail (order detail).png index c862bbcad5..9ae2fc771e 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order with promo code and check it in order detail (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should create order with promo code and check it in order detail (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should register after order completion, and check that the just created order is in customer orders (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should register after order completion, and check that the just created order is in customer orders (order detail).png index 1ed5251ec0..b5a27fdcfd 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should register after order completion, and check that the just created order is in customer orders (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrder.cy.ts/should register after order completion, and check that the just created order is in customer orders (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should first select saved default delivery address for logged-in user, but then fill and keep new delivery address after refresh (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should first select saved default delivery address for logged-in user, but then fill and keep new delivery address after refresh (order detail).png index cea00d5856..6ae5f21d8c 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should first select saved default delivery address for logged-in user, but then fill and keep new delivery address after refresh (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should first select saved default delivery address for logged-in user, but then fill and keep new delivery address after refresh (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should first select saved default delivery address for logged-in user, then fill new delivery address, then change it to a saved one and back to the new address which should stay filled (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should first select saved default delivery address for logged-in user, then fill new delivery address, then change it to a saved one and back to the new address which should stay filled (order detail).png index 405b1ee5f4..f731f168ed 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should first select saved default delivery address for logged-in user, then fill new delivery address, then change it to a saved one and back to the new address which should stay filled (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should first select saved default delivery address for logged-in user, then fill new delivery address, then change it to a saved one and back to the new address which should stay filled (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address after page refresh (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address after page refresh (order detail).png index 3b37ea986e..e4b0171eae 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address after page refresh (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address after page refresh (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address after unchecking the checkbox for different delivery address and then checking it again (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address after unchecking the checkbox for different delivery address and then checking it again (order detail).png index 3b37ea986e..e4b0171eae 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address after unchecking the checkbox for different delivery address and then checking it again (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address after unchecking the checkbox for different delivery address and then checking it again (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address for logged-in user after page refresh (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address for logged-in user after page refresh (order detail).png index 21532adadc..367c117bbe 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address for logged-in user after page refresh (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address for logged-in user after page refresh (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address for logged-in user after unchecking the checkbox for different delivery address and then checking it again (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address for logged-in user after unchecking the checkbox for different delivery address and then checking it again (order detail).png index 0279e9a167..69af6c7411 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address for logged-in user after unchecking the checkbox for different delivery address and then checking it again (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should keep filled delivery address for logged-in user after unchecking the checkbox for different delivery address and then checking it again (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should not prefill delivery contact for logged-in user with saved address and pickup point, but keep filled delivery information after unchecking and checking checkbox for different delivery address (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should not prefill delivery contact for logged-in user with saved address and pickup point, but keep filled delivery information after unchecking and checking checkbox for different delivery address (order detail).png index fbb94fa8e0..e4c643089c 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should not prefill delivery contact for logged-in user with saved address and pickup point, but keep filled delivery information after unchecking and checking checkbox for different delivery address (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should not prefill delivery contact for logged-in user with saved address and pickup point, but keep filled delivery information after unchecking and checking checkbox for different delivery address (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should not prefill delivery contact for logged-in user with saved address and with selected pickup point, and then keep the filled delivery information after refresh (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should not prefill delivery contact for logged-in user with saved address and with selected pickup point, and then keep the filled delivery information after refresh (order detail).png index 596c0a960e..3fa2c72f06 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should not prefill delivery contact for logged-in user with saved address and with selected pickup point, and then keep the filled delivery information after refresh (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should not prefill delivery contact for logged-in user with saved address and with selected pickup point, and then keep the filled delivery information after refresh (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should prefill delivery address from selected pickup point and keep delivery contact after refresh (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should prefill delivery address from selected pickup point and keep delivery contact after refresh (order detail).png index 86fe6d9876..24eb985e1a 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should prefill delivery address from selected pickup point and keep delivery contact after refresh (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should prefill delivery address from selected pickup point and keep delivery contact after refresh (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should prefill delivery address from selected pickup point and keep delivery contact after unchecking the checkbox for different delivery contact and then checking it again (order detail).png b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should prefill delivery address from selected pickup point and keep delivery contact after unchecking the checkbox for different delivery contact and then checking it again (order detail).png index 86fe6d9876..24eb985e1a 100644 Binary files a/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should prefill delivery address from selected pickup point and keep delivery contact after unchecking the checkbox for different delivery contact and then checking it again (order detail).png and b/storefront/cypress/snapshots/e2e/order/createOrderWithDeliveryAddress.cy.ts/should prefill delivery address from selected pickup point and keep delivery contact after unchecking the checkbox for different delivery contact and then checking it again (order detail).png differ diff --git a/storefront/cypress/snapshots/e2e/visits/simpleVisitsWithScreenshots.cy.ts/blog article detail visit with screenshot (blog article detail).png b/storefront/cypress/snapshots/e2e/visits/simpleVisitsWithScreenshots.cy.ts/blog article detail visit with screenshot (blog article detail).png index 3b5bdd14c6..241fcf0912 100644 Binary files a/storefront/cypress/snapshots/e2e/visits/simpleVisitsWithScreenshots.cy.ts/blog article detail visit with screenshot (blog article detail).png and b/storefront/cypress/snapshots/e2e/visits/simpleVisitsWithScreenshots.cy.ts/blog article detail visit with screenshot (blog article detail).png differ diff --git a/storefront/cypress/tids.ts b/storefront/cypress/tids.ts index be5e3e4ad3..ecd46049f9 100644 --- a/storefront/cypress/tids.ts +++ b/storefront/cypress/tids.ts @@ -81,4 +81,5 @@ export enum TIDs { blog_preview_image = 'blog_preview_image', product_gallery_image = 'product_gallery_image', stores_map = 'stores_map', + blog_article_publication_date = 'blog_article_publication_date', } diff --git a/storefront/store/slices/createPageLoadingStateSlice.ts b/storefront/store/slices/createPageLoadingStateSlice.ts index 3dc62462a2..2f8fbcdd89 100644 --- a/storefront/store/slices/createPageLoadingStateSlice.ts +++ b/storefront/store/slices/createPageLoadingStateSlice.ts @@ -13,6 +13,7 @@ const CUSTOM_PAGE_TYPES = [ 'contact-information', 'cart', 'order-confirmation', + 'contact', ] as const; export type PageType = FriendlyPagesTypesKey | (typeof CUSTOM_PAGE_TYPES)[number];