@lana-commerce/core 14.0.0-alpha.15 → 14.0.0-alpha.16

package/CHANGELOG.md

@@ -11,6 +11,7 @@ This project adheres to [Semantic Versioning][semantic versioning].
 - OAuth APIs of "customer" module were changed in backwards incompatible way. To delete oauth provider you need to specify its type. This is due to the fact that you can connect multiple providers now.
 - Do not export "parseFormat" from "formatToJSX".
 - Use new data format for "slate" module. Bringing "slate" lib based editor up to date with upstream.
+- New variant pricing model using pricing rules.
 
 ### Minor Changes
 

package/cjs/graphql/fragments/CommonCartVariant.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = "fragment CommonCartVariant on StorefrontProductVariant{barcode country_of_origin created_at currency_prices{...CurrencyPrice}discountable expiration_days fulfillment_service grams height hs_code id media_files{...MediaFile}linked_media_files{...MediaFile}inventory{available low_stock locations{available low_stock inventory_location{id}}}inventory_policy is_default length map_price max_downloads options{...VariantOption}position price retail_price sale_price sale_price_eligible sale_price_from sale_price_to sku tax_class taxable type updated_at width customer_group_price favorite{id created_at}tiered_pricing{...TieredPricing}}\n";
+exports.default = "fragment CommonCartVariant on StorefrontProductVariant{barcode country_of_origin created_at currency_prices{...CurrencyPrice}discountable expiration_days fulfillment_service grams height hs_code id media_files{...MediaFile}linked_media_files{...MediaFile}inventory{available low_stock locations{available low_stock inventory_location{id}}}inventory_policy is_default length map_price max_downloads options{...VariantOption}position price retail_price sku tax_class taxable type updated_at width favorite{id created_at}tiered_pricing{...TieredPricing}previous_pricing{price retail_price map_price currency_prices{...CurrencyPrice}tiered_pricing{...TieredPricing}}}\n";

package/cjs/graphql/fragments/CurrencyPrice.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = "fragment CurrencyPrice on CurrencyPrice{currency map_price price retail_price sale_price tiered_pricing{...TieredPricing}}\n";
+exports.default = "fragment CurrencyPrice on CurrencyPrice{currency map_price price retail_price tiered_pricing{...TieredPricing}}\n";

package/cjs/lineItemPrice.js

@@ -14,7 +14,6 @@ function applyDiscountPreview(pi, quantity, dp) {
     const iprice = lprice / quantity;
     return {
         sale: pi.sale,
-        hide: pi.hide,
         kind: "price_discount",
         lineItemPrice: lprice,
         perItemPrice: iprice,
@@ -24,71 +23,52 @@ function applyDiscountPreview(pi, quantity, dp) {
     };
 }
 function lineItemPriceInfoPreDiscountPreview(vpi, quantity, tieredQuantity) {
-    if (vpi.tieredPricing && vpi.tieredPricing.tiers.length > 0) {
-        // tiered pricing
-        if (vpi.sale) {
-            const prevLPrice = (0, tieredPrice_js_1.tieredPrice)(vpi.tieredPricing, vpi.previousPrice, quantity, tieredQuantity);
-            const prevIPrice = Math.round(prevLPrice / quantity);
+    if (vpi.previousPrice === 0 && vpi.tieredPricing && vpi.tieredPricing.tiers.length > 0) {
+        // previous price is not provided and tiered pricing is defined, let's use original price as previous price
+        const tieredLPrice = (0, tieredPrice_js_1.tieredPrice)(vpi.tieredPricing, vpi.price, quantity, tieredQuantity);
+        const tieredIPrice = Math.round(tieredLPrice / quantity);
+        if (tieredLPrice !== vpi.price * quantity) {
             return {
-                sale: vpi.sale,
-                hide: vpi.hide,
+                sale: false,
                 kind: "price_discount",
-                lineItemPrice: vpi.price * quantity,
-                perItemPrice: vpi.price,
-                previousLineItemPrice: prevLPrice,
-                previousPerItemPrice: prevIPrice,
-                percentageOff: (0, percentageOff_js_1.percentageOff)(prevLPrice, vpi.price * quantity),
+                lineItemPrice: tieredLPrice,
+                perItemPrice: tieredIPrice,
+                previousLineItemPrice: vpi.price * quantity,
+                previousPerItemPrice: vpi.price,
+                percentageOff: (0, percentageOff_js_1.percentageOff)(vpi.price * quantity, tieredLPrice),
             };
         }
         else {
-            const tieredLPrice = (0, tieredPrice_js_1.tieredPrice)(vpi.tieredPricing, vpi.price, quantity, tieredQuantity);
-            const tieredIPrice = Math.round(tieredLPrice / quantity);
-            if (tieredLPrice !== vpi.price * quantity) {
-                return {
-                    sale: vpi.sale,
-                    hide: vpi.hide,
-                    kind: "price_discount",
-                    lineItemPrice: tieredLPrice,
-                    perItemPrice: tieredIPrice,
-                    previousLineItemPrice: vpi.price * quantity,
-                    previousPerItemPrice: vpi.price,
-                    percentageOff: (0, percentageOff_js_1.percentageOff)(vpi.price * quantity, tieredLPrice),
-                };
-            }
-            else {
-                return {
-                    sale: vpi.sale,
-                    hide: vpi.hide,
-                    kind: "price",
-                    lineItemPrice: vpi.price * quantity,
-                    perItemPrice: vpi.price,
-                };
-            }
-        }
-    }
-    else {
-        // normal pricing
-        if (vpi.previousPrice !== 0 && vpi.previousPrice !== vpi.price) {
             return {
-                sale: vpi.sale,
-                hide: vpi.hide,
-                kind: "price_discount",
+                sale: false,
+                kind: "price",
                 lineItemPrice: vpi.price * quantity,
                 perItemPrice: vpi.price,
-                previousLineItemPrice: vpi.previousPrice * quantity,
-                previousPerItemPrice: vpi.previousPrice,
-                percentageOff: (0, percentageOff_js_1.percentageOff)(vpi.previousPrice, vpi.price),
             };
         }
-        else {
+    }
+    else {
+        const tieredLPrice = (0, tieredPrice_js_1.tieredPrice)(vpi.tieredPricing, vpi.price, quantity, tieredQuantity);
+        const tieredIPrice = Math.round(tieredLPrice / quantity);
+        if (vpi.previousPrice === 0) {
             return {
                 sale: vpi.sale,
-                hide: vpi.hide,
                 kind: "price",
-                lineItemPrice: vpi.price * quantity,
-                perItemPrice: vpi.price,
+                lineItemPrice: tieredLPrice,
+                perItemPrice: tieredIPrice,
             };
         }
+        const previousTieredLPrice = (0, tieredPrice_js_1.tieredPrice)(vpi.previousTieredPricing, vpi.previousPrice, quantity, tieredQuantity);
+        const previousTieredIPrice = Math.round(previousTieredLPrice / quantity);
+        return {
+            sale: vpi.sale,
+            kind: "price_discount",
+            lineItemPrice: tieredLPrice,
+            perItemPrice: tieredIPrice,
+            previousLineItemPrice: previousTieredLPrice,
+            previousPerItemPrice: previousTieredIPrice,
+            percentageOff: (0, percentageOff_js_1.percentageOff)(previousTieredLPrice, tieredLPrice),
+        };
     }
 }
 function customItemPriceInfo(customItemPrice) {
@@ -98,6 +78,7 @@ function customItemPriceInfo(customItemPrice) {
         price: customItemPrice || 0,
         sale: false,
         tieredPricing: undefined,
+        previousTieredPricing: undefined,
     };
 }
 function lineItemPriceInfo(vpi, customItemPrice, quantity, tieredQuantity, discountPreview) {

package/cjs/slate.js

@@ -228,6 +228,9 @@ function serializeBlock(ctx, buf, n) {
     else if (n.type === "separator") {
         // TODO
     }
+    else if (n.type === "mention") {
+        // TODO
+    }
 }
 function serializeNode(ctx, buf, n) {
     if (isLanaSlateText(n)) {

package/cjs/variantPrice.js

@@ -2,6 +2,49 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.variantPriceInfo = variantPriceInfo;
 const toMajor_js_1 = require("./toMajor.js");
+function findPriceForCurrency(env, vp) {
+    const defaultPrice = {
+        sale: false,
+        price: vp.price,
+        mapPrice: vp.map_price,
+        previousPrice: 0,
+        hide: false,
+        tieredPricing: vp.tiered_pricing || undefined,
+        previousTieredPricing: undefined,
+    };
+    if (env.currency !== env.shopCurrency) {
+        // try to find appropriate price
+        const cp = vp.currency_prices.find((cp) => cp.currency === env.currency);
+        if (cp) {
+            return {
+                sale: false,
+                price: cp.price,
+                mapPrice: cp.map_price,
+                previousPrice: 0,
+                hide: false,
+                tieredPricing: cp.tiered_pricing || undefined,
+                previousTieredPricing: undefined,
+            };
+        }
+        else {
+            // otherwise convert the price
+            const tp = defaultPrice.tieredPricing;
+            defaultPrice.price = convertCurrency(env, defaultPrice.price);
+            defaultPrice.mapPrice = convertCurrency(env, defaultPrice.mapPrice);
+            defaultPrice.tieredPricing = tp
+                ? {
+                    model: tp.model,
+                    tiers: tp.tiers.map((t) => ({
+                        from: t.from,
+                        to: t.to,
+                        price: convertCurrency(env, t.price),
+                    })),
+                }
+                : undefined;
+        }
+    }
+    return defaultPrice;
+}
 function convertCurrency(env, value) {
     const to = env.shopCurrencies[env.currency];
     if (!to) {
@@ -17,47 +60,37 @@ function convertCurrency(env, value) {
     const v = Math.ceil(major * xrate * to.currency.to_minor);
     return v + Math.ceil(v * (to.conversion_fee || 0));
 }
-function salePriceOrPrice(salePriceEligible, pi, tieredPricing) {
-    return salePriceEligible
-        ? { sale: true, price: pi.sale_price, previousPrice: pi.price, hide: pi.sale_price < pi.map_price, tieredPricing }
-        : { sale: false, price: pi.price, previousPrice: pi.retail_price, hide: pi.price < pi.map_price, tieredPricing };
-}
 function variantPriceInfoImpl(env, p) {
     if (!p)
-        return { sale: false, price: 0, previousPrice: 0, hide: false, tieredPricing: undefined };
-    const defaultPrice = salePriceOrPrice(p.sale_price_eligible, p, p.tiered_pricing || undefined);
-    if (env.currency !== env.shopCurrency) {
-        // secondary currency, has priority over customer group prices
-        const cp = p.currency_prices.find((cp) => cp.currency === env.currency);
-        if (cp)
-            return salePriceOrPrice(p.sale_price_eligible, cp, cp.tiered_pricing || undefined);
-        // okay, when there is no provided currency price, we have to perform the conversion
-        defaultPrice.price = convertCurrency(env, defaultPrice.price);
-        defaultPrice.previousPrice = convertCurrency(env, defaultPrice.previousPrice);
-        if (defaultPrice.tieredPricing) {
-            const tp = defaultPrice.tieredPricing;
-            defaultPrice.tieredPricing = {
-                model: tp.model,
-                tiers: tp.tiers.map((t) => ({
-                    from: t.from,
-                    to: t.to,
-                    price: convertCurrency(env, t.price),
-                })),
-            };
-        }
-        return defaultPrice;
-    }
-    if (p.customer_group_price !== 0) {
         return {
             sale: false,
-            price: p.customer_group_price,
+            price: 0,
             previousPrice: 0,
             hide: false,
-            tieredPricing: p.tiered_pricing || undefined,
+            tieredPricing: undefined,
+            previousTieredPricing: undefined,
+        };
+    const curr = findPriceForCurrency(env, p);
+    if (p.previous_pricing) {
+        const prev = findPriceForCurrency(env, p.previous_pricing);
+        return {
+            sale: true,
+            price: curr.price,
+            previousPrice: prev.price,
+            tieredPricing: curr.tieredPricing,
+            previousTieredPricing: prev.tieredPricing,
+            hide: curr.price < curr.mapPrice,
         };
     }
     else {
-        return defaultPrice;
+        return {
+            sale: false,
+            price: curr.price,
+            previousPrice: 0,
+            tieredPricing: curr.tieredPricing,
+            previousTieredPricing: undefined,
+            hide: curr.price < curr.mapPrice,
+        };
     }
 }
 function applySubscriptionPlanPricing(oldPrice, plan, isShopCurrency) {

package/cjs/variantPriceCommerce.js

@@ -2,27 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.variantPriceInfo = variantPriceInfo;
 const variantPrice_js_1 = require("./variantPrice.js");
-function variantLikeToStorefrontVariantPricer(v, customerGroupID) {
-    let tiered_pricing = v.tiered_pricing;
-    let customer_group_price = 0;
-    for (const c of v.customer_group_prices) {
-        if (c.customer_group && c.customer_group.id === customerGroupID) {
-            customer_group_price = c.price;
-            tiered_pricing = c.tiered_pricing;
+function pricingForPricingRuleID(v, prID) {
+    const po = v.pricing_overrides.find((po) => { var _a; return ((_a = po.pricing_rule) === null || _a === void 0 ? void 0 : _a.id) === prID; });
+    return po
+        ? {
+            price: po.price,
+            map_price: po.map_price,
+            retail_price: po.retail_price,
+            tiered_pricing: po.tiered_pricing,
+            currency_prices: po.currency_prices,
         }
-    }
-    return {
-        price: v.price,
-        customer_group_price,
-        sale_price: v.sale_price,
-        sale_price_eligible: v.sale_price_eligible,
-        retail_price: v.retail_price,
-        map_price: v.map_price,
-        currency_prices: v.currency_prices,
-        tiered_pricing,
-    };
+        : {
+            price: v.price,
+            map_price: v.map_price,
+            retail_price: v.retail_price,
+            tiered_pricing: v.tiered_pricing,
+            currency_prices: v.currency_prices,
+        };
 }
-function variantPriceInfo(env, variant, customerGroupID) {
-    const v = variantLikeToStorefrontVariantPricer(variant, customerGroupID);
+function variantLikeToStorefrontVariantPricer(v, pricingRuleID, parentPricingRuleID, displayPriceDifference) {
+    const current = pricingForPricingRuleID(v, pricingRuleID);
+    const previous = displayPriceDifference ? pricingForPricingRuleID(v, parentPricingRuleID) : null;
+    return Object.assign(Object.assign({}, current), { previous_pricing: previous });
+}
+function variantPriceInfo(env, variant, pricingRuleID, parentPricingRuleID, displayPriceDifference) {
+    const v = variantLikeToStorefrontVariantPricer(variant, pricingRuleID, parentPricingRuleID, displayPriceDifference);
     return (0, variantPrice_js_1.variantPriceInfo)(env, v);
 }

package/esm/graphql/fragments/CommonCartVariant.js

@@ -1 +1 @@
-export default "fragment CommonCartVariant on StorefrontProductVariant{barcode country_of_origin created_at currency_prices{...CurrencyPrice}discountable expiration_days fulfillment_service grams height hs_code id media_files{...MediaFile}linked_media_files{...MediaFile}inventory{available low_stock locations{available low_stock inventory_location{id}}}inventory_policy is_default length map_price max_downloads options{...VariantOption}position price retail_price sale_price sale_price_eligible sale_price_from sale_price_to sku tax_class taxable type updated_at width customer_group_price favorite{id created_at}tiered_pricing{...TieredPricing}}\n";
+export default "fragment CommonCartVariant on StorefrontProductVariant{barcode country_of_origin created_at currency_prices{...CurrencyPrice}discountable expiration_days fulfillment_service grams height hs_code id media_files{...MediaFile}linked_media_files{...MediaFile}inventory{available low_stock locations{available low_stock inventory_location{id}}}inventory_policy is_default length map_price max_downloads options{...VariantOption}position price retail_price sku tax_class taxable type updated_at width favorite{id created_at}tiered_pricing{...TieredPricing}previous_pricing{price retail_price map_price currency_prices{...CurrencyPrice}tiered_pricing{...TieredPricing}}}\n";

package/esm/graphql/fragments/CurrencyPrice.js

@@ -1 +1 @@
-export default "fragment CurrencyPrice on CurrencyPrice{currency map_price price retail_price sale_price tiered_pricing{...TieredPricing}}\n";
+export default "fragment CurrencyPrice on CurrencyPrice{currency map_price price retail_price tiered_pricing{...TieredPricing}}\n";

package/esm/lineItemPrice.js

@@ -10,7 +10,6 @@ function applyDiscountPreview(pi, quantity, dp) {
     const iprice = lprice / quantity;
     return {
         sale: pi.sale,
-        hide: pi.hide,
         kind: "price_discount",
         lineItemPrice: lprice,
         perItemPrice: iprice,
@@ -20,71 +19,52 @@ function applyDiscountPreview(pi, quantity, dp) {
     };
 }
 function lineItemPriceInfoPreDiscountPreview(vpi, quantity, tieredQuantity) {
-    if (vpi.tieredPricing && vpi.tieredPricing.tiers.length > 0) {
-        // tiered pricing
-        if (vpi.sale) {
-            const prevLPrice = tieredPrice(vpi.tieredPricing, vpi.previousPrice, quantity, tieredQuantity);
-            const prevIPrice = Math.round(prevLPrice / quantity);
+    if (vpi.previousPrice === 0 && vpi.tieredPricing && vpi.tieredPricing.tiers.length > 0) {
+        // previous price is not provided and tiered pricing is defined, let's use original price as previous price
+        const tieredLPrice = tieredPrice(vpi.tieredPricing, vpi.price, quantity, tieredQuantity);
+        const tieredIPrice = Math.round(tieredLPrice / quantity);
+        if (tieredLPrice !== vpi.price * quantity) {
             return {
-                sale: vpi.sale,
-                hide: vpi.hide,
+                sale: false,
                 kind: "price_discount",
-                lineItemPrice: vpi.price * quantity,
-                perItemPrice: vpi.price,
-                previousLineItemPrice: prevLPrice,
-                previousPerItemPrice: prevIPrice,
-                percentageOff: percentageOff(prevLPrice, vpi.price * quantity),
+                lineItemPrice: tieredLPrice,
+                perItemPrice: tieredIPrice,
+                previousLineItemPrice: vpi.price * quantity,
+                previousPerItemPrice: vpi.price,
+                percentageOff: percentageOff(vpi.price * quantity, tieredLPrice),
             };
         }
         else {
-            const tieredLPrice = tieredPrice(vpi.tieredPricing, vpi.price, quantity, tieredQuantity);
-            const tieredIPrice = Math.round(tieredLPrice / quantity);
-            if (tieredLPrice !== vpi.price * quantity) {
-                return {
-                    sale: vpi.sale,
-                    hide: vpi.hide,
-                    kind: "price_discount",
-                    lineItemPrice: tieredLPrice,
-                    perItemPrice: tieredIPrice,
-                    previousLineItemPrice: vpi.price * quantity,
-                    previousPerItemPrice: vpi.price,
-                    percentageOff: percentageOff(vpi.price * quantity, tieredLPrice),
-                };
-            }
-            else {
-                return {
-                    sale: vpi.sale,
-                    hide: vpi.hide,
-                    kind: "price",
-                    lineItemPrice: vpi.price * quantity,
-                    perItemPrice: vpi.price,
-                };
-            }
-        }
-    }
-    else {
-        // normal pricing
-        if (vpi.previousPrice !== 0 && vpi.previousPrice !== vpi.price) {
             return {
-                sale: vpi.sale,
-                hide: vpi.hide,
-                kind: "price_discount",
+                sale: false,
+                kind: "price",
                 lineItemPrice: vpi.price * quantity,
                 perItemPrice: vpi.price,
-                previousLineItemPrice: vpi.previousPrice * quantity,
-                previousPerItemPrice: vpi.previousPrice,
-                percentageOff: percentageOff(vpi.previousPrice, vpi.price),
             };
         }
-        else {
+    }
+    else {
+        const tieredLPrice = tieredPrice(vpi.tieredPricing, vpi.price, quantity, tieredQuantity);
+        const tieredIPrice = Math.round(tieredLPrice / quantity);
+        if (vpi.previousPrice === 0) {
             return {
                 sale: vpi.sale,
-                hide: vpi.hide,
                 kind: "price",
-                lineItemPrice: vpi.price * quantity,
-                perItemPrice: vpi.price,
+                lineItemPrice: tieredLPrice,
+                perItemPrice: tieredIPrice,
             };
         }
+        const previousTieredLPrice = tieredPrice(vpi.previousTieredPricing, vpi.previousPrice, quantity, tieredQuantity);
+        const previousTieredIPrice = Math.round(previousTieredLPrice / quantity);
+        return {
+            sale: vpi.sale,
+            kind: "price_discount",
+            lineItemPrice: tieredLPrice,
+            perItemPrice: tieredIPrice,
+            previousLineItemPrice: previousTieredLPrice,
+            previousPerItemPrice: previousTieredIPrice,
+            percentageOff: percentageOff(previousTieredLPrice, tieredLPrice),
+        };
     }
 }
 function customItemPriceInfo(customItemPrice) {
@@ -94,6 +74,7 @@ function customItemPriceInfo(customItemPrice) {
         price: customItemPrice || 0,
         sale: false,
         tieredPricing: undefined,
+        previousTieredPricing: undefined,
     };
 }
 export function lineItemPriceInfo(vpi, customItemPrice, quantity, tieredQuantity, discountPreview) {

package/esm/slate.js

@@ -217,6 +217,9 @@ function serializeBlock(ctx, buf, n) {
     else if (n.type === "separator") {
         // TODO
     }
+    else if (n.type === "mention") {
+        // TODO
+    }
 }
 function serializeNode(ctx, buf, n) {
     if (isLanaSlateText(n)) {

package/esm/variantPrice.js

@@ -1,4 +1,47 @@
 import { toMajor } from "./toMajor.js";
+function findPriceForCurrency(env, vp) {
+    const defaultPrice = {
+        sale: false,
+        price: vp.price,
+        mapPrice: vp.map_price,
+        previousPrice: 0,
+        hide: false,
+        tieredPricing: vp.tiered_pricing || undefined,
+        previousTieredPricing: undefined,
+    };
+    if (env.currency !== env.shopCurrency) {
+        // try to find appropriate price
+        const cp = vp.currency_prices.find((cp) => cp.currency === env.currency);
+        if (cp) {
+            return {
+                sale: false,
+                price: cp.price,
+                mapPrice: cp.map_price,
+                previousPrice: 0,
+                hide: false,
+                tieredPricing: cp.tiered_pricing || undefined,
+                previousTieredPricing: undefined,
+            };
+        }
+        else {
+            // otherwise convert the price
+            const tp = defaultPrice.tieredPricing;
+            defaultPrice.price = convertCurrency(env, defaultPrice.price);
+            defaultPrice.mapPrice = convertCurrency(env, defaultPrice.mapPrice);
+            defaultPrice.tieredPricing = tp
+                ? {
+                    model: tp.model,
+                    tiers: tp.tiers.map((t) => ({
+                        from: t.from,
+                        to: t.to,
+                        price: convertCurrency(env, t.price),
+                    })),
+                }
+                : undefined;
+        }
+    }
+    return defaultPrice;
+}
 function convertCurrency(env, value) {
     const to = env.shopCurrencies[env.currency];
     if (!to) {
@@ -14,47 +57,37 @@ function convertCurrency(env, value) {
     const v = Math.ceil(major * xrate * to.currency.to_minor);
     return v + Math.ceil(v * (to.conversion_fee || 0));
 }
-function salePriceOrPrice(salePriceEligible, pi, tieredPricing) {
-    return salePriceEligible
-        ? { sale: true, price: pi.sale_price, previousPrice: pi.price, hide: pi.sale_price < pi.map_price, tieredPricing }
-        : { sale: false, price: pi.price, previousPrice: pi.retail_price, hide: pi.price < pi.map_price, tieredPricing };
-}
 function variantPriceInfoImpl(env, p) {
     if (!p)
-        return { sale: false, price: 0, previousPrice: 0, hide: false, tieredPricing: undefined };
-    const defaultPrice = salePriceOrPrice(p.sale_price_eligible, p, p.tiered_pricing || undefined);
-    if (env.currency !== env.shopCurrency) {
-        // secondary currency, has priority over customer group prices
-        const cp = p.currency_prices.find((cp) => cp.currency === env.currency);
-        if (cp)
-            return salePriceOrPrice(p.sale_price_eligible, cp, cp.tiered_pricing || undefined);
-        // okay, when there is no provided currency price, we have to perform the conversion
-        defaultPrice.price = convertCurrency(env, defaultPrice.price);
-        defaultPrice.previousPrice = convertCurrency(env, defaultPrice.previousPrice);
-        if (defaultPrice.tieredPricing) {
-            const tp = defaultPrice.tieredPricing;
-            defaultPrice.tieredPricing = {
-                model: tp.model,
-                tiers: tp.tiers.map((t) => ({
-                    from: t.from,
-                    to: t.to,
-                    price: convertCurrency(env, t.price),
-                })),
-            };
-        }
-        return defaultPrice;
-    }
-    if (p.customer_group_price !== 0) {
         return {
             sale: false,
-            price: p.customer_group_price,
+            price: 0,
             previousPrice: 0,
             hide: false,
-            tieredPricing: p.tiered_pricing || undefined,
+            tieredPricing: undefined,
+            previousTieredPricing: undefined,
+        };
+    const curr = findPriceForCurrency(env, p);
+    if (p.previous_pricing) {
+        const prev = findPriceForCurrency(env, p.previous_pricing);
+        return {
+            sale: true,
+            price: curr.price,
+            previousPrice: prev.price,
+            tieredPricing: curr.tieredPricing,
+            previousTieredPricing: prev.tieredPricing,
+            hide: curr.price < curr.mapPrice,
         };
     }
     else {
-        return defaultPrice;
+        return {
+            sale: false,
+            price: curr.price,
+            previousPrice: 0,
+            tieredPricing: curr.tieredPricing,
+            previousTieredPricing: undefined,
+            hide: curr.price < curr.mapPrice,
+        };
     }
 }
 function applySubscriptionPlanPricing(oldPrice, plan, isShopCurrency) {

package/esm/variantPriceCommerce.js

@@ -1,25 +1,31 @@
 import { variantPriceInfo as storefrontVariantPriceInfo } from "./variantPrice.js";
-function variantLikeToStorefrontVariantPricer(v, customerGroupID) {
-    let tiered_pricing = v.tiered_pricing;
-    let customer_group_price = 0;
-    for (const c of v.customer_group_prices) {
-        if (c.customer_group && c.customer_group.id === customerGroupID) {
-            customer_group_price = c.price;
-            tiered_pricing = c.tiered_pricing;
+function pricingForPricingRuleID(v, prID) {
+    const po = v.pricing_overrides.find((po) => po.pricing_rule?.id === prID);
+    return po
+        ? {
+            price: po.price,
+            map_price: po.map_price,
+            retail_price: po.retail_price,
+            tiered_pricing: po.tiered_pricing,
+            currency_prices: po.currency_prices,
         }
-    }
+        : {
+            price: v.price,
+            map_price: v.map_price,
+            retail_price: v.retail_price,
+            tiered_pricing: v.tiered_pricing,
+            currency_prices: v.currency_prices,
+        };
+}
+function variantLikeToStorefrontVariantPricer(v, pricingRuleID, parentPricingRuleID, displayPriceDifference) {
+    const current = pricingForPricingRuleID(v, pricingRuleID);
+    const previous = displayPriceDifference ? pricingForPricingRuleID(v, parentPricingRuleID) : null;
     return {
-        price: v.price,
-        customer_group_price,
-        sale_price: v.sale_price,
-        sale_price_eligible: v.sale_price_eligible,
-        retail_price: v.retail_price,
-        map_price: v.map_price,
-        currency_prices: v.currency_prices,
-        tiered_pricing,
+        ...current,
+        previous_pricing: previous,
     };
 }
-export function variantPriceInfo(env, variant, customerGroupID) {
-    const v = variantLikeToStorefrontVariantPricer(variant, customerGroupID);
+export function variantPriceInfo(env, variant, pricingRuleID, parentPricingRuleID, displayPriceDifference) {
+    const v = variantLikeToStorefrontVariantPricer(variant, pricingRuleID, parentPricingRuleID, displayPriceDifference);
     return storefrontVariantPriceInfo(env, v);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lana-commerce/core",
-  "version": "14.0.0-alpha.15",
+  "version": "14.0.0-alpha.16",
   "description": "Lana JS Core",
   "scripts": {
     "test": "jest",

package/types/graphql/fragments/CommonCartVariant.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "fragment CommonCartVariant on StorefrontProductVariant{barcode country_of_origin created_at currency_prices{...CurrencyPrice}discountable expiration_days fulfillment_service grams height hs_code id media_files{...MediaFile}linked_media_files{...MediaFile}inventory{available low_stock locations{available low_stock inventory_location{id}}}inventory_policy is_default length map_price max_downloads options{...VariantOption}position price retail_price sale_price sale_price_eligible sale_price_from sale_price_to sku tax_class taxable type updated_at width customer_group_price favorite{id created_at}tiered_pricing{...TieredPricing}}\n";
+declare const _default: "fragment CommonCartVariant on StorefrontProductVariant{barcode country_of_origin created_at currency_prices{...CurrencyPrice}discountable expiration_days fulfillment_service grams height hs_code id media_files{...MediaFile}linked_media_files{...MediaFile}inventory{available low_stock locations{available low_stock inventory_location{id}}}inventory_policy is_default length map_price max_downloads options{...VariantOption}position price retail_price sku tax_class taxable type updated_at width favorite{id created_at}tiered_pricing{...TieredPricing}previous_pricing{price retail_price map_price currency_prices{...CurrencyPrice}tiered_pricing{...TieredPricing}}}\n";
 export default _default;

package/types/graphql/fragments/CurrencyPrice.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "fragment CurrencyPrice on CurrencyPrice{currency map_price price retail_price sale_price tiered_pricing{...TieredPricing}}\n";
+declare const _default: "fragment CurrencyPrice on CurrencyPrice{currency map_price price retail_price tiered_pricing{...TieredPricing}}\n";
 export default _default;