payment-kit 1.13.309 → 1.14.0

package/api/src/routes/checkout-sessions.ts

@@ -751,12 +751,44 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
             .status(403)
             .json({ code: 'SUBSCRIPTION_INVALID', error: 'Checkout session subscription status unexpected' });
         }
+        const setup = getSubscriptionCreateSetup(lineItems, paymentCurrency.id, trialInDays, trialEnds);
         subscription = await subscription.update({
           currency_id: paymentCurrency.id,
           customer_id: customer.id,
           default_payment_method_id: paymentMethod.id,
+          current_period_start: setup.period.start,
+          current_period_end: setup.period.end,
+          billing_cycle_anchor: checkoutSession.subscription_data?.billing_cycle_anchor || setup.cycle.anchor,
+          trial_end: setup.trial.end,
+          trial_start: setup.trial.start,
+          pending_invoice_item_interval: setup.recurring,
           pending_setup_intent: setupIntent?.id,
         });
+        logger.info('subscription updated on checkout session resubmit', {
+          session: checkoutSession.id,
+          subscription: subscription.id,
+        });
+
+        // rebuild subscription items
+        await SubscriptionItem.destroy({ where: { subscription_id: subscription.id } });
+        const items = await Promise.all(
+          lineItems
+            .filter((x) => x.price.type === 'recurring')
+            .map((x) =>
+              SubscriptionItem.create({
+                livemode: !!checkoutSession.livemode,
+                // @ts-ignore
+                subscription_id: subscription.id,
+                price_id: x.upsell_price_id || x.price_id,
+                quantity: x.quantity,
+                metadata: checkoutSession.metadata as any,
+              })
+            )
+        );
+        logger.info('subscription items rebuilt on checkout session resubmit', {
+          session: checkoutSession.id,
+          items: items.map((x) => x.id),
+        });
       } else {
         // FIXME: @wangshijun respect all checkoutSession.subscription_data fields
         const setup = getSubscriptionCreateSetup(lineItems, paymentCurrency.id, trialInDays, trialEnds);
@@ -802,7 +834,6 @@ router.put('/:id/submit', user, ensureCheckoutSessionOpen, async (req, res) => {
           subscription: subscription.id,
         });
 
-        // FIXME: @wangshijun what if we have have changed subscription items when resubmit
         // create subscription items
         const items = await Promise.all(
           lineItems

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.13.309
+version: 1.14.0
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.309",
+  "version": "1.14.0",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@arcblock/validator": "^1.18.124",
     "@blocklet/js-sdk": "1.16.28",
     "@blocklet/logger": "1.16.28",
-    "@blocklet/payment-react": "1.13.309",
+    "@blocklet/payment-react": "1.14.0",
     "@blocklet/sdk": "1.16.28",
     "@blocklet/ui-react": "^2.10.3",
     "@blocklet/uploader": "^0.1.20",
@@ -118,7 +118,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.28",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.13.309",
+    "@blocklet/payment-types": "1.14.0",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "bb892b5514943397caa1d96f9c6b355fcf7a0e71"
+  "gitHead": "f39e47fae8a2c10598c6ee28e10b76f338b14c97"
 }