Merge branch 'main' into mobile_payment

apps/web/composables/useCart/types.ts

@@ -33,6 +33,7 @@ export interface UseCart {
   setCart: SetCart;
   clearCartItems: ClearCartItems;
   lastUpdatedCartItem: Readonly<Ref<UseCartState['lastUpdatedCartItem']>>;
+  cartIsEmpty: ComputedRef<boolean>;
 }
 
 export type UseCartReturn = () => UseCart;

apps/web/composables/useCart/useCart.ts

@@ -243,6 +243,8 @@ export const useCart: UseCartReturn = () => {
     }
   };
 
+  const cartIsEmpty = computed(() => !state.value.data?.items?.length);
+
   return {
     setCart,
     clearCartItems,
@@ -251,6 +253,7 @@ export const useCart: UseCartReturn = () => {
     addItemsToCart,
     deleteCartItem,
     getCart,
+    cartIsEmpty,
     ...toRefs(state.value),
   };
 };

apps/web/composables/useCheckout/useCheckout.ts

@@ -12,7 +12,7 @@ export const useCheckout = (cacheKey = '') => {
     init: false,
   }));
 
-  const { data: cart, getCart, clearCartItems, loading: cartLoading } = useCart();
+  const { data: cart, cartIsEmpty, getCart, clearCartItems, loading: cartLoading } = useCart();
   const { checkboxValue: termsAccepted, setShowErrors } = useAgreementCheckbox('checkoutGeneralTerms');
   const { shippingAsBilling } = useShippingAsBilling();
   const { addresses: shippingAddresses, get: getShipping } = useAddressStore(AddressType.Shipping);
@@ -105,6 +105,7 @@ export const useCheckout = (cacheKey = '') => {
   return {
     ...toRefs(state.value),
     cart,
+    cartIsEmpty,
     getCart,
     clearCartItems,
     cartLoading,

apps/web/composables/useNotification/__tests__/useNotification.spec.ts

@@ -74,7 +74,7 @@ describe('useNotification', () => {
         expect(data.value.length).toBe(5);
     });
 
-    it('should remove a notification after default timeout (3000ms)', async () => {
+    it('should remove a notification after default timeout (5000ms)', async () => {
         const { data, send } = useNotification();
 
         send({
@@ -83,8 +83,8 @@ describe('useNotification', () => {
         });
 
         expect(data.value.length).toBe(1);
-        
-        await new Promise((resolve) => setTimeout(resolve, 2000));
+
+        await new Promise((resolve) => setTimeout(resolve, 4000));
         expect(data.value.length).toBe(1);
 
         await new Promise((resolve) => setTimeout(resolve, 1100));

apps/web/composables/useNotification/useNotification.ts

@@ -1,7 +1,7 @@
 import type { UseNotificationState, UseNotificationReturn, Notification } from './types';
 
 const maxVisibleNotifications = 5;
-const dismissTimeout = 3000;
+const dismissTimeout = 5000;
 
 /**
  * @description Composable to display ui notifications

apps/web/lang/de.json

@@ -418,6 +418,7 @@
   "editAddress": "Adresse bearbeiten",
   "email": "E-Mail",
   "emptyCart": "Ihr Warenkorb ist leer",
+  "emptyCartNotification": "Sie haben keine Artikel in Ihrem Warenkorb",
   "emptyCartImgAlt": "Bild eines leeren Warenkorbs",
   "emptyStateAltText": "Bild, das beschreibt, dass keine Produkte gefunden wurden",
   "emptyStateText": "Wir haben keine Produkte mehr in dieser Kategorie.",

apps/web/lang/en.json

@@ -418,6 +418,7 @@
   "editAddress": "Edit address",
   "email": "Email",
   "emptyCart": "Your cart is empty",
+  "emptyCartNotification": "You don't have any items in your cart",
   "emptyCartImgAlt": "Image of an empty cart",
   "emptyStateAltText": "Image that describes that no products were found",
   "emptyStateText": "We no longer have products in this category.",

apps/web/middleware/reject-empty-checkout.ts

@@ -0,0 +1,8 @@
+export default defineNuxtRouteMiddleware(async () => {
+  const { getCart, cartIsEmpty } = useCart();
+  const localePath = useLocalePath();
+
+  await getCart();
+  if (!cartIsEmpty.value) return;
+  return navigateTo(localePath(paths.cart));
+});

apps/web/pages/cart.vue

@@ -2,11 +2,11 @@
   <NuxtLayout
     name="checkout"
     :back-to-cart="false"
-    :back-label-desktop="$t('back')"
-    :back-label-mobile="$t('back')"
-    :heading="$t('myCart')"
+    :back-label-desktop="t('back')"
+    :back-label-mobile="t('back')"
+    :heading="t('myCart')"
   >
-    <div v-if="cartNotEmpty" class="md:grid md:grid-cols-12 md:gap-x-6" data-testid="cart-page-content">
+    <div v-if="!cartIsEmpty" class="md:grid md:grid-cols-12 md:gap-x-6" data-testid="cart-page-content">
       <div class="col-span-7 mb-2 md:mb-0">
         <div v-for="(cartItem, index) in cart?.items" :key="cartItem.id">
           <UiCartProductCard :cart-item="cartItem" :class="{ 'border-t': index === 0 }" />
@@ -24,7 +24,7 @@
             size="lg"
             class="w-full mb-4 md:mb-0"
           >
-            {{ $t('goToCheckout') }}
+            {{ t('goToCheckout') }}
           </UiButton>
           <client-only>
             <PayPalExpressButton :disabled="loading" class="mt-4" type="CartPreview" />
@@ -34,7 +34,7 @@
       </div>
     </div>
     <div v-else class="flex items-center justify-center flex-col pt-24 pb-32" data-testid="cart-page-content">
-      <h2 class="mt-8 typography-headline-3 font-bold">{{ $t('emptyCart') }}</h2>
+      <h2 class="mt-8 typography-headline-3 font-bold">{{ t('emptyCart') }}</h2>
     </div>
   </NuxtLayout>
 </template>
@@ -46,10 +46,14 @@ import { cartGetters } from '@plentymarkets/shop-api';
 definePageMeta({ pageType: 'static' });
 
 const NuxtLink = resolveComponent('NuxtLink');
+const { send } = useNotification();
+const { t } = useI18n();
 const viewport = useViewport();
 const localePath = useLocalePath();
 const { isAuthorized } = useCustomer();
-const { data: cart, loading } = useCart();
-const cartNotEmpty = computed(() => (cart.value?.items?.length ?? 0) > 0);
+const { data: cart, cartIsEmpty, loading } = useCart();
 const goToCheckout = () => (isAuthorized.value ? localePath(paths.checkout) : localePath(paths.guestLogin));
+onNuxtReady(() => {
+  if (cartIsEmpty.value) send({ type: 'neutral', message: t('emptyCartNotification') });
+});
 </script>

apps/web/pages/checkout.vue

@@ -120,6 +120,7 @@ import { PayPalAddToCartCallback } from '~/components/PayPal/types';
 definePageMeta({
   layout: 'simplified-header-and-footer',
   pageType: 'static',
+  middleware: ['reject-empty-checkout'],
 });
 
 const { send } = useNotification();
@@ -130,7 +131,7 @@ const { shippingPrivacyAgreement } = useAdditionalInformation();
 const { checkboxValue: termsAccepted } = useAgreementCheckbox('checkoutGeneralTerms');
 const {
   cart,
-  getCart,
+  cartIsEmpty,
   clearCartItems,
   cartLoading,
   anyAddressFormIsOpen,
@@ -177,18 +178,15 @@ onNuxtReady(async () => {
   await checkPayPalPaymentsEligible();
 });
 
-await getCart().then(
-  async () =>
-    await Promise.all([
-      useCartShippingMethods().getShippingMethods(),
-      usePaymentMethods().fetchPaymentMethods(),
-      useAggregatedCountries().fetchAggregatedCountries(),
-    ]),
-);
+await Promise.all([
+  useCartShippingMethods().getShippingMethods(),
+  usePaymentMethods().fetchPaymentMethods(),
+  useAggregatedCountries().fetchAggregatedCountries(),
+]);
 
 const paypalCardDialog = ref(false);
 const disableShippingPayment = computed(() => loadShipping.value || loadPayment.value);
-
+const processingOrder = ref(false);
 const paypalPaymentId = computed(() => {
   if (!paymentMethods.value.list) return null;
   return paymentProviderGetters.getIdByPaymentKey(paymentMethods.value.list, PayPalPaymentKey);
@@ -244,10 +242,15 @@ const handlePayPalExpress = (callback?: PayPalAddToCartCallback) => {
 const order = async () => {
   if (!readyToBuy()) return;
 
+  processingOrder.value = true;
   const paymentMethodsById = _.keyBy(paymentMethods.value.list, 'id');
 
   paymentMethodsById[selectedPaymentId.value].key === 'plentyPayPal'
     ? (paypalCardDialog.value = true)
     : await handleRegularOrder();
 };
+
+watch(cartIsEmpty, async () => {
+  if (!processingOrder.value) await navigateTo(localePath(paths.cart));
+});
 </script>

apps/web/pages/readonly-checkout.vue

@@ -1,9 +1,9 @@
 <template>
   <NuxtLayout
     name="checkout"
-    :back-label-desktop="t('backToCart')"
-    :back-label-mobile="t('back')"
-    :heading="t('checkout')"
+    :back-label-desktop="$t('backToCart')"
+    :back-label-mobile="$t('back')"
+    :heading="$t('checkout')"
   >
     <div v-if="cart" class="md:grid md:grid-cols-12 md:gap-x-6">
       <div class="col-span-7 mb-10 md:mb-0">
@@ -44,7 +44,7 @@
                 size="sm"
               />
               <span v-else>
-                {{ t('buy') }}
+                {{ $t('buy') }}
               </span>
             </UiButton>
           </OrderSummary>
@@ -65,7 +65,7 @@ definePageMeta({
 const ID_CHECKBOX = '#terms-checkbox';
 
 const { getSession } = useCustomer();
-const { data: cart, clearCartItems, loading: cartLoading } = useCart();
+const { data: cart, cartIsEmpty, clearCartItems, loading: cartLoading } = useCart();
 const { data: billingAddresses, getAddresses: getBillingAddresses } = useAddress(AddressType.Billing);
 const {
   data: shippingAddresses,
@@ -78,8 +78,6 @@ const { loading: createOrderLoading, createOrder } = useMakeOrder();
 const { shippingPrivacyAgreement } = useAdditionalInformation();
 const { loading: executeOrderLoading, executeOrder } = usePayPal();
 const route = useRoute();
-const { send } = useNotification();
-const { t } = useI18n();
 const localePath = useLocalePath();
 const { checkboxValue: termsAccepted, setShowErrors } = useAgreementCheckbox('checkoutGeneralTerms');
 
@@ -98,21 +96,8 @@ const loadAddresses = async () => {
   await getShippingMethods();
 };
 
-const redirectBack = () => {
-  if (cart.value.items?.length === 0) {
-    send({
-      type: 'neutral',
-      message: t('emptyCart'),
-    });
-
-    navigateTo(localePath(paths.cart));
-    return true;
-  }
-  return false;
-};
-
 await getSession();
-redirectBack();
+if (cartIsEmpty.value) await navigateTo(localePath(paths.cart));
 await loadAddresses();
 await getShippingMethods();
 await fetchPaymentMethods();
@@ -133,7 +118,8 @@ const validateTerms = (): boolean => {
 };
 
 const order = async () => {
-  if (redirectBack() || !validateTerms()) return;
+  if (cartIsEmpty.value) await navigateTo(localePath(paths.cart));
+  if (!validateTerms()) return;
 
   const data = await createOrder({
     paymentId: cart.value.methodOfPaymentId,

apps/web/vitest.config.ts

@@ -9,6 +9,7 @@ export default defineVitestConfig({
     coverage: {
       reporter: ['text', 'html', 'json-summary', 'json'],
     },
+    testTimeout: 6000,
     environment: 'nuxt',
     globals: true,
     clearMocks: true,

docs/changelog/changelog_en.md

@@ -37,6 +37,8 @@
 - Started to unify the SDK/API error handling. Errors do now return keys that can be translated in the frontend.
 - Manufacturer visual improvments
 - Changed manufacturer translation text.
+- In cases where the basket is empty during the checkout process, the system will now redirect to `/cart` and display a notification.
+- Increased default notification timeout from 3 to 5 seconds.
 
 ## v1.6.0 (2024-10-10) <a href="https://github.com/plentymarkets/plentyshop-pwa/compare/v1.5.0...v1.6.0" target="_blank" rel="noopener"><b>Overview of all changes</b></a>