payment-kit 1.18.22 → 1.18.24

package/api/src/integrations/blocklet/user.ts

@@ -1,5 +1,6 @@
 import notification from '@blocklet/sdk/service/notification';
 
+import dayjs from 'dayjs';
 import { Customer } from '../../store/models';
 
 import logger from '../../libs/logger';
@@ -15,13 +16,17 @@ const handleUserUpdate = async ({ user }: { user: any }) => {
     },
   });
   if (customer) {
+    if (Math.abs(dayjs(customer.updated_at).diff(dayjs(user.updatedAt), 'minute')) <= 1) {
+      logger.info(`skip customer update due to recent sync within 1 minute: ${customer.did}`);
+      return;
+    }
     const now = Math.floor(Date.now() / 1000);
     await customer.update({
-      name: user.fullName,
-      email: user.email,
-      phone: user.phone,
+      name: user.fullName || customer.name,
+      email: user.email || customer.email,
+      phone: user.phone || customer.phone,
       last_sync_at: now,
-      address: Customer.formatAddressFromUser(user),
+      address: Customer.formatAddressFromUser(user, customer),
     });
     logger.info(`customer info updated: ${customer.did}`);
   }

package/api/src/routes/checkout-sessions.ts

@@ -1312,7 +1312,6 @@ router.put('/:id/donate-submit', ensureCheckoutSessionOpen, async (req, res) =>
       lineItems
     );
 
-    // 返回支付信息
     return res.json({
       paymentIntent,
       checkoutSession,

package/api/src/routes/customers.ts

@@ -104,7 +104,7 @@ router.get('/me', sessionMiddleware(), async (req, res) => {
     if (!doc) {
       if (req.query.fallback) {
         const result = await blocklet.getUser(req.user.did);
-        return res.json({ ...result.user, address: {}, livemode });
+        return res.json({ ...result.user, address: Customer.formatAddressFromUser(result.user), livemode });
       }
       if (req.query.create) {
         // create customer
@@ -132,6 +132,9 @@ router.get('/me', sessionMiddleware(), async (req, res) => {
         return res.json({ error: 'Customer not found' });
       }
     }
+    if (req.query.skipSummary) {
+      return res.json({ ...doc.toJSON(), livemode });
+    }
     try {
       const [summary, stake, token] = await Promise.all([
         doc.getSummary(livemode),

package/api/src/routes/donations.ts

@@ -34,7 +34,7 @@ const donationSchema = Joi.object<DonationSettings>({
     .default([]),
   amount: Joi.object({
     presets: Joi.array().items(Joi.number().positive()).optional().default([]),
-    preset: Joi.number().positive().optional(),
+    preset: Joi.number().empty('').positive().optional(),
     minimum: Joi.number().positive().optional(),
     maximum: Joi.number().positive().optional(),
     custom: Joi.boolean().optional().default(true),

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

@@ -283,14 +283,14 @@ export class Customer extends Model<InferAttributes<Customer>, InferCreationAttr
     return nextInvoicePrefix();
   }
 
-  public static formatAddressFromUser(user: any) {
+  public static formatAddressFromUser(user: any, customer?: Customer) {
     return {
-      country: user.address?.country || '',
-      state: user.address?.province || '',
-      city: user.address?.city || '',
-      line1: user.address?.line1 || '',
-      line2: user.address?.line2 || '',
-      postal_code: user.address?.postalCode || '',
+      country: user.address?.country || customer?.address?.country || '',
+      state: user.address?.province || customer?.address?.state || '',
+      city: user.address?.city || customer?.address?.city || '',
+      line1: user.address?.line1 || customer?.address?.line1 || '',
+      line2: user.address?.line2 || customer?.address?.line2 || '',
+      postal_code: user.address?.postalCode || customer?.address?.postal_code || '',
     };
   }
 

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.18.22",
+  "version": "1.18.24",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -46,17 +46,17 @@
     "@abtnode/cron": "^1.16.40",
     "@arcblock/did": "^1.19.15",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
-    "@arcblock/did-connect": "^2.12.43",
+    "@arcblock/did-connect": "^2.12.48",
     "@arcblock/did-util": "^1.19.15",
     "@arcblock/jwt": "^1.19.15",
-    "@arcblock/ux": "^2.12.43",
+    "@arcblock/ux": "^2.12.48",
     "@arcblock/validator": "^1.19.15",
     "@blocklet/js-sdk": "^1.16.40",
     "@blocklet/logger": "^1.16.40",
-    "@blocklet/payment-react": "1.18.22",
+    "@blocklet/payment-react": "1.18.24",
     "@blocklet/sdk": "^1.16.40",
-    "@blocklet/ui-react": "^2.12.43",
-    "@blocklet/uploader": "^0.1.79",
+    "@blocklet/ui-react": "^2.12.48",
+    "@blocklet/uploader": "^0.1.81",
     "@blocklet/xss": "^0.1.30",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
@@ -121,7 +121,7 @@
   "devDependencies": {
     "@abtnode/types": "^1.16.40",
     "@arcblock/eslint-config-ts": "^0.3.3",
-    "@blocklet/payment-types": "1.18.22",
+    "@blocklet/payment-types": "1.18.24",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -151,7 +151,7 @@
     "vite": "^5.3.5",
     "vite-node": "^2.0.4",
     "vite-plugin-babel-import": "^2.0.5",
-    "vite-plugin-blocklet": "^0.9.27",
+    "vite-plugin-blocklet": "^0.9.29",
     "vite-plugin-node-polyfills": "^0.21.0",
     "vite-plugin-svgr": "^4.2.0",
     "vite-tsconfig-paths": "^4.3.2",
@@ -167,5 +167,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "844883f56da79c1222fc5aa1b445abb2859e3230"
+  "gitHead": "6c36b088743e696ce250cda11f8502b3886df0ef"
 }