@usethrottle/auth 0.6.1 → 0.8.0

package/dist/index.d.cts

@@ -96,7 +96,10 @@ interface Order {
     billingAddress: unknown | null;
     shippingAddress: unknown | null;
     discountCode: string | null;
+    /** Set only when the order is linked to exactly one subscription. Read `subscriptionIds`. */
     subscriptionId: string | null;
+    /** Every subscription this order created, in line order. One cart can hold several. */
+    subscriptionIds: string[];
     /**
      * The invoice raised for this order, when one exists. Resolved on the
      * detail read only — the list would need a lookup per row.
@@ -120,6 +123,8 @@ interface OrderLineItem {
     discountAmount: number;
     total: number;
     imageUrl: string | null;
+    /** The subscription this line created, or null for a one-time line. */
+    subscriptionId: string | null;
 }
 /**
  * What `getOrder` returns. Deliberately NOT folded into `Order`: the list route
@@ -175,6 +180,21 @@ interface Subscription {
     totalPayments: number | null;
     paymentsMade: number;
     completedAt: string | null;
+    /** Installment plans only: every payment in order; dueAt is an estimate. */
+    paymentSchedule?: Array<{
+        index: number;
+        amount: number;
+        discount: number;
+        net: number;
+        intervalUnit: string | null;
+        intervalCount: number | null;
+        status: 'paid' | 'due' | 'upcoming';
+        dueAt: string | null;
+    }> | null;
+    /** Installment plans only: the sum of every payment's net amount. */
+    scheduleTotal?: number | null;
+    /** Installment plans only: what the next payment will charge; null once complete. */
+    nextPaymentAmount?: number | null;
     amount: number;
     quantity: number;
     currency: string;

package/dist/index.d.ts

@@ -96,7 +96,10 @@ interface Order {
     billingAddress: unknown | null;
     shippingAddress: unknown | null;
     discountCode: string | null;
+    /** Set only when the order is linked to exactly one subscription. Read `subscriptionIds`. */
     subscriptionId: string | null;
+    /** Every subscription this order created, in line order. One cart can hold several. */
+    subscriptionIds: string[];
     /**
      * The invoice raised for this order, when one exists. Resolved on the
      * detail read only — the list would need a lookup per row.
@@ -120,6 +123,8 @@ interface OrderLineItem {
     discountAmount: number;
     total: number;
     imageUrl: string | null;
+    /** The subscription this line created, or null for a one-time line. */
+    subscriptionId: string | null;
 }
 /**
  * What `getOrder` returns. Deliberately NOT folded into `Order`: the list route
@@ -175,6 +180,21 @@ interface Subscription {
     totalPayments: number | null;
     paymentsMade: number;
     completedAt: string | null;
+    /** Installment plans only: every payment in order; dueAt is an estimate. */
+    paymentSchedule?: Array<{
+        index: number;
+        amount: number;
+        discount: number;
+        net: number;
+        intervalUnit: string | null;
+        intervalCount: number | null;
+        status: 'paid' | 'due' | 'upcoming';
+        dueAt: string | null;
+    }> | null;
+    /** Installment plans only: the sum of every payment's net amount. */
+    scheduleTotal?: number | null;
+    /** Installment plans only: what the next payment will charge; null once complete. */
+    nextPaymentAmount?: number | null;
     amount: number;
     quantity: number;
     currency: string;

package/dist/react/components/index.cjs

@@ -780,6 +780,7 @@ var THROTTLE_ELEMENT_KEYS = [
   "orderDetail.cancelButton",
   "orderDetail.returnButton",
   "orderDetail.invoiceButton",
+  "orderDetail.subscriptionButton",
   "orderDetail.actions",
   "invoiceDetail.layout",
   "invoiceDetail.main",
@@ -1187,7 +1188,8 @@ var enUS = {
     quantity: "Qty",
     shippingAddress: "Shipping address",
     billingAddress: "Billing address",
-    viewSubscription: "View subscription"
+    viewSubscription: "View subscription",
+    viewSubscriptionFor: "View subscription for"
   },
   invoices: {
     empty: "No invoices yet",
@@ -1226,6 +1228,11 @@ var enUS = {
     cancelledOn: "Cancelled on",
     trialEnds: "Trial ends",
     installmentProgress: "Payment {paid} of {total}",
+    installmentTotal: "{amount} total",
+    installmentNext: "Next {amount} on {date}",
+    /** Spec §5: a varied schedule's dated list; dates are estimates, hence "~". */
+    upcomingPayments: "Upcoming payments",
+    upcomingPayment: "{amount} \xB7 ~{date}",
     cancelButton: "Cancel",
     cancelAtPeriodEnd: "Cancel at period end",
     cancelNow: "Cancel immediately",
@@ -3862,6 +3869,16 @@ function OrderTimeline(props) {
   ] });
 }
 
+// src/react/components/account/order-subscription-links.ts
+function orderSubscriptionLinks(order, labels) {
+  const ids = order.subscriptionIds?.length ? order.subscriptionIds : order.subscriptionId ? [order.subscriptionId] : [];
+  if (ids.length === 1) return [{ id: ids[0], label: labels.single }];
+  return ids.map((id, index) => {
+    const name = order.lineItems.find((li) => li.subscriptionId === id)?.name;
+    return { id, label: name ? `${labels.named} ${name}` : `${labels.single} ${index + 1}` };
+  });
+}
+
 // src/react/components/account/OrderDetail.tsx
 var import_jsx_runtime39 = require("react/jsx-runtime");
 var CAN_PAY = /* @__PURE__ */ new Set(["draft", "pending"]);
@@ -4022,14 +4039,19 @@ function OrderDetail(props) {
                     children: t.orders.reorder
                   }
                 ) : null,
-                order.subscriptionId && props.onViewSubscription ? /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+                props.onViewSubscription ? orderSubscriptionLinks(order, {
+                  single: t.orders.viewSubscription,
+                  named: t.orders.viewSubscriptionFor
+                }).map((link) => /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
                   Button,
                   {
                     variant: "secondary",
-                    onClick: () => props.onViewSubscription(order.subscriptionId),
-                    children: t.orders.viewSubscription
-                  }
-                ) : null,
+                    elementKey: "orderDetail.subscriptionButton",
+                    onClick: () => props.onViewSubscription(link.id),
+                    children: link.label
+                  },
+                  link.id
+                )) : null,
                 showReturn ? /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
                   Button,
                   {
@@ -4397,6 +4419,18 @@ function isIntervalUnit(value) {
   return typeof value === "string" && INTERVAL_UNITS.includes(value);
 }
 
+// ../core-cadence/src/schedule.ts
+function isVariedSchedule(rows) {
+  if (!rows || rows.length === 0) return false;
+  return rows.some(
+    (r, i) => r.discount !== 0 || r.amount !== rows[0].amount || i > 1 && (r.intervalUnit !== rows[1].intervalUnit || r.intervalCount !== rows[1].intervalCount)
+  );
+}
+function upcomingSchedulePayments(rows) {
+  if (!rows || !isVariedSchedule(rows)) return [];
+  return rows.filter((r) => r.status !== "paid" && r.dueAt != null);
+}
+
 // ../core-cadence/src/labels.ts
 var NAMED_NOUN = {
   weekly: "week",
@@ -4412,6 +4446,10 @@ function cadenceNoun(cadence) {
   }
   return cadence.interval;
 }
+function scheduleDeal(sub) {
+  if (!sub.paymentSchedule || sub.scheduleTotal == null || !isVariedSchedule(sub.paymentSchedule)) return null;
+  return { total: sub.scheduleTotal, payments: sub.paymentSchedule.length };
+}
 
 // src/react/components/account/SubscriptionsPanel.tsx
 var import_jsx_runtime43 = require("react/jsx-runtime");
@@ -4438,7 +4476,20 @@ function SubscriptionsPanel(props) {
       await run(fn);
     })();
   };
-  const priceLabel = (sub) => `${formatMoney(sub.amount, sub.currency, locale)} / ${cadenceNoun(sub)}${sub.quantity > 1 ? ` \xD7 ${sub.quantity}` : ""}`;
+  const priceLabel = (sub) => {
+    const deal = scheduleDeal(sub);
+    return deal ? t.subscriptions.installmentTotal.replace("{amount}", formatMoney(deal.total, sub.currency, locale)) : `${formatMoney(sub.amount, sub.currency, locale)} / ${cadenceNoun(sub)}${sub.quantity > 1 ? ` \xD7 ${sub.quantity}` : ""}`;
+  };
+  const nextPaymentLabel = (sub) => {
+    if (!isVariedSchedule(sub.paymentSchedule) || !sub.paymentSchedule || sub.nextPaymentAmount == null) return null;
+    const upcoming = sub.paymentSchedule.find((r) => r.status !== "paid");
+    return t.subscriptions.installmentNext.replace("{amount}", formatMoney(sub.nextPaymentAmount, sub.currency, locale)).replace("{date}", formatDate(upcoming?.dueAt ?? sub.currentPeriodEnd, locale));
+  };
+  const upcomingList = (sub) => {
+    const upcoming = upcomingSchedulePayments(sub.paymentSchedule);
+    if (upcoming.length === 0) return null;
+    return /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("ul", { className: "throttle-muted", "aria-label": t.subscriptions.upcomingPayments, children: upcoming.map((r) => /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("li", { children: t.subscriptions.upcomingPayment.replace("{amount}", formatMoney(r.net, sub.currency, locale)).replace("{date}", formatDate(r.dueAt, locale)) }, r.dueAt)) });
+  };
   const renewsLabel = (sub) => formatDate(
     sub.status === "completed" ? sub.completedAt ?? sub.currentPeriodEnd : sub.status === "cancelled" ? sub.cancelledAt ?? sub.currentPeriodEnd : sub.currentPeriodEnd,
     locale
@@ -4520,7 +4571,9 @@ function SubscriptionsPanel(props) {
             columns: [
               { key: "plan", label: t.subscriptions.columnPlan, render: (sub) => /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(import_jsx_runtime43.Fragment, { children: [
                 sub.planName ?? sub.planReference,
-                sub.totalPayments != null ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("div", { className: "throttle-muted", children: t.subscriptions.installmentProgress.replace("{paid}", String(Math.min(sub.paymentsMade ?? 0, sub.totalPayments))).replace("{total}", String(sub.totalPayments)) }) : null
+                sub.totalPayments != null ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("div", { className: "throttle-muted", children: t.subscriptions.installmentProgress.replace("{paid}", String(Math.min(sub.paymentsMade ?? 0, sub.totalPayments))).replace("{total}", String(sub.totalPayments)) }) : null,
+                nextPaymentLabel(sub) ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("div", { className: "throttle-muted", children: nextPaymentLabel(sub) }) : null,
+                upcomingList(sub)
               ] }) },
               { key: "price", label: t.subscriptions.columnPrice, render: (sub) => /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("span", { className: "throttle-table__money", children: priceLabel(sub) }) },
               { key: "renews", label: t.subscriptions.columnRenews, render: (sub) => renewsLabel(sub) },
@@ -4538,12 +4591,9 @@ function SubscriptionsPanel(props) {
               /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(StatusBadge, { status: sub.status, labels: t.subscriptions.statusLabels })
             ] }),
             sub.totalPayments != null ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("div", { className: "throttle-muted", children: t.subscriptions.installmentProgress.replace("{paid}", String(Math.min(sub.paymentsMade ?? 0, sub.totalPayments))).replace("{total}", String(sub.totalPayments)) }) : null,
-            /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("p", { className: "throttle-muted", children: [
-              formatMoney(sub.amount, sub.currency, locale),
-              " / ",
-              cadenceNoun(sub),
-              sub.quantity > 1 ? ` \xD7 ${sub.quantity}` : ""
-            ] }),
+            nextPaymentLabel(sub) ? /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("div", { className: "throttle-muted", children: nextPaymentLabel(sub) }) : null,
+            upcomingList(sub),
+            /* @__PURE__ */ (0, import_jsx_runtime43.jsx)("p", { className: "throttle-muted", children: priceLabel(sub) }),
             sub.status === "completed" ? /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)("p", { className: "throttle-muted", children: [
               t.subscriptions.statusLabels.completed,
               " ",