payment-kit 1.13.271 → 1.13.273

package/api/src/libs/subscription.ts

@@ -563,7 +563,7 @@ export async function finalizeStripeSubscriptionUpdate({
         // remote item not associated with local item
         const created = await SubscriptionItem.create({
           price_id: item.price_id as string,
-          quantity: item.quantity as number,
+          quantity: (item.quantity || 1) as number,
           livemode: subscription.livemode,
           subscription_id: subscription.id,
           metadata: {

package/api/src/routes/connect/shared.ts

@@ -277,19 +277,50 @@ export async function ensureInvoiceForCheckout({
     logger.info(`Invoice already created for checkout session ${checkoutSession.id}: ${checkoutSession.invoice_id}`);
     const invoice = await Invoice.findByPk(checkoutSession.invoice_id);
     if (invoice) {
-      await invoice.update({ status: 'open' });
-      logger.info(`Invoice status reset for checkout session ${checkoutSession.id}: ${checkoutSession.invoice_id}`);
-      if (invoice.payment_intent_id) {
-        await PaymentIntent.update({ status: 'requires_capture' }, { where: { id: invoice.payment_intent_id } });
-        logger.info(
-          `PaymentIntent status reset for checkout session ${checkoutSession.id}: ${invoice.payment_intent_id}`
-        );
+      if (invoice.status === 'paid') {
+        logger.info(`Invoice already paid for checkout session ${checkoutSession.id}: ${checkoutSession.invoice_id}`);
+        throw new Error('Invoice already paid');
+      }
+
+      // invoice currency is aligned
+      if (invoice.currency_id === checkoutSession.currency_id) {
+        await invoice.update({ status: 'open' });
+        logger.info(`Invoice status reset for checkout session ${checkoutSession.id}: ${checkoutSession.invoice_id}`);
+
+        if (invoice.payment_intent_id) {
+          await PaymentIntent.update({ status: 'requires_capture' }, { where: { id: invoice.payment_intent_id } });
+          logger.info(
+            `PaymentIntent status reset for checkout session ${checkoutSession.id}: ${invoice.payment_intent_id}`
+          );
+        }
+
+        return {
+          invoice,
+          items: await InvoiceItem.findAll({ where: { invoice_id: checkoutSession.invoice_id } }),
+        };
+      }
+
+      // invalid currency not aligned: we should generate new invoice
+      await invoice.update({ status: 'void' });
+      logger.info(`Invoice marked void for checkout session ${checkoutSession.id}: ${checkoutSession.invoice_id}`);
+      const method = await PaymentMethod.findByPk(invoice.default_payment_method_id);
+      if (method?.type === 'stripe' && invoice.metadata?.stripe_id) {
+        const client = method.getStripeClient();
+        client.invoices
+          .voidInvoice(invoice.metadata.stripe_id)
+          .then(() => {
+            logger.info(
+              `Invoice marked void on stripe for checkout session ${checkoutSession.id}: ${checkoutSession.invoice_id}`
+            );
+          })
+          .catch((err) => {
+            logger.error(
+              `Invoice marked void on stripe failed for checkout session ${checkoutSession.id}: ${checkoutSession.invoice_id}`,
+              err
+            );
+          });
       }
     }
-    return {
-      invoice,
-      items: await InvoiceItem.findAll({ where: { invoice_id: checkoutSession.invoice_id } }),
-    };
   }
 
   const currency = await PaymentCurrency.findByPk(checkoutSession.currency_id);

package/api/src/routes/subscriptions.ts

@@ -703,7 +703,9 @@ router.put('/:id', authPortal, async (req, res) => {
           addedItems.map(async (x) => {
             const price = await Price.findByPk(x.price_id);
             const stripePrice = await ensureStripePrice(price!, paymentMethod, paymentCurrency);
-            return { price: stripePrice.id, quantity: x.quantity };
+            return price!.recurring?.usage_type === 'metered'
+              ? { price: stripePrice.id }
+              : { price: stripePrice.id, quantity: x.quantity };
           })
         );
         const updatedStripeItems = await Promise.all(
@@ -716,7 +718,12 @@ router.put('/:id', authPortal, async (req, res) => {
         const deletedStripeItems = await Promise.all(
           deletedItems.map(async (x) => {
             const item = await SubscriptionItem.findByPk(x.id);
-            return { id: item!.metadata.stripe_id, deleted: true, clear_usage: x.clear_usage };
+            const price = await Price.findByPk(item!.price_id);
+            return {
+              id: item!.metadata.stripe_id,
+              deleted: true,
+              clear_usage: price!.recurring?.usage_type === 'metered',
+            };
           })
         );
 

package/api/src/store/models/subscription-item.ts

@@ -51,7 +51,7 @@ export class SubscriptionItem extends Model<InferAttributes<SubscriptionItem>, I
     },
     quantity: {
       type: DataTypes.INTEGER,
-      allowNull: false,
+      allowNull: true,
     },
     metadata: {
       type: DataTypes.JSON,

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.271
+version: 1.13.273
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.271",
+  "version": "1.13.273",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -51,7 +51,7 @@
     "@arcblock/ux": "^2.9.90",
     "@arcblock/validator": "^1.18.123",
     "@blocklet/logger": "1.16.26",
-    "@blocklet/payment-react": "1.13.271",
+    "@blocklet/payment-react": "1.13.273",
     "@blocklet/sdk": "1.16.26",
     "@blocklet/ui-react": "^2.9.90",
     "@blocklet/uploader": "^0.1.6",
@@ -116,7 +116,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.26",
     "@arcblock/eslint-config-ts": "^0.3.0",
-    "@blocklet/payment-types": "1.13.271",
+    "@blocklet/payment-types": "1.13.273",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -155,5 +155,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "cf476c72b4c54fd56881e03828e4b2c764e76e84"
+  "gitHead": "565e708d3d02876ec28c679500fa9a99278bbdc7"
 }