payment-kit 1.13.83 → 1.13.85

package/api/src/queues/subscription.ts

@@ -146,17 +146,28 @@ export const handleSubscription = async (job: SubscriptionJob) => {
       // @link https://stripe.com/docs/products-prices/pricing-models#usage-types
       if (x.price.recurring?.usage_type === 'metered') {
         const duration = setup.cycle / 1000;
-        x.quantity = await UsageRecord.getSummary(
+        const rawQuantity = await UsageRecord.getSummary(
           x.id,
           // FIXME: this causes inconsistency when subscription is paused or billing_cycle_anchor reset
           setup.period.start - duration,
           setup.period.end - duration,
           x.price.recurring?.aggregate_usage
         );
+        if (x.price.transform_quantity) {
+          if (x.price.transform_quantity.round === 'up') {
+            x.quantity = Math.ceil(rawQuantity / x.price.transform_quantity.divide_by);
+          } else {
+            x.quantity = Math.floor(rawQuantity / x.price.transform_quantity.divide_by);
+          }
+        } else {
+          x.quantity = rawQuantity;
+        }
         logger.info('Invoice.usageRecordSummary', {
           subscriptionId: subscription.id,
           subscriptionItemId: x.id,
           priceId: x.price_id,
+          transformQuantity: x.price.transform_quantity,
+          rawQuantity,
           quantity: x.quantity,
           start: setup.period.start - duration,
           end: setup.period.end - duration,

package/api/src/store/migrate.ts

@@ -7,7 +7,18 @@ import logger from '../libs/logger';
 import { sequelize } from './sequelize';
 
 const umzug = new Umzug({
-  migrations: { glob: ['migrations/*.{ts,js}', { cwd: __dirname }] },
+  migrations: {
+    glob: ['migrations/*.{ts,js}', { cwd: __dirname }],
+    resolve: ({ name, path, context }) => {
+      // eslint-disable-next-line import/no-dynamic-require, global-require
+      const migration = require(path!);
+      return {
+        name: name.replace(/\.ts$/, '.js'),
+        up: () => migration.up({ context }),
+        down: () => migration.down({ context }),
+      };
+    },
+  },
   context: sequelize.getQueryInterface(),
   storage: new SequelizeStorage({ sequelize }),
   logger,

package/api/src/store/models/price.ts

@@ -254,6 +254,8 @@ export class Price extends Model<InferAttributes<Price>, InferCreationAttributes
 
       if (price.model !== 'package') {
         price.transform_quantity = null;
+      } else if (price.transform_quantity) {
+        price.transform_quantity.divide_by = Number(price.transform_quantity.divide_by) || 1;
       }
     }
 

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.83",
+  "version": "1.13.85",
   "scripts": {
     "dev": "COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@blocklet/logger": "1.16.21-beta-e828f413",
     "@blocklet/sdk": "1.16.21-beta-e828f413",
     "@blocklet/ui-react": "^2.8.23",
-    "@blocklet/uploader": "^0.0.55",
+    "@blocklet/uploader": "^0.0.56",
     "@mui/icons-material": "^5.14.19",
     "@mui/lab": "^5.0.0-alpha.155",
     "@mui/material": "^5.14.20",
@@ -110,7 +110,7 @@
     "@abtnode/types": "1.16.21-beta-e828f413",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.83",
+    "@did-pay/types": "1.13.85",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "e6357508c38296224f7c493b6630a45fd359d6bc"
+  "gitHead": "3d976b6a4bb4c0f910ddda7a60d42ec0e08ea5d9"
 }

package/src/components/uploader.tsx

@@ -65,7 +65,7 @@ export default function Uploader({ onUploaded, preview, maxFileSize, allowedFile
 
 Uploader.defaultProps = {
   preview: '',
-  maxFileSize: 1024 * 1024 * 2,
+  maxFileSize: undefined,
   allowedFileTypes: ['image/png', 'image/jpeg', 'image/webp'],
 };