payment-kit 1.15.7 → 1.15.9

package/api/src/crons/currency.ts

@@ -0,0 +1,36 @@
+import { Op } from 'sequelize';
+import { getUrl } from '@blocklet/sdk';
+import { PaymentMethod, PaymentCurrency } from '../store/models';
+import logger from '../libs/logger';
+
+export async function syncCurrencyLogo() {
+  const where = {
+    logo: {
+      [Op.like]: '%/methods/%.png',
+    },
+  };
+
+  const [paymentMethods, paymentCurrencies] = await Promise.all([
+    PaymentMethod.findAll({ where }),
+    PaymentCurrency.findAll({ where }),
+  ]);
+
+  const promises: Promise<any>[] = [];
+
+  const updateLogo = (item: PaymentMethod | PaymentCurrency) => {
+    const { logo } = item;
+    if (/\/methods\/(stripe|arcblock|ethereum)\.png$/.test(logo)) {
+      const newLogo = getUrl(logo.replace(/^.*?(\/methods\/.*)$/, '$1'));
+      promises.push((item as any).update({ logo: newLogo }));
+    }
+  };
+
+  paymentMethods.forEach(updateLogo);
+  paymentCurrencies.forEach(updateLogo);
+
+  try {
+    await Promise.all(promises);
+  } catch (error) {
+    logger.error('syncCurrency error', error);
+  }
+}

package/api/src/hooks/pre-start.ts

@@ -6,6 +6,7 @@ import { ensurePaymentStats } from '../crons/payment-stat';
 import { initPaywallResources } from '../libs/resource';
 import { initialize } from '../store/models';
 import { sequelize } from '../store/sequelize';
+import { syncCurrencyLogo } from '../crons/currency';
 
 dotenv.config({ silent: true });
 
@@ -14,6 +15,7 @@ dotenv.config({ silent: true });
     initialize(sequelize);
     await initPaywallResources();
     await ensurePaymentStats();
+    await syncCurrencyLogo();
     process.exit(0);
   } catch (err) {
     console.error('pre-start error', err);

package/api/src/index.ts

@@ -11,6 +11,7 @@ import morgan from 'morgan';
 
 // eslint-disable-next-line import/no-extraneous-dependencies
 import { xss } from '@blocklet/xss';
+import { csrf } from '@blocklet/sdk/lib/middlewares';
 
 import crons from './crons/index';
 import { ensureStakedForGas } from './integrations/arcblock/stake';
@@ -57,6 +58,7 @@ app.use((req, res, next) => {
 app.use(express.urlencoded({ extended: true, limit: '1 mb' }));
 app.use(cors());
 app.use(xss({ allowedKeys: [] }));
+app.use(csrf());
 app.use(ensureI18n());
 
 const router = express.Router();

package/api/src/libs/notification/template/customer-reward-succeeded.ts

@@ -44,6 +44,7 @@ interface CustomerRewardSucceededEmailTemplateContext {
         title: string;
         appDID: string;
         logo?: string;
+        desc?: string;
       }[]
     | null;
   donationSettings: DonationSettings;
@@ -187,6 +188,7 @@ export class CustomerRewardSucceededEmailTemplate
         title: string;
         appDID: string;
         logo?: string;
+        desc?: string;
       }[]
     | null
   > {
@@ -215,6 +217,7 @@ export class CustomerRewardSucceededEmailTemplate
             ? joinURL(process.env.BLOCKLET_APP_URL, users[index]?.user?.avatar as string)
             : '',
         appDID: x.address,
+        desc: '',
       };
     });
 
@@ -296,6 +299,13 @@ export class CustomerRewardSucceededEmailTemplate
                 text: translate('notification.common.rewardDetail', locale),
               },
             },
+            {
+              type: 'text',
+              data: {
+                type: 'plain',
+                text: ' ', // TODO: ios bug fix, wait for next release
+              },
+            },
           ].filter(Boolean),
         },
         ...(rewardDetail

package/api/src/libs/notification/template/subscription-will-renew.ts

@@ -100,11 +100,14 @@ export class SubscriptionWillRenewEmailTemplate
     // paymentDetail.price = +amount;
 
     const paymentAmount = await getPaymentAmountForCycleSubscription(subscription, paymentCurrency);
-    const paymentDetail = { price: paymentAmount, balance: 0, symbol: paymentCurrency.symbol };
+    const paymentDetail = { price: paymentAmount, balance: 0, symbol: paymentCurrency.symbol, balanceFormatted: '0' };
 
     const token = await getTokenSummaryByDid(userDid, customer.livemode);
 
-    paymentDetail.balance = +fromUnitToToken(token?.[paymentCurrency.id] || '0', paymentCurrency.decimal);
+    const balance = fromUnitToToken(token?.[paymentCurrency.id] || '0', paymentCurrency.decimal);
+    paymentDetail.balanceFormatted = balance;
+    paymentDetail.balance = +balance;
+
     const { isPrePaid, interval } = await this.getPaymentCategory({
       subscriptionId: subscription.id,
     });
@@ -173,9 +176,10 @@ export class SubscriptionWillRenewEmailTemplate
 
     const lineItemExpanded = await Price.expand(subscriptionItems);
     const metered = lineItemExpanded.find((lineItem) => lineItem.price.recurring?.usage_type === 'metered');
+    const recurringItems = lineItemExpanded.filter((lineItem) => lineItem.price.type === 'recurring');
 
     const isPrePaid = !metered;
-    const interval = metered?.price.recurring?.interval;
+    const interval = recurringItems?.[0]?.price.recurring?.interval;
 
     return {
       isPrePaid,
@@ -269,7 +273,7 @@ export class SubscriptionWillRenewEmailTemplate
               at,
               productName,
               willRenewDuration,
-              balance: `${paymentDetail.balance} ${paymentDetail.symbol}`,
+              balance: `${paymentDetail.balanceFormatted} ${paymentDetail.symbol}`,
             })}`
           : `${translate('notification.subscriptionWillRenew.unableToPayBody', locale, {
               at,
@@ -326,25 +330,28 @@ export class SubscriptionWillRenewEmailTemplate
                 text: paymentInfo,
               },
             },
-            {
-              type: 'text',
-              data: {
-                type: 'plain',
-                color: '#9397A1',
-                text: translate('notification.common.currentBalance', locale),
-              },
-            },
-            {
-              type: 'text',
-              data: {
-                type: 'plain',
-                ...(!canPay &&
-                  !isStripe && {
-                    color: '#FF0000',
-                  }),
-                text: `${paymentDetail.balance} ${paymentDetail.symbol}`,
-              },
-            },
+            ...(!isStripe
+              ? [
+                  {
+                    type: 'text',
+                    data: {
+                      type: 'plain',
+                      color: '#9397A1',
+                      text: translate('notification.common.currentBalance', locale),
+                    },
+                  },
+                  {
+                    type: 'text',
+                    data: {
+                      type: 'plain',
+                      ...(!canPay && {
+                        color: '#FF0000',
+                      }),
+                      text: `${paymentDetail.balanceFormatted} ${paymentDetail.symbol}`,
+                    },
+                  },
+                ]
+              : []),
             ...(!canPay && !isStripe
               ? [
                   {
@@ -368,7 +375,6 @@ export class SubscriptionWillRenewEmailTemplate
                   },
                 ]
               : []),
-
             {
               type: 'text',
               data: {

package/api/src/libs/payment.ts

@@ -185,6 +185,7 @@ export interface PaymentDetail {
   balance: number;
   price: number;
   symbol: LiteralUnion<'ABT' | 'USD', string>;
+  balanceFormatted?: string;
 }
 export async function getPaymentDetail(
   userDid: string,

package/api/src/routes/invoices.ts

@@ -134,13 +134,14 @@ router.get('/', authMine, async (req, res) => {
             const client = method.getOcapClient();
             const { address } = subscription.payment_details.arcblock.staking;
             const { state } = await client.getStakeState({ address });
-            const last =
-              list[list.length - 1] ||
-              (await Invoice.findOne({ where: { subscription_id: subscription.id }, order: [['created_at', 'ASC']] }));
-
-            if (state && last) {
+            const firstInvoice = await Invoice.findOne({
+              where: { subscription_id: subscription.id },
+              order: [['created_at', 'ASC']],
+            });
+            const last = query.o === 'asc' ? list?.[list.length - 1] : list?.[0];
+            if (state && firstInvoice) {
               const data = JSON.parse(state.data?.value || '{}');
-              const customer = await Customer.findByPk(last.customer_id);
+              const customer = await Customer.findByPk(firstInvoice.customer_id);
               const currency = await PaymentCurrency.findOne({
                 where: { payment_method_id: method.id, is_base_currency: true },
               });
@@ -178,7 +179,7 @@ router.get('/', authMine, async (req, res) => {
                 amount_due: '0',
                 amount_paid: stakeAmount,
                 amount_remaining: '0',
-                ...pick(last, [
+                ...pick(firstInvoice, [
                   'number',
                   'paid',
                   'auto_advance',

package/api/src/routes/prices.ts

@@ -305,7 +305,7 @@ router.put('/:id', auth, async (req, res) => {
     pick(
       req.body,
       locked
-        ? ['nickname', 'description', 'metadata', 'currency_options', 'upsell', ...quantityKeys]
+        ? ['nickname', 'description', 'metadata', 'currency_options', 'upsell', 'lookup_key', ...quantityKeys]
         : ['type', 'model', 'active', 'livemode', 'nickname', 'recurring', 'description', 'tiers', 'unit_amount', 'transform_quantity', 'metadata', 'lookup_key', 'currency_options', 'upsell', ...quantityKeys] // prettier-ignore
     )
   );

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.7",
+  "version": "1.15.9",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -42,7 +42,7 @@
     ]
   },
   "dependencies": {
-    "@abtnode/cron": "1.16.30",
+    "@abtnode/cron": "^1.16.31",
     "@arcblock/did": "^1.18.135",
     "@arcblock/did-auth-storage-nedb": "^1.7.1",
     "@arcblock/did-connect": "^2.10.33",
@@ -50,12 +50,12 @@
     "@arcblock/jwt": "^1.18.135",
     "@arcblock/ux": "^2.10.33",
     "@arcblock/validator": "^1.18.135",
-    "@blocklet/js-sdk": "1.16.30",
-    "@blocklet/logger": "1.16.30",
-    "@blocklet/payment-react": "1.15.7",
-    "@blocklet/sdk": "1.16.30",
+    "@blocklet/js-sdk": "^1.16.31",
+    "@blocklet/logger": "^1.16.31",
+    "@blocklet/payment-react": "1.15.9",
+    "@blocklet/sdk": "^1.16.31",
     "@blocklet/ui-react": "^2.10.33",
-    "@blocklet/uploader": "^0.1.35",
+    "@blocklet/uploader": "^0.1.36",
     "@blocklet/xss": "^0.1.7",
     "@mui/icons-material": "^5.16.6",
     "@mui/lab": "^5.0.0-alpha.173",
@@ -116,9 +116,9 @@
     "validator": "^13.12.0"
   },
   "devDependencies": {
-    "@abtnode/types": "1.16.30",
+    "@abtnode/types": "^1.16.31",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.15.7",
+    "@blocklet/payment-types": "1.15.9",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "9aae61000ca85dc8199f750e3989d756a8747307"
+  "gitHead": "d2919fe52ba2b7aee1c6c1275c325f91b81027da"
 }

package/src/components/product/create.tsx

@@ -29,7 +29,7 @@ export default function CreateProduct({
       name: '',
       description: '',
       images: [],
-      statement_descriptor: window.blocklet.appName,
+      statement_descriptor: '',
       unit_label: '',
       features: [],
       prices: [{ ...DEFAULT_PRICE, currency_id: settings.baseCurrency.id }],
@@ -47,7 +47,7 @@ export default function CreateProduct({
 
   const onCreate = (data: Product) => {
     setState({ loading: true });
-    api
+    return api
       .post('/api/products', data)
       .then(() => {
         Toast.success(t('admin.product.saved'));

package/src/contexts/products.tsx

@@ -15,7 +15,7 @@ const { Provider, Consumer } = ProductsContext;
 
 const getProducts = async (): Promise<TProductExpanded[]> => {
   // FIXME: pagination here
-  const { data } = await api.get('/api/products?active=true&page=1&pageSize=100');
+  const { data } = await api.get('/api/products?active=true&page=1&pageSize=100&donation=hide');
   return data.list || [];
 };
 

package/src/pages/customer/index.tsx

@@ -116,7 +116,7 @@ export default function CustomerHome() {
 
   useEffect(() => {
     runAsync();
-    events.once('switch-did', () => {
+    events.on('switch-did', () => {
       runAsync();
     });
   }, []);

package/src/pages/customer/invoice/past-due.tsx

@@ -30,7 +30,7 @@ export default function CustomerInvoicePastDue() {
   const { loading, error, data, runAsync } = useRequest(fetchData);
 
   useEffect(() => {
-    events.once('switch-did', () => {
+    events.on('switch-did', () => {
       runAsync().catch(console.error);
     });
   }, []);

package/src/pages/customer/subscription/change-payment.tsx

@@ -281,6 +281,7 @@ function CustomerSubscriptionChangePayment({ subscription, customer, onComplete
           mode="setup"
           onConfirm={onStripeConfirm}
           onCancel={onStripeCancel}
+          returnUrl={window.location.href.replace(/\/[^/]+$/, '')}
         />
       )}
     </Root>

package/src/pages/customer/subscription/embed.tsx

@@ -60,16 +60,21 @@ export default function SubscriptionEmbed() {
   const authToken = params.get('authToken') || '';
   const defaultPageSize = useDefaultPageSize(20);
   const { data: subscription, error, loading } = useRequest(() => fetchSubscriptionData(subscriptionId, authToken));
-  const { data } = useRequest(() =>
-    fetchInvoiceData({
-      page: 1,
-      pageSize: defaultPageSize,
-      status: 'open,paid,uncollectible',
-      subscription_id: subscriptionId,
-      authToken,
-      ignore_zero: true,
-      include_staking: true,
-    })
+  const { data } = useRequest(
+    () =>
+      fetchInvoiceData({
+        page: 1,
+        pageSize: defaultPageSize,
+        status: 'open,paid,uncollectible',
+        subscription_id: subscriptionId,
+        authToken,
+        ignore_zero: true,
+        include_staking: true,
+        customer_id: subscription?.customer_id,
+      }),
+    {
+      refreshDeps: [subscriptionId, authToken, subscription?.customer_id],
+    }
   );
 
   const subscriptionPageUrl: string = useMemo(() => {