@meith/plugin-dues 0.34.0 → 0.35.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meith/plugin-dues",
-  "version": "0.34.0",
+  "version": "0.35.1",
   "description": "Membership dues for a Meith board: Stripe-backed subscriptions as a contained plugin.",
   "license": "MIT",
   "repository": {
@@ -20,8 +20,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@meith/plugin-kit": "^0.34.0",
-    "@meith/theme-kit": "^0.34.0"
+    "@meith/plugin-kit": "^0.35.1",
+    "@meith/theme-kit": "^0.35.1"
   },
   "peerDependencies": {
     "react": "^19.2.0"

package/src/definition.tsx

@@ -57,7 +57,7 @@ export function createDues(input: DuesConfigInput = {}): PluginDefinition {
   return definePlugin({
     key: 'dues',
     name: 'Dues',
-    version: '0.34.0',
+    version: '0.35.1',
     description: en['dues.definition.description'].replace(
       '{label}',
       staticConfig.label.toLowerCase(),

package/src/entitlement.ts

@@ -16,6 +16,7 @@ import {
   type OrderRow,
   orderByPaymentIntent,
   orderBySessionId,
+  orderHasCharge,
   type PlanRow,
   planRowByKey,
   releaseCodeReservation,
@@ -106,6 +107,8 @@ export async function settlePaidOrder(
       stripeSubscriptionId: info.subscriptionId,
       lastOrderId: order.id,
     })
+  } else if (existing.lastOrderId === order.id) {
+    membership = existing
   } else {
     await extendMembership(deps.data, existing.id, {
       currentPeriodEnd: periodEnd,
@@ -141,16 +144,18 @@ export async function settlePaidOrder(
     ...(order.discountMinor > 0 ? [`code took ${order.discountMinor} off`] : []),
   ]
 
-  await insertLedger(deps.data, {
-    kind: 'charge',
-    userId: order.buyerUserId,
-    membershipId: membership.id,
-    orderId: order.id,
-    amountMinor: order.amountMinor,
-    currency: order.currency,
-    stripeRef: info.paymentIntentId ?? info.subscriptionId,
-    note: notes.length === 0 ? null : notes.join('; '),
-  })
+  if (!(await orderHasCharge(deps.data, order.id))) {
+    await insertLedger(deps.data, {
+      kind: 'charge',
+      userId: order.buyerUserId,
+      membershipId: membership.id,
+      orderId: order.id,
+      amountMinor: order.amountMinor,
+      currency: order.currency,
+      stripeRef: info.paymentIntentId ?? info.subscriptionId,
+      note: notes.length === 0 ? null : notes.join('; '),
+    })
+  }
 
   await settleOrder(deps.data, order.id, {
     status: 'paid',

package/src/store.ts

@@ -594,6 +594,15 @@ export async function insertLedger(data: PluginData, entry: NewLedgerEntry): Pro
   )
 }
 
+export async function orderHasCharge(data: PluginData, orderId: number): Promise<boolean> {
+  const row = await data.one(
+    `select 1 as found from plugin_dues_ledger
+      where order_id = $1 and kind = 'charge' limit 1`,
+    [orderId],
+  )
+  return row !== null
+}
+
 export async function recentLedger(data: PluginData, limit = 50): Promise<readonly LedgerRow[]> {
   const rows = await data.query(
     `select * from plugin_dues_ledger order by occurred_at desc limit $1`,