payment-kit 1.15.5 → 1.15.7

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

@@ -1,6 +1,7 @@
-import { Customer } from '@api/store/models';
 import notification from '@blocklet/sdk/service/notification';
 
+import { Customer } from '../../store/models';
+
 import logger from '../../libs/logger';
 
 const handleUserUpdate = async ({ user }: { user: any }) => {

package/api/src/libs/invoice.ts

@@ -2,8 +2,8 @@ import { component } from '@blocklet/sdk';
 import type { LiteralUnion } from 'type-fest';
 import { withQuery } from 'ufo';
 
-import { Invoice, InvoiceItem, PaymentCurrency, Price, Product } from '@api/store/models';
 import { fromUnitToToken } from '@ocap/util';
+import { Invoice, InvoiceItem, PaymentCurrency, Price, Product } from '../store/models';
 import { getConnectQueryParam } from './util';
 import { expandLineItems } from './session';
 

package/api/src/libs/notification/template/subscription-renewed.ts

@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/indent */
 import { fromUnitToToken, toDid } from '@ocap/util';
 import prettyMsI18n from 'pretty-ms-i18n';
-import logger from '@api/libs/logger';
+import logger from '../../logger';
 import { getUserLocale } from '../../../integrations/blocklet/notification';
 import { translate } from '../../../locales';
 import {

package/api/src/libs/notification/template/subscription-succeeded.ts

@@ -4,7 +4,7 @@ import pWaitFor from 'p-wait-for';
 import prettyMsI18n from 'pretty-ms-i18n';
 import isEmpty from 'lodash/isEmpty';
 
-import { getPaymentAmountForCycleSubscription } from '@api/libs/payment';
+import { getPaymentAmountForCycleSubscription } from '../../payment';
 import { getUserLocale } from '../../../integrations/blocklet/notification';
 import { translate } from '../../../locales';
 import {
@@ -14,9 +14,9 @@ import {
   PaymentIntent,
   PaymentMethod,
   Subscription,
+  PaymentCurrency,
+  Invoice,
 } from '../../../store/models';
-import { Invoice } from '../../../store/models/invoice';
-import { PaymentCurrency } from '../../../store/models/payment-currency';
 import { getCustomerInvoicePageUrl, getOneTimeProductInfo } from '../../invoice';
 import { getMainProductName } from '../../product';
 import { getCustomerSubscriptionPageUrl } from '../../subscription';

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

@@ -4,11 +4,10 @@ import { fromUnitToToken } from '@ocap/util';
 import type { ManipulateType } from 'dayjs';
 import prettyMsI18n from 'pretty-ms-i18n';
 
-import { getTokenSummaryByDid } from '@api/integrations/arcblock/stake';
+import { getTokenSummaryByDid } from '../../../integrations/arcblock/stake';
 import { getUserLocale } from '../../../integrations/blocklet/notification';
 import { translate } from '../../../locales';
-import { Customer, PaymentMethod, Subscription } from '../../../store/models';
-import { PaymentCurrency } from '../../../store/models/payment-currency';
+import { Customer, PaymentMethod, Subscription, PaymentCurrency } from '../../../store/models';
 import { PaymentDetail, getPaymentAmountForCycleSubscription } from '../../payment';
 import { getMainProductName } from '../../product';
 import { getCustomerSubscriptionPageUrl } from '../../subscription';

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

@@ -5,12 +5,19 @@ import dayjs from 'dayjs';
 import prettyMsI18n from 'pretty-ms-i18n';
 import type { LiteralUnion } from 'type-fest';
 
-import { getTokenSummaryByDid } from '@api/integrations/arcblock/stake';
 import { fromUnitToToken } from '@ocap/util';
+import { getTokenSummaryByDid } from '../../../integrations/arcblock/stake';
 import { getUserLocale } from '../../../integrations/blocklet/notification';
 import { translate } from '../../../locales';
-import { Customer, Invoice, PaymentMethod, Price, Subscription, SubscriptionItem } from '../../../store/models';
-import { PaymentCurrency } from '../../../store/models/payment-currency';
+import {
+  Customer,
+  Invoice,
+  PaymentMethod,
+  Price,
+  Subscription,
+  SubscriptionItem,
+  PaymentCurrency,
+} from '../../../store/models';
 import { getPaymentAmountForCycleSubscription, type PaymentDetail } from '../../payment';
 import { getMainProductName } from '../../product';
 import { getCustomerSubscriptionPageUrl } from '../../subscription';

package/api/src/libs/payment.ts

@@ -357,10 +357,22 @@ export async function getPaymentAmountForCycleSubscription(
   paymentCurrency: PaymentCurrency
 ) {
   const subscriptionItems = await SubscriptionItem.findAll({ where: { subscription_id: subscription.id } });
+  if (subscriptionItems.length === 0) {
+    logger.info('subscription items not found in getPaymentAmountForCycleSubscription', {
+      subscription: subscription.id,
+    });
+    return 0;
+  }
   let expandedItems = await Price.expand(
     subscriptionItems.map((x) => ({ id: x.id, price_id: x.price_id, quantity: x.quantity })),
     { product: true }
   );
+  if (expandedItems.length === 0) {
+    logger.info('expanded items not found in getPaymentAmountForCycleSubscription', {
+      subscription: subscription.id,
+    });
+    return 0;
+  }
   const previousPeriodEnd =
     subscription.status === 'trialing' ? subscription.trial_end : subscription.current_period_end;
   const setup = getSubscriptionCycleSetup(subscription.pending_invoice_item_interval, previousPeriodEnd as number);
@@ -375,7 +387,7 @@ export async function getPaymentAmountForCycleSubscription(
           start: setup.period.start - setup.cycle / 1000,
           end: setup.period.end - setup.cycle / 1000,
           method: x.price.recurring?.aggregate_usage,
-          dryRun: false,
+          dryRun: true,
         });
         x.quantity = x.price.transformQuantity(rawQuantity);
         // record raw quantity in metadata

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

@@ -13,7 +13,7 @@ import sortBy from 'lodash/sortBy';
 import uniq from 'lodash/uniq';
 import type { WhereOptions } from 'sequelize';
 
-import { MetadataSchema } from '@api/libs/api';
+import { MetadataSchema } from '../libs/api';
 import { checkPassportForPaymentLink } from '../integrations/blocklet/passport';
 import { handleStripePaymentSucceed } from '../integrations/stripe/handlers/payment-intent';
 import { handleStripeSubscriptionSucceed } from '../integrations/stripe/handlers/subscription';

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.15.5",
+  "version": "1.15.7",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@arcblock/validator": "^1.18.135",
     "@blocklet/js-sdk": "1.16.30",
     "@blocklet/logger": "1.16.30",
-    "@blocklet/payment-react": "1.15.5",
+    "@blocklet/payment-react": "1.15.7",
     "@blocklet/sdk": "1.16.30",
     "@blocklet/ui-react": "^2.10.33",
     "@blocklet/uploader": "^0.1.35",
@@ -118,7 +118,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.30",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.15.5",
+    "@blocklet/payment-types": "1.15.7",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -160,5 +160,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "013d9fb8161d6021b66da18916f49242dc156580"
+  "gitHead": "9aae61000ca85dc8199f750e3989d756a8747307"
 }

package/src/components/filter-toolbar.tsx

@@ -128,7 +128,7 @@ function SearchStatus({
           <Add sx={{ color: 'text.secondary', cursor: 'pointer', fontSize: '1.2rem' }} />
         )}
         {t('common.status')}
-        <span>{search!.status}</span>
+        <span>{formatStatus ? formatStatus(search!.status) : search!.status}</span>
       </Button>
       <Menu
         anchorEl={show}