@foxy.io/elements 1.45.0-beta.2 → 1.45.0-beta.3

package/dist/cdn/translations/coupon-card/en.json

@@ -1,16 +1,16 @@
 {
-  "allunits_price_amount_discount_summary": "{{adjustment}}[currency] each after {{from}}",
+  "allunits_price_amount_discount_summary": "{{adjustment}}¤ amount each after {{from}}",
   "allunits_price_percentage_discount_summary": "{{adjustment, percent}} after {{from}}",
-  "allunits_quantity_amount_discount_summary": "{{adjustment}}[currency] each on orders of {{from}}+",
+  "allunits_quantity_amount_discount_summary": "{{adjustment}}¤ amount each on orders of {{from}}+",
   "allunits_quantity_percentage_discount_summary": "{{adjustment, percent}} on orders of {{from}}+",
   "date_range_any": "Ongoing",
   "date_range_complete": "{{start, date}} – {{end, date}}",
   "date_range_from": "From {{start, date}}",
   "date_range_until": "Until {{end, date}}",
   "discount_summary": "{{params, discount}}",
-  "incremental_price_amount_discount_summary": "{{adjustment}}[currency] each on orders of {{from}}+",
+  "incremental_price_amount_discount_summary": "{{adjustment}}¤ amount each on orders of {{from}}+",
   "incremental_price_percentage_discount_summary": "{{adjustment, percent}} on orders of {{from}}+",
-  "incremental_quantity_amount_discount_summary": "{{adjustment}}[currency] each on items {{from}}+",
+  "incremental_quantity_amount_discount_summary": "{{adjustment}}¤ amount each on items {{from}}+",
   "incremental_quantity_percentage_discount_summary": "{{adjustment, percent}} on items {{from}}+",
   "ordinal_few": "rd",
   "ordinal_many": "th",
@@ -18,13 +18,13 @@
   "ordinal_other": "th",
   "ordinal_two": "nd",
   "ordinal_zero": "th",
-  "repeat_price_amount_discount_summary": "for each {{from}}, {{adjustment}}[currency] on the next item",
+  "repeat_price_amount_discount_summary": "for each {{from}}, {{adjustment}}¤ amount on the next item",
   "repeat_price_percentage_discount_summary": "for each {{from}}, {{adjustment, percent}} on the next item",
-  "repeat_quantity_amount_discount_summary": "{{adjustment}}[currency] on each {{from, ordinal}} item",
+  "repeat_quantity_amount_discount_summary": "{{adjustment}}¤ amount on each {{from, ordinal}} item",
   "repeat_quantity_percentage_discount_summary": "{{adjustment, percent}} on each {{from, ordinal}} item",
-  "single_price_amount_discount_summary": "{{adjustment}}[currency] after {{from}}",
+  "single_price_amount_discount_summary": "{{adjustment}}¤ amount after {{from}}",
   "single_price_percentage_discount_summary": "{{adjustment, percent}} after {{from}}",
-  "single_quantity_amount_discount_summary": "{{adjustment}}[currency] after {{from}} item(s)",
+  "single_quantity_amount_discount_summary": "{{adjustment}}¤ amount after {{from}} item(s)",
   "single_quantity_percentage_discount_summary": "{{adjustment, percent}} after {{from}} item(s)",
   "uses_count": "{{count}} uses",
   "uses_to_total_count": "{{count}}/{{total}} uses",

package/dist/cdn/translations/coupon-form/en.json

@@ -145,27 +145,27 @@
       "tier_repeat": "price of next item",
       "tier_single": "order total",
       "tier_then": "then",
-      "units_amount": "currency",
-      "units_percentage": "percent",
+      "units_amount": "¤ amount",
+      "units_percentage": "% percentage",
       "quantity": "quantity",
       "total": "total",
       "reduce": "reduce",
       "increase": "increase"
     },
-    "allunits_price_amount_discount_summary": "{{adjustment}}[currency] each after {{from}}",
+    "allunits_price_amount_discount_summary": "{{adjustment}}¤ amount each after {{from}}",
     "allunits_price_percentage_discount_summary": "{{adjustment, percent}} after {{from}}",
-    "allunits_quantity_amount_discount_summary": "{{adjustment}}[currency] each on orders of {{from}}+",
+    "allunits_quantity_amount_discount_summary": "{{adjustment}}¤ amount each on orders of {{from}}+",
     "allunits_quantity_percentage_discount_summary": "{{adjustment, percent}} on orders of {{from}}+",
-    "incremental_price_amount_discount_summary": "{{adjustment}}[currency] each on orders of {{from}}+",
+    "incremental_price_amount_discount_summary": "{{adjustment}}¤ amount each on orders of {{from}}+",
     "incremental_price_percentage_discount_summary": "{{adjustment, percent}} on orders of {{from}}+",
-    "incremental_quantity_amount_discount_summary": "{{adjustment}}[currency] each on items {{from}}+",
+    "incremental_quantity_amount_discount_summary": "{{adjustment}}¤ amount each on items {{from}}+",
     "incremental_quantity_percentage_discount_summary": "{{adjustment, percent}} on items {{from}}+",
-    "repeat_price_amount_discount_summary": "for each {{from}}, {{adjustment}}[currency] on the next item",
+    "repeat_price_amount_discount_summary": "for each {{from}}, {{adjustment}}¤ amount on the next item",
     "repeat_price_percentage_discount_summary": "for each {{from}}, {{adjustment, percent}} on the next item",
-    "repeat_quantity_amount_discount_summary": "{{adjustment}}[currency] on each {{from, ordinal}} item",
-    "single_price_amount_discount_summary": "{{adjustment}}[currency] after {{from}}",
+    "repeat_quantity_amount_discount_summary": "{{adjustment}}¤ amount on each {{from, ordinal}} item",
+    "single_price_amount_discount_summary": "{{adjustment}}¤ amount after {{from}}",
     "single_price_percentage_discount_summary": "{{adjustment, percent}} after {{from}}",
-    "single_quantity_amount_discount_summary": "{{adjustment}}[currency] after {{from}} items",
+    "single_quantity_amount_discount_summary": "{{adjustment}}¤ amount after {{from}} items",
     "single_quantity_percentage_discount_summary": "{{adjustment, percent}} after {{from}} items",
     "repeat_quantity_percentage_discount_summary": "{{adjustment, percent}} on each {{from, ordinal}} item",
     "discount_summary": "Applied discount: {{params, discount}}.",

package/dist/cdn/translations/discount-builder/en.json

@@ -7,8 +7,8 @@
   "tier_repeat": "price of next item",
   "tier_single": "order total",
   "tier_then": "then",
-  "units_amount": "currency",
-  "units_percentage": "percent",
+  "units_amount": "¤ amount",
+  "units_percentage": "% percentage",
   "quantity": "quantity",
   "total": "total",
   "reduce": "reduce",

package/dist/cdn/translations/experimental-add-to-cart-builder/en.json

@@ -230,8 +230,8 @@
             "tier_repeat": "price of next item",
             "tier_single": "order total",
             "tier_then": "then",
-            "units_amount": "currency",
-            "units_percentage": "percent",
+            "units_amount": "¤ amount",
+            "units_percentage": "% percentage",
             "quantity": "quantity",
             "total": "total",
             "reduce": "reduce",
@@ -544,7 +544,7 @@
     "empty": "Modify the item parameters to see the add-to-cart link.",
     "unavailable": {
       "loading_extra_data_needed": "Creating direct link...",
-      "error_special_characters_present": "At the moment we don't support signed direct links with item parameters that contain the following characters: #, &, %, =.",
+      "error_special_characters_present": "At the moment we don't support signed direct links with custom option names that contain the following characters: #, &, %, =.",
       "error_price_configurable": "Direct link is not available when one or more items have configurable price.",
       "error_duplicate_custom_option_names": "Direct link is not available when one or more items have configurable custom options.",
       "paused_code_required": "Direct link will be available once you provide an SKU for each item.",

package/dist/cdn/translations/item-category-form/en.json

@@ -186,8 +186,8 @@
       "tier_repeat": "price of next item",
       "tier_single": "order total",
       "tier_then": "then",
-      "units_amount": "currency",
-      "units_percentage": "percent",
+      "units_amount": "¤ amount",
+      "units_percentage": "% percentage",
       "quantity": "quantity",
       "total": "total",
       "reduce": "reduce",

package/dist/cdn/translations/item-form/en.json

@@ -198,8 +198,8 @@
       "tier_repeat": "price of next item",
       "tier_single": "order total",
       "tier_then": "then",
-      "units_amount": "currency",
-      "units_percentage": "percent",
+      "units_amount": "¤ amount",
+      "units_percentage": "% percentage",
       "quantity": "quantity",
       "total": "total",
       "reduce": "reduce",

package/dist/cdn/translations/transaction/en.json

@@ -301,8 +301,8 @@
             "tier_repeat": "price of next item",
             "tier_single": "order total",
             "tier_then": "then",
-            "units_amount": "currency",
-            "units_percentage": "percent",
+            "units_amount": "¤ amount",
+            "units_percentage": "% percentage",
             "quantity": "quantity",
             "total": "total",
             "reduce": "reduce",

package/dist/elements/public/ExperimentalAddToCartBuilder/ExperimentalAddToCartBuilder.js

@@ -14,16 +14,23 @@ import hljs from 'highlight.js/lib/core.js';
 const NS = 'experimental-add-to-cart-builder';
 const Base = ResponsiveMixin(TranslatableMixin(InternalForm, NS));
 hljs.registerLanguage('xml', hljsxml);
-// TODO use proper encoding when encoding API supports HTML entities
-const weakEncode = (value, checkHmacCompatibility) => {
-    if (checkHmacCompatibility) {
+// Notes about encoding for HMAC signing:
+//
+// API does not support HTML entities in attribute values. Good thing is that
+// encoding is optional for HTML attributes, except for the quote character.
+// Since we use double quotes for attributes, they can't appear in the attribute values.
+//
+// API supports % encoding for URLs, but only in the query parameter values. Query parameter
+// names must never be encoded. This is why we limit the allowed characters in the custom field names.
+function encodeAttributeValue(value, isCartSigningOn) {
+    if (isCartSigningOn) {
         if (decode(value) !== value)
             throw new Error('error_html_entities_present');
         if (value.includes('"'))
             throw new Error('error_double_quotes_present');
     }
     return value.replace(/"/g, '"');
-};
+}
 /**
  * WARNING: this element is marked as experimental and is subject to change in future releases.
  * We will not be maintaining backwards compatibility for elements in the experimental namespace.
@@ -513,13 +520,14 @@ export class ExperimentalAddToCartBuilder extends Base {
             throw new Error('loading_extra_data_needed');
         }
         const isHmacOn = store.use_cart_validation;
+        const encodedAction = encodeAttributeValue(cartUrl, isHmacOn);
         let hasAtLeastOneFieldset = false;
-        let output = `<form action="${weakEncode(cartUrl, isHmacOn)}" method="post" target="_blank">`;
+        let output = `<form action="${encodedAction}" method="post" target="_blank">`;
         let level = 1;
         const newline = () => `\n${' '.repeat(level * 2)}`;
         const addHiddenInput = (name, value) => {
-            const encodedValue = weakEncode(value, isHmacOn);
-            const encodedName = weakEncode(name, isHmacOn);
+            const encodedValue = encodeAttributeValue(value, isHmacOn);
+            const encodedName = encodeAttributeValue(name, isHmacOn);
             output += `${newline()}<input type="hidden" name="${encodedName}" value="${encodedValue}">`;
         };
         if (templateSet.code !== 'DEFAULT')
@@ -559,7 +567,7 @@ export class ExperimentalAddToCartBuilder extends Base {
             addHiddenInput(`${prefix}name`, resolvedName);
             const price = `${product.price}${currencyCode}`;
             if (product.price_configurable) {
-                const encodedNoCurrencyPrice = weakEncode(product.price.toFixed(2), isHmacOn);
+                const encodedNoCurrencyPrice = encodeAttributeValue(product.price.toFixed(2), isHmacOn);
                 output += `${newline()}<label>`;
                 level++;
                 output += `${newline()}<span>${encode(this.t('preview.price_label'))}</span>`;
@@ -635,17 +643,17 @@ export class ExperimentalAddToCartBuilder extends Base {
                 output += `${newline()}<label>`;
                 level++;
                 output += `${newline()}<span>${encode(this.t('preview.quantity_label'))}</span>`;
-                const encodedName = weakEncode(`${prefix}quantity`, isHmacOn);
+                const encodedName = encodeAttributeValue(`${prefix}quantity`, isHmacOn);
                 output += `${newline()}<input type="number" name="${encodedName}"`;
-                output += ` min="${weakEncode(String(resolvedMinQty), isHmacOn)}"`;
+                output += ` min="${encodeAttributeValue(String(resolvedMinQty), isHmacOn)}"`;
                 if (resolvedMaxQty !== Infinity)
-                    output += ` max="${weakEncode(String(resolvedMaxQty), isHmacOn)}"`;
+                    output += ` max="${encodeAttributeValue(String(resolvedMaxQty), isHmacOn)}"`;
                 if (store.use_cart_validation) {
-                    const encodedQuantity = weakEncode(String((_e = product.quantity) !== null && _e !== void 0 ? _e : 1), isHmacOn);
+                    const encodedQuantity = encodeAttributeValue(String((_e = product.quantity) !== null && _e !== void 0 ? _e : 1), isHmacOn);
                     output += ` value="--OPEN--" data-replace="${encodedQuantity}">`;
                 }
                 else {
-                    output += ` value="${weakEncode(String((_f = product.quantity) !== null && _f !== void 0 ? _f : 1), isHmacOn)}">`;
+                    output += ` value="${encodeAttributeValue(String((_f = product.quantity) !== null && _f !== void 0 ? _f : 1), isHmacOn)}">`;
                 }
                 level--;
                 output += `${newline()}</label>`;
@@ -700,12 +708,12 @@ export class ExperimentalAddToCartBuilder extends Base {
                         output += `${newline()}<label>`;
                         level++;
                         output += `${newline()}<span>${encode(optionName)}:</span>`;
-                        output += `${newline()}<input name="${weakEncode(name, isHmacOn)}" `;
+                        output += `${newline()}<input name="${encodeAttributeValue(name, isHmacOn)}" `;
                         if (store.use_cart_validation) {
-                            output += `value="--OPEN--" data-replace="${weakEncode(value, isHmacOn)}">`;
+                            output += `value="--OPEN--" data-replace="${encodeAttributeValue(value, isHmacOn)}">`;
                         }
                         else {
-                            output += `value="${weakEncode(value, isHmacOn)}">`;
+                            output += `value="${encodeAttributeValue(value, isHmacOn)}">`;
                         }
                         level--;
                         output += `${newline()}</label>`;
@@ -725,7 +733,7 @@ export class ExperimentalAddToCartBuilder extends Base {
                         const optionIndex = product.custom_options.indexOf(option);
                         const itemCategory = (_a = this.__getItemCategoryLoader(productIndex, optionIndex)) === null || _a === void 0 ? void 0 : _a.data;
                         const modifiers = this.__getOptionModifiers(option, itemCategory !== null && itemCategory !== void 0 ? itemCategory : null, currencyCode);
-                        const encodedValue = weakEncode(`${option.value}${modifiers}`, isHmacOn);
+                        const encodedValue = encodeAttributeValue(`${option.value}${modifiers}`, isHmacOn);
                         const encodedCaption = encode((_b = option.value) !== null && _b !== void 0 ? _b : '');
                         output += `${newline()}<option value="${encodedValue}">${encodedCaption}</option>`;
                     });
@@ -756,21 +764,18 @@ export class ExperimentalAddToCartBuilder extends Base {
         if (!this.defaultDomain || !templateSet || !store || !currencyCode || !cartUrl) {
             throw new Error('loading_extra_data_needed');
         }
-        const signedUrlParams = new Map();
-        const unsignedUrlParams = new URLSearchParams();
+        const query = new Map();
         const setOrThrow = (name, value) => {
             if (store.use_cart_validation) {
-                if (name.includes('&') ||
-                    value.includes('&') ||
-                    name.includes('%') ||
-                    value.includes('%') ||
-                    name.includes('=') ||
-                    value.includes('='))
+                if (['&', '%', '=', '#'].some(c => name.includes(c))) {
                     throw new Error('error_special_characters_present');
-                signedUrlParams.set(name, value);
+                }
+                else {
+                    query.set(name, encodeURIComponent(value));
+                }
             }
             else {
-                unsignedUrlParams.set(name, value);
+                query.set(encodeURIComponent(name), encodeURIComponent(value));
             }
         };
         if (templateSet.code !== 'DEFAULT')
@@ -883,11 +888,9 @@ export class ExperimentalAddToCartBuilder extends Base {
                 setOrThrow(`${prefix}${option.name}`, `${(_h = option.value) !== null && _h !== void 0 ? _h : ''}${modifiers}`);
             }
         }
-        return store.use_cart_validation
-            ? `${cartUrl}?${Array.from(signedUrlParams.entries())
-                .map(([key, value]) => `${key}=${value}`)
-                .join('&')}`
-            : `${cartUrl}?${unsignedUrlParams.toString()}`;
+        return `${cartUrl}?${Array.from(query.entries())
+            .map(([key, value]) => `${key}=${value}`)
+            .join('&')}`;
     }
     __getAddToCartCode() {
         var _a;
@@ -915,7 +918,7 @@ export class ExperimentalAddToCartBuilder extends Base {
         try {
             linkHref = this.__getAddToCartLinkHref();
             if (linkHref) {
-                const linkHTML = `<a href="${weakEncode(linkHref, checkEquality)}">Add to cart</a>`;
+                const linkHTML = `<a href="${encodeAttributeValue(linkHref, checkEquality)}">Add to cart</a>`;
                 unsignedCode = `${formHTML}${this.__signingSeparator}${linkHTML}`;
             }
         }