@blocklet/payment-react 1.14.34 → 1.14.37

package/es/payment/index.js

@@ -9,6 +9,7 @@ import { fromTokenToUnit } from "@ocap/util";
 import { useSetState } from "ahooks";
 import { useEffect, useState } from "react";
 import { FormProvider, useForm, useWatch } from "react-hook-form";
+import trim from "lodash/trim";
 import { usePaymentContext } from "../contexts/payment.js";
 import api from "../libs/api.js";
 import { findCurrency, formatError, getStatementDescriptor, isMobileSafari, isValidCountry } from "../libs/util.js";
@@ -145,14 +146,21 @@ function PaymentInner({
     setState({ checkoutSession: result.checkoutSession });
     onPaid(result);
   };
+  let trialInDays = Number(state.checkoutSession?.subscription_data?.trial_period_days || 0);
+  let trialEnd = Number(state.checkoutSession?.subscription_data?.trial_end || 0);
+  const trialCurrencyIds = (state.checkoutSession?.subscription_data?.trial_currency || "").split(",").map(trim).filter(Boolean);
+  if (trialCurrencyIds.length > 0 && trialCurrencyIds.includes(currencyId) === false) {
+    trialInDays = 0;
+    trialEnd = 0;
+  }
   return /* @__PURE__ */ jsx(FormProvider, { ...methods, children: /* @__PURE__ */ jsxs(Stack, { className: "cko-container", sx: { gap: { sm: mode === "standalone" ? 0 : mode === "inline" ? 4 : 8 } }, children: [
     !hideSummaryCard && /* @__PURE__ */ jsx(Fade, { in: true, children: /* @__PURE__ */ jsxs(Stack, { className: "base-card cko-overview", direction: "column", children: [
       /* @__PURE__ */ jsx(
         PaymentSummary,
         {
           items: state.checkoutSession.line_items,
-          trialInDays: state.checkoutSession.subscription_data?.trial_period_days || 0,
-          trialEnd: state.checkoutSession.subscription_data?.trial_end || 0,
+          trialInDays,
+          trialEnd,
           billingThreshold: Math.max(
             state.checkoutSession.subscription_data?.billing_threshold_amount || 0,
             // @ts-ignore

package/es/payment/summary.js

@@ -54,24 +54,27 @@ function getStakingSetup(items, currency, billingThreshold = 0) {
     licensed: new BN(0),
     metered: new BN(0)
   };
-  items.forEach((x) => {
-    const price = x.upsell_price || x.price;
-    const unit = getPriceUintAmountByCurrency(price, currency);
-    const amount = new BN(unit).mul(new BN(x.quantity));
-    if (price.type === "recurring" && price.recurring) {
-      if (price.recurring.usage_type === "licensed") {
-        staking.licensed = staking.licensed.add(amount);
-      }
-      if (price.recurring.usage_type === "metered") {
-        if (+billingThreshold) {
-          staking.metered = fromTokenToUnit(billingThreshold, currency.decimal);
-        } else {
+  const recurringItems = items.map((x) => x.upsell_price || x.price).filter((x) => x.type === "recurring" && x.recurring);
+  if (recurringItems.length > 0) {
+    if (+billingThreshold) {
+      return fromTokenToUnit(billingThreshold, currency.decimal).toString();
+    }
+    items.forEach((x) => {
+      const price = x.upsell_price || x.price;
+      const unit = getPriceUintAmountByCurrency(price, currency);
+      const amount = new BN(unit).mul(new BN(x.quantity));
+      if (price.type === "recurring" && price.recurring) {
+        if (price.recurring.usage_type === "licensed") {
+          staking.licensed = staking.licensed.add(amount);
+        }
+        if (price.recurring.usage_type === "metered") {
           staking.metered = staking.metered.add(amount);
         }
       }
-    }
-  });
-  return staking.licensed.add(staking.metered).toString();
+    });
+    return staking.licensed.add(staking.metered).toString();
+  }
+  return "0";
 }
 PaymentSummary.defaultProps = {
   onUpsell: noop,

package/lib/payment/index.js

@@ -16,6 +16,7 @@ var _util = require("@ocap/util");
 var _ahooks = require("ahooks");
 var _react = require("react");
 var _reactHookForm = require("react-hook-form");
+var _trim = _interopRequireDefault(require("lodash/trim"));
 var _payment = require("../contexts/payment");
 var _api = _interopRequireDefault(require("../libs/api"));
 var _util2 = require("../libs/util");
@@ -195,6 +196,13 @@ function PaymentInner({
     });
     onPaid(result);
   };
+  let trialInDays = Number(state.checkoutSession?.subscription_data?.trial_period_days || 0);
+  let trialEnd = Number(state.checkoutSession?.subscription_data?.trial_end || 0);
+  const trialCurrencyIds = (state.checkoutSession?.subscription_data?.trial_currency || "").split(",").map(_trim.default).filter(Boolean);
+  if (trialCurrencyIds.length > 0 && trialCurrencyIds.includes(currencyId) === false) {
+    trialInDays = 0;
+    trialEnd = 0;
+  }
   return /* @__PURE__ */(0, _jsxRuntime.jsx)(_reactHookForm.FormProvider, {
     ...methods,
     children: /* @__PURE__ */(0, _jsxRuntime.jsxs)(_material.Stack, {
@@ -211,8 +219,8 @@ function PaymentInner({
           direction: "column",
           children: [/* @__PURE__ */(0, _jsxRuntime.jsx)(_summary.default, {
             items: state.checkoutSession.line_items,
-            trialInDays: state.checkoutSession.subscription_data?.trial_period_days || 0,
-            trialEnd: state.checkoutSession.subscription_data?.trial_end || 0,
+            trialInDays,
+            trialEnd,
             billingThreshold: Math.max(state.checkoutSession.subscription_data?.billing_threshold_amount || 0,
             // @ts-ignore
             state.checkoutSession.subscription_data?.min_stake_amount || 0),

package/lib/payment/summary.js

@@ -61,24 +61,27 @@ function getStakingSetup(items, currency, billingThreshold = 0) {
     licensed: new _util.BN(0),
     metered: new _util.BN(0)
   };
-  items.forEach(x => {
-    const price = x.upsell_price || x.price;
-    const unit = (0, _util2.getPriceUintAmountByCurrency)(price, currency);
-    const amount = new _util.BN(unit).mul(new _util.BN(x.quantity));
-    if (price.type === "recurring" && price.recurring) {
-      if (price.recurring.usage_type === "licensed") {
-        staking.licensed = staking.licensed.add(amount);
-      }
-      if (price.recurring.usage_type === "metered") {
-        if (+billingThreshold) {
-          staking.metered = (0, _util.fromTokenToUnit)(billingThreshold, currency.decimal);
-        } else {
+  const recurringItems = items.map(x => x.upsell_price || x.price).filter(x => x.type === "recurring" && x.recurring);
+  if (recurringItems.length > 0) {
+    if (+billingThreshold) {
+      return (0, _util.fromTokenToUnit)(billingThreshold, currency.decimal).toString();
+    }
+    items.forEach(x => {
+      const price = x.upsell_price || x.price;
+      const unit = (0, _util2.getPriceUintAmountByCurrency)(price, currency);
+      const amount = new _util.BN(unit).mul(new _util.BN(x.quantity));
+      if (price.type === "recurring" && price.recurring) {
+        if (price.recurring.usage_type === "licensed") {
+          staking.licensed = staking.licensed.add(amount);
+        }
+        if (price.recurring.usage_type === "metered") {
           staking.metered = staking.metered.add(amount);
         }
       }
-    }
-  });
-  return staking.licensed.add(staking.metered).toString();
+    });
+    return staking.licensed.add(staking.metered).toString();
+  }
+  return "0";
 }
 PaymentSummary.defaultProps = {
   onUpsell: _noop.default,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.14.34",
+  "version": "1.14.37",
   "description": "Reusable react components for payment kit v2",
   "keywords": [
     "react",
@@ -93,7 +93,7 @@
     "@babel/core": "^7.25.2",
     "@babel/preset-env": "^7.25.2",
     "@babel/preset-react": "^7.24.7",
-    "@blocklet/payment-types": "1.14.34",
+    "@blocklet/payment-types": "1.14.37",
     "@storybook/addon-essentials": "^7.6.20",
     "@storybook/addon-interactions": "^7.6.20",
     "@storybook/addon-links": "^7.6.20",
@@ -123,5 +123,5 @@
     "vite-plugin-babel": "^1.2.0",
     "vite-plugin-node-polyfills": "^0.21.0"
   },
-  "gitHead": "7e2c9a3dd52ccd6880ebbd08a953d93aec715dff"
+  "gitHead": "645ae0bdbab463eec878af0521eb982b51499639"
 }

package/src/payment/index.tsx

@@ -18,6 +18,7 @@ import { fromTokenToUnit } from '@ocap/util';
 import { useSetState } from 'ahooks';
 import { useEffect, useState } from 'react';
 import { FormProvider, useForm, useWatch } from 'react-hook-form';
+import trim from 'lodash/trim';
 import type { LiteralUnion } from 'type-fest';
 
 import { usePaymentContext } from '../contexts/payment';
@@ -176,6 +177,18 @@ function PaymentInner({
     onPaid(result);
   };
 
+  // trialing can be limited with trial_currency, which can be a list
+  let trialInDays = Number(state.checkoutSession?.subscription_data?.trial_period_days || 0);
+  let trialEnd = Number(state.checkoutSession?.subscription_data?.trial_end || 0);
+  const trialCurrencyIds = (state.checkoutSession?.subscription_data?.trial_currency || '')
+    .split(',')
+    .map(trim)
+    .filter(Boolean);
+  if (trialCurrencyIds.length > 0 && trialCurrencyIds.includes(currencyId) === false) {
+    trialInDays = 0;
+    trialEnd = 0;
+  }
+
   return (
     <FormProvider {...methods}>
       <Stack className="cko-container" sx={{ gap: { sm: mode === 'standalone' ? 0 : mode === 'inline' ? 4 : 8 } }}>
@@ -184,8 +197,8 @@ function PaymentInner({
             <Stack className="base-card cko-overview" direction="column">
               <PaymentSummary
                 items={state.checkoutSession.line_items}
-                trialInDays={state.checkoutSession.subscription_data?.trial_period_days || 0}
-                trialEnd={state.checkoutSession.subscription_data?.trial_end || 0}
+                trialInDays={trialInDays}
+                trialEnd={trialEnd}
                 billingThreshold={Math.max(
                   state.checkoutSession.subscription_data?.billing_threshold_amount || 0,
                   // @ts-ignore

package/src/payment/summary.tsx

@@ -100,25 +100,33 @@ function getStakingSetup(items: TLineItemExpanded[], currency: TPaymentCurrency,
     metered: new BN(0),
   };
 
-  items.forEach((x) => {
-    const price = x.upsell_price || x.price;
-    const unit = getPriceUintAmountByCurrency(price, currency);
-    const amount = new BN(unit).mul(new BN(x.quantity));
-    if (price.type === 'recurring' && price.recurring) {
-      if (price.recurring.usage_type === 'licensed') {
-        staking.licensed = staking.licensed.add(amount);
-      }
-      if (price.recurring.usage_type === 'metered') {
-        if (+billingThreshold) {
-          staking.metered = fromTokenToUnit(billingThreshold, currency.decimal);
-        } else {
+  const recurringItems = items
+    .map((x) => x.upsell_price || x.price)
+    .filter((x) => x.type === 'recurring' && x.recurring);
+
+  if (recurringItems.length > 0) {
+    if (+billingThreshold) {
+      return fromTokenToUnit(billingThreshold, currency.decimal).toString();
+    }
+
+    items.forEach((x) => {
+      const price = x.upsell_price || x.price;
+      const unit = getPriceUintAmountByCurrency(price, currency);
+      const amount = new BN(unit).mul(new BN(x.quantity));
+      if (price.type === 'recurring' && price.recurring) {
+        if (price.recurring.usage_type === 'licensed') {
+          staking.licensed = staking.licensed.add(amount);
+        }
+        if (price.recurring.usage_type === 'metered') {
           staking.metered = staking.metered.add(amount);
         }
       }
-    }
-  });
+    });
+
+    return staking.licensed.add(staking.metered).toString();
+  }
 
-  return staking.licensed.add(staking.metered).toString();
+  return '0';
 }
 
 PaymentSummary.defaultProps = {