payment-kit 1.14.13 → 1.14.15

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

@@ -83,6 +83,10 @@ export async function validateInventory(line_items: LineItem[], includePendingQu
     const priceId = item.price_id;
     const quantity = Number(item.quantity || 0);
 
+    if (quantity < 1) {
+      throw new Error(`Quantity should be greater or equal to 1 for price: ${priceId}`);
+    }
+
     const price = await Price.findOne({ where: { id: priceId } });
 
     let delta = quantity;

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

@@ -114,6 +114,11 @@ export async function createPaymentLink(payload: any) {
     throw new Error('line_items should not be empty for payment link');
   }
 
+  const invalidQuantityIndex = raw.line_items.findIndex((x) => Number(x?.quantity || 0) < 1);
+  if (invalidQuantityIndex > -1) {
+    throw new Error(`line_items[${invalidQuantityIndex}].quantity should be greater or equal to 1`);
+  }
+
   const items = await Price.expand(raw.line_items);
   if (items.find((x) => x.price.custom_unit_amount) && items.length > 1) {
     throw new Error('Multiple items with custom unit amount are not supported in payment link');

package/api/src/routes/prices.ts

@@ -172,6 +172,18 @@ const priceQuantitySchema = Joi.object({
   quantity_limit_per_checkout: Joi.number().integer().min(0).optional().default(0),
 });
 
+const priceAmountSchema = Joi.object({
+  currency_options: Joi.array()
+    .items(
+      Joi.object({
+        unit_amount: Joi.number().greater(0).required(),
+        // 其他属性
+      }).unknown(true)
+    )
+    .optional(),
+  unit_amount: Joi.number().greater(0).required(),
+});
+
 // FIXME: @wangshijun use schema validation
 // create price
 // eslint-disable-next-line consistent-return
@@ -183,6 +195,10 @@ router.post('/', auth, async (req, res) => {
     if (error) {
       return res.status(400).json({ error: `Price create request invalid: ${error.message}` });
     }
+    const { error: priceAmountError } = priceAmountSchema.validate(pick(req.body, ['currency_options', 'unit_amount']));
+    if (priceAmountError) {
+      return res.status(400).json({ error: `Price create request invalid: ${priceAmountError.message}` });
+    }
     const result = await createPrice({
       ...req.body,
       livemode: !!req.livemode,
@@ -248,6 +264,11 @@ router.put('/:id', auth, async (req, res) => {
   if (error) {
     return res.status(400).json({ error: `Price update request invalid: ${error.message}` });
   }
+
+  const { error: priceAmountError } = priceAmountSchema.validate(pick(req.body, ['currency_options', 'unit_amount']));
+  if (priceAmountError) {
+    return res.status(400).json({ error: `Price update request invalid: ${priceAmountError.message}` });
+  }
   const doc = await Price.findByPkOrLookupKey(req.params.id as string);
 
   if (!doc) {

package/api/src/routes/products.ts

@@ -18,6 +18,24 @@ const router = Router();
 
 const auth = authenticate<Product>({ component: true, roles: ['owner', 'admin'] });
 
+const priceAmountSchema = Joi.object({
+  prices: Joi.array()
+    .items(
+      Joi.object({
+        currency_options: Joi.array()
+          .items(
+            Joi.object({
+              unit_amount: Joi.number().greater(0).required(),
+              // 其他属性
+            }).unknown(true)
+          )
+          .optional(),
+        unit_amount: Joi.number().greater(0).required(),
+      }).unknown(true)
+    )
+    .required(),
+});
+
 export async function createProductAndPrices(payload: any) {
   const raw: Partial<Product> = pick(payload, [
     'name',
@@ -107,8 +125,13 @@ export async function createProductAndPrices(payload: any) {
 
 // FIXME: @wangshijun use schema validation
 // create product and price
+// eslint-disable-next-line consistent-return
 router.post('/', auth, async (req, res) => {
   try {
+    const { error: priceAmountError } = priceAmountSchema.validate(pick(req.body, ['prices']));
+    if (priceAmountError) {
+      return res.status(400).json({ error: `Product create request invalid: ${priceAmountError.message}` });
+    }
     const result = await createProductAndPrices({
       ...req.body,
       active: true,
@@ -121,7 +144,7 @@ router.post('/', auth, async (req, res) => {
     res.json(result);
   } catch (err) {
     logger.error('create product error', err);
-    res.status(400).json({ error: err.message });
+    return res.status(400).json({ error: err.message });
   }
 });
 

package/api/src/routes/subscriptions.ts

@@ -251,7 +251,7 @@ router.put('/:id/cancel', authPortal, async (req, res) => {
   if (req.user?.via === 'portal') {
     updates.cancel_at_period_end = true;
     updates.cancel_at = subscription.current_period_end;
-    updates.cancelation_details = { reason: 'cancellation_requested', feedback, comment };
+    updates.cancelation_details = { reason: 'cancellation_requested', feedback, comment, return_stake: canReturnStake };
     updates.canceled_at = now;
     await addSubscriptionJob(subscription, 'cancel', true, updates.cancel_at);
   } else {

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.14.13
+version: 1.14.15
 logo: logo.png
 files:
   - dist
@@ -44,6 +44,7 @@ interfaces:
           ignoreUrls:
             - /api/did/**
             - /api/integrations/stripe/webhook
+            - /api/products/**
           blockUnauthorized: false
 community: ''
 documentation: ''

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.14.13",
+  "version": "1.14.15",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@arcblock/validator": "^1.18.127",
     "@blocklet/js-sdk": "1.16.28",
     "@blocklet/logger": "1.16.28",
-    "@blocklet/payment-react": "1.14.13",
+    "@blocklet/payment-react": "1.14.15",
     "@blocklet/sdk": "1.16.28",
     "@blocklet/ui-react": "^2.10.11",
     "@blocklet/uploader": "^0.1.20",
@@ -118,7 +118,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.28",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.14.13",
+    "@blocklet/payment-types": "1.14.15",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "80711d01804ae23dfa655a1673a7e182c3f040f1"
+  "gitHead": "a2bc07ca48172f040a2874ee1b4bb751cc41e873"
 }

package/src/components/payment-link/item.tsx

@@ -80,12 +80,19 @@ export default function LineItem({ prefix, product, valid, onUpdate, onRemove }:
           render={({ field }) => (
             <Stack direction="row" alignItems="center" mt={1}>
               <TextField
-                sx={{ width: 40, mr: 1 }}
+                sx={{ width: 80, mr: 1 }}
                 inputProps={{ style: { padding: '4px 8px' } }}
                 size="small"
+                type="number"
                 {...field}
+                onChange={(e) => {
+                  const intValue = parseInt(e.target.value || '1', 10);
+                  if (intValue >= 1) {
+                    field.onChange(intValue);
+                  }
+                }}
               />
-              <FormLabel style={{ marginBottom: 0 }}>Quantity</FormLabel>
+              <FormLabel style={{ marginBottom: 0 }}>{t('common.quantity')}</FormLabel>
             </Stack>
           )}
         />

package/src/components/price/form.tsx

@@ -127,7 +127,7 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
   const isLocked = priceLocked && window.blocklet?.PAYMENT_CHANGE_LOCKED_PRICE !== '1';
 
   const validateAmount = (v: number, currency: { maximum_precision?: number }) => {
-    if (Number(v) < 0) {
+    if (Number(v) <= 0) {
       return t('admin.price.unit_amount.positive');
     }
     const validPrecision = formatAmountPrecisionLimit(v.toString(), locale, currency?.maximum_precision || 6);
@@ -201,6 +201,15 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
                     </InputAdornment>
                   ),
                 }}
+                onChange={(e) => {
+                  const { value } = e.target;
+                  field.onChange(value);
+                  const index = currencies.fields.findIndex((x: any) => x.currency_id === settings.baseCurrency.id);
+                  if (index === -1) {
+                    return;
+                  }
+                  setValue(getFieldName(`currency_options.${index}.unit_amount`), value, { shouldValidate: true });
+                }}
               />
             </Box>
           )}

package/src/pages/admin/products/prices/actions.tsx

@@ -132,7 +132,7 @@ export default function PriceActions({ data, onChange, variant, setAsDefault }:
       disabled: true,
     },
     { label: t('admin.paymentLink.add'), handler: onCreatePaymentLink, color: 'primary' },
-    { label: t('admin.pricingTable.add'), handler: onCreatePricingTable, color: 'primary' },
+    { label: t('admin.pricingTable.add'), handler: onCreatePricingTable, color: 'primary', disabled: !data.recurring },
   ];
 
   if (setAsDefault) {