@aglyn/plugins-commerce 1.0.0-beta.291 → 1.0.0-beta.293

package/src/lib/server/cart-checkout.js

@@ -224,6 +224,16 @@ import { boundedCreditCents, checkoutCreditProviderForCode, encodeCheckoutCredit
                     visible: `"${product.name}": ${useDayProblem} Remove it and add it again with a new day.`
                 });
             }
+            // Add-ons (AGL-4100), priced HERE from the product on the variant
+            // sold — the cart holds their ids and nothing else. A line whose
+            // choices no longer answer the product (a required group unanswered, a
+            // choice removed) is refused with what to do, never charged short.
+            const chosen = CommerceModel.resolveWebsiteLineModifiers(product, line.modifiers, variant.id);
+            if (!chosen.ok) {
+                throw Object.assign(new Error('unavailable'), {
+                    visible: CommerceModel.cartLineModifierProblem(chosen.error)
+                });
+            }
             // Gift cards are a Business+ entitlement, checked per sale (AGL-470).
             if (product.giftCard && !Aglyn.checkEntitlement(ownerOrg.org, 'giftCards')) {
                 throw Object.assign(new Error('unavailable'), {
@@ -248,7 +258,7 @@ import { boundedCreditCents, checkoutCreditProviderForCode, encodeCheckoutCredit
                     quantity: line.quantity
                 });
             }
-            const unitCents = Math.round(Number(variant.priceUsd) * 100);
+            const unitCents = Math.round(Number(variant.priceUsd) * 100) + chosen.extraCents;
             itemsCents += unitCents * line.quantity;
             extrasLines.push(_extends({
                 productId: line.productId,
@@ -303,7 +313,9 @@ import { boundedCreditCents, checkoutCreditProviderForCode, encodeCheckoutCredit
             params.set(`line_items[${index}][quantity]`, String(line.quantity));
             params.set(`line_items[${index}][price_data][currency]`, 'usd');
             params.set(`line_items[${index}][price_data][unit_amount]`, String(unitCents));
-            params.set(`line_items[${index}][price_data][product_data][name]`, `${product.name}${Object.keys((_variant_options = variant.options) != null ? _variant_options : {}).length ? ` (${Object.values((_variant_options1 = variant.options) != null ? _variant_options1 : {}).join(' / ')})` : ''}`.slice(0, 120));
+            // The variant, then the add-ons, as the order line will print them.
+            const lineLabel = CommerceModel.lineLabelWithModifiers(Object.keys((_variant_options = variant.options) != null ? _variant_options : {}).length ? Object.values((_variant_options1 = variant.options) != null ? _variant_options1 : {}).join(' / ') : undefined, chosen.modifiers);
+            params.set(`line_items[${index}][price_data][product_data][name]`, `${product.name}${lineLabel ? ` (${lineLabel})` : ''}`.slice(0, 120));
         });
         // GIFT CARDS ARE A CASH-OUT (AGL-3363): a ceiling per order, and per
         // visitor per day, lower while the workspace is young. Above the claim,