payment-kit 1.13.28 → 1.13.30

package/api/src/integrations/blockchain/nft.ts

@@ -60,6 +60,7 @@ export async function mintNftForCheckoutSession(id: string) {
       await checkoutSession.update({
         nft_mint_status: 'error',
         nft_mint_details: {
+          type: 'arcblock',
           arcblock: {
             address: preMint.address,
             owner: nftOwner as string,
@@ -88,6 +89,7 @@ export async function mintNftForCheckoutSession(id: string) {
     await checkoutSession.update({
       nft_mint_status: 'minted',
       nft_mint_details: {
+        type: 'arcblock',
         arcblock: {
           tx_hash: hash,
           address: preMint.address,

package/api/src/routes/products.ts

@@ -182,14 +182,12 @@ router.put('/:id', auth, async (req, res) => {
   if (!product) {
     return res.status(404).json({ error: 'product not found' });
   }
-  if (product.active === false) {
-    return res.status(403).json({ error: 'product archived' });
-  }
   if (product.locked) {
     return res.status(403).json({ error: 'product locked' });
   }
 
   const updates: Partial<Product> = pick(req.body, [
+    'status',
     'name',
     'description',
     'images',
@@ -216,7 +214,6 @@ router.put('/:id/archive', auth, async (req, res) => {
   if (!product) {
     return res.status(404).json({ error: 'product not found' });
   }
-
   if (product.locked) {
     return res.status(403).json({ error: 'product locked' });
   }
@@ -235,11 +232,6 @@ router.delete('/:id', auth, async (req, res) => {
   if (!product) {
     return res.status(404).json({ error: 'product not found' });
   }
-
-  if (product.active === false) {
-    return res.status(403).json({ error: 'product archived' });
-  }
-
   if (product.locked) {
     return res.status(403).json({ error: 'product locked' });
   }

package/api/src/routes/webhook-endpoints.ts

@@ -31,19 +31,33 @@ router.post('/', auth, async (req, res) => {
 const schema = Joi.object<{
   page: number;
   pageSize: number;
+  status?: string;
   livemode?: boolean;
 }>({
   page: Joi.number().integer().min(1).default(1),
   pageSize: Joi.number().integer().min(1).max(100).default(20),
+  status: Joi.string().empty(''),
   livemode: Joi.boolean().empty(''),
 });
 router.get('/', auth, async (req, res) => {
-  const { page, pageSize, ...query } = await schema.validateAsync(req.query, { stripUnknown: true });
+  const { page, pageSize, status, ...query } = await schema.validateAsync(req.query, { stripUnknown: true });
   const where: WhereOptions<WebhookEndpoint> = {};
 
   if (typeof query.livemode === 'boolean') {
     where.livemode = query.livemode;
   }
+  if (status) {
+    where.status = status
+      .split(',')
+      .map((x) => x.trim())
+      .filter(Boolean);
+  }
+  Object.keys(query)
+    .filter((x) => x.startsWith('metadata.'))
+    .forEach((key: string) => {
+      // @ts-ignore
+      where[key] = query[key];
+    });
 
   try {
     const { rows: list, count } = await WebhookEndpoint.findAndCountAll({
@@ -81,7 +95,13 @@ router.put('/:id', auth, async (req, res) => {
     return res.status(404).json({ error: 'webhook endpoint not found' });
   }
 
-  const updates: Partial<WebhookEndpoint> = pick(req.body, ['description', 'metadata', 'status', 'enabled_events']);
+  const updates: Partial<WebhookEndpoint> = pick(req.body, [
+    'url',
+    'description',
+    'metadata',
+    'status',
+    'enabled_events',
+  ]);
   if (updates.metadata) {
     updates.metadata = formatMetadata(updates.metadata);
   }

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

@@ -275,6 +275,7 @@ export type NftMintSettings = {
 };
 
 export type NftMintDetails = {
+  type: LiteralUnion<'arcblock' | 'ethereum' | 'bitcoin', string>;
   arcblock?: {
     tx_hash?: string;
     address: string;

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.28",
+  "version": "1.13.30",
   "scripts": {
     "dev": "blocklet dev",
     "eject": "vite eject",
@@ -103,7 +103,7 @@
     "@abtnode/types": "1.16.17-beta-703fb879",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.28",
+    "@did-pay/types": "1.13.30",
     "@types/cookie-parser": "^1.4.4",
     "@types/cors": "^2.8.14",
     "@types/dotenv-flow": "^3.3.1",
@@ -140,5 +140,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "b4a13ea876d489b52fed81b21049fd39bda088d4"
+  "gitHead": "eb3b428db29ac33c697ca9ae3796d377ec779335"
 }