@shoppexio/storefront-react 0.6.0 → 0.6.1

package/eject/account/account-subscriptions.ts

@@ -126,6 +126,8 @@ export interface BillingHistoryInvoice {
   kind: 'first_order' | 'renewal' | 'plan_change';
   /** The plan change it paid for; null on a renewal or a first order. Days are null when the producer did not count them. */
   plan_change: { from_plan_name: string; to_plan_name: string; days_left: number | null; days_total: number | null } | null;
+  /** The coupon term payment it billed (`BillingHistoryCouponPayment`): the code, its 1-based payment, and the payments it discounts (null: every one). Null when it billed none. */
+  coupon_payment: { code: string; payment: number; payments_total: number | null } | null;
 }
 
 const BILLING_KINDS: ReadonlyArray<BillingHistoryInvoice['kind']> = ['first_order', 'renewal', 'plan_change'];
@@ -147,6 +149,17 @@ function readPlanChange(value: unknown): BillingHistoryInvoice['plan_change'] |
   return { from_plan_name: from, to_plan_name: to, days_left: daysLeft, days_total: daysTotal };
 }
 
+// The route sends the field on every row (required, nullable): only null means no coupon payment; absent or malformed fails the read.
+function readCouponPayment(value: unknown): BillingHistoryInvoice['coupon_payment'] | undefined {
+  if (value === null) return null;
+  if (!isRecord(value)) return undefined;
+  const code = readString(value, 'code');
+  const payment = readCount(value, 'payment');
+  const paymentsTotal = readCount(value, 'payments_total');
+  if (code === null || payment === undefined || payment === null || paymentsTotal === undefined) return undefined;
+  return { code, payment, payments_total: paymentsTotal };
+}
+
 /** What a billing history row billed (Design Batch 9, C3), as a catalog key: "Renewal", "First order", "Plan change, Basic to Pro". */
 export function billingEntryTitle(invoice: BillingHistoryInvoice): { key: string; params?: { from: string; to: string } } {
   if (invoice.plan_change) {
@@ -199,11 +212,12 @@ export function narrowBillingHistory(payload: unknown): BillingHistoryResult {
     // A kind this build does not know fails the read: a row that guesses what it billed could misname a charge.
     const kind = BILLING_KINDS.find((known) => known === entry.kind);
     const planChange = readPlanChange(entry.plan_change);
-    if (uniqid === null || total === null || currency === null || status === null || createdAt === null || !kind || planChange === undefined) {
+    const couponPayment = readCouponPayment(entry.coupon_payment);
+    if (uniqid === null || total === null || currency === null || status === null || createdAt === null || !kind || planChange === undefined || couponPayment === undefined) {
       return { ok: false };
     }
 
-    invoices.push({ uniqid, total, currency, status, created_at: createdAt, kind, plan_change: planChange });
+    invoices.push({ uniqid, total, currency, status, created_at: createdAt, kind, plan_change: planChange, coupon_payment: couponPayment });
   }
 
   return { ok: true, invoices };

package/eject/account/messages/ar.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "الطلب الأول",
     "historyRenewal": "تجديد",
     "historyPlanChange": "تغيير الخطة، من {from} إلى {to}",
-    "historyDays": "عن {days} من {total} يومًا"
+    "historyDays": "عن {days} من {total} يومًا",
+    "historyCouponPayment": "{code} · {payment} من {total}"
   },
   "favorites": {
     "loading": "جارٍ تحميل مفضلتك",

package/eject/account/messages/de.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "Erstbestellung",
     "historyRenewal": "Verlängerung",
     "historyPlanChange": "Tarifwechsel, {from} zu {to}",
-    "historyDays": "für {days} von {total} Tagen"
+    "historyDays": "für {days} von {total} Tagen",
+    "historyCouponPayment": "{code} · {payment} von {total}"
   },
   "favorites": {
     "loading": "Deine Favoriten werden geladen",

package/eject/account/messages/en.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "First order",
     "historyRenewal": "Renewal",
     "historyPlanChange": "Plan change, {from} to {to}",
-    "historyDays": "for {days} of {total} days"
+    "historyDays": "for {days} of {total} days",
+    "historyCouponPayment": "{code} · {payment} of {total}"
   },
   "favorites": {
     "loading": "Loading your favorites",

package/eject/account/messages/es.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "Primer pedido",
     "historyRenewal": "Renovación",
     "historyPlanChange": "Cambio de plan, de {from} a {to}",
-    "historyDays": "por {days} de {total} días"
+    "historyDays": "por {days} de {total} días",
+    "historyCouponPayment": "{code} · {payment} de {total}"
   },
   "favorites": {
     "loading": "Cargando tus favoritos",

package/eject/account/messages/fi.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "Ensimmäinen tilaus",
     "historyRenewal": "Uusinta",
     "historyPlanChange": "Sopimuksen vaihto, {from} → {to}",
-    "historyDays": "{days}/{total} päivältä"
+    "historyDays": "{days}/{total} päivältä",
+    "historyCouponPayment": "{code} · {payment}/{total}"
   },
   "favorites": {
     "loading": "Ladataan suosikkejasi",

package/eject/account/messages/fr.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "Première commande",
     "historyRenewal": "Renouvellement",
     "historyPlanChange": "Changement de formule, de {from} à {to}",
-    "historyDays": "pour {days} jours sur {total}"
+    "historyDays": "pour {days} jours sur {total}",
+    "historyCouponPayment": "{code} · {payment} sur {total}"
   },
   "favorites": {
     "loading": "Chargement de vos favoris",

package/eject/account/messages/hi.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "पहला ऑर्डर",
     "historyRenewal": "नवीनीकरण",
     "historyPlanChange": "योजना बदलाव, {from} से {to}",
-    "historyDays": "{total} में से {days} दिनों के लिए"
+    "historyDays": "{total} में से {days} दिनों के लिए",
+    "historyCouponPayment": "{code} · {total} में से {payment}"
   },
   "favorites": {
     "loading": "आपके पसंदीदा लोड हो रहे हैं",

package/eject/account/messages/it.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "Primo ordine",
     "historyRenewal": "Rinnovo",
     "historyPlanChange": "Cambio piano, da {from} a {to}",
-    "historyDays": "per {days} giorni su {total}"
+    "historyDays": "per {days} giorni su {total}",
+    "historyCouponPayment": "{code} · {payment} di {total}"
   },
   "favorites": {
     "loading": "Caricamento dei tuoi preferiti",

package/eject/account/messages/lt.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "Pirmas užsakymas",
     "historyRenewal": "Atnaujinimas",
     "historyPlanChange": "Plano keitimas, {from} → {to}",
-    "historyDays": "už {days} iš {total} d."
+    "historyDays": "už {days} iš {total} d.",
+    "historyCouponPayment": "{code} · {payment} iš {total}"
   },
   "favorites": {
     "loading": "Įkeliami jūsų mėgstami",

package/eject/account/messages/nl.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "Eerste bestelling",
     "historyRenewal": "Verlenging",
     "historyPlanChange": "Pakketwijziging, van {from} naar {to}",
-    "historyDays": "voor {days} van {total} dagen"
+    "historyDays": "voor {days} van {total} dagen",
+    "historyCouponPayment": "{code} · {payment} van {total}"
   },
   "favorites": {
     "loading": "Je favorieten worden geladen",

package/eject/account/messages/pl.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "Pierwsze zamówienie",
     "historyRenewal": "Odnowienie",
     "historyPlanChange": "Zmiana planu, z {from} na {to}",
-    "historyDays": "za {days} z {total} dni"
+    "historyDays": "za {days} z {total} dni",
+    "historyCouponPayment": "{code} · {payment} z {total}"
   },
   "favorites": {
     "loading": "Wczytujemy Twoje ulubione",

package/eject/account/messages/pt.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "Primeiro pedido",
     "historyRenewal": "Renovação",
     "historyPlanChange": "Mudança de plano, de {from} para {to}",
-    "historyDays": "por {days} de {total} dias"
+    "historyDays": "por {days} de {total} dias",
+    "historyCouponPayment": "{code} · {payment} de {total}"
   },
   "favorites": {
     "loading": "A carregar os teus favoritos",

package/eject/account/messages/ru.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "Первый заказ",
     "historyRenewal": "Продление",
     "historyPlanChange": "Смена тарифа: {from} на {to}",
-    "historyDays": "за {days} из {total} дн."
+    "historyDays": "за {days} из {total} дн.",
+    "historyCouponPayment": "{code} · {payment} из {total}"
   },
   "favorites": {
     "loading": "Загружаем ваше избранное",

package/eject/account/messages/tr.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "İlk sipariş",
     "historyRenewal": "Yenileme",
     "historyPlanChange": "Plan değişikliği, {from} → {to}",
-    "historyDays": "{total} günün {days} günü için"
+    "historyDays": "{total} günün {days} günü için",
+    "historyCouponPayment": "{code} · {payment}/{total}"
   },
   "favorites": {
     "loading": "Favorileriniz yükleniyor",

package/eject/account/messages/uk.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "Перше замовлення",
     "historyRenewal": "Продовження",
     "historyPlanChange": "Зміна тарифу: {from} на {to}",
-    "historyDays": "за {days} з {total} дн."
+    "historyDays": "за {days} з {total} дн.",
+    "historyCouponPayment": "{code} · {payment} з {total}"
   },
   "favorites": {
     "loading": "Завантажуємо ваше обране",

package/eject/account/messages/zh.json

@@ -365,7 +365,8 @@
     "historyFirstOrder": "首次订单",
     "historyRenewal": "续订",
     "historyPlanChange": "套餐变更：{from} 改为 {to}",
-    "historyDays": "{total} 天中的 {days} 天"
+    "historyDays": "{total} 天中的 {days} 天",
+    "historyCouponPayment": "{code} · 第 {payment}/{total} 次"
   },
   "favorites": {
     "loading": "正在加载你的收藏",

package/eject/account/subscriptions.tsx

@@ -776,6 +776,7 @@ export function BillingHistoryList({ payload, reload }: { payload: unknown; relo
       {history.invoices.map((invoice) => {
         const title = billingEntryTitle(invoice);
         const days = billingEntryDays(invoice);
+        const coupon = invoice.coupon_payment;
         return (
           <li key={invoice.uniqid}>
             <Link
@@ -788,6 +789,14 @@ export function BillingHistoryList({ payload, reload }: { payload: unknown; relo
                   {formatAccountDate(invoice.created_at)}
                   {days ? ` · ${t(days.key, days.params)}` : null}
                 </p>
+                {/* A discounted payment names its code and which term payment it was, as the dashboard does: "LAUNCH20 · 2 of 3", the code alone when every payment is discounted. Its own line, so it does not wrap after the date at 375 px. */}
+                {coupon ? (
+                  <p className="sxa:mt-0.5 sxa:text-micro sxa:tabular-nums sxa:text-muted">
+                    {coupon.payments_total === null
+                      ? coupon.code
+                      : t('subscriptions.historyCouponPayment', { code: coupon.code, payment: coupon.payment, total: coupon.payments_total })}
+                  </p>
+                ) : null}
               </div>
               <div className="sxa:flex sxa:shrink-0 sxa:flex-col sxa:items-end sxa:gap-1.5 sxa:sm:flex-row sxa:sm:items-center sxa:sm:gap-3">
                 <span className="sxa:text-small sxa:font-semibold sxa:tabular-nums">{formatAccountAmount(invoice.total, invoice.currency)}</span>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shoppexio/storefront-react",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "React hooks, models and a customer account for Shoppex code storefronts",
   "type": "module",
   "homepage": "https://docs.shoppex.io/storefront/code-storefront-development",