payment-kit 1.13.77 → 1.13.79

package/api/src/routes/payment-links.ts

@@ -143,7 +143,7 @@ const paginationSchema = Joi.object<{
 });
 router.get('/', auth, async (req, res) => {
   const { page, pageSize, ...query } = await paginationSchema.validateAsync(req.query, { stripUnknown: true });
-  const where: WhereOptions<PaymentLink> = {};
+  const where: WhereOptions<PaymentLink> = { 'metadata.preview': null };
 
   if (typeof query.active === 'boolean') {
     where.active = query.active;

package/api/src/routes/pricing-table.ts

@@ -3,7 +3,7 @@ import { Router } from 'express';
 import Joi from 'joi';
 import pick from 'lodash/pick';
 import uniq from 'lodash/uniq';
-import { Op, WhereOptions } from 'sequelize';
+import type { WhereOptions } from 'sequelize';
 
 import { checkPassportForPricingTable } from '../integrations/blocklet/passport';
 import logger from '../libs/logger';
@@ -164,7 +164,7 @@ const paginationSchema = Joi.object<{
 });
 router.get('/', auth, async (req, res) => {
   const { page, pageSize, ...query } = await paginationSchema.validateAsync(req.query, { stripUnknown: true });
-  const where: WhereOptions<PricingTable> = { id: { [Op.notIn]: [`prctbl_${req.user?.did}`] } };
+  const where: WhereOptions<PricingTable> = { 'metadata.preview': null };
 
   if (typeof query.active === 'boolean') {
     where.active = query.active;
@@ -289,10 +289,11 @@ router.post('/stash', auth, async (req, res) => {
     raw.locked = false;
     raw.livemode = !!req.livemode;
     raw.created_via = req.user?.via;
+    raw.metadata = { preview: '1' };
 
     let doc = await PricingTable.findByPk(raw.id);
     if (doc) {
-      await doc.update({ ...formatPricingTable(req.body), livemode: raw.livemode });
+      await doc.update({ ...formatPricingTable(req.body), metadata: raw.metadata, livemode: raw.livemode });
     } else {
       doc = await PricingTable.create(raw as PricingTable);
     }

package/api/src/routes/subscriptions.ts

@@ -389,28 +389,22 @@ router.put('/:id', auth, async (req, res) => {
     if (!subscription) {
       return res.status(404).json({ error: 'Subscription not found' });
     }
-    if (['trailing', 'active'].includes(subscription.status) === false) {
-      return res.status(400).json({ error: 'Subscription can only be updated when in trailing or active mode' });
-    }
-
-    const lastInvoice = await Invoice.findByPk(subscription.latest_invoice_id);
-    if (!lastInvoice) {
-      throw new Error('Subscription should have latest invoice');
-    }
-    const paymentCurrency = await PaymentCurrency.findByPk(subscription.currency_id);
-    if (!paymentCurrency) {
-      throw new Error('Subscription should have payment currency');
-    }
-    const customer = await Customer.findByPk(subscription.customer_id);
-    if (!customer) {
-      throw new Error('Subscription should have customer');
-    }
 
     // handle updates
     const updates: Partial<TSubscription> = {};
     if (req.body.metadata) {
       updates.metadata = formatMetadata(req.body.metadata);
     }
+    if (subscription.isImmutable()) {
+      if (updates.metadata) {
+        await subscription.update(updates);
+        return res.json({ subscription });
+      }
+      return res.status(400).json({ error: 'Only metadata can be updated when subscription is immutable' });
+    }
+    if (subscription.isActive() === false) {
+      return res.status(400).json({ error: 'Subscription can only be updated when active' });
+    }
     if (req.body.description) {
       updates.description = req.body.description;
     }
@@ -421,6 +415,19 @@ router.put('/:id', auth, async (req, res) => {
       updates.proration_behavior = req.body.proration_behavior;
     }
 
+    const lastInvoice = await Invoice.findByPk(subscription.latest_invoice_id);
+    if (!lastInvoice) {
+      throw new Error('Subscription should have latest invoice');
+    }
+    const paymentCurrency = await PaymentCurrency.findByPk(subscription.currency_id);
+    if (!paymentCurrency) {
+      throw new Error('Subscription should have payment currency');
+    }
+    const customer = await Customer.findByPk(subscription.customer_id);
+    if (!customer) {
+      throw new Error('Subscription should have customer');
+    }
+
     let invoice: Invoice;
 
     await sequelize.transaction({ isolationLevel: Transaction.ISOLATION_LEVELS.READ_UNCOMMITTED }, async () => {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.77",
+  "version": "1.13.79",
   "scripts": {
     "dev": "COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -109,7 +109,7 @@
     "@abtnode/types": "^1.16.20",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.77",
+    "@did-pay/types": "1.13.79",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -148,5 +148,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "216a753f4625b3b2712dabac88d20ea680d9eff9"
+  "gitHead": "2e35efe8ba1977c9547af7eeafeb29aeee257a90"
 }