From 9fc8c47bfaa4ab1bad8bcf595372faf70b6f54ff Mon Sep 17 00:00:00 2001
From: Anton Sylka <antonsylka1004@gmail.com>
Date: Mon, 30 Sep 2024 15:09:23 +0700
Subject: [PATCH 1/8] Refs #33164: Product Price - update after promotional
 campaign content changed

---
 components/atoms/a-product-price.vue                  |  4 ++++
 components/molecules/m-product-carousel.vue           |  4 ++++
 components/organisms/o-cart-items-table.vue           |  5 +++++
 components/organisms/o-confirm-order.vue              | 11 +++++++----
 .../organisms/o-cross-sells-products-selector.vue     |  5 +++++
 components/organisms/o-product-details.vue            |  4 ++++
 components/storyblok/Product.vue                      |  5 +++++
 helpers/use-related-products.ts                       |  5 +++++
 pages/Category.vue                                    |  4 ++++
 9 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/components/atoms/a-product-price.vue b/components/atoms/a-product-price.vue
index 56ad7b6a5..ef841afb0 100644
--- a/components/atoms/a-product-price.vue
+++ b/components/atoms/a-product-price.vue
@@ -25,7 +25,11 @@ export default {
     }
   },
   computed: {
+    campaignContent () {
+      return this.$store.getters['promotionPlatform/campaignContent'];
+    },
     price () {
+      const _ = this.campaignContent;
       return getProductDefaultPrice(this.product, this.customOptions, false)
     }
   }
diff --git a/components/molecules/m-product-carousel.vue b/components/molecules/m-product-carousel.vue
index 4290fede4..c3de69bd6 100644
--- a/components/molecules/m-product-carousel.vue
+++ b/components/molecules/m-product-carousel.vue
@@ -57,7 +57,11 @@ export default {
     }
   },
   computed: {
+    campaignContent () {
+      return this.$store.getters['promotionPlatform/campaignContent'];
+    },
     carouselProducts () {
+      const _ = this.campaignContent;
       return this.products.map(prepareCategoryProduct);
     }
   }
diff --git a/components/organisms/o-cart-items-table.vue b/components/organisms/o-cart-items-table.vue
index 67aece63f..8907c0174 100644
--- a/components/organisms/o-cart-items-table.vue
+++ b/components/organisms/o-cart-items-table.vue
@@ -14,6 +14,7 @@ import { getCartItemPrice } from 'src/modules/shared';
 import CartItem from 'core/modules/cart/types/CartItem';
 import getCartItemKey from 'src/modules/budsies/helpers/get-cart-item-key.function';
 import { getCustomizationSystemCartItemThumbnail } from 'src/modules/customization-system';
+import CampaignContent from 'src/modules/promotion-platform/types/CampaignContent.model';
 
 import { getCartItemOptions } from 'theme/helpers/get-cart-item-options.function';
 import { OrderContentItem } from '../interfaces/order-content-item.interface';
@@ -48,7 +49,11 @@ export default {
     }
   },
   computed: {
+    campaignContent (): CampaignContent | undefined {
+      return this.$store.getters['promotionPlatform/campaignContent'];
+    },
     tableItems (): OrderContentItem[] {
+      const _ = this.campaignContent;
       return this.cartItems.map((cartItem) => {
         return {
           key: this.getCartItemKey(cartItem),
diff --git a/components/organisms/o-confirm-order.vue b/components/organisms/o-confirm-order.vue
index a801cca63..8d428e5ac 100644
--- a/components/organisms/o-confirm-order.vue
+++ b/components/organisms/o-confirm-order.vue
@@ -85,8 +85,8 @@
                 v-model="product.qty"
                 :image="getThumbnailForProduct(product)"
                 :title="product.name | htmlDecode"
-                :regular-price="getProductRegularPrice(product)"
-                :special-price="getProductSpecialPrice(product)"
+                :regular-price="getProductRegularPrice(product, campaignContent)"
+                :special-price="getProductSpecialPrice(product, campaignContent)"
                 class="collected-product"
               >
                 <template #configuration>
@@ -292,6 +292,9 @@ export default {
       isGiftCardProcessing: 'giftCard/isGiftCardProcessing'
     }),
     ...mapMobileObserver(),
+    campaignContent () {
+      return this.$store.getters['promotionPlatform/campaignContent'];
+    },
     cartItems () {
       return this.$store.getters['cart/getCartItems'];
     },
@@ -366,10 +369,10 @@ export default {
 
       return getThumbnailForProduct(product);
     },
-    getProductRegularPrice (product) {
+    getProductRegularPrice (product, campaignContent) {
       return getCartItemPrice(product, {}).regular;
     },
-    getProductSpecialPrice (product) {
+    getProductSpecialPrice (product, campaignContent) {
       return getCartItemPrice(product, {}).special;
     },
     onFailure (response) {
diff --git a/components/organisms/o-cross-sells-products-selector.vue b/components/organisms/o-cross-sells-products-selector.vue
index 32b46b737..8842e7e51 100644
--- a/components/organisms/o-cross-sells-products-selector.vue
+++ b/components/organisms/o-cross-sells-products-selector.vue
@@ -25,6 +25,7 @@ import { SfHeading } from '@storefront-ui/vue';
 
 import Product from '@vue-storefront/core/modules/catalog/types/Product';
 import { getProductGallery } from '@vue-storefront/core/modules/catalog/helpers';
+import CampaignContent from 'src/modules/promotion-platform/types/CampaignContent.model';
 import { getProductDefaultPrice } from 'src/modules/shared';
 import { getFinalPrice } from 'src/modules/shared/helpers/price';
 
@@ -94,10 +95,14 @@ export default defineComponent({
     }
   },
   computed: {
+    campaignContent (): CampaignContent | undefined {
+      return this.$store.getters['promotionPlatform/campaignContent'];
+    },
     isDisabled (): boolean {
       return this.$store.getters['cart/getIsAdding'];
     },
     productOptions (): AddonOption[] {
+      const _ = this.campaignContent;
       return this.relatedProducts.map(getAddonOptionFromProduct);
     },
     selectedProducts: {
diff --git a/components/organisms/o-product-details.vue b/components/organisms/o-product-details.vue
index 5a26cbdeb..d038b3ae9 100644
--- a/components/organisms/o-product-details.vue
+++ b/components/organisms/o-product-details.vue
@@ -149,7 +149,11 @@ export default {
     availability () {
       return this.product.stock && this.product.stock.is_in_stock ? 'InStock' : 'OutOfStock'
     },
+    campaignContent () {
+      return this.$store.getters['promotionPlatform/campaignContent'];
+    },
     productPrice () {
+      const _ = this.campaignContent;
       const price = getProductDefaultPrice(this.product, {}, false);
       return price.special ? price.special : price.regular
     },
diff --git a/components/storyblok/Product.vue b/components/storyblok/Product.vue
index db6df5ebc..8631c3b21 100644
--- a/components/storyblok/Product.vue
+++ b/components/storyblok/Product.vue
@@ -37,6 +37,7 @@ import ProductImage from '../core/ProductImage.vue';
 import { LocalizedRoute, StoreView } from 'core/lib/types';
 import config from 'config';
 import Product from 'core/modules/catalog/types/Product';
+import CampaignContent from 'src/modules/promotion-platform/types/CampaignContent.model';
 import { Blok } from 'src/modules/vsf-storyblok-module/components';
 import { getProductDefaultPrice } from 'src/modules/shared';
 
@@ -56,6 +57,9 @@ export default Blok.extend({
     }
   },
   computed: {
+    campaignContent (): CampaignContent | undefined {
+      return this.$store.getters['promotionPlatform/campaignContent'];
+    },
     itemData (): ProductData {
       return this.item as ProductData;
     },
@@ -67,6 +71,7 @@ export default Blok.extend({
         return undefined;
       }
 
+      const _ = this.campaignContent;
       const price = getProductDefaultPrice(this.product, {}, false);
 
       return getFinalPrice(price);
diff --git a/helpers/use-related-products.ts b/helpers/use-related-products.ts
index f97be333e..82c914ccc 100644
--- a/helpers/use-related-products.ts
+++ b/helpers/use-related-products.ts
@@ -9,6 +9,7 @@ import { Dictionary } from 'src/modules/budsies';
 import isCustomProduct from 'src/modules/shared/helpers/is-custom-product.function';
 
 import { prepareCategoryProduct } from 'theme/helpers';
+import CampaignContent from 'src/modules/promotion-platform/types/CampaignContent.model';
 
 export const CROSS_SELL = 'crosssell';
 export const UP_SELL = 'upsell';
@@ -36,6 +37,9 @@ export function useRelatedProducts (
   const productBySkuDictionary = computed<Record<string, Product>>(() => {
     return rootStore.getters['product/getProductBySkuDictionary'];
   });
+  const campaignContent = computed<CampaignContent | undefined>(() => {
+    return rootStore.getters['promotionPlatform/campaignContent'];
+  })
   const relatedProducts = computed(() => {
     if (!currentProduct.value) {
       return [];
@@ -55,6 +59,7 @@ export function useRelatedProducts (
     return dictionary;
   });
   const preparedRelatedProducts = computed(() => {
+    const _ = campaignContent.value;
     return relatedProducts.value.map(
       (item: Product) => (
         {
diff --git a/pages/Category.vue b/pages/Category.vue
index 097d8665e..8585cf9b9 100644
--- a/pages/Category.vue
+++ b/pages/Category.vue
@@ -411,7 +411,11 @@ export default {
           })
         : this.getCurrentPageProducts;
     },
+    campaignContent () {
+      return this.$store.getters['promotionPlatform/campaignContent'];
+    },
     preparedProducts () {
+      const _ = this.campaignContent;
       return this.products.map(prepareCategoryProduct);
     },
     totalPages () {

From 7dbb33225fa7b10a84d4d4109dc8d3b322637a1c Mon Sep 17 00:00:00 2001
From: Anton Sylka <antonsylka1004@gmail.com>
Date: Thu, 10 Oct 2024 14:27:07 +0700
Subject: [PATCH 2/8] Refs #33224: Refactor price calculation (WIP)

---
 components/atoms/a-product-price.vue          |  8 +++---
 components/molecules/m-product-carousel.vue   | 22 +++++++++-------
 .../o-cross-sells-products-selector.vue       | 23 +++++++++++------
 components/organisms/o-product-details.vue    |  9 -------
 components/storyblok/Product.vue              | 10 +++-----
 ...lowest-price-for-bundle-option.function.ts | 25 -------------------
 helpers/index.ts                              | 15 ++++++++---
 7 files changed, 46 insertions(+), 66 deletions(-)
 delete mode 100644 helpers/get-lowest-price-for-bundle-option.function.ts

diff --git a/components/atoms/a-product-price.vue b/components/atoms/a-product-price.vue
index ef841afb0..16aec7ee3 100644
--- a/components/atoms/a-product-price.vue
+++ b/components/atoms/a-product-price.vue
@@ -7,7 +7,6 @@
 
 <script>
 import ACustomPrice from '../atoms/a-custom-price.vue';
-import { getProductDefaultPrice } from 'src/modules/shared'
 
 export default {
   name: 'AProductPrice',
@@ -25,12 +24,11 @@ export default {
     }
   },
   computed: {
-    campaignContent () {
-      return this.$store.getters['promotionPlatform/campaignContent'];
+    productPriceDictionary () {
+      return this.$store.getters['product/productPriceDictionary'];
     },
     price () {
-      const _ = this.campaignContent;
-      return getProductDefaultPrice(this.product, this.customOptions, false)
+      return this.productPriceDictionary[this.product.id];
     }
   }
 }
diff --git a/components/molecules/m-product-carousel.vue b/components/molecules/m-product-carousel.vue
index c3de69bd6..6ece39ab5 100644
--- a/components/molecules/m-product-carousel.vue
+++ b/components/molecules/m-product-carousel.vue
@@ -35,13 +35,8 @@
 </template>
 <script>
 import { SfCarousel } from '@storefront-ui/vue';
-import { htmlDecode } from '@vue-storefront/core/filters';
-import config from 'config';
-import { currentStoreView } from '@vue-storefront/core/lib/multistore';
-import { formatProductLink } from '@vue-storefront/core/modules/url/helpers';
-import { productThumbnailPath } from '@vue-storefront/core/helpers';
-import { prepareCategoryProduct } from 'theme/helpers';
 
+import { prepareCategoryProduct } from 'theme/helpers';
 import OProductCard from 'theme/components/organisms/o-product-card';
 
 export default {
@@ -57,12 +52,21 @@ export default {
     }
   },
   computed: {
-    campaignContent () {
-      return this.$store.getters['promotionPlatform/campaignContent'];
+    productPriceDictionary () {
+      return this.$store.getters['product/productPriceDictionary'];
+    },
+    productDiscountDictionary () {
+      return this.$store.getters['product/productDiscountDictionary'];
     },
     carouselProducts () {
       const _ = this.campaignContent;
-      return this.products.map(prepareCategoryProduct);
+      return this.products.map(
+        (product) => prepareCategoryProduct(
+          product,
+          this.productPriceDictionary,
+          this.productDiscountDictionary
+        )
+      );
     }
   }
 };
diff --git a/components/organisms/o-cross-sells-products-selector.vue b/components/organisms/o-cross-sells-products-selector.vue
index 8842e7e51..784ee6dc3 100644
--- a/components/organisms/o-cross-sells-products-selector.vue
+++ b/components/organisms/o-cross-sells-products-selector.vue
@@ -26,7 +26,7 @@ import { SfHeading } from '@storefront-ui/vue';
 import Product from '@vue-storefront/core/modules/catalog/types/Product';
 import { getProductGallery } from '@vue-storefront/core/modules/catalog/helpers';
 import CampaignContent from 'src/modules/promotion-platform/types/CampaignContent.model';
-import { getProductDefaultPrice } from 'src/modules/shared';
+import { PriceHelper } from 'src/modules/shared';
 import { getFinalPrice } from 'src/modules/shared/helpers/price';
 
 import { CROSS_SELL, useRelatedProducts } from 'theme/helpers/use-related-products';
@@ -36,8 +36,11 @@ import AddonOption from '../interfaces/addon-option.interface';
 
 import MAddonsSelector from '../molecules/m-addons-selector.vue';
 
-function getAddonOptionFromProduct (product: Product): AddonOption {
-  const price = getProductDefaultPrice(product, {}, false);
+function getAddonOptionFromProduct (
+  product: Product,
+  productPriceDictionary: Record<string, PriceHelper.ProductPrice>
+): AddonOption {
+  const price = productPriceDictionary[product.id];
 
   return {
     id: product.id as number,
@@ -95,15 +98,19 @@ export default defineComponent({
     }
   },
   computed: {
-    campaignContent (): CampaignContent | undefined {
-      return this.$store.getters['promotionPlatform/campaignContent'];
-    },
     isDisabled (): boolean {
       return this.$store.getters['cart/getIsAdding'];
     },
+    productPriceDictionary (): Record<string, PriceHelper.ProductPrice> {
+      return this.$store.getters['product/productPriceDictionary'];
+    },
     productOptions (): AddonOption[] {
-      const _ = this.campaignContent;
-      return this.relatedProducts.map(getAddonOptionFromProduct);
+      return this.relatedProducts.map(
+        (product) => getAddonOptionFromProduct(
+          product,
+          this.productPriceDictionary
+        )
+      );
     },
     selectedProducts: {
       get (): number[] {
diff --git a/components/organisms/o-product-details.vue b/components/organisms/o-product-details.vue
index d038b3ae9..de35765be 100644
--- a/components/organisms/o-product-details.vue
+++ b/components/organisms/o-product-details.vue
@@ -74,7 +74,6 @@ import OCrossSellsProductsSelector from 'theme/components/organisms/o-cross-sell
 import { ModalList } from 'theme/store/ui/modals';
 import getProductImagePlaceholder from '@vue-storefront/core/modules/cart/helpers/getProductImagePlaceholder';
 import { mapActions } from 'vuex';
-import { getProductDefaultPrice } from 'src/modules/shared';
 
 export default {
   inject: {
@@ -149,14 +148,6 @@ export default {
     availability () {
       return this.product.stock && this.product.stock.is_in_stock ? 'InStock' : 'OutOfStock'
     },
-    campaignContent () {
-      return this.$store.getters['promotionPlatform/campaignContent'];
-    },
-    productPrice () {
-      const _ = this.campaignContent;
-      const price = getProductDefaultPrice(this.product, {}, false);
-      return price.special ? price.special : price.regular
-    },
     sharingData () {
       // todo may contains html tags
       const rawDescription = this.product.short_description ? this.product.short_description.replace(/(<p>|<\/p>)/g, '') : '';
diff --git a/components/storyblok/Product.vue b/components/storyblok/Product.vue
index 8631c3b21..0275bd0ea 100644
--- a/components/storyblok/Product.vue
+++ b/components/storyblok/Product.vue
@@ -37,9 +37,8 @@ import ProductImage from '../core/ProductImage.vue';
 import { LocalizedRoute, StoreView } from 'core/lib/types';
 import config from 'config';
 import Product from 'core/modules/catalog/types/Product';
-import CampaignContent from 'src/modules/promotion-platform/types/CampaignContent.model';
 import { Blok } from 'src/modules/vsf-storyblok-module/components';
-import { getProductDefaultPrice } from 'src/modules/shared';
+import { PriceHelper } from 'src/modules/shared';
 
 import ProductData from './interfaces/product-data.interface';
 import getProductImagePlaceholder from '@vue-storefront/core/modules/cart/helpers/getProductImagePlaceholder';
@@ -57,8 +56,8 @@ export default Blok.extend({
     }
   },
   computed: {
-    campaignContent (): CampaignContent | undefined {
-      return this.$store.getters['promotionPlatform/campaignContent'];
+    productPriceDictionary (): Record<string, PriceHelper.ProductPrice> {
+      return this.$store.getters['product/productPriceDictionary'];
     },
     itemData (): ProductData {
       return this.item as ProductData;
@@ -71,8 +70,7 @@ export default Blok.extend({
         return undefined;
       }
 
-      const _ = this.campaignContent;
-      const price = getProductDefaultPrice(this.product, {}, false);
+      const price = this.productPriceDictionary[this.product.id];
 
       return getFinalPrice(price);
     },
diff --git a/helpers/get-lowest-price-for-bundle-option.function.ts b/helpers/get-lowest-price-for-bundle-option.function.ts
deleted file mode 100644
index 7779696ad..000000000
--- a/helpers/get-lowest-price-for-bundle-option.function.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { BundleOptionsProductLink } from 'core/modules/catalog/types/BundleOption';
-import Product from 'core/modules/catalog/types/Product';
-
-import { PriceHelper } from 'src/modules/shared';
-
-export function getLowestPriceForBundleOptionProductLinks (productLinks: BundleOptionsProductLink[]): PriceHelper.ProductPrice {
-  let lowestPrice: number | undefined;
-  let lowestPriceProduct: Product | undefined;
-
-  productLinks.forEach((productLink) => {
-    if (!productLink.product) {
-      return;
-    }
-
-    const productPrice = PriceHelper.getProductDefaultPrice(productLink.product, {}, false);
-    const finalProductPrice = PriceHelper.getFinalPrice(productPrice);
-
-    if (lowestPrice === undefined || finalProductPrice < lowestPrice) {
-      lowestPrice = finalProductPrice;
-      lowestPriceProduct = productLink.product;
-    }
-  });
-
-  return PriceHelper.getProductDefaultPrice(lowestPriceProduct, {}, false);
-}
diff --git a/helpers/index.ts b/helpers/index.ts
index 7d0f3fe38..644708011 100644
--- a/helpers/index.ts
+++ b/helpers/index.ts
@@ -4,9 +4,10 @@ import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 import { productThumbnailPath, getThumbnailPath, isServer } from '@vue-storefront/core/helpers'
 import { htmlDecode } from '@vue-storefront/core/filters'
 
-import { getProductDefaultPrice, getProductDefaultDiscount } from 'src/modules/shared';
+import { PriceHelper } from 'src/modules/shared';
 
 import getProductImagePlaceholder from '@vue-storefront/core/modules/cart/helpers/getProductImagePlaceholder';
+import Product from 'core/modules/catalog/types/Product';
 
 export function getPathForStaticPage (path: string) {
   const { storeCode } = currentStoreView()
@@ -53,22 +54,28 @@ export function getTopLevelCategories (categoryList) {
   )
 }
 
-export function prepareCategoryProduct (product) {
+export function prepareCategoryProduct (
+  product,
+  productPriceDictionary: Record<string, PriceHelper.ProductPrice>,
+  productDiscountDictionary: Record<string, PriceHelper.ProductDiscount>
+) {
   const imagePath = productThumbnailPath(product);
   const thumbnailPath = !imagePath ? getProductImagePlaceholder() : getThumbnailPath(
     imagePath,
     config.products.thumbnails.width,
     config.products.thumbnails.height
   );
+  const price = productPriceDictionary[product.id];
+  const discount = productDiscountDictionary[product.id];
 
   return {
-    discount: getProductDefaultDiscount(product),
+    discount: PriceHelper.formatProductDiscount(discount),
     id: product.id,
     sku: product.sku,
     title: htmlDecode(product.name),
     image: thumbnailPath,
     link: formatProductLink(product, currentStoreView().storeCode),
-    price: getProductDefaultPrice(product, {}),
+    price: PriceHelper.formatProductPrice(price),
     rating: {
       max: 5,
       score: 5

From 649f6591b565bbb1b22c7ed46de581e299cf1ac8 Mon Sep 17 00:00:00 2001
From: Anton Sylka <antonsylka1004@gmail.com>
Date: Fri, 11 Oct 2024 15:45:48 +0700
Subject: [PATCH 3/8] Refs #33224: Cart items price - refactor calculation
 (WIP)

---
 components/organisms/o-cart-items-table.vue |  24 +-
 components/organisms/o-confirm-order.vue    |  20 +-
 components/organisms/o-microcart-panel.vue  | 279 --------------------
 pages/DetailedCart.vue                      |  24 +-
 4 files changed, 30 insertions(+), 317 deletions(-)
 delete mode 100644 components/organisms/o-microcart-panel.vue

diff --git a/components/organisms/o-cart-items-table.vue b/components/organisms/o-cart-items-table.vue
index 8907c0174..f3eeea41c 100644
--- a/components/organisms/o-cart-items-table.vue
+++ b/components/organisms/o-cart-items-table.vue
@@ -10,16 +10,16 @@
 import { PropType } from 'vue';
 import { getThumbnailForProduct } from '@vue-storefront/core/modules/cart/helpers';
 
-import { getCartItemPrice } from 'src/modules/shared';
 import CartItem from 'core/modules/cart/types/CartItem';
 import getCartItemKey from 'src/modules/budsies/helpers/get-cart-item-key.function';
 import { getCustomizationSystemCartItemThumbnail } from 'src/modules/customization-system';
-import CampaignContent from 'src/modules/promotion-platform/types/CampaignContent.model';
 
 import { getCartItemOptions } from 'theme/helpers/get-cart-item-options.function';
 import { OrderContentItem } from '../interfaces/order-content-item.interface';
 
 import OOrderContent from './o-order-content.vue';
+import { PriceHelper } from 'src/modules/shared';
+import { CART_ITEM_PRICE_DICTIONARY, GET_CART_ITEM_PRICE } from 'core/modules/catalog';
 
 export default {
   name: 'OCartItemsTable',
@@ -49,12 +49,16 @@ export default {
     }
   },
   computed: {
-    campaignContent (): CampaignContent | undefined {
-      return this.$store.getters['promotionPlatform/campaignContent'];
+    cartItemPriceDictionary (): Record<string, PriceHelper.ProductPrice> {
+      return this.$store.getters[CART_ITEM_PRICE_DICTIONARY];
     },
     tableItems (): OrderContentItem[] {
-      const _ = this.campaignContent;
       return this.cartItems.map((cartItem) => {
+        const price: PriceHelper.ProductPrice = cartItem.checksum
+          ? this.cartItemPriceDictionary[cartItem.checksum]
+          : this.$store.getters[GET_CART_ITEM_PRICE](cartItem);
+        const formattedPrice = PriceHelper.formatProductPrice(price);
+
         return {
           key: this.getCartItemKey(cartItem),
           thumbnail: this.getThumbnailForProduct(cartItem),
@@ -62,20 +66,14 @@ export default {
           qty: cartItem.qty,
           customizations: cartItem.customizations,
           customizationState: cartItem.extension_attributes?.customization_state,
-          specialPrice: this.getProductSpecialPrice(cartItem),
-          regularPrice: this.getProductRegularPrice(cartItem),
+          specialPrice: formattedPrice.special,
+          regularPrice: formattedPrice.regular,
           customOptions: getCartItemOptions(cartItem)
         }
       });
     }
   },
   methods: {
-    getProductRegularPrice (product: CartItem): string {
-      return getCartItemPrice(product, {}).regular;
-    },
-    getProductSpecialPrice (product: CartItem): string {
-      return getCartItemPrice(product, {}).special;
-    },
     getThumbnailForProduct (product: CartItem): string {
       const customizationSystemThumbnail = getCustomizationSystemCartItemThumbnail(product, this.imageHandlerService);
 
diff --git a/components/organisms/o-confirm-order.vue b/components/organisms/o-confirm-order.vue
index 34fbf1b49..f34988cae 100644
--- a/components/organisms/o-confirm-order.vue
+++ b/components/organisms/o-confirm-order.vue
@@ -85,8 +85,8 @@
                 v-model="product.qty"
                 :image="getThumbnailForProduct(product)"
                 :title="product.name | htmlDecode"
-                :regular-price="getProductRegularPrice(product, campaignContent)"
-                :special-price="getProductSpecialPrice(product, campaignContent)"
+                :regular-price="formatPrice(cartItemPriceDictionary[product.checksum].regular)"
+                :special-price="formatPrice(cartItemPriceDictionary[product.checksum].special)"
                 class="collected-product"
               >
                 <template #configuration>
@@ -232,11 +232,12 @@ import { OrderModule, ORDER_CONFLICT_EVENT } from '@vue-storefront/core/modules/
 import { ORDER_ERROR_EVENT } from '@vue-storefront/core/modules/checkout';
 import { OrderReview } from '@vue-storefront/core/modules/checkout/components/OrderReview';
 import { Payment } from '@vue-storefront/core/modules/checkout/components/Payment';
+import { CART_ITEM_PRICE_DICTIONARY } from 'core/modules/catalog';
 import getCartItemKey from 'src/modules/budsies/helpers/get-cart-item-key.function';
 import { getCustomizationSystemCartItemThumbnail } from 'src/modules/customization-system';
 import { AFFIRM_MODAL_CLOSED } from 'src/modules/payment-affirm/types/AffirmCheckoutEvents';
 import { getComponentByMethodCode, supportedMethodsCodes as braintreeSupportedMethodsCodes } from 'src/modules/payment-braintree';
-import { getCartItemPrice, PAYMENT_ERROR_EVENT } from 'src/modules/shared';
+import { PAYMENT_ERROR_EVENT, PriceHelper } from 'src/modules/shared';
 
 import { createSmoothscroll } from 'theme/helpers';
 import { getCartItemOptions } from 'theme/helpers/get-cart-item-options.function';
@@ -292,8 +293,8 @@ export default {
       isGiftCardProcessing: 'giftCard/isGiftCardProcessing'
     }),
     ...mapMobileObserver(),
-    campaignContent () {
-      return this.$store.getters['promotionPlatform/campaignContent'];
+    cartItemPriceDictionary () {
+      return this.$store.getters[CART_ITEM_PRICE_DICTIONARY]
     },
     cartItems () {
       return this.$store.getters['cart/getCartItems'];
@@ -353,6 +354,9 @@ export default {
     ...mapActions('ui', {
       openModal: 'openModal'
     }),
+    formatPrice (price) {
+      return PriceHelper.formatPrice(price);
+    },
     getCartItemOptions,
     getThumbnailForProduct (product) {
       const customizationSystemThumbnail =
@@ -371,12 +375,6 @@ export default {
 
       return getThumbnailForProduct(product);
     },
-    getProductRegularPrice (product, campaignContent) {
-      return getCartItemPrice(product, {}).regular;
-    },
-    getProductSpecialPrice (product, campaignContent) {
-      return getCartItemPrice(product, {}).special;
-    },
     onFailure (response) {
       this.$store.dispatch('notification/spawnNotification', {
         type: 'danger',
diff --git a/components/organisms/o-microcart-panel.vue b/components/organisms/o-microcart-panel.vue
deleted file mode 100644
index 80f17bffc..000000000
--- a/components/organisms/o-microcart-panel.vue
+++ /dev/null
@@ -1,279 +0,0 @@
-<template>
-  <SfSidebar
-    :visible="isMicrocartOpen && isMicrocartVisible"
-    class="sf-sidebar--right sf-sidebar--icon o-microcart-panel"
-    @close="$store.commit('ui/setMicrocart')"
-  >
-    <template v-if="totalItems" #content-top>
-      <SfProperty
-        class="sf-property--large"
-        :name="$t('Total items')"
-        :value="productsCount"
-      />
-    </template>
-    <transition name="fade" mode="out-in">
-      <div v-if="totalItems" key="my-cart" class="my-cart">
-        <div class="collected-product-list">
-          <transition-group name="fade" tag="div">
-            <SfCollectedProduct
-              v-for="product in productsInCart"
-              :key="product.id"
-              :image="getThumbnailForProductExtend(product)"
-              :title="product.name"
-              :regular-price="getCartItemPrice(product).regular"
-              :special-price="getCartItemPrice(product).special"
-              :stock="10"
-              :qty="product.qty"
-              class="collected-product"
-              @click:remove="removeHandler(product)"
-              @input="changeQuantity(product, $event)"
-            >
-              <template #configuration>
-                <div class="collected-product__properties">
-                  <SfProperty :name="$t('SKU')" :value="product.sku" />
-                  <SfProperty
-                    v-for="property in getProductOptions(product)"
-                    :key="property.label"
-                    :name="property.label"
-                  >
-                    <template #value>
-                      <span class="sf-property__value" v-html="property.value" />
-                    </template>
-                  </SfProperty>
-                </div>
-              </template>
-              <template #more-actions>
-                <span />
-              </template>
-            </SfCollectedProduct>
-          </transition-group>
-        </div>
-      </div>
-      <div v-else key="empty-cart" class="empty-cart">
-        <div class="empty-cart__banner">
-          <SfImage
-            :src="require('@storefront-ui/shared/icons/empty_cart.svg')"
-            :alt="$t('Your bag is empty')"
-            class="empty-cart__image"
-          />
-          <SfHeading
-            :title="$t('Your bag is empty')"
-            :subtitle="$t('Looks like you haven’t added any items to the bag yet. Start shopping to fill it in.')"
-            :level="2"
-            class="empty-cart__heading"
-          />
-        </div>
-      </div>
-    </transition>
-    <template #content-bottom>
-      <transition name="fade">
-        <div v-if="totalItems">
-          <SfProperty
-            class="sf-property--full-width my-cart__total-price"
-            v-for="total in totals"
-            :key="total.code"
-          >
-            <template #name>
-              <span class="sf-property__name">{{ total.title }}</span>
-            </template>
-            <template #value>
-              <SfPrice :regular="total.value | price" />
-            </template>
-          </SfProperty>
-          <SfButton
-            class="sf-button--full-width color-secondary _checkout-button"
-            @click.native="goToCheckout"
-          >
-            {{ $t('Go to checkout') }}
-          </SfButton>
-        </div>
-        <div v-else>
-          <SfButton
-            class="sf-button--full-width color-primary"
-            @click.native="startShopping"
-          >
-            {{ $t('Start shopping') }}
-          </SfButton>
-        </div>
-      </transition>
-    </template>
-  </SfSidebar>
-</template>
-
-<script>
-import { mapState, mapGetters } from 'vuex';
-import { localizedRoute } from '@vue-storefront/core/lib/multistore';
-import { onlineHelper } from '@vue-storefront/core/helpers';
-import { getThumbnailForProduct } from '@vue-storefront/core/modules/cart/helpers';
-import { getCartItemPrice, getProductPriceFromTotals } from 'src/modules/shared';
-import VueOfflineMixin from 'vue-offline/mixin';
-import onEscapePress from '@vue-storefront/core/mixins/onEscapePress';
-
-import {
-  SfButton,
-  SfCollectedProduct,
-  SfProperty,
-  SfPrice,
-  SfImage,
-  SfHeading,
-  SfSidebar
-} from '@storefront-ui/vue';
-
-export default {
-  components: {
-    SfButton,
-    SfCollectedProduct,
-    SfProperty,
-    SfPrice,
-    SfImage,
-    SfHeading,
-    SfSidebar
-  },
-  mixins: [VueOfflineMixin, onEscapePress],
-  data () {
-    return {
-      isMicrocartVisible: false
-    };
-  },
-  computed: {
-    ...mapState({
-      isMicrocartOpen: state => state.ui.microcart
-    }),
-    ...mapGetters({
-      productsInCart: 'cart/getCartItems',
-      totals: 'cart/getTotals'
-    }),
-    totalItems () {
-      return this.productsInCart.length;
-    },
-    productsCount () {
-      let count = 0;
-      this.productsInCart.forEach(product => {
-        count = count + parseInt(product.qty);
-      });
-      return count;
-    }
-  },
-  methods: {
-    closeMicrocartExtend () {
-      this.$store.dispatch('ui/closeMicrocart')
-    },
-    onEscapePress () {
-      this.closeMicrocartExtend();
-    },
-    startShopping () {
-      this.$router.push(localizedRoute('/'));
-      this.closeMicrocartExtend();
-    },
-    getThumbnailForProductExtend (product) {
-      return getThumbnailForProduct(product);
-    },
-    getCartItemPrice (product) {
-      return onlineHelper.isOnline && product.totals && product.totals.options
-        ? getProductPriceFromTotals(product)
-        : getCartItemPrice(product);
-    },
-    getProductOptions (product) {
-      return onlineHelper.isOnline && product.totals && product.totals.options
-        ? product.totals.options
-        : product.options || {};
-    },
-    removeHandler (product) {
-      this.$store.dispatch('cart/removeItem', { product: product });
-    },
-    goToCheckout () {
-      this.$router.push(localizedRoute({ name: 'checkout' }));
-      this.closeMicrocartExtend();
-    },
-    changeQuantity (product, newQuantity) {
-      this.$store.dispatch('cart/updateQuantity', {
-        product: product,
-        qty: newQuantity
-      });
-    }
-  },
-  mounted () {
-    this.isMicrocartVisible = true;
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-@import "~@storefront-ui/shared/styles/helpers/breakpoints";
-.o-microcart-panel {
-  @include for-mobile {
-    ::v-deep .sf-sidebar__aside {
-      max-height: calc(100vh - var(--bottom-navigation-height));
-    }
-  }
-  @include for-desktop {
-    --sidebar-bottom-padding: var(--spacer-base);
-    --sidebar-content-padding: var(--spacer-base);
-  }
-}
-.my-cart {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  &__total-items {
-    margin: 0;
-  }
-  &__total-price {
-    --price-font-size: var(--font-sm);
-    --price-font-weight: var(--font-semibold);
-    margin: 0 0 var(--spacer-xs) 0;
-  }
-}
-.empty-cart {
-  --heading-subtitle-margin: 0 0 var(--spacer-xl) 0;
-  --heading-title-margin: 0 0 var(--spacer-base) 0;
-  --heading-title-color: var(--c-primary);
-  --heading-title-font-weight: var(--font-semibold);
-  display: flex;
-  flex: 1;
-  align-items: center;
-  flex-direction: column;
-  &__banner {
-    display: flex;
-    justify-content: center;
-    flex-direction: column;
-    align-items: center;
-    flex: 1;
-  }
-  &__heading {
-    padding: 0 var(--spacer-base);
-  }
-  &__image {
-    --image-width: 13.1875rem;
-    margin: 0 0 var(--spacer-2xl) 0;
-  }
-  @include for-desktop {
-    --heading-title-font-size: var(--font-xl);
-  }
-}
-.collected-product-list {
-  flex: 1;
-}
-.collected-product {
-  --collected-product-image-background: var(--c-white);
-  margin: 0 0 var(--spacer-sm) 0;
-  &__properties {
-    margin: var(--spacer-xs) 0 0 0;
-  }
-  &__actions {
-    transition: opacity 150ms ease-in-out;
-    opacity: var(--cp-actions-opacity, 0);
-  }
-  &__action {
-    --button-padding: 0;
-  }
-  &:hover {
-    --cp-actions-opacity: 1;
-  }
-}
-::v-deep {
-  .sf-property__value {
-    overflow-wrap: anywhere;
-  }
-}
-</style>
diff --git a/pages/DetailedCart.vue b/pages/DetailedCart.vue
index 56b63d58c..c75483230 100644
--- a/pages/DetailedCart.vue
+++ b/pages/DetailedCart.vue
@@ -70,9 +70,9 @@
 
                 <template #remove>
                   <SfPrice
-                    v-if="getProductRegularPrice(product, campaignContent)"
-                    :regular="getProductRegularPrice(product, campaignContent)"
-                    :special="getProductSpecialPrice(product, campaignContent)"
+                    v-if="cartItemPriceDictionary[product.checksum]"
+                    :regular="formatPrice(cartItemPriceDictionary[product.checksum]).regular"
+                    :special="formatPrice(cartItemPriceDictionary[product.checksum]).special"
                   />
                 </template>
 
@@ -173,9 +173,10 @@ import {
 } from '@storefront-ui/vue';
 import { OrderSummary } from './DetailedCart/index.js';
 import { mapGetters, mapState } from 'vuex';
-import { getCartItemPrice } from 'src/modules/shared';
+import { PriceHelper } from 'src/modules/shared';
 import { localizedRoute } from '@vue-storefront/core/lib/multistore';
 import { getThumbnailForProduct } from '@vue-storefront/core/modules/cart/helpers';
+import { CART_ITEM_PRICE_DICTIONARY } from 'core/modules/catalog';
 import getCartItemKey from 'src/modules/budsies/helpers/get-cart-item-key.function';
 import CartEvents from 'src/modules/shared/types/cart-events';
 import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus';
@@ -374,6 +375,9 @@ export default {
       products: 'cart/getCartItems'
     }),
     ...mapMobileObserver(),
+    cartItemPriceDictionary () {
+      return this.$store.getters[CART_ITEM_PRICE_DICTIONARY];
+    },
     totalItems () {
       return this.products.reduce(
         (totalItems, product) => totalItems + parseInt(product.qty, 10),
@@ -385,9 +389,6 @@ export default {
     },
     canShowProductionSpotCountdown () {
       return this.products.some((product) => isCustomProduct(product.id));
-    },
-    campaignContent () {
-      return this.$store.getters['promotionPlatform/campaignContent'];
     }
   },
   async mounted () {
@@ -470,13 +471,8 @@ export default {
         });
       }
     },
-    // TODO: campaignContent param is quick fix, need to refactor
-    getProductRegularPrice (product, campaignContent) {
-      return getCartItemPrice(product, {}).regular;
-    },
-    // TODO: campaignContent param is quick fix, need to refactor
-    getProductSpecialPrice (product, campaignContent) {
-      return getCartItemPrice(product, {}).special;
+    formatPrice (price) {
+      return PriceHelper.formatPrice(price);
     },
     removeHandler (product) {
       this.$store.dispatch('cart/removeItem', { product: product });

From 4a28891fb2ca27f34eda1103c2059fc1813f53f3 Mon Sep 17 00:00:00 2001
From: Anton Sylka <antonsylka1004@gmail.com>
Date: Mon, 21 Oct 2024 10:37:32 +0700
Subject: [PATCH 4/8] Refs #33224: Cart items price helper - update imports

---
 components/molecules/m-product-carousel.vue |  6 +-----
 components/organisms/o-cart-items-table.vue |  4 ++--
 components/organisms/o-confirm-order.vue    |  2 +-
 helpers/index.ts                            |  7 +++----
 helpers/use-related-products.ts             |  9 +++------
 pages/Category.vue                          | 13 ++++++++-----
 pages/DetailedCart.vue                      |  4 ++--
 7 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/components/molecules/m-product-carousel.vue b/components/molecules/m-product-carousel.vue
index 6ece39ab5..6ed5567aa 100644
--- a/components/molecules/m-product-carousel.vue
+++ b/components/molecules/m-product-carousel.vue
@@ -55,16 +55,12 @@ export default {
     productPriceDictionary () {
       return this.$store.getters['product/productPriceDictionary'];
     },
-    productDiscountDictionary () {
-      return this.$store.getters['product/productDiscountDictionary'];
-    },
     carouselProducts () {
       const _ = this.campaignContent;
       return this.products.map(
         (product) => prepareCategoryProduct(
           product,
-          this.productPriceDictionary,
-          this.productDiscountDictionary
+          this.productPriceDictionary
         )
       );
     }
diff --git a/components/organisms/o-cart-items-table.vue b/components/organisms/o-cart-items-table.vue
index f3eeea41c..f9ac5fc02 100644
--- a/components/organisms/o-cart-items-table.vue
+++ b/components/organisms/o-cart-items-table.vue
@@ -10,16 +10,16 @@
 import { PropType } from 'vue';
 import { getThumbnailForProduct } from '@vue-storefront/core/modules/cart/helpers';
 
+import { CART_ITEM_PRICE_DICTIONARY, GET_CART_ITEM_PRICE } from '@vue-storefront/core/modules/catalog';
 import CartItem from 'core/modules/cart/types/CartItem';
 import getCartItemKey from 'src/modules/budsies/helpers/get-cart-item-key.function';
 import { getCustomizationSystemCartItemThumbnail } from 'src/modules/customization-system';
+import { PriceHelper } from 'src/modules/shared';
 
 import { getCartItemOptions } from 'theme/helpers/get-cart-item-options.function';
 import { OrderContentItem } from '../interfaces/order-content-item.interface';
 
 import OOrderContent from './o-order-content.vue';
-import { PriceHelper } from 'src/modules/shared';
-import { CART_ITEM_PRICE_DICTIONARY, GET_CART_ITEM_PRICE } from 'core/modules/catalog';
 
 export default {
   name: 'OCartItemsTable',
diff --git a/components/organisms/o-confirm-order.vue b/components/organisms/o-confirm-order.vue
index 34361b642..f3ed62a72 100644
--- a/components/organisms/o-confirm-order.vue
+++ b/components/organisms/o-confirm-order.vue
@@ -234,7 +234,7 @@ import { OrderModule, ORDER_CONFLICT_EVENT } from '@vue-storefront/core/modules/
 import { ORDER_ERROR_EVENT } from '@vue-storefront/core/modules/checkout';
 import { OrderReview } from '@vue-storefront/core/modules/checkout/components/OrderReview';
 import { Payment } from '@vue-storefront/core/modules/checkout/components/Payment';
-import { CART_ITEM_PRICE_DICTIONARY } from 'core/modules/catalog';
+import { CART_ITEM_PRICE_DICTIONARY } from '@vue-storefront/core/modules/catalog';
 import getCartItemKey from 'src/modules/budsies/helpers/get-cart-item-key.function';
 import { getCustomizationSystemCartItemThumbnail } from 'src/modules/customization-system';
 import { AFFIRM_MODAL_CLOSED } from 'src/modules/payment-affirm/types/AffirmCheckoutEvents';
diff --git a/helpers/index.ts b/helpers/index.ts
index 644708011..89441d973 100644
--- a/helpers/index.ts
+++ b/helpers/index.ts
@@ -56,8 +56,7 @@ export function getTopLevelCategories (categoryList) {
 
 export function prepareCategoryProduct (
   product,
-  productPriceDictionary: Record<string, PriceHelper.ProductPrice>,
-  productDiscountDictionary: Record<string, PriceHelper.ProductDiscount>
+  productPriceDictionary: Record<string, PriceHelper.ProductPrice>
 ) {
   const imagePath = productThumbnailPath(product);
   const thumbnailPath = !imagePath ? getProductImagePlaceholder() : getThumbnailPath(
@@ -66,10 +65,10 @@ export function prepareCategoryProduct (
     config.products.thumbnails.height
   );
   const price = productPriceDictionary[product.id];
-  const discount = productDiscountDictionary[product.id];
+  const discount = PriceHelper.getProductDiscount(price);
 
   return {
-    discount: PriceHelper.formatProductDiscount(discount),
+    discount: PriceHelper.formatProductDiscount(discount).discountPercent,
     id: product.id,
     sku: product.sku,
     title: htmlDecode(product.name),
diff --git a/helpers/use-related-products.ts b/helpers/use-related-products.ts
index 82c914ccc..fc05487ae 100644
--- a/helpers/use-related-products.ts
+++ b/helpers/use-related-products.ts
@@ -9,7 +9,6 @@ import { Dictionary } from 'src/modules/budsies';
 import isCustomProduct from 'src/modules/shared/helpers/is-custom-product.function';
 
 import { prepareCategoryProduct } from 'theme/helpers';
-import CampaignContent from 'src/modules/promotion-platform/types/CampaignContent.model';
 
 export const CROSS_SELL = 'crosssell';
 export const UP_SELL = 'upsell';
@@ -37,9 +36,6 @@ export function useRelatedProducts (
   const productBySkuDictionary = computed<Record<string, Product>>(() => {
     return rootStore.getters['product/getProductBySkuDictionary'];
   });
-  const campaignContent = computed<CampaignContent | undefined>(() => {
-    return rootStore.getters['promotionPlatform/campaignContent'];
-  })
   const relatedProducts = computed(() => {
     if (!currentProduct.value) {
       return [];
@@ -59,11 +55,12 @@ export function useRelatedProducts (
     return dictionary;
   });
   const preparedRelatedProducts = computed(() => {
-    const _ = campaignContent.value;
+    const productPriceDictionary = rootStore.getters['product/productPriceDictionary'];
+
     return relatedProducts.value.map(
       (item: Product) => (
         {
-          ...prepareCategoryProduct(item),
+          ...prepareCategoryProduct(item, productPriceDictionary),
           landing_page_url: item.landing_page_url
         }
       )
diff --git a/pages/Category.vue b/pages/Category.vue
index a6a3edd94..0605f37c7 100644
--- a/pages/Category.vue
+++ b/pages/Category.vue
@@ -411,12 +411,15 @@ export default {
           })
         : this.getCurrentPageProducts;
     },
-    campaignContent () {
-      return this.$store.getters['promotionPlatform/campaignContent'];
-    },
     preparedProducts () {
-      const _ = this.campaignContent;
-      return this.products.map(prepareCategoryProduct);
+      const productPriceDictionary = this.$store.getters['product/productPriceDictionary'];
+
+      return this.products.map(
+        (product) => prepareCategoryProduct(
+          product,
+          productPriceDictionary
+        )
+      );
     },
     totalPages () {
       return Math.ceil(this.getCategoryProductsTotal / THEME_PAGE_SIZE);
diff --git a/pages/DetailedCart.vue b/pages/DetailedCart.vue
index 15d388772..902def8c0 100644
--- a/pages/DetailedCart.vue
+++ b/pages/DetailedCart.vue
@@ -154,7 +154,7 @@ import { mapGetters, mapState } from 'vuex';
 import { PriceHelper } from 'src/modules/shared';
 import { localizedRoute } from '@vue-storefront/core/lib/multistore';
 import { getThumbnailForProduct } from '@vue-storefront/core/modules/cart/helpers';
-import { CART_ITEM_PRICE_DICTIONARY } from 'core/modules/catalog';
+import { CART_ITEM_PRICE_DICTIONARY } from '@vue-storefront/core/modules/catalog';
 import getCartItemKey from 'src/modules/budsies/helpers/get-cart-item-key.function';
 import CartEvents from 'src/modules/shared/types/cart-events';
 import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus';
@@ -452,7 +452,7 @@ export default {
       }
     },
     formatPrice (price) {
-      return PriceHelper.formatPrice(price);
+      return PriceHelper.formatProductPrice(price);
     },
     removeHandler (product) {
       this.$store.dispatch('cart/removeItem', { product: product });

From b566b252d09ca9a9dfce683493a12fff8253752c Mon Sep 17 00:00:00 2001
From: Anton Sylka <antonsylka1004@gmail.com>
Date: Mon, 21 Oct 2024 15:27:19 +0700
Subject: [PATCH 5/8] Refs #33224: Cart items price helper - replace hardcoded
 getter name with constant

---
 components/atoms/a-product-price.vue                     | 4 +++-
 components/molecules/m-product-carousel.vue              | 4 +++-
 components/organisms/o-cross-sells-products-selector.vue | 4 ++--
 components/storyblok/Product.vue                         | 3 ++-
 helpers/use-related-products.ts                          | 3 ++-
 pages/Category.vue                                       | 3 ++-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/components/atoms/a-product-price.vue b/components/atoms/a-product-price.vue
index 16aec7ee3..c4dd49518 100644
--- a/components/atoms/a-product-price.vue
+++ b/components/atoms/a-product-price.vue
@@ -6,6 +6,8 @@
 </template>
 
 <script>
+import { PRODUCT_PRICE_DICTIONARY } from '@vue-storefront/core/modules/catalog';
+
 import ACustomPrice from '../atoms/a-custom-price.vue';
 
 export default {
@@ -25,7 +27,7 @@ export default {
   },
   computed: {
     productPriceDictionary () {
-      return this.$store.getters['product/productPriceDictionary'];
+      return this.$store.getters[PRODUCT_PRICE_DICTIONARY];
     },
     price () {
       return this.productPriceDictionary[this.product.id];
diff --git a/components/molecules/m-product-carousel.vue b/components/molecules/m-product-carousel.vue
index 6ed5567aa..5ceb51aa9 100644
--- a/components/molecules/m-product-carousel.vue
+++ b/components/molecules/m-product-carousel.vue
@@ -36,6 +36,8 @@
 <script>
 import { SfCarousel } from '@storefront-ui/vue';
 
+import { PRODUCT_PRICE_DICTIONARY } from '@vue-storefront/core/modules/catalog';
+
 import { prepareCategoryProduct } from 'theme/helpers';
 import OProductCard from 'theme/components/organisms/o-product-card';
 
@@ -53,7 +55,7 @@ export default {
   },
   computed: {
     productPriceDictionary () {
-      return this.$store.getters['product/productPriceDictionary'];
+      return this.$store.getters[PRODUCT_PRICE_DICTIONARY];
     },
     carouselProducts () {
       const _ = this.campaignContent;
diff --git a/components/organisms/o-cross-sells-products-selector.vue b/components/organisms/o-cross-sells-products-selector.vue
index 784ee6dc3..1cfa9141e 100644
--- a/components/organisms/o-cross-sells-products-selector.vue
+++ b/components/organisms/o-cross-sells-products-selector.vue
@@ -23,9 +23,9 @@
 import { PropType, defineComponent, onBeforeMount, onServerPrefetch, toRefs } from '@vue/composition-api';
 import { SfHeading } from '@storefront-ui/vue';
 
+import { PRODUCT_PRICE_DICTIONARY } from '@vue-storefront/core/modules/catalog';
 import Product from '@vue-storefront/core/modules/catalog/types/Product';
 import { getProductGallery } from '@vue-storefront/core/modules/catalog/helpers';
-import CampaignContent from 'src/modules/promotion-platform/types/CampaignContent.model';
 import { PriceHelper } from 'src/modules/shared';
 import { getFinalPrice } from 'src/modules/shared/helpers/price';
 
@@ -102,7 +102,7 @@ export default defineComponent({
       return this.$store.getters['cart/getIsAdding'];
     },
     productPriceDictionary (): Record<string, PriceHelper.ProductPrice> {
-      return this.$store.getters['product/productPriceDictionary'];
+      return this.$store.getters[PRODUCT_PRICE_DICTIONARY];
     },
     productOptions (): AddonOption[] {
       return this.relatedProducts.map(
diff --git a/components/storyblok/Product.vue b/components/storyblok/Product.vue
index 0275bd0ea..058033337 100644
--- a/components/storyblok/Product.vue
+++ b/components/storyblok/Product.vue
@@ -36,6 +36,7 @@ import { formatProductLink } from '@vue-storefront/core/modules/url/helpers';
 import ProductImage from '../core/ProductImage.vue';
 import { LocalizedRoute, StoreView } from 'core/lib/types';
 import config from 'config';
+import { PRODUCT_PRICE_DICTIONARY } from '@vue-storefront/core/modules/catalog';
 import Product from 'core/modules/catalog/types/Product';
 import { Blok } from 'src/modules/vsf-storyblok-module/components';
 import { PriceHelper } from 'src/modules/shared';
@@ -57,7 +58,7 @@ export default Blok.extend({
   },
   computed: {
     productPriceDictionary (): Record<string, PriceHelper.ProductPrice> {
-      return this.$store.getters['product/productPriceDictionary'];
+      return this.$store.getters[PRODUCT_PRICE_DICTIONARY];
     },
     itemData (): ProductData {
       return this.item as ProductData;
diff --git a/helpers/use-related-products.ts b/helpers/use-related-products.ts
index fc05487ae..258343782 100644
--- a/helpers/use-related-products.ts
+++ b/helpers/use-related-products.ts
@@ -3,6 +3,7 @@ import config from 'config';
 import { SearchQuery } from 'storefront-query-builder';
 
 import rootStore from '@vue-storefront/core/store';
+import { PRODUCT_PRICE_DICTIONARY } from '@vue-storefront/core/modules/catalog';
 import Product from '@vue-storefront/core/modules/catalog/types/Product';
 
 import { Dictionary } from 'src/modules/budsies';
@@ -55,7 +56,7 @@ export function useRelatedProducts (
     return dictionary;
   });
   const preparedRelatedProducts = computed(() => {
-    const productPriceDictionary = rootStore.getters['product/productPriceDictionary'];
+    const productPriceDictionary = rootStore.getters[PRODUCT_PRICE_DICTIONARY];
 
     return relatedProducts.value.map(
       (item: Product) => (
diff --git a/pages/Category.vue b/pages/Category.vue
index 0605f37c7..aab4c898c 100644
--- a/pages/Category.vue
+++ b/pages/Category.vue
@@ -233,6 +233,7 @@ import {
   mapMobileObserver,
   unMapMobileObserver
 } from '@storefront-ui/vue/src/utilities/mobile-observer';
+import { PRODUCT_PRICE_DICTIONARY } from '@vue-storefront/core/modules/catalog';
 import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus'
 import getHostFromHeaders from '@vue-storefront/core/helpers/get-host-from-headers.function';
 
@@ -412,7 +413,7 @@ export default {
         : this.getCurrentPageProducts;
     },
     preparedProducts () {
-      const productPriceDictionary = this.$store.getters['product/productPriceDictionary'];
+      const productPriceDictionary = this.$store.getters[PRODUCT_PRICE_DICTIONARY];
 
       return this.products.map(
         (product) => prepareCategoryProduct(

From ca425539add58f1b956fd9fac226eb81229a51d4 Mon Sep 17 00:00:00 2001
From: Anton Sylka <antonsylka1004@gmail.com>
Date: Mon, 21 Oct 2024 15:43:27 +0700
Subject: [PATCH 6/8] Refs #33224: Cart items price getter - move to "Cart"
 module

---
 components/organisms/o-cart-items-table.vue | 2 +-
 components/organisms/o-confirm-order.vue    | 2 +-
 pages/DetailedCart.vue                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/organisms/o-cart-items-table.vue b/components/organisms/o-cart-items-table.vue
index f9ac5fc02..e6e0d3195 100644
--- a/components/organisms/o-cart-items-table.vue
+++ b/components/organisms/o-cart-items-table.vue
@@ -10,7 +10,7 @@
 import { PropType } from 'vue';
 import { getThumbnailForProduct } from '@vue-storefront/core/modules/cart/helpers';
 
-import { CART_ITEM_PRICE_DICTIONARY, GET_CART_ITEM_PRICE } from '@vue-storefront/core/modules/catalog';
+import { CART_ITEM_PRICE_DICTIONARY, GET_CART_ITEM_PRICE } from '@vue-storefront/core/modules/cart';
 import CartItem from 'core/modules/cart/types/CartItem';
 import getCartItemKey from 'src/modules/budsies/helpers/get-cart-item-key.function';
 import { getCustomizationSystemCartItemThumbnail } from 'src/modules/customization-system';
diff --git a/components/organisms/o-confirm-order.vue b/components/organisms/o-confirm-order.vue
index f3ed62a72..35eba1793 100644
--- a/components/organisms/o-confirm-order.vue
+++ b/components/organisms/o-confirm-order.vue
@@ -234,7 +234,7 @@ import { OrderModule, ORDER_CONFLICT_EVENT } from '@vue-storefront/core/modules/
 import { ORDER_ERROR_EVENT } from '@vue-storefront/core/modules/checkout';
 import { OrderReview } from '@vue-storefront/core/modules/checkout/components/OrderReview';
 import { Payment } from '@vue-storefront/core/modules/checkout/components/Payment';
-import { CART_ITEM_PRICE_DICTIONARY } from '@vue-storefront/core/modules/catalog';
+import { CART_ITEM_PRICE_DICTIONARY } from '@vue-storefront/core/modules/cart';
 import getCartItemKey from 'src/modules/budsies/helpers/get-cart-item-key.function';
 import { getCustomizationSystemCartItemThumbnail } from 'src/modules/customization-system';
 import { AFFIRM_MODAL_CLOSED } from 'src/modules/payment-affirm/types/AffirmCheckoutEvents';
diff --git a/pages/DetailedCart.vue b/pages/DetailedCart.vue
index 902def8c0..accaec3d3 100644
--- a/pages/DetailedCart.vue
+++ b/pages/DetailedCart.vue
@@ -154,7 +154,7 @@ import { mapGetters, mapState } from 'vuex';
 import { PriceHelper } from 'src/modules/shared';
 import { localizedRoute } from '@vue-storefront/core/lib/multistore';
 import { getThumbnailForProduct } from '@vue-storefront/core/modules/cart/helpers';
-import { CART_ITEM_PRICE_DICTIONARY } from '@vue-storefront/core/modules/catalog';
+import { CART_ITEM_PRICE_DICTIONARY } from '@vue-storefront/core/modules/cart';
 import getCartItemKey from 'src/modules/budsies/helpers/get-cart-item-key.function';
 import CartEvents from 'src/modules/shared/types/cart-events';
 import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus';

From c169dab9b50f96c12e96e2b125efedc9f3fca7d8 Mon Sep 17 00:00:00 2001
From: Anton Sylka <antonsylka1004@gmail.com>
Date: Mon, 21 Oct 2024 15:57:57 +0700
Subject: [PATCH 7/8] Refs #33224: Product - fix price helpers usage

---
 components/molecules/m-product-carousel.vue | 1 -
 components/storyblok/Product.vue            | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/components/molecules/m-product-carousel.vue b/components/molecules/m-product-carousel.vue
index 5ceb51aa9..34556dd06 100644
--- a/components/molecules/m-product-carousel.vue
+++ b/components/molecules/m-product-carousel.vue
@@ -58,7 +58,6 @@ export default {
       return this.$store.getters[PRODUCT_PRICE_DICTIONARY];
     },
     carouselProducts () {
-      const _ = this.campaignContent;
       return this.products.map(
         (product) => prepareCategoryProduct(
           product,
diff --git a/components/storyblok/Product.vue b/components/storyblok/Product.vue
index 058033337..1d857deb7 100644
--- a/components/storyblok/Product.vue
+++ b/components/storyblok/Product.vue
@@ -43,7 +43,6 @@ import { PriceHelper } from 'src/modules/shared';
 
 import ProductData from './interfaces/product-data.interface';
 import getProductImagePlaceholder from '@vue-storefront/core/modules/cart/helpers/getProductImagePlaceholder';
-import { formatPrice, getFinalPrice } from 'src/modules/shared/helpers/price';
 
 export default Blok.extend({
   name: 'StoryblokProductBlock',
@@ -73,14 +72,14 @@ export default Blok.extend({
 
       const price = this.productPriceDictionary[this.product.id];
 
-      return getFinalPrice(price);
+      return PriceHelper.getFinalPrice(price);
     },
     formattedPrice (): string {
       if (!this.price) {
         return '';
       }
 
-      return formatPrice(this.price);
+      return PriceHelper.formatPrice(this.price);
     },
     name (): string {
       if (!this.product) {

From ac2094d9e0a29d64f8a0d8f5a0731153d755d40e Mon Sep 17 00:00:00 2001
From: Anton Sylka <antonsylka1004@gmail.com>
Date: Tue, 22 Oct 2024 13:32:59 +0700
Subject: [PATCH 8/8] Refs #33225: Product Forms - update price helper usage

---
 .../o-creativity-kit-product-order-form.vue   | 10 ++++---
 pages/CreativityKitProduct.vue                | 26 +++++++++++--------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/components/organisms/CreativityKitProduct/o-creativity-kit-product-order-form.vue b/components/organisms/CreativityKitProduct/o-creativity-kit-product-order-form.vue
index 88cbd1650..805287e04 100644
--- a/components/organisms/CreativityKitProduct/o-creativity-kit-product-order-form.vue
+++ b/components/organisms/CreativityKitProduct/o-creativity-kit-product-order-form.vue
@@ -49,9 +49,10 @@ import { SfButton, SfHeading } from '@storefront-ui/vue';
 import { BundleOption } from 'core/modules/catalog/types/BundleOption';
 import Product from '@vue-storefront/core/modules/catalog/types/Product';
 import { Logger } from '@vue-storefront/core/lib/logger';
+import { PRODUCT_PRICE_DICTIONARY } from '@vue-storefront/core/modules/catalog';
 import * as catalogTypes from '@vue-storefront/core/modules/catalog/store/product/mutation-types';
 import i18n from '@vue-storefront/i18n';
-import { getProductDefaultPrice, PriceHelper, ServerError } from 'src/modules/shared';
+import { PriceHelper, ServerError } from 'src/modules/shared';
 
 import ACustomProductQuantity from 'theme/components/atoms/a-custom-product-quantity.vue';
 
@@ -93,8 +94,11 @@ export default Vue.extend({
     }
   },
   computed: {
+    productPriceDictionary (): Record<string, PriceHelper.ProductPrice> {
+      return this.$store.getters[PRODUCT_PRICE_DICTIONARY];
+    },
     baseProductFinalPrice (): number {
-      const price = getProductDefaultPrice(this.product, {}, false);
+      const price = this.productPriceDictionary[this.product.id];
       return PriceHelper.getFinalPrice(price)
     },
     defaultOption (): CreativityKitFormOption | undefined {
@@ -128,7 +132,7 @@ export default Vue.extend({
           continue;
         }
 
-        const price = getProductDefaultPrice(productLink.product, {}, false);
+        const price = this.productPriceDictionary[productLink.product.id];
         const finalPrice = PriceHelper.getFinalPrice(price);
 
         let image = productLink.product.image;
diff --git a/pages/CreativityKitProduct.vue b/pages/CreativityKitProduct.vue
index ee1d58a94..8ce3e0174 100644
--- a/pages/CreativityKitProduct.vue
+++ b/pages/CreativityKitProduct.vue
@@ -202,10 +202,11 @@ import { SfHeading } from '@storefront-ui/vue';
 
 import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus';
 import { htmlDecode } from '@vue-storefront/core/filters';
+import { PRODUCT_PRICE_DICTIONARY } from '@vue-storefront/core/modules/catalog';
 import { catalogHooksExecutors } from '@vue-storefront/core/modules/catalog-next/hooks';
 import { PRODUCT_UNSET_CURRENT } from '@vue-storefront/core/modules/catalog/store/product/mutation-types';
 import Product from 'core/modules/catalog/types/Product';
-import { getProductDefaultPrice, PriceHelper, ProductEvent } from 'src/modules/shared';
+import { PriceHelper, ProductEvent } from 'src/modules/shared';
 
 import { ProductStructuredData } from 'src/modules/budsies';
 
@@ -256,22 +257,25 @@ export default (Vue as VueConstructor<Vue & InjectedServices>).extend({
       const productBySku = this.$store.getters['product/getProductBySkuDictionary'];
       return productBySku[budsieProductSku];
     },
+    productPriceDictionary (): Record<string, PriceHelper.ProductPrice> {
+      return this.$store.getters[PRODUCT_PRICE_DICTIONARY];
+    },
     budsieProductPrice (): number {
-      const price = getProductDefaultPrice(
-        this.getBudsieProduct,
-        {},
-        false
-      );
+      if (!this.getBudsieProduct) {
+        return budsieShippingPrice;
+      }
+
+      const price = this.productPriceDictionary[this.getBudsieProduct.id];
       const finalPrice = PriceHelper.getFinalPrice(price);
 
       return finalPrice + budsieShippingPrice;
     },
     superizedAddonPrice (): number {
-      const price = getProductDefaultPrice(
-        this.superizedAddonProduct,
-        {},
-        false
-      );
+      if (!this.superizedAddonProduct) {
+        return 0;
+      }
+
+      const price = this.productPriceDictionary[this.superizedAddonProduct.id];
 
       return PriceHelper.getFinalPrice(price);
     },