@@ -302,13 +335,23 @@ ${HTMLTemplate.indent(this.renderProductItems(opt.items), 2)}`).join('\n')}
/**
* Create the variant prices
- * @param {Pick
} prices
+ * @param {Variant} variant
* @returns {string}
*/
- renderVariantPrices(prices) {
- return /* html */ `\
-Regular: ${prices.regular?.amount} ${prices.regular?.currency}${HTMLTemplate.priceRange(prices.regular?.minimumAmount, prices.regular?.maximumAmount)}
-Final: ${prices.final?.amount} ${prices.final?.currency}${HTMLTemplate.priceRange(prices.final?.minimumAmount, prices.final?.maximumAmount)}
`;
+ renderVariantPrices(variant) {
+ if (variant.price) {
+ const { price } = variant;
+ return /* html */ `\
+Regular: ${price.regular?.amount?.value} ${price.regular?.amount?.currency}
+Final: ${price.final?.amount?.value} ${price.final?.amount?.currency}
`;
+ }
+ if (variant.priceRange) {
+ const { minimum, maximum } = variant.priceRange;
+ return /* html */ `\
+Regular: ${HTMLTemplate.priceRange(minimum?.regular?.amount?.value, maximum?.regular?.amount?.value)} ${minimum?.regular?.amount?.currency}
+Final: ${HTMLTemplate.priceRange(minimum?.final?.amount?.value, maximum?.final?.amount?.value)} ${minimum?.final?.amount?.currency}
`;
+ }
+ return '';
}
/**
@@ -328,7 +371,7 @@ ${this.variants.map((v) => /* html */`\
${v.name}
${v.description}
${v.inStock ? 'inStock' : ''}
-${v.prices ? HTMLTemplate.indent(this.renderVariantPrices(v.prices), 4) : ''}
+${v.price || v.priceRange ? HTMLTemplate.indent(this.renderVariantPrices(v), 4) : ''}
${HTMLTemplate.indent(this.renderVariantImages(v.images), 6)}
@@ -389,6 +432,7 @@ ${HTMLTemplate.indent(this.renderHead(), 2)}
${name}
${description ? `${description}
` : ''}
${HTMLTemplate.indent(this.renderProductImages(images), 8)}
+${HTMLTemplate.indent(this.renderProductPrices(this.product), 8)}
${HTMLTemplate.indent(this.renderProductAttributes(attributes), 8)}
${HTMLTemplate.indent(this.renderProductOptions(options), 8)}
${HTMLTemplate.indent(this.renderProductVariants(), 8)}
diff --git a/src/templates/json/JSONTemplate.js b/src/templates/json/JSONTemplate.js
index 1285aee..de8c129 100644
--- a/src/templates/json/JSONTemplate.js
+++ b/src/templates/json/JSONTemplate.js
@@ -126,11 +126,21 @@ export class JSONTemplate {
const configurableProduct = this.variants?.length > 0;
const offers = configurableProduct ? this.variants : [this.product];
return offers.map((v) => {
- const { prices: variantPrices } = v;
const offerUrl = this.constructProductURL(configurableProduct ? v : undefined);
const mpn = this.constructMPN(configurableProduct ? v : undefined);
- const finalPrice = variantPrices?.final?.amount;
- const regularPrice = variantPrices?.regular?.amount;
+
+ let finalPrice;
+ let regularPrice;
+ let currency;
+ if (v.price) {
+ finalPrice = v.price.final.amount.value;
+ regularPrice = v.price.regular.amount.value;
+ currency = v.price.final.amount.currency;
+ } else if (v.priceRange) {
+ finalPrice = v.priceRange.minimum.final.amount.value;
+ regularPrice = v.priceRange.minimum.regular.amount.value;
+ currency = v.priceRange.minimum.final.amount.currency;
+ }
const offer = {
'@type': 'Offer',
@@ -140,16 +150,14 @@ export class JSONTemplate {
image: v.images?.[0]?.url ?? image,
availability: v.inStock ? 'InStock' : 'OutOfStock',
price: finalPrice,
- priceCurrency: variantPrices?.final?.currency,
+ priceCurrency: currency,
gtin: v.attributeMap.gtin,
priceValidUntil: v.specialToDate,
aggregateRating: this.renderRating(v),
};
- if (variantPrices) {
- if (finalPrice < regularPrice) {
- offer.priceSpecification = this.renderOffersPriceSpecification(v);
- }
+ if (finalPrice < regularPrice) {
+ offer.priceSpecification = this.renderOffersPriceSpecification(regularPrice, currency);
}
return pruneUndefined(offer);
@@ -157,14 +165,14 @@ export class JSONTemplate {
}
/**
- * @param {Variant} variant
+ * @param {number} regularPrice
+ * @param {string} currency
*/
- renderOffersPriceSpecification(variant) {
- const { prices: { regular: { amount, currency } } } = variant;
+ renderOffersPriceSpecification(regularPrice, currency) {
return {
'@type': 'UnitPriceSpecification',
priceType: 'https://schema.org/ListPrice',
- price: amount,
+ price: regularPrice,
priceCurrency: currency,
};
}
diff --git a/src/types.d.ts b/src/types.d.ts
index 8d2d073..17b0a4a 100644
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -185,15 +185,20 @@ declare global {
metaTitle?: string;
description?: string;
images: Image[];
- prices: Prices;
attributes: Attribute[];
- options: ProductOption[];
+ options?: ProductOption[];
url?: string;
urlKey?: string;
externalId?: string;
variants?: Variant[]; // variants exist on products in helix commerce but not on magento
specialToDate?: string;
- rating?: Rating
+ rating?: Rating;
+ price?: Price;
+ priceRange?: {
+ minimum: Price;
+ maximum: Price;
+ }
+ type: 'simple' | 'complex';
// not handled currently:
externalParentId?: string;
@@ -211,13 +216,18 @@ declare global {
url: string;
inStock: boolean;
images: Image[];
- prices: Pick;
selections: string[];
attributes: Attribute[];
externalId: string;
specialToDate?: string;
gtin?: string;
rating?: Rating;
+ price?: Price;
+ priceRange?: {
+ minimum: Price;
+ maximum: Price;
+ }
+ type: 'simple' | 'complex';
// internal use:
attributeMap: Record;
@@ -242,16 +252,18 @@ declare global {
}
interface Price {
- amount?: number;
- currency?: string;
- maximumAmount?: number;
- minimumAmount?: number;
- variant?: 'default' | 'strikethrough';
- }
-
- interface Prices {
- regular: Price;
- final: Price;
+ regular: {
+ amount: {
+ value: number;
+ currency: string;
+ }
+ },
+ final: {
+ amount: {
+ value: number;
+ currency: string;
+ }
+ },
visible: boolean;
}
@@ -278,7 +290,7 @@ declare global {
product?: {
name: string;
sku: string;
- prices?: Prices;
+ price?: Price;
};
}