@ticketboothapp/booking 1.2.140 → 1.2.141

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ticketboothapp/booking",
-  "version": "1.2.140",
+  "version": "1.2.141",
   "private": false,
   "sideEffects": [
     "**/*.css",

package/src/components/booking/AdminChangeBookingContent.tsx

@@ -155,6 +155,7 @@ const checkoutPanelPropKeys = [
   'receiptTotal',
   'originalReceipt',
   'priceSummaryLinesIncludeTaxRow',
+  'isServerAmendmentQuote',
   'isTaxIncludedInPrice',
   'taxRate',
   'currency',

package/src/components/booking/AdminChangeBookingFlow.tsx

@@ -971,6 +971,7 @@ export function AdminChangeBookingFlow({
         receiptTax: adminFeAuthoritativeReceipt.tax,
         receiptTotal: adminFeAuthoritativeReceipt.total,
         originalReceipt,
+        isServerAmendmentQuote: latestChangeQuote?.pricingVersion === 'booking-amendment-v1',
         ...{ priceSummaryLinesIncludeTaxRow, isTaxIncludedInPrice, showProviderPricingInlineEditor },
         taxRate: pricingConfig?.taxRate,
         ...{ providerPricingUi, providerQuotedLines },

package/src/components/booking/AdminChangeCheckoutPanel.tsx

@@ -30,6 +30,7 @@ export interface AdminChangeCheckoutPanelProps {
   receiptTotal: number;
   originalReceipt: ChangeBookingFlowProps['originalReceipt'];
   priceSummaryLinesIncludeTaxRow: boolean;
+  isServerAmendmentQuote?: boolean;
   isTaxIncludedInPrice: boolean;
   taxRate?: number;
   currency: Currency;
@@ -99,6 +100,7 @@ export function AdminChangeCheckoutPanel({
   receiptTotal,
   originalReceipt,
   priceSummaryLinesIncludeTaxRow,
+  isServerAmendmentQuote,
   isTaxIncludedInPrice,
   taxRate,
   currency,
@@ -188,6 +190,7 @@ export function AdminChangeCheckoutPanel({
         }}
         newPriceSummaryLines={priceSummaryLines}
         newPriceSummaryLinesIncludeTaxRow={priceSummaryLinesIncludeTaxRow}
+        isServerAmendmentQuote={isServerAmendmentQuote}
         amountDue={changeFlowAmountDue}
         amountDueLabel={totalSummaryLabel}
         currency={currency}

package/src/components/booking/AdminChangeReceiptComparison.tsx

@@ -16,6 +16,7 @@ export interface AdminChangeReceiptComparisonProps {
   newReceipt: Pick<AdminFeAuthoritativeReceipt, 'subtotal' | 'tax' | 'total'>;
   newPriceSummaryLines: PriceSummaryLine[];
   newPriceSummaryLinesIncludeTaxRow: boolean;
+  isServerAmendmentQuote?: boolean;
   amountDue: number;
   amountDueLabel: string;
   currency: Currency;
@@ -124,6 +125,7 @@ export function AdminChangeReceiptComparison({
   originalReceipt,
   newReceipt,
   newPriceSummaryLines,
+  isServerAmendmentQuote = false,
   amountDueLabel,
   currency,
   locale,
@@ -137,10 +139,34 @@ export function AdminChangeReceiptComparison({
     [originalReceipt],
   );
   const originalLinesIncludeTaxRow = hasTaxLine(originalReceiptLines);
-  const calculatedChangeLines = useMemo(
-    () => amendmentDeltaLines(originalReceiptLines, newPriceSummaryLines),
-    [newPriceSummaryLines, originalReceiptLines],
-  );
+  const calculatedChangeLines = useMemo(() => {
+    if (!isServerAmendmentQuote) {
+      return amendmentDeltaLines(originalReceiptLines, newPriceSummaryLines);
+    }
+    const nonTax = newPriceSummaryLines.filter(
+      (line) => !(line.kind === 'line' && String(line.type ?? '').toUpperCase() === 'TAX'),
+    );
+    const tax = roundMoney(
+      newPriceSummaryLines.reduce(
+        (sum, line) =>
+          line.kind === 'line' && String(line.type ?? '').toUpperCase() === 'TAX'
+            ? sum + line.amount
+            : sum,
+        0,
+      ),
+    );
+    return Math.abs(tax) < 0.005
+      ? nonTax
+      : [
+          ...nonTax,
+          {
+            kind: 'line' as const,
+            label: tax >= 0 ? 'Additional tax' : 'Tax reduction',
+            amount: tax,
+            type: 'TAX',
+          },
+        ];
+  }, [isServerAmendmentQuote, newPriceSummaryLines, originalReceiptLines]);
   const nonTaxChangeSubtotal = roundMoney(
     calculatedChangeLines.reduce(
       (sum, line) =>
@@ -151,7 +177,15 @@ export function AdminChangeReceiptComparison({
     ),
   );
   const receiptTaxDelta = roundMoney(
-    taxRate != null && nonTaxChangeSubtotal > 0
+    isServerAmendmentQuote
+      ? calculatedChangeLines.reduce(
+          (sum, line) =>
+            line.kind === 'line' && String(line.type ?? '').toUpperCase() === 'TAX'
+              ? sum + line.amount
+              : sum,
+          0,
+        )
+      : taxRate != null && nonTaxChangeSubtotal > 0
       ? nonTaxChangeSubtotal * taxRate
       : newReceipt.tax - originalReceipt.tax,
   );
@@ -274,12 +308,19 @@ export function AdminChangeReceiptComparison({
           </span>
         </div>
         <PriceSummary
-          lines={[...originalReceiptLines, ...changeLines].map((line) => ({ ...line, editable: false, lineKey: undefined }))}
+          lines={[
+            ...originalReceiptLines.filter(
+              (line) => !(line.kind === 'line' && String(line.type ?? '').toUpperCase() === 'TAX'),
+            ),
+            ...changeLines.filter(
+              (line) => !(line.kind === 'line' && String(line.type ?? '').toUpperCase() === 'TAX'),
+            ),
+          ].map((line) => ({ ...line, editable: false, lineKey: undefined }))}
           total={displayedUpdatedTotal}
           currency={currency}
           locale={displayLocale}
           subtotal={displayedUpdatedSubtotal}
-          taxAmount={!hasTaxLine([...originalReceiptLines, ...changeLines]) ? displayedUpdatedTax : 0}
+          taxAmount={displayedUpdatedTax}
           taxRate={taxRate}
           size="sm"
           t={t}

package/src/components/booking/useAdminChangePriceSummary.ts

@@ -336,7 +336,7 @@ export function useAdminChangePriceSummary({
 
   const checkoutPriceSummaryLinesForCheckout = useMemo(() => {
     let raw: PriceSummaryLine[];
-    if (!useAdminFeAuthoritativeQuote && suppressSelfServeCurrencyUi && selfServePricingConfirmed) {
+    if (suppressSelfServeCurrencyUi && selfServePricingConfirmed) {
       raw =
         latestServerPriceSummaryLines && latestServerPriceSummaryLines.length > 0
           ? latestServerPriceSummaryLines
@@ -366,7 +366,6 @@ export function useAdminChangePriceSummary({
   }, [
     suppressSelfServeCurrencyUi,
     selfServePricingConfirmed,
-    useAdminFeAuthoritativeQuote,
     checkoutPriceSummaryLines,
     latestServerPriceSummaryLines,
     effectivePromoDiscountAmount,

package/src/components/booking/useAdminChangeQuotePreview.ts

@@ -261,9 +261,11 @@ export function useAdminChangeQuotePreview({
       hasChangesFromInitial: hasEffectiveChangeSelection,
       selectionTotal:
         originalReceipt
-          ? suppressSelfServeCurrencyUi && !selfServePricingConfirmed && !useAdminFeAuthoritativeQuote
-            ? null
-            : displayChangeFlowProposedTotalWithEditableLines
+          ? selfServePricingConfirmed && latestChangeQuote?.serverPreview?.totalNewBooking != null
+            ? latestChangeQuote.serverPreview.totalNewBooking
+            : suppressSelfServeCurrencyUi
+              ? null
+              : displayChangeFlowProposedTotalWithEditableLines
           : totalPrice,
       selectionCurrency: currency,
     };
@@ -281,7 +283,7 @@ export function useAdminChangeQuotePreview({
     displayChangeFlowProposedTotalWithEditableLines,
     suppressSelfServeCurrencyUi,
     selfServePricingConfirmed,
-    useAdminFeAuthoritativeQuote,
+    latestChangeQuote?.serverPreview?.totalNewBooking,
   ]);
 
   useEffect(() => {

package/src/components/booking/useAdminChangeReceiptDerivation.ts

@@ -188,7 +188,12 @@ export function useAdminChangeReceiptDerivation({
     });
   })();
   const changeFlowClientEstimateDue = normalizeNearZeroOwed(
-    roundMoney(changeFlowClientEstimateDueBase + editableSummaryPreSubtotalDelta),
+    roundMoney(
+      changeFlowClientEstimateDueBase +
+        (latestChangeQuote?.pricingVersion === 'booking-amendment-v1'
+          ? 0
+          : editableSummaryPreSubtotalDelta),
+    ),
   );
   const changeFlowAmountDue = normalizeNearZeroOwed(changeFlowClientEstimateDue);