payment-kit 1.13.33 → 1.13.35

package/api/src/libs/session.ts

@@ -80,7 +80,7 @@ export function getCheckoutAmount(items: TLineItemExpanded[], currency: TPayment
 
 export function getRecurringPeriod(recurring: PriceRecurring) {
   const { interval } = recurring;
-  const count = recurring.interval_count || 1;
+  const count = +recurring.interval_count || 1;
   const dayInMs = 24 * 60 * 60 * 1000;
 
   switch (interval) {

package/api/src/routes/prices.ts

@@ -1,6 +1,8 @@
 import { fromTokenToUnit } from '@ocap/util';
 import { Router } from 'express';
+import Joi from 'joi';
 import pick from 'lodash/pick';
+import type { WhereOptions } from 'sequelize';
 
 import { authenticate } from '../libs/security';
 import { canUpsell } from '../libs/session';
@@ -12,7 +14,33 @@ const router = Router();
 
 const auth = authenticate<Price>({ component: true, roles: ['owner', 'admin'] });
 
-// FIXME: @wangshijun use schema validation, validate product exist
+export async function getExpandedPrice(id: string) {
+  const price = await Price.findByPkOrLookupKey(id, {
+    include: [
+      { model: Product, as: 'product' },
+      { model: PaymentCurrency, as: 'currency' },
+    ],
+  });
+
+  if (price) {
+    const currencies = await PaymentCurrency.findAll();
+    const doc = Price.formatAfterRead(price.toJSON(), currencies);
+
+    if (doc.upsell?.upsells_to_id) {
+      const to = await Price.findByPk(doc.upsell.upsells_to_id);
+      if (to) {
+        // @ts-ignore
+        doc.upsell.upsells_to = Price.formatAfterRead(to.toJSON(), currencies);
+      }
+    }
+
+    return doc;
+  }
+
+  return null;
+}
+
+// FIXME: @wangshijun use schema validation
 // create price
 // eslint-disable-next-line consistent-return
 router.post('/', auth, async (req, res) => {
@@ -23,14 +51,17 @@ router.post('/', auth, async (req, res) => {
   raw.currency_id = raw.currency_id || req.currency.id;
   raw.created_via = req.user?.via as string;
 
+  if (!raw.product_id) {
+    return res.status(400).json({ error: 'product_id is required to create a price' });
+  }
+
   if (!raw.unit_amount) {
     return res.status(400).json({ error: 'price unit_amount is required' });
   }
 
-  if (raw.currency_options?.length === 0) {
-    raw.currency_options = [
-      { currency_id: raw.currency_id, unit_amount: raw.unit_amount, tiers: null, custom_unit_amount: null },
-    ];
+  const product = await Product.findByPk(raw.product_id);
+  if (!product) {
+    return res.status(400).json({ error: `product ${raw.product_id} not found for price` });
   }
 
   const currencies = await PaymentCurrency.findAll({ where: { active: true } });
@@ -38,39 +69,29 @@ router.post('/', auth, async (req, res) => {
   if (!currency) {
     return res.status(400).json({ error: `currency used in price or not active: ${raw.currency_id}` });
   }
-  raw.unit_amount = fromTokenToUnit(raw.unit_amount, currency.decimal).toString();
+
+  if (Array.isArray(raw.currency_options) === false) {
+    raw.currency_options = [];
+  }
+  if (raw.currency_options.some((x) => x.currency_id === raw.currency_id) === false) {
+    raw.currency_options.unshift({
+      currency_id: raw.currency_id,
+      unit_amount: raw.unit_amount,
+      tiers: null,
+      custom_unit_amount: null,
+    });
+  }
+
   raw.currency_options = Price.formatCurrencies(raw.currency_options, currencies);
+  raw.unit_amount = fromTokenToUnit(raw.unit_amount, currency.decimal).toString();
 
   const price = await Price.insert(raw);
-
-  res.json(price);
+  res.json(await getExpandedPrice(price.id as string));
 });
 
 // get price detail
 router.get('/:id', auth, async (req, res) => {
-  const price = await Price.findByPkOrLookupKey(req.params.id as string, {
-    include: [
-      { model: Product, as: 'product' },
-      { model: PaymentCurrency, as: 'currency' },
-    ],
-  });
-
-  if (price) {
-    const currencies = await PaymentCurrency.findAll();
-    const doc = Price.formatAfterRead(price.toJSON(), currencies);
-
-    if (doc.upsell?.upsells_to_id) {
-      const to = await Price.findByPk(doc.upsell.upsells_to_id);
-      if (to) {
-        // @ts-ignore
-        doc.upsell.upsells_to = Price.formatAfterRead(to.toJSON(), currencies);
-      }
-    }
-
-    res.json(doc);
-  } else {
-    res.json(null);
-  }
+  res.json(await getExpandedPrice(req.params.id as string));
 });
 
 router.get('/:id/upsell', auth, async (req, res) => {
@@ -107,7 +128,7 @@ router.put('/:id', auth, async (req, res) => {
     pick(
       req.body,
       price.locked
-        ? ['nickname', 'description', 'metadata', 'upsell']
+        ? ['nickname', 'description', 'metadata', 'currency_options', 'upsell']
         : ['type', 'model', 'active', 'livemode', 'nickname', 'recurring', 'description', 'tiers', 'unit_amount', 'transform_quantity', 'metadata', 'lookup_key', 'currency_options', 'upsell'] // prettier-ignore
     )
   );
@@ -120,17 +141,16 @@ router.put('/:id', auth, async (req, res) => {
   }
 
   const currencies = await PaymentCurrency.findAll({ where: { active: true } });
+  const currency = currencies.find((x) => x.id === price.currency_id);
+  if (!currency) {
+    return res.status(400).json({ error: `currency used in price not found or not active: ${price.currency_id}` });
+  }
   if (updates.unit_amount) {
-    const currency = currencies.find((x) => x.id === price.currency_id);
-    if (!currency) {
-      return res.status(400).json({ error: `currency used in price not found or not active: ${price.currency_id}` });
-    }
     updates.unit_amount = fromTokenToUnit(updates.unit_amount, currency.decimal).toString();
   }
   if (updates.currency_options) {
     updates.currency_options = Price.formatCurrencies(updates.currency_options, currencies);
-    const base = updates.currency_options.find((x) => x.currency_id === price.currency_id);
-    if (!base) {
+    if (updates.currency_options.some((x) => x.currency_id === price.currency_id) === false) {
       updates.currency_options.unshift({
         currency_id: price.currency_id,
         unit_amount: price.unit_amount,
@@ -139,21 +159,16 @@ router.put('/:id', auth, async (req, res) => {
       });
     }
     if (updates.unit_amount) {
-      const exist = updates.currency_options.find((x) => x.currency_id === price.currency_id);
-      if (exist) {
-        exist.unit_amount = updates.unit_amount;
+      const base = price.currency_options.find((x) => x.currency_id === price.currency_id);
+      if (base) {
+        base.unit_amount = updates.unit_amount;
       }
     }
-  } else if (updates.unit_amount) {
-    const exist = price.currency_options.find((x) => x.currency_id === price.currency_id);
-    if (exist) {
-      exist.unit_amount = updates.unit_amount;
-    }
   }
 
   await price.update(Price.formatBeforeSave(updates));
 
-  return res.json(price);
+  return res.json(await getExpandedPrice(req.params.id as string));
 });
 
 // archive
@@ -173,7 +188,8 @@ router.put('/:id/archive', auth, async (req, res) => {
   }
 
   await price.update({ active: false });
-  return res.json(price);
+
+  return res.json(await getExpandedPrice(req.params.id as string));
 });
 
 // delete price
@@ -199,4 +215,63 @@ router.delete('/:id', auth, async (req, res) => {
   return res.json(price);
 });
 
+// list products and prices
+const paginationSchema = Joi.object<{
+  page: number;
+  pageSize: number;
+  livemode?: boolean;
+  active?: boolean;
+  type?: string;
+  currency_id?: string;
+  product_id?: string;
+  lookup_key?: string;
+}>({
+  page: Joi.number().integer().min(1).default(1),
+  pageSize: Joi.number().integer().min(1).max(100).default(20),
+  livemode: Joi.boolean().empty(''),
+  active: Joi.boolean().empty(''),
+  type: Joi.string().empty(''),
+  currency_id: Joi.string().empty(''),
+  product_id: Joi.string().empty(''),
+  lookup_key: Joi.string().empty(''),
+});
+router.get('/', auth, async (req, res) => {
+  const { page, pageSize, active, livemode, ...query } = await paginationSchema.validateAsync(req.query, {
+    stripUnknown: false,
+    allowUnknown: true,
+  });
+  const where: WhereOptions<Price> = {};
+
+  if (typeof active === 'boolean') {
+    where.active = active;
+  }
+  if (typeof livemode === 'boolean') {
+    where.livemode = livemode;
+  }
+  ['type', 'currency_id', 'product_id', 'lookup_key'].forEach((key: string) => {
+    // @ts-ignore
+    if (query[key]) {
+      // @ts-ignore
+      where[key] = query[key].split(',').map((x: string) => x.trim()).filter(Boolean); // prettier-ignore
+    }
+  });
+
+  Object.keys(query)
+    .filter((x) => x.startsWith('recurring.'))
+    .forEach((key: string) => {
+      // @ts-ignore
+      where[key] = query[key];
+    });
+
+  const { rows, count } = await Price.findAndCountAll({
+    where,
+    attributes: ['id'],
+    order: [['created_at', 'DESC']],
+    offset: (page - 1) * pageSize,
+    limit: pageSize,
+  });
+
+  res.json({ count, list: await Promise.all(rows.map((x) => getExpandedPrice(x.id))) });
+});
+
 export default router;

package/api/src/routes/products.ts

@@ -63,12 +63,14 @@ router.post('/', auth, async (req, res) => {
       } else {
         price.currency_options = [];
       }
-      price.currency_options.unshift({
-        currency_id: price.currency_id,
-        unit_amount: price.unit_amount,
-        tiers: null,
-        custom_unit_amount: null,
-      });
+      if (price.currency_options.some((x) => x.currency_id === price.currency_id) === false) {
+        price.currency_options.unshift({
+          currency_id: price.currency_id,
+          unit_amount: price.unit_amount,
+          tiers: null,
+          custom_unit_amount: null,
+        });
+      }
 
       return price;
     });
@@ -138,10 +140,9 @@ router.get('/', auth, async (req, res) => {
   res.json({ count, list });
 });
 
-// get product detail
-router.get('/:id', auth, async (req, res) => {
+export async function getExpandedProduct(id: string) {
   const product = await Product.findOne({
-    where: { id: req.params.id },
+    where: { id },
     include: [
       { model: Price, as: 'prices', include: [{ model: PaymentCurrency, as: 'currency' }] },
       { model: Price, as: 'default_price' },
@@ -169,10 +170,16 @@ router.get('/:id', auth, async (req, res) => {
         ];
       }
     }
-    res.json(doc);
-  } else {
-    res.json(null);
+
+    return doc;
   }
+
+  return null;
+}
+
+// get product detail
+router.get('/:id', auth, async (req, res) => {
+  res.json(await getExpandedProduct(req.params.id as string));
 });
 
 // update product
@@ -204,7 +211,7 @@ router.put('/:id', auth, async (req, res) => {
   }
   await product.update(updates);
 
-  return res.json(product);
+  return res.json(await getExpandedProduct(req.params.id as string));
 });
 
 // archive
@@ -221,8 +228,7 @@ router.put('/:id/archive', auth, async (req, res) => {
   await product.update({ active: !product.active });
 
   // FIXME: deactivate payment-links, pricing-tables
-
-  return res.json(product);
+  return res.json(await getExpandedProduct(req.params.id as string));
 });
 
 // delete product

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

@@ -355,7 +355,7 @@ export class Price extends Model<InferAttributes<Price>, InferCreationAttributes
     }
 
     // @ts-ignore
-    return this.create(this.formatBeforeSave(price));
+    return this.create(this.formatBeforeSave({ model: 'standard', ...price }));
   }
 
   public static findByPkOrLookupKey(id: string, options: FindOptions<Price> = {}) {

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.33",
+  "version": "1.13.35",
   "scripts": {
     "dev": "blocklet dev",
     "eject": "vite eject",
@@ -103,7 +103,7 @@
     "@abtnode/types": "1.16.17-beta-952ef53d",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.33",
+    "@did-pay/types": "1.13.35",
     "@types/cookie-parser": "^1.4.4",
     "@types/cors": "^2.8.14",
     "@types/dotenv-flow": "^3.3.1",
@@ -140,5 +140,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "d22dad06dbe2d08c06279f3d4a66c666f2542255"
+  "gitHead": "25a3e75f4894d8aefb016605548c58645c0ca194"
 }

package/src/components/checkout/product-item.tsx

@@ -61,12 +61,12 @@ export default function ProductItem({ item, session, currency, onUpsell, onDowns
               onChange={() => onUpsell(item.price_id, item.price.upsell?.upsells_to_id)}
             />
             {t('checkout.upsell.save', {
-              recurring: formatRecurring(item.price.upsell.upsells_to.recurring as PriceRecurring),
+              recurring: t(`common.${formatRecurring(item.price.upsell.upsells_to.recurring as PriceRecurring)}`),
             })}
-            <Status label={t('checkout.upsell.off', { saving })} color="primary" variant="outlined" sx={{ ml: 0.5 }} />
+            <Status label={t('checkout.upsell.off', { saving })} color="primary" variant="outlined" sx={{ ml: 1 }} />
           </Typography>
           <Typography component="span" sx={{ fontSize: 12 }}>
-            {formatPrice(item.price.upsell.upsells_to, currency)}
+            {formatPrice(item.price.upsell.upsells_to, currency, item.price.product?.unit_label)}
           </Typography>
         </Stack>
       )}
@@ -88,11 +88,11 @@ export default function ProductItem({ item, session, currency, onUpsell, onDowns
               onChange={() => onDownsell(item.upsell_price_id)}
             />
             {t('checkout.upsell.revert', {
-              recurring: formatRecurring(item.price.recurring as PriceRecurring),
+              recurring: t(`common.${formatRecurring(item.price.recurring as PriceRecurring)}`),
             })}
           </Typography>
           <Typography component="span" sx={{ fontSize: 12 }}>
-            {formatPrice(item.price, currency)}
+            {formatPrice(item.price, currency, item.price.product?.unit_label)}
           </Typography>
         </Stack>
       )}

package/src/components/metadata/editor.tsx

@@ -20,8 +20,6 @@ export default function MetadataEditor({
   const metadata = data.metadata || {};
   const methods = useForm<any>({
     defaultValues: {
-      ...data,
-      // @ts-ignore
       metadata: Object.keys(metadata).map((key: string) => ({ key, value: metadata[key] })),
     },
   });

package/src/components/price/upsell-select.tsx

@@ -12,13 +12,14 @@ import AddPrice from '../product/add-price';
 type Props = {
   price: TPriceExpanded;
   onSelect: Function;
+  onAdd: Function;
 };
 
 const fetchData = (id: string): Promise<TPriceExpanded[]> => {
   return api.get(`/api/prices/${id}/upsell`).then((res) => res.data);
 };
 
-export default function UpsellSelect({ price, onSelect }: Props) {
+export default function UpsellSelect({ price, onSelect, onAdd }: Props) {
   const { t } = useLocaleContext();
   const [state, setState] = useSetState({ loading: false, adding: false, action: '' });
 
@@ -47,6 +48,7 @@ export default function UpsellSelect({ price, onSelect }: Props) {
       setState({ adding: true });
       await api.post('/api/prices', { ...formData, product_id: price.product_id });
       Toast.success(t('common.saved'));
+      onAdd();
     } catch (err) {
       console.error(err);
       Toast.error(formatError(err));

package/src/components/price/upsell.tsx

@@ -58,7 +58,7 @@ export function UpsellForm({ data, onChange }: { data: TPriceExpanded; onChange:
     );
   }
 
-  return <UpsellSelect price={data} onSelect={onSelectUpsell} />;
+  return <UpsellSelect price={data} onSelect={onSelectUpsell} onAdd={onChange} />;
 }
 
 export default function PriceUpsell({ data, onChange }: { data: TPriceExpanded; onChange: Function }) {

package/src/libs/util.ts

@@ -332,9 +332,36 @@ export function formatPaymentLinkPricing(link: TPaymentLinkExpanded, currency: T
     currency
   );
 }
+export function getRecurringPeriod(recurring: PriceRecurring) {
+  const { interval } = recurring;
+  const count = +recurring.interval_count || 1;
+  const dayInMs = 24 * 60 * 60 * 1000;
+
+  switch (interval) {
+    case 'hour':
+      return 60 * 60 * 1000;
+    case 'day':
+      return count * dayInMs;
+    case 'week':
+      return count * 7 * dayInMs;
+    case 'month':
+      return count * 30 * dayInMs;
+    case 'year':
+      return count * 365 * dayInMs;
+    default:
+      throw new Error(`Unsupported recurring interval: ${interval}`);
+  }
+}
 
 export function formatUpsellSaving(session: TCheckoutSessionExpanded, currency: TPaymentCurrency) {
   const items = session.line_items as TLineItemExpanded[];
+  if (items[0]?.upsell_price_id) {
+    return '0';
+  }
+  if (!items[0]?.price.upsell?.upsells_to) {
+    return '0';
+  }
+
   const from = getCheckoutAmount(items, currency, false, false);
   const to = getCheckoutAmount(
     items.map((x) => ({
@@ -347,11 +374,18 @@ export function formatUpsellSaving(session: TCheckoutSessionExpanded, currency:
     true
   );
 
-  const factor = 12; // FIXME: interval
+  const fromRecurring = items[0].price?.recurring as PriceRecurring;
+  const toRecurring = items[0].price?.upsell?.upsells_to?.recurring as PriceRecurring;
+  if (!fromRecurring || !toRecurring) {
+    return '0';
+  }
+
+  const factor = Math.floor(getRecurringPeriod(toRecurring) / getRecurringPeriod(fromRecurring));
+
   const before = new BN(from.total).mul(new BN(factor));
   const after = new BN(to.total);
 
-  return Number(before.sub(after).mul(new BN(100)).div(after).toString()).toFixed(0);
+  return Number(before.sub(after).mul(new BN(100)).div(before).toString()).toFixed(0);
 }
 
 export function formatCheckoutHeadlines(

package/src/locales/zh.tsx

@@ -501,15 +501,15 @@ export default flat({
     },
     customer: {
       name: '姓名',
-      email: '电子邮件',
+      email: '邮件',
       phone: '电话',
       phonePlaceholder: '电话号码',
       phoneTip: '以防需要与您联系有关您的订单',
     },
     upsell: {
-      save: '使用{recurring}计费方式节省',
+      save: '使用{recurring}计费方式',
       revert: '切换到{recurring}计费方式',
-      off: '{saving}%折扣',
+      off: '省 {saving}%',
     },
     expired: {
       title: '链接已过期',

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

@@ -26,7 +26,7 @@ export default function PriceActions(props: Props) {
 
   const canEdit = props.data.active;
   const canArchive = props.data.active;
-  const canRemove = !props.data.locked && props.setAsDefault;
+  const canRemove = !props.data.locked && !props.setAsDefault;
 
   const [state, setState] = useSetState({
     action: '',