payment-kit 1.13.272 → 1.13.274

package/README.md

@@ -19,3 +19,13 @@ The decentralized stripe for blocklet platform.
 ### Test Stripe
 
 Invoices for subscriptions are not finalized automatically. You can use stripe postman collection to finalize it and then confirm the payment.
+
+### Easter Eggs
+
+None public environment variables used in the code, can change the behavior of the payment-kit.
+
+- PAYMENT_CHANGE_LOCKED_PRICE: allow change locked price, must be set to "1" to work
+- PAYMENT_RELOAD_SUBSCRIPTION_JOBS: reload subscription jobs on start, must be set to "1" to work
+- PAYMENT_BILLING_THRESHOLD: global default billing threshold, must be a number
+- PAYMENT_DAYS_UNTIL_DUE: global default days until due, must be a number
+- PAYMENT_DAYS_UNTIL_CANCEL: global default days until cancel, must be a number

package/api/src/libs/subscription.ts

@@ -21,6 +21,7 @@ import {
   TLineItemExpanded,
   UsageRecord,
 } from '../store/models';
+import { createEvent } from './audit';
 import dayjs from './dayjs';
 import env from './env';
 import logger from './logger';
@@ -563,7 +564,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: {
@@ -584,6 +585,8 @@ export async function finalizeStripeSubscriptionUpdate({
     const releaseAt = subscription.current_period_end;
     await Lock.acquire(`${subscription.id}-change-plan`, releaseAt);
     logger.info('subscription plan change lock acquired on finalize', { subscription: subscription.id, releaseAt });
+
+    createEvent('Subscription', 'customer.subscription.upgraded', subscription).catch(console.error);
   }
 
   logger.info('subscription update finalized', { subscription: subscription.id, updates, items });

package/api/src/queues/subscription.ts

@@ -501,7 +501,7 @@ export const startSubscriptionQueue = async () => {
     if (supportAutoCharge === false) {
       return;
     }
-    await addSubscriptionJob(x, 'cycle');
+    await addSubscriptionJob(x, 'cycle', process.env.PAYMENT_RELOAD_SUBSCRIPTION_JOBS === '1');
   });
 
   await batchHandleStripeSubscriptions();
@@ -568,6 +568,15 @@ events.on('customer.subscription.deleted', (subscription: Subscription) => {
   // FIXME: ensure invoices that are open or uncollectible are voided
 });
 
+events.on('customer.subscription.upgraded', async (subscription: Subscription) => {
+  await subscriptionQueue.delete(subscription.id);
+  await addSubscriptionJob(subscription, 'cancel', true, subscription.current_period_end);
+  logger.info('subscription cycle job rescheduled after upgrade', {
+    subscription: subscription.id,
+    runAt: subscription.current_period_end,
+  });
+});
+
 events.on('customer.stake.revoked', async ({ subscriptionId, tx }: { subscriptionId: string; tx: any }) => {
   const subscription = await Subscription.findByPk(subscriptionId);
   if (!subscription) {

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',
+            };
           })
         );
 
@@ -987,9 +994,7 @@ router.put('/:id', authPortal, async (req, res) => {
         }
         if (shouldCycle) {
           await addSubscriptionJob(subscription, 'cycle', true, now);
-          logger.info('subscription job rescheduled on period end', {
-            subscription: subscription.id,
-          });
+          logger.info('subscription job rescheduled on period end', { subscription: subscription.id });
         }
       }
     }

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.272",
+  "version": "1.13.274",
   "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.272",
+    "@blocklet/payment-react": "1.13.274",
     "@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.272",
+    "@blocklet/payment-types": "1.13.274",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -155,5 +155,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "b8ed6f58120859dfec4c8dfa1352a9f3b57aad17"
+  "gitHead": "e16c193a6fe497c78f6d1b1ccb7627e1ff0224f2"
 }