@cartbase/storefront 0.1.2 → 0.3.0

package/src/lib/payment-constants.ts

@@ -1,66 +1,53 @@
-/**
- * Payment provider helpers — identifier sniffing for store payment sessions.
- *
- * Ported from `@1click/ui/src/lib/payment-constants.ts` (v2.3.1) and
- * translated to the barter provider-id seam (code truth:
- * `src/lib/stripe/providers.ts isStripeProviderId` matches exactly
- * `"pp_stripe" | "stripe"`; the accepted checkout ids are
- * `pp_stripe | pp_cod | pp_manual` — docs/contracts/store-api.md).
- * `pp_system_default` is the RETIRED legacy manual twin (payments-registry
- * card): no longer provisioned, hidden from merchants, kept here only so
- * historic orders keep rendering. The Medusa-era prefixes (`pp_stripe_*`,
- * `pp_medusa-*`) are kept as fallbacks so components ported later keep
- * working against either wire.
- *
- * Intentionally ships NO icons — stores render their own icons via their
- * own icon set. The library stays free of icon-kit imports at this layer.
- */
-
-/**
- * True if the provider id is a Stripe-backed card payment provider.
- * Barter's canonical ids first (`pp_stripe` / `stripe`), then the
- * Medusa-era prefixes (`pp_stripe_*`, `pp_medusa-*`).
- */
-export const isStripeLike = (providerId?: string): boolean => {
-  return Boolean(
-    providerId &&
-      (providerId === "pp_stripe" ||
-        providerId === "stripe" ||
-        providerId.startsWith("pp_stripe_") ||
-        providerId.startsWith("pp_medusa-"))
-  )
-}
-
-/** True if the provider id is PayPal. */
-export const isPaypal = (providerId?: string): boolean => {
-  return Boolean(providerId?.startsWith("pp_paypal"))
-}
-
-/**
- * True if the provider id is an offline/manual provider: `pp_manual` (the
- * id checkout actually charges — payments-registry card) with the retired
- * `pp_system_default*` legacy twin as fallback for historic orders. COD is
- * NOT manual — `pp_cod` has its own id and its own fee flow.
- */
-export const isManual = (providerId?: string): boolean => {
-  return Boolean(
-    providerId &&
-      (providerId === "pp_manual" || providerId.startsWith("pp_system_default"))
-  )
-}
-
-export const paymentInfoMap: Record<
-  string,
-  { title: string; icon: React.JSX.Element | null }
-> = {
-  pp_stripe: { title: "Credit / debit card", icon: null },
-  pp_stripe_stripe: { title: "Credit / debit card", icon: null },
-  "pp_medusa-payments_default": { title: "Credit / debit card", icon: null },
-  "pp_stripe-ideal_stripe": { title: "iDeal", icon: null },
-  "pp_stripe-bancontact_stripe": { title: "Bancontact", icon: null },
-  pp_paypal_paypal: { title: "PayPal", icon: null },
-  pp_cod: { title: "Cash on delivery", icon: null },
-  pp_manual: { title: "Manual payment", icon: null },
-  // Retired legacy manual twin — historic orders only (payments-registry).
-  pp_system_default: { title: "Manual payment", icon: null },
-}
+/**
+ * Payment tender helpers — identifier sniffing for store payment sessions.
+ *
+ * The Cartbase wire has exactly TWO tender shapes since the pp_* kill
+ * (20260811250000, no-payment-method-by-default card):
+ *
+ *   - a PROCESSOR the merchant connected — `provider_id` (`pp_stripe`
+ *     today; PayPal etc. as integrations land);
+ *   - a merchant-operated PAYMENT METHOD — `payment_method_id` + `name` +
+ *     `kind` (`manual` for Bank transfer / Pay in store, `cod` for the
+ *     collection-on-delivery switch). Its session carries `provider_id`
+ *     NULL; the merchant's NAME is the display everywhere.
+ *
+ * The dead ids (`pp_cod`, `pp_manual`, `pp_system_default`) are gone from
+ * the wire and from this module. The Medusa-era Stripe prefixes
+ * (`pp_stripe_*`, `pp_medusa-*`) are kept as fallbacks so components
+ * ported later keep working against either wire.
+ *
+ * Intentionally ships NO icons — stores render their own icons via their
+ * own icon set. The library stays free of icon-kit imports at this layer.
+ */
+
+/**
+ * True if the provider id is a Stripe-backed card payment provider.
+ * Cartbase's canonical ids first (`pp_stripe` / `stripe`), then the
+ * Medusa-era prefixes (`pp_stripe_*`, `pp_medusa-*`).
+ */
+export const isStripeLike = (providerId?: string | null): boolean => {
+  return Boolean(
+    providerId &&
+      (providerId === "pp_stripe" ||
+        providerId === "stripe" ||
+        providerId.startsWith("pp_stripe_") ||
+        providerId.startsWith("pp_medusa-"))
+  )
+}
+
+/** True if the provider id is PayPal. */
+export const isPaypal = (providerId?: string | null): boolean => {
+  return Boolean(providerId?.startsWith("pp_paypal"))
+}
+
+export const paymentInfoMap: Record<
+  string,
+  { title: string; icon: React.JSX.Element | null }
+> = {
+  pp_stripe: { title: "Credit / debit card", icon: null },
+  pp_stripe_stripe: { title: "Credit / debit card", icon: null },
+  "pp_medusa-payments_default": { title: "Credit / debit card", icon: null },
+  "pp_stripe-ideal_stripe": { title: "iDeal", icon: null },
+  "pp_stripe-bancontact_stripe": { title: "Bancontact", icon: null },
+  pp_paypal_paypal: { title: "PayPal", icon: null },
+}

package/src/lib/store-api-error.ts

@@ -6,7 +6,7 @@ import { StoreApiError } from "../api/types"
  * Normalizes any error thrown by the `@cartbase/storefront` SDK layer into a
  * clean, user-presentable `Error` whose message starts with a capital and
  * ends with a period — the same normalization contract the Medusa-era
- * helper enforced, adapted to the barter error contract (`StoreApiError`
+ * helper enforced, adapted to the Cartbase error contract (`StoreApiError`
  * with `status` + `code` + raw `body`, see `../api/types`).
  *
  * Always throws — never returns. Use in `.catch()` chains:

package/src/order/index.ts

@@ -1,6 +1,6 @@
 /**
  * @cartbase/storefront/order — order confirmation + account order views.
- * Ported from `@1click/ui/src/order` (v2.3.1) with barter data seams; see
+ * Ported from `@1click/ui/src/order` (v2.3.1) with Cartbase data seams; see
  * per-module JSDoc and docs/storefront/components.md for the contracts.
  */
 export { OrderLabelsProvider, useOrderLabels } from "./context"

package/src/order/labels-bg.ts

@@ -1,39 +1,39 @@
-import type { OrderLabels } from "./labels"
-
-/**
- * Bulgarian order labels — the Alenika/mindpages production copy, ported
- * from `@1click/ui/src/order/labels-bg.ts` (v2.3.1) + `tracking`.
- */
-export const bulgarianOrderLabels: OrderLabels = {
-  orderConfirmed: "Поръчката е потвърдена",
-  confirmationSent: "Изпратихме потвърждение на",
-  orderNumber: "Поръчка",
-  orderDate: "Дата",
-  summary: "Обобщение на поръчката",
-  subtotal: "Междинна сума",
-  shipping: "Доставка",
-  discount: "Отстъпка",
-  tax: "ДДС",
-  total: "Общо",
-  codFee: "Такса наложен платеж",
-  contactInfo: "Данни за контакт",
-  delivery: "Доставка",
-  paymentMethod: "Метод на плащане",
-  paymentMethodTitles: {
-    card: "Кредитна / дебитна карта",
-    cod: "Наложен платеж",
-    manual: "Друг начин на плащане",
-    paypal: "PayPal",
-  },
-  needHelp: "Имате нужда от помощ?",
-  contactUs: "Свържете се с нас",
-  returnsExchanges: "Връщания и замени",
-  orderPlaced: "Приета",
-  processing: "Обработка",
-  shipped: "Изпратена",
-  delivered: "Доставена",
-  free: "БЕЗПЛАТНА",
-  continueShopping: "Продължи пазаруването",
-  qty: "бр.",
-  tracking: "Проследяване",
-}
+import type { OrderLabels } from "./labels"
+
+/**
+ * Bulgarian order labels — the Alenika/mindpages production copy, ported
+ * from `@1click/ui/src/order/labels-bg.ts` (v2.3.1) + `tracking`.
+ */
+export const bulgarianOrderLabels: OrderLabels = {
+  orderConfirmed: "Поръчката е потвърдена",
+  confirmationSent: "Изпратихме потвърждение на",
+  orderNumber: "Поръчка",
+  orderDate: "Дата",
+  summary: "Обобщение на поръчката",
+  subtotal: "Междинна сума",
+  shipping: "Доставка",
+  discount: "Отстъпка",
+  tax: "ДДС",
+  total: "Общо",
+  paymentMethodFee: "Такса за плащане",
+  contactInfo: "Данни за контакт",
+  delivery: "Доставка",
+  paymentMethod: "Метод на плащане",
+  paymentMethodTitles: {
+    card: "Кредитна / дебитна карта",
+    cod: "Наложен платеж",
+    manual: "Друг начин на плащане",
+    paypal: "PayPal",
+  },
+  needHelp: "Имате нужда от помощ?",
+  contactUs: "Свържете се с нас",
+  returnsExchanges: "Връщания и замени",
+  orderPlaced: "Приета",
+  processing: "Обработка",
+  shipped: "Изпратена",
+  delivered: "Доставена",
+  free: "БЕЗПЛАТНА",
+  continueShopping: "Продължи пазаруването",
+  qty: "бр.",
+  tracking: "Проследяване",
+}

package/src/order/labels.ts

@@ -1,79 +1,79 @@
-/**
- * Order family label pack. Ported from `@1click/ui/src/order/labels.ts`
- * (v2.3.1) unchanged, plus `tracking` — new in the barter port because the
- * barter order surface exposes fulfillment tracking labels
- * (`StoreOrderDetail.fulfillments[].fulfillment.labels`) that
- * `OrderDeliveryCard` now renders.
- */
-export type OrderLabels = {
-  orderConfirmed: string
-  confirmationSent: string
-  orderNumber: string
-  orderDate: string
-  summary: string
-  subtotal: string
-  shipping: string
-  discount: string
-  tax: string
-  total: string
-  /** Default label for the cash-on-delivery fee row. Used as the third-
-   *  level fallback when neither a per-store override nor the server's
-   *  `cod_fee_label` / fee line title is available. */
-  codFee: string
-  contactInfo: string
-  delivery: string
-  paymentMethod: string
-  paymentMethodTitles: {
-    card: string
-    cod: string
-    /** Offline manual payments (pp_manual) — NOT cash on delivery. */
-    manual: string
-    paypal: string
-  }
-  needHelp: string
-  contactUs: string
-  returnsExchanges: string
-  orderPlaced: string
-  processing: string
-  shipped: string
-  delivered: string
-  free: string
-  continueShopping: string
-  qty: string
-  /** Heading for the fulfillment tracking-numbers block (barter addition). */
-  tracking: string
-}
-
-export const defaultOrderLabels: OrderLabels = {
-  orderConfirmed: "Order confirmed",
-  confirmationSent: "We sent a confirmation to",
-  orderNumber: "Order",
-  orderDate: "Date",
-  summary: "Order summary",
-  subtotal: "Subtotal",
-  shipping: "Shipping",
-  discount: "Discount",
-  tax: "Tax",
-  total: "Total",
-  codFee: "Cash on delivery fee",
-  contactInfo: "Contact info",
-  delivery: "Delivery",
-  paymentMethod: "Payment method",
-  paymentMethodTitles: {
-    card: "Credit / debit card",
-    cod: "Cash on delivery",
-    manual: "Manual payment",
-    paypal: "PayPal",
-  },
-  needHelp: "Need help?",
-  contactUs: "Contact us",
-  returnsExchanges: "Returns & exchanges",
-  orderPlaced: "Placed",
-  processing: "Processing",
-  shipped: "Shipped",
-  delivered: "Delivered",
-  free: "FREE",
-  continueShopping: "Continue shopping",
-  qty: "qty.",
-  tracking: "Tracking",
-}
+/**
+ * Order family label pack. Ported from `@1click/ui/src/order/labels.ts`
+ * (v2.3.1) unchanged, plus `tracking` — new in the Cartbase port because the
+ * Cartbase order surface exposes fulfillment tracking labels
+ * (`StoreOrderDetail.fulfillments[].fulfillment.labels`) that
+ * `OrderDeliveryCard` now renders.
+ */
+export type OrderLabels = {
+  orderConfirmed: string
+  confirmationSent: string
+  orderNumber: string
+  orderDate: string
+  summary: string
+  subtotal: string
+  shipping: string
+  discount: string
+  tax: string
+  total: string
+  /** Default label for the cash-on-delivery fee row. Used as the third-
+   *  level fallback when neither a per-store override nor the server's
+   *  `payment_method_fee_label` / fee line title is available. */
+  paymentMethodFee: string
+  contactInfo: string
+  delivery: string
+  paymentMethod: string
+  paymentMethodTitles: {
+    card: string
+    cod: string
+    /** Offline manual payments (pp_manual) — NOT cash on delivery. */
+    manual: string
+    paypal: string
+  }
+  needHelp: string
+  contactUs: string
+  returnsExchanges: string
+  orderPlaced: string
+  processing: string
+  shipped: string
+  delivered: string
+  free: string
+  continueShopping: string
+  qty: string
+  /** Heading for the fulfillment tracking-numbers block (Cartbase addition). */
+  tracking: string
+}
+
+export const defaultOrderLabels: OrderLabels = {
+  orderConfirmed: "Order confirmed",
+  confirmationSent: "We sent a confirmation to",
+  orderNumber: "Order",
+  orderDate: "Date",
+  summary: "Order summary",
+  subtotal: "Subtotal",
+  shipping: "Shipping",
+  discount: "Discount",
+  tax: "Tax",
+  total: "Total",
+  paymentMethodFee: "Payment method fee",
+  contactInfo: "Contact info",
+  delivery: "Delivery",
+  paymentMethod: "Payment method",
+  paymentMethodTitles: {
+    card: "Credit / debit card",
+    cod: "Cash on delivery",
+    manual: "Manual payment",
+    paypal: "PayPal",
+  },
+  needHelp: "Need help?",
+  contactUs: "Contact us",
+  returnsExchanges: "Returns & exchanges",
+  orderPlaced: "Placed",
+  processing: "Processing",
+  shipped: "Shipped",
+  delivered: "Delivered",
+  free: "FREE",
+  continueShopping: "Continue shopping",
+  qty: "qty.",
+  tracking: "Tracking",
+}

package/src/order/order-address-card.tsx

@@ -3,7 +3,7 @@ import { defaultOrderLabels, type OrderLabels } from "./labels"
 /**
  * Contact-info card (name, phone, email). Ported from
  * `@1click/ui/src/order/order-address-card.tsx` (v2.3.1); data seam:
- * structural pick — barter's `StoreOrderDetail` (with its embedded
+ * structural pick — Cartbase's `StoreOrderDetail` (with its embedded
  * `order_addresses` row) satisfies it directly.
  */
 export interface OrderContactData {

package/src/order/order-completed-template.tsx

@@ -25,11 +25,11 @@ import { OrderHelpSection } from "./order-help-section"
 /**
  * Full order-confirmation page. Ported from
  * `@1click/ui/src/order/order-completed-template.tsx` (v2.3.1) with the
- * barter data seam: Medusa's `StoreOrder` was one object carrying items
- * with totals, order totals, shipping methods and payments — barter splits
+ * Cartbase data seam: Medusa's `StoreOrder` was one object carrying items
+ * with totals, order totals, shipping methods and payments — Cartbase splits
  * those across surfaces, so the template takes them as separate props:
  *
- *  - `order` — barter `StoreOrderDetail` (or any structural equivalent:
+ *  - `order` — Cartbase `StoreOrderDetail` (or any structural equivalent:
  *    id/display_id/email/created_at/currency_code/metadata/addresses/
  *    fulfillments). The fulfillment timeline is derived from
  *    `order.fulfillments` internally.
@@ -40,9 +40,12 @@ import { OrderHelpSection } from "./order-help-section"
  *    `order.items` via `displayItemFromOrderItem` (prefer passing
  *    cart-derived lines via `displayItemFromCartLine` right after checkout
  *    to keep server-computed per-line discounts).
- *  - `shippingMethod` / `paymentProviderId` / `cardLast4` — from the
- *    checkout state (decorated cart / prepare-checkout response); the
- *    delivery and payment cards render only what they are given.
+ *  - `shippingMethod` / `paymentProviderId` / `paymentMethodName` /
+ *    `cardLast4` — from the checkout state (decorated cart /
+ *    prepare-checkout response); the delivery and payment cards render
+ *    only what they are given. A merchant-method order passes
+ *    `paymentMethodName` (its merchant name — the display everywhere
+ *    since the pp_* kill) and no provider id.
  *
  * The Purchase tracking trio (fbq/gtag/rybbit, deduped by
  * `order.display_id`) stays APP-OWNED: fire it from the confirmation
@@ -61,6 +64,8 @@ type OrderCompletedTemplateProps = {
   items?: OrderDisplayItem[]
   shippingMethod?: ShippingMethodDisplay | null
   paymentProviderId?: string | null
+  /** The merchant method's name — wins over any provider bucket. */
+  paymentMethodName?: string | null
   cardLast4?: string | null
   labels?: OrderLabels
   locale?: string
@@ -69,11 +74,12 @@ type OrderCompletedTemplateProps = {
   /** Href for the bottom "continue shopping" CTA (source hardcoded /store). */
   storeHref?: string
   /**
-   * Per-store override for the cash-on-delivery fee row in the totals
-   * breakdown. Optional — falls back to the server's `cod_fee_label`,
-   * then the fee line's title, then the translated `labels.codFee`.
+   * Per-store override for the method-fee row in the totals breakdown.
+   * Optional — falls back to the server's `payment_method_fee_label`,
+   * then the fee line's title, then the translated
+   * `labels.paymentMethodFee`.
    */
-  codFeeLabel?: string
+  methodFeeLabel?: string
 }
 
 export function OrderCompletedTemplate({
@@ -82,13 +88,14 @@ export function OrderCompletedTemplate({
   items,
   shippingMethod,
   paymentProviderId,
+  paymentMethodName,
   cardLast4,
   labels,
   locale,
   contactHref,
   returnsHref,
   storeHref = "/store",
-  codFeeLabel,
+  methodFeeLabel,
 }: OrderCompletedTemplateProps) {
   const l = { ...defaultOrderLabels, ...labels }
   const displayItems =
@@ -119,7 +126,7 @@ export function OrderCompletedTemplate({
                 currencyCode={order.currency_code}
                 items={displayItems}
                 labels={l}
-                codFeeLabel={codFeeLabel}
+                methodFeeLabel={methodFeeLabel}
               />
             </div>
           </div>
@@ -134,6 +141,7 @@ export function OrderCompletedTemplate({
             />
             <OrderPaymentCard
               providerId={paymentProviderId}
+              methodName={paymentMethodName}
               cardLast4={cardLast4}
               labels={l}
             />

package/src/order/order-confirmation-header.tsx

@@ -4,7 +4,7 @@ import { defaultOrderLabels, type OrderLabels } from "./labels"
 /**
  * Confirmation hero (check mark + order number + date). Ported from
  * `@1click/ui/src/order/order-confirmation-header.tsx` (v2.3.1); data
- * seam: structural pick instead of Medusa's `StoreOrder` — both barter's
+ * seam: structural pick instead of Medusa's `StoreOrder` — both Cartbase's
  * `StoreOrderDetail` and `completeCart()`'s `CompletedOrder` satisfy it.
  */
 export interface OrderHeaderData {

package/src/order/order-delivery-card.tsx

@@ -5,17 +5,17 @@ import { defaultOrderLabels, type OrderLabels } from "./labels"
 
 /**
  * Delivery card: pickup point / address, shipping method row, and — new in
- * the barter port — the fulfillment tracking labels. Ported from
+ * the Cartbase port — the fulfillment tracking labels. Ported from
  * `@1click/ui/src/order/order-delivery-card.tsx` (v2.3.1) with these seam
  * translations:
  *
- *  - Medusa's `order.shipping_methods[0]` embed does not exist on barter's
+ *  - Medusa's `order.shipping_methods[0]` embed does not exist on Cartbase's
  *    `StoreOrderDetail`; the method comes via the `shippingMethod` prop
  *    (structural — `api/carts` `CartShippingMethod` from the decorated
  *    cart on the confirmation page satisfies it; `data` still carries the
  *    fulfillment-option id used for the pickup detection below).
  *  - `order.fulfillments[].fulfillment.labels` (tracking_number /
- *    tracking_url) ARE on the barter surface (docs/storefront/orders.md);
+ *    tracking_url) ARE on the Cartbase surface (docs/storefront/orders.md);
  *    `pickTrackingLabels()` selects the renderable ones and the card shows
  *    them under a `labels.tracking` heading.
  *  - Pickup detection preserved verbatim: `metadata.econt_office_code` (the

package/src/order/order-item.tsx

@@ -6,10 +6,10 @@ import { defaultOrderLabels, type OrderLabels } from "./labels"
 
 /**
  * Order line row. Ported from `@1click/ui/src/order/order-item.tsx`
- * (v2.3.1) with the data seam translated to barter:
+ * (v2.3.1) with the data seam translated to Cartbase:
  *
  * Medusa's `StoreOrderLineItem` carried per-line computed totals
- * (`total` / `original_total`). Barter's store order surface does NOT —
+ * (`total` / `original_total`). Cartbase's store order surface does NOT —
  * `StoreOrderDetail.items` are version-pivot rows (`{quantity, line_item}`)
  * whose embedded `order_line_items` row carries only `unit_price` (see
  * docs/storefront/orders.md). The component therefore renders a normalized

package/src/order/order-items-list.tsx

@@ -5,7 +5,7 @@ import { defaultOrderLabels, type OrderLabels } from "./labels"
 /**
  * Order items list. Ported from `@1click/ui/src/order/order-items-list.tsx`
  * (v2.3.1); data seam: takes normalized `OrderDisplayItem[]` (see
- * `order-item.tsx` converters) + the currency, since barter's
+ * `order-item.tsx` converters) + the currency, since Cartbase's
  * `StoreOrderDetail` carries no order-level computed fields beyond
  * `currency_code`.
  */
@@ -23,9 +23,9 @@ export function OrderItemsList({
   const l = { ...defaultOrderLabels, ...labels }
   // Render product lines only — backend-injected fee lines (legacy COD-fee
   // line items tagged `metadata.is_cod_fee`) are hidden here and surfaced
-  // as a dedicated row in OrderTotals instead. barter's NATIVE COD fee is
+  // as a dedicated row in OrderTotals instead. Cartbase's NATIVE COD fee is
   // never a line item (order_summaries.totals.cod_fee_total), so on pure
-  // barter data this filter is a no-op safety net.
+  // Cartbase data this filter is a no-op safety net.
   const visible = (items || []).filter((i) => isProductLine(i))
 
   return (