@licklist/design 0.78.11 → 0.78.14

package/bitbucket-pipelines.yml

@@ -62,7 +62,7 @@ pipelines:
           name: Publish to NPM
           script:
             - printf "//`node -p \"require('url').parse(process.env.NPM_REGISTRY_URL || 'https://registry.npmjs.org').host\"`/:_authToken=${NPM_TOKEN}\nregistry=${NPM_REGISTRY_URL:-https://registry.npmjs.org}\n" >> ~/.npmrc
-            - pipe: atlassian/npm-publish:0.2.0
+            - pipe: atlassian/npm-publish:1.1.1
               variables:
                 NPM_TOKEN: $NPM_TOKEN
 

package/dist/iframe/payment/order-items-table/hooks/useTableData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTableData.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/payment/order-items-table/hooks/useTableData.tsx"],"names":[],"mappings":"AAWA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,OAAO,EAAE,oBAAoB,EAAe,MAAM,UAAU,CAAA;AAQ5D,eAAO,MAAM,2BAA2B;;;;CAIvC,CAAA;AAED,eAAO,MAAM,YAAY,oEAKtB,oBAAoB;;;;;IA+KtB,CAAA"}
+{"version":3,"file":"useTableData.d.ts","sourceRoot":"","sources":["../../../../../src/iframe/payment/order-items-table/hooks/useTableData.tsx"],"names":[],"mappings":"AAYA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,OAAO,EAAE,oBAAoB,EAAe,MAAM,UAAU,CAAA;AAK5D,eAAO,MAAM,2BAA2B;;;;CAIvC,CAAA;AAED,eAAO,MAAM,YAAY,oEAKtB,oBAAoB;;;;;IA2KtB,CAAA"}

package/dist/iframe/payment/order-items-table/hooks/useTableData.js

@@ -65,55 +65,52 @@ var useTableData = function(param) {
         });
     };
     var renderCategoryItem = function(products) {
-        var _products__productCategory;
-        var _products__productCategory_name;
+        var _products__productCategory, _products_;
+        var _products__productCategory_name, _order_orderProducts;
         return {
             key: uniqueId('category-id-'),
-            name: wrapLabelContent((_products__productCategory_name = (_products__productCategory = products[0].productCategory) === null || _products__productCategory === void 0 ? void 0 : _products__productCategory.name) !== null && _products__productCategory_name !== void 0 ? _products__productCategory_name : ''),
+            name: wrapLabelContent((_products__productCategory_name = (_products_ = products[0]) === null || _products_ === void 0 ? void 0 : (_products__productCategory = _products_.productCategory) === null || _products__productCategory === void 0 ? void 0 : _products__productCategory.name) !== null && _products__productCategory_name !== void 0 ? _products__productCategory_name : ''),
             quantity: '',
-            price: wrapLabelContent("".concat(t('total'), ": ").concat(formatPrice(getTotalSumByCategory(order.orderProducts, products))))
+            price: wrapLabelContent("".concat(t('total'), ": ").concat(formatPrice(getTotalSumByCategory((_order_orderProducts = order.orderProducts) !== null && _order_orderProducts !== void 0 ? _order_orderProducts : [], products))))
         };
     };
     var reworkProductStructure = function(order) {
-        return order ? flatMap(order, function(item) {
-            if (!item || !Array.isArray(item)) return [];
-            return item.map(function(modGroup, idx) {
-                var _order_deletedAt, _order_orderId, _order_price, _order_productId, _modGroup_productQuantity, _order_deposit;
-                return {
-                    deletedAt: (_order_deletedAt = order.deletedAt) !== null && _order_deletedAt !== void 0 ? _order_deletedAt : null,
-                    id: "".concat(order.id, "-").concat(idx + 1),
-                    orderId: (_order_orderId = order.orderId) !== null && _order_orderId !== void 0 ? _order_orderId : null,
-                    price: (_order_price = order.price) !== null && _order_price !== void 0 ? _order_price : 0,
-                    productId: (_order_productId = order.productId) !== null && _order_productId !== void 0 ? _order_productId : '',
-                    quantity: (_modGroup_productQuantity = modGroup.productQuantity) !== null && _modGroup_productQuantity !== void 0 ? _modGroup_productQuantity : 1,
-                    deposit: (_order_deposit = order.deposit) !== null && _order_deposit !== void 0 ? _order_deposit : 0,
-                    orderProductModifiers: modGroup.modifiers.map(function(mod) {
-                        var _mod_modifierId, _mod_price, _mod_productId, _mod_quantity, _mod_modifierSetId, _mod_modifier;
-                        return {
-                            modifierId: (_mod_modifierId = mod.modifierId) !== null && _mod_modifierId !== void 0 ? _mod_modifierId : '',
-                            price: (_mod_price = mod.price) !== null && _mod_price !== void 0 ? _mod_price : 0,
-                            productId: (_mod_productId = mod.productId) !== null && _mod_productId !== void 0 ? _mod_productId : '',
-                            quantity: (_mod_quantity = mod.quantity) !== null && _mod_quantity !== void 0 ? _mod_quantity : 1,
-                            modifierSetId: (_mod_modifierSetId = mod.modifierSetId) !== null && _mod_modifierSetId !== void 0 ? _mod_modifierSetId : '',
-                            modifier: (_mod_modifier = mod.modifier) !== null && _mod_modifier !== void 0 ? _mod_modifier : null
-                        };
-                    })
-                };
-            });
-        }) : [];
+        if (!order) return [];
+        var _order_orderProductModifiersGroups;
+        var groups = (_order_orderProductModifiersGroups = order === null || order === void 0 ? void 0 : order.orderProductModifiersGroups) !== null && _order_orderProductModifiersGroups !== void 0 ? _order_orderProductModifiersGroups : [];
+        if (!Array.isArray(groups) || !groups.length) return [
+            order
+        ];
+        return groups.flatMap(function(modGroup, idx) {
+            var _order_deletedAt, _order_orderId, _order_price, _order_productId, _modGroup_productQuantity, _order_deposit, _modGroup_modifiers, _map;
+            return {
+                deletedAt: (_order_deletedAt = order.deletedAt) !== null && _order_deletedAt !== void 0 ? _order_deletedAt : null,
+                id: "".concat(order.id, "-").concat(idx + 1),
+                orderId: (_order_orderId = order.orderId) !== null && _order_orderId !== void 0 ? _order_orderId : null,
+                price: (_order_price = order.price) !== null && _order_price !== void 0 ? _order_price : 0,
+                productId: (_order_productId = order.productId) !== null && _order_productId !== void 0 ? _order_productId : '',
+                quantity: (_modGroup_productQuantity = modGroup === null || modGroup === void 0 ? void 0 : modGroup.productQuantity) !== null && _modGroup_productQuantity !== void 0 ? _modGroup_productQuantity : 1,
+                deposit: (_order_deposit = order.deposit) !== null && _order_deposit !== void 0 ? _order_deposit : 0,
+                orderProductModifiers: (_map = ((_modGroup_modifiers = modGroup === null || modGroup === void 0 ? void 0 : modGroup.modifiers) !== null && _modGroup_modifiers !== void 0 ? _modGroup_modifiers : []).map(function(mod) {
+                    var _mod_modifierId, _mod_price, _mod_productId, _mod_quantity, _mod_modifierSetId, _mod_modifier;
+                    return {
+                        modifierId: (_mod_modifierId = mod === null || mod === void 0 ? void 0 : mod.modifierId) !== null && _mod_modifierId !== void 0 ? _mod_modifierId : '',
+                        price: (_mod_price = mod === null || mod === void 0 ? void 0 : mod.price) !== null && _mod_price !== void 0 ? _mod_price : 0,
+                        productId: (_mod_productId = mod === null || mod === void 0 ? void 0 : mod.productId) !== null && _mod_productId !== void 0 ? _mod_productId : '',
+                        quantity: (_mod_quantity = mod === null || mod === void 0 ? void 0 : mod.quantity) !== null && _mod_quantity !== void 0 ? _mod_quantity : 1,
+                        modifierSetId: (_mod_modifierSetId = mod === null || mod === void 0 ? void 0 : mod.modifierSetId) !== null && _mod_modifierSetId !== void 0 ? _mod_modifierSetId : '',
+                        modifier: (_mod_modifier = mod === null || mod === void 0 ? void 0 : mod.modifier) !== null && _mod_modifier !== void 0 ? _mod_modifier : null
+                    };
+                })) !== null && _map !== void 0 ? _map : []
+            };
+        });
     };
-    var renderProductItem = function(param) {
-        var product = param.product, productsForCategory = param.productsForCategory;
-        var _productsForCategory_find, _product_orderProductModifiers;
-        if (product.quantity === 0) {
-            return null;
-        }
-        var name = ((_productsForCategory_find = productsForCategory.find(function(item) {
-            return item.id === product.productId;
-        })) === null || _productsForCategory_find === void 0 ? void 0 : _productsForCategory_find.name) || '';
+    var renderModifierItem = function(orderModifier) {
+        if (!orderModifier || orderModifier.quantity === 0) return null;
+        var quantity = orderModifier.quantity, modifier = orderModifier.modifier, modifierId = orderModifier.modifierId, price = orderModifier.price;
         return {
-            key: product.id,
-            name: name,
+            key: modifierId,
+            name: " - ".concat((modifier === null || modifier === void 0 ? void 0 : modifier.name) || ''),
             quantity: /*#__PURE__*/ jsxs("div", {
                 className: "quantity",
                 children: [
@@ -121,21 +118,23 @@ var useTableData = function(param) {
                         className: "multiplier",
                         children: "x"
                     }),
-                    product.quantity
+                    quantity
                 ]
             }),
-            price: formatPrice(product.price),
-            modifier: (product === null || product === void 0 ? void 0 : (_product_orderProductModifiers = product.orderProductModifiers) === null || _product_orderProductModifiers === void 0 ? void 0 : _product_orderProductModifiers.map(renderModifierItem)) || []
+            price: formatPrice(price !== null && price !== void 0 ? price : 0)
         };
     };
-    var renderModifierItem = function(orderModifier) {
-        var quantity = orderModifier.quantity, modifier = orderModifier.modifier, modifierId = orderModifier.modifierId, price = orderModifier.price;
-        if (quantity === 0) {
-            return null;
-        }
+    var renderProductItem = function(param) {
+        var product = param.product, productsForCategory = param.productsForCategory;
+        var _productsForCategory_find, _product_orderProductModifiers;
+        if (!product || product.quantity === 0) return null;
+        var name = ((_productsForCategory_find = productsForCategory.find(function(item) {
+            return item.id === product.productId;
+        })) === null || _productsForCategory_find === void 0 ? void 0 : _productsForCategory_find.name) || '';
+        var _product_price, _product_orderProductModifiers_map;
         return {
-            key: modifierId,
-            name: " - ".concat((modifier === null || modifier === void 0 ? void 0 : modifier.name) || ''),
+            key: product.id,
+            name: name,
             quantity: /*#__PURE__*/ jsxs("div", {
                 className: "quantity",
                 children: [
@@ -143,47 +142,51 @@ var useTableData = function(param) {
                         className: "multiplier",
                         children: "x"
                     }),
-                    quantity
+                    product.quantity
                 ]
             }),
-            price: formatPrice(price)
+            price: formatPrice((_product_price = product.price) !== null && _product_price !== void 0 ? _product_price : 0),
+            modifier: ((_product_orderProductModifiers_map = product === null || product === void 0 ? void 0 : (_product_orderProductModifiers = product.orderProductModifiers) === null || _product_orderProductModifiers === void 0 ? void 0 : _product_orderProductModifiers.map(renderModifierItem)) !== null && _product_orderProductModifiers_map !== void 0 ? _product_orderProductModifiers_map : []).filter(Boolean)
         };
     };
     var renderProductsContent = function() {
         var productCategories = _to_consumable_array(new Set(order.products.map(function(product) {
             return product.productCategoryId;
         })));
-        return productCategories.reduce(function(previousValues, categoryId) {
-            var productsForCategory = order === null || order === void 0 ? void 0 : order.products.filter(function(product) {
-                return product.productCategoryId === categoryId;
-            });
-            var products = order.orderProducts.filter(function(el) {
-                return productsForCategory.map(function(product) {
-                    return product.id;
+        return productCategories.reduce(function(acc, categoryId) {
+            var _order_orderProducts;
+            var _order_products_filter;
+            var productsForCategory = (_order_products_filter = order === null || order === void 0 ? void 0 : order.products.filter(function(p) {
+                return p.productCategoryId === categoryId;
+            })) !== null && _order_products_filter !== void 0 ? _order_products_filter : [];
+            var _order_orderProducts_filter;
+            var products = (_order_orderProducts_filter = order === null || order === void 0 ? void 0 : (_order_orderProducts = order.orderProducts) === null || _order_orderProducts === void 0 ? void 0 : _order_orderProducts.filter(function(el) {
+                return productsForCategory.map(function(p) {
+                    return p.id;
                 }).includes(el.productId);
-            });
-            if (!products.length) {
-                return previousValues;
-            }
+            })) !== null && _order_orderProducts_filter !== void 0 ? _order_orderProducts_filter : [];
+            if (!products.length) return acc;
             var productsWithReworkedModifier = products.map(function(product) {
-                if (!product.orderProductModifiers.length) return product;
+                var _product_orderProductModifiers;
+                if (!(product === null || product === void 0 ? void 0 : (_product_orderProductModifiers = product.orderProductModifiers) === null || _product_orderProductModifiers === void 0 ? void 0 : _product_orderProductModifiers.length)) return product;
                 return reworkProductStructure(product);
             });
-            var filteredProducts = flatten(productsWithReworkedModifier).map(function(product) {
+            var filteredProducts = flatten(productsWithReworkedModifier).map(function(p) {
                 return renderProductItem({
-                    product: product,
+                    product: p,
                     productsForCategory: productsForCategory
                 });
+            }).filter(function(row) {
+                return Boolean(row);
             });
-            var productWithModifier = flatMap(filteredProducts, function(item) {
+            if (!filteredProducts.length) return acc;
+            var productWithModifier = flatMap(filteredProducts, function(row) {
+                var _row_modifier;
                 return [
-                    item
-                ].concat(_to_consumable_array(item.modifier));
+                    row
+                ].concat(_to_consumable_array((_row_modifier = row.modifier) !== null && _row_modifier !== void 0 ? _row_modifier : []));
             });
-            if (!filteredProducts.length) {
-                return previousValues;
-            }
-            return _to_consumable_array(previousValues).concat([
+            return _to_consumable_array(acc).concat([
                 renderCategoryItem(productsForCategory)
             ], _to_consumable_array(productWithModifier));
         }, []);
@@ -200,20 +203,18 @@ var useTableData = function(param) {
         });
     };
     var data = useMemo(function() {
-        if (!order) {
-            return [];
-        }
+        if (!order) return [];
         return _to_consumable_array(renderProductsContent()).concat(_to_consumable_array(renderSummaryItems(getOrderSummaryItems({
             order: order,
             paymentDetail: paymentDetail,
             isPaymentProcessed: isPaymentProcessed,
             externalDiscount: externalDiscount
         }))));
-    }, // eslint-disable-next-line react-hooks/exhaustive-deps
-    [
+    }, [
         order,
         externalDiscount,
-        isPaymentProcessed
+        isPaymentProcessed,
+        paymentDetail
     ]);
     return data;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@licklist/design",
-  "version": "0.78.11",
+  "version": "0.78.14",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@bitbucket.org/artelogicsoft/licklist_design.git"

package/src/iframe/payment/order-items-table/hooks/useTableData.tsx

@@ -1,24 +1,22 @@
 import { useMemo } from 'react'
-import { uniqueId, flatMap, flatten, map } from 'lodash'
+import { uniqueId, flatMap, flatten } from 'lodash'
 import { useIntl } from 'react-intl'
 import { useTranslation } from 'react-i18next'
 import { Product } from '@licklist/core/dist/DataMapper/Product/ProductDataMapper'
 import { OrderModifier } from '@licklist/core/dist/DataMapper/Order/OrderModifierDataMapper'
+import { OrderProduct } from '@licklist/core/dist/DataMapper/Order/OrderProductDataMapper'
 import {
   PAYMENT_TYPE_VAT,
   PAYMENT_TYPE_FEE,
   PAYMENT_TYPE_NET_PROFIT,
 } from '@licklist/core/dist/DataMapper/Order/PaymentDataMapper'
 import { StaticTableData } from '../../../../table'
-import { getProductQuantityAndPrice, getTotalSumByCategory } from '../utils'
+import { getTotalSumByCategory } from '../utils'
 import { OrderItemsTableProps, SummaryItem } from '../types'
 import { getOrderSummaryItems } from '../utils/paymentSummary'
-import { Order } from '@licklist/core/dist/DataMapper'
-import { OrderPayment } from '@licklist/core/dist/DataMapper/Order/OrderPaymentDataMapper'
-import { OrderProduct } from '@licklist/core/dist/DataMapper/Order/OrderProductDataMapper'
-import { OrderModifierByProduct } from '@licklist/core/dist/DataMapper/Order/OrderModifiierByProduct'
 
 const CURRENCY_DEFAULT = 'GBP'
+
 export const PAYMENT_TYPE_TRANSLATE_KEYS = {
   [PAYMENT_TYPE_NET_PROFIT]: 'netAmount',
   [PAYMENT_TYPE_FEE]: 'bookeditFee',
@@ -41,43 +39,62 @@ export const useTableData = ({
     })
 
   const wrapLabelContent = (string: string) => (
-    <div className='label'>{string}</div>
+    <div className="label">{string}</div>
   )
 
   const renderCategoryItem = (products: Product[]) => ({
     key: uniqueId('category-id-'),
-    name: wrapLabelContent(products[0].productCategory?.name ?? ''),
+    name: wrapLabelContent(products[0]?.productCategory?.name ?? ''),
     quantity: '',
     price: wrapLabelContent(
       `${t('total')}: ${formatPrice(
-        getTotalSumByCategory(order.orderProducts, products),
+        getTotalSumByCategory(order.orderProducts ?? [], products),
       )}`,
     ),
   })
 
-  const reworkProductStructure = (order: OrderProduct) =>
-    order
-      ? flatMap(order, (item) => {
-          if (!item || !Array.isArray(item)) return []
-          return item.map((modGroup, idx) => ({
-            deletedAt: order.deletedAt ?? null,
-            id: `${order.id}-${idx + 1}`, // Ensuring uniqueness with string concatenation
-            orderId: order.orderId ?? null,
-            price: order.price ?? 0,
-            productId: order.productId ?? '',
-            quantity: modGroup.productQuantity ?? 1,
-            deposit: order.deposit ?? 0,
-            orderProductModifiers: modGroup.modifiers.map((mod) => ({
-              modifierId: mod.modifierId ?? '',
-              price: mod.price ?? 0,
-              productId: mod.productId ?? '',
-              quantity: mod.quantity ?? 1,
-              modifierSetId: mod.modifierSetId ?? '',
-              modifier: mod.modifier ?? null,
-            })),
-          }))
-        })
-      : []
+  const reworkProductStructure = (order: OrderProduct) => {
+    if (!order) return []
+
+    const groups: any[] = (order as any)?.orderProductModifiersGroups ?? []
+    if (!Array.isArray(groups) || !groups.length) return [order]
+
+    return groups.flatMap((modGroup, idx) => ({
+      deletedAt: order.deletedAt ?? null,
+      id: `${order.id}-${idx + 1}`,
+      orderId: order.orderId ?? null,
+      price: order.price ?? 0,
+      productId: order.productId ?? '',
+      quantity: modGroup?.productQuantity ?? 1,
+      deposit: order.deposit ?? 0,
+      orderProductModifiers:
+        (modGroup?.modifiers ?? []).map((mod: any) => ({
+          modifierId: mod?.modifierId ?? '',
+          price: mod?.price ?? 0,
+          productId: mod?.productId ?? '',
+          quantity: mod?.quantity ?? 1,
+          modifierSetId: mod?.modifierSetId ?? '',
+          modifier: mod?.modifier ?? null,
+        })) ?? [],
+    }))
+  }
+
+  const renderModifierItem = (orderModifier: OrderModifier) => {
+    if (!orderModifier || orderModifier.quantity === 0) return null
+    const { quantity, modifier, modifierId, price } = orderModifier
+
+    return {
+      key: modifierId,
+      name: ` - ${modifier?.name || ''}`,
+      quantity: (
+        <div className="quantity">
+          <div className="multiplier">x</div>
+          {quantity}
+        </div>
+      ),
+      price: formatPrice(price ?? 0),
+    }
+  }
 
   const renderProductItem = ({
     product,
@@ -86,43 +103,26 @@ export const useTableData = ({
     product: OrderProduct
     productsForCategory: Product[]
   }) => {
-    if (product.quantity === 0) {
-      return null
-    }
- 
+    if (!product || product.quantity === 0) return null
+
     const name =
-      productsForCategory.find((item) => item.id === product.productId)?.name || ''
+      productsForCategory.find((item) => item.id === product.productId)?.name ||
+      ''
 
     return {
       key: product.id,
       name,
       quantity: (
-        <div className='quantity'>
-          <div className='multiplier'>x</div>
+        <div className="quantity">
+          <div className="multiplier">x</div>
           {product.quantity}
         </div>
       ),
-      price: formatPrice(product.price),
-      modifier: product?.orderProductModifiers?.map(renderModifierItem) || [],
-    }
-  }
-
-  const renderModifierItem = (orderModifier: OrderModifier) => {
-    const { quantity, modifier, modifierId, price } = orderModifier
-    if (quantity === 0) {
-      return null
-    }
-
-    return {
-      key: modifierId,
-      name: ` - ${modifier?.name || ''}`,
-      quantity: (
-        <div className='quantity'>
-          <div className='multiplier'>x</div>
-          {quantity}
-        </div>
-      ),
-      price: formatPrice(price),
+      price: formatPrice(product.price ?? 0),
+      modifier:
+        (product?.orderProductModifiers?.map(renderModifierItem) ?? []).filter(
+          Boolean,
+        ),
     }
   }
 
@@ -132,41 +132,40 @@ export const useTableData = ({
     ]
 
     return productCategories.reduce(
-      (previousValues: StaticTableData[], categoryId) => {
-        const productsForCategory = order?.products.filter(
-          (product) => product.productCategoryId === categoryId,
-        )
-
-        const products = order.orderProducts.filter((el) =>
-          productsForCategory
-            .map((product) => product.id)
-            .includes(el.productId),
-        )
-
-        if (!products.length) {
-          return previousValues
-        }
+      (acc: StaticTableData[], categoryId) => {
+        const productsForCategory =
+          order?.products.filter((p) => p.productCategoryId === categoryId) ?? []
+
+        const products =
+          order?.orderProducts?.filter((el) =>
+            productsForCategory.map((p) => p.id).includes(el.productId),
+          ) ?? []
+
+        if (!products.length) return acc
+
         const productsWithReworkedModifier = products.map((product) => {
-          if (!product.orderProductModifiers.length) return product
+          if (!product?.orderProductModifiers?.length) return product
           return reworkProductStructure(product)
         })
 
-        const filteredProducts =  flatten(productsWithReworkedModifier).map(
-          (product) =>
-            renderProductItem({ product , productsForCategory }),
-        )
- 
-        const productWithModifier = flatMap(filteredProducts, (item) => [
-          item,
-          ...item.modifier,
-        ])
+        const filteredProducts = flatten(productsWithReworkedModifier)
+          .map((p) =>
+            renderProductItem({
+              product: p as OrderProduct,
+              productsForCategory,
+            }),
+          )
+          .filter((row): row is NonNullable<typeof row> => Boolean(row))
+
+        if (!filteredProducts.length) return acc
 
-        if (!filteredProducts.length) {
-          return previousValues
-        }
+        const productWithModifier = flatMap(filteredProducts, (row) => [
+          row,
+          ...(row.modifier ?? []),
+        ])
 
         return [
-          ...previousValues,
+          ...acc,
           renderCategoryItem(productsForCategory),
           ...productWithModifier,
         ]
@@ -183,26 +182,21 @@ export const useTableData = ({
       price: wrapLabelContent(formatPrice(price)),
     }))
 
-  const data = useMemo(
-    () => {
-      if (!order) {
-        return []
-      }
-
-      return [
-        ...renderProductsContent(),
-        ...renderSummaryItems(
-          getOrderSummaryItems({
-            order,
-            paymentDetail,
-            isPaymentProcessed,
-            externalDiscount,
-          }),
-        ),
-      ]
-    },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [order, externalDiscount, isPaymentProcessed],
-  )
+  const data = useMemo(() => {
+    if (!order) return []
+
+    return [
+      ...renderProductsContent(),
+      ...renderSummaryItems(
+        getOrderSummaryItems({
+          order,
+          paymentDetail,
+          isPaymentProcessed,
+          externalDiscount,
+        }),
+      ),
+    ]
+  }, [order, externalDiscount, isPaymentProcessed, paymentDetail])
+
   return data
 }