payment-kit 1.13.294 → 1.13.296

package/api/src/routes/connect/pay.ts

@@ -28,7 +28,7 @@ export default {
     const { checkoutSessionId, connectedDid } = extraParams;
     const { paymentIntent, paymentCurrency, paymentMethod } = await ensurePaymentIntent(
       checkoutSessionId,
-      userDid || connectedDid
+      connectedDid || userDid
     );
     if (!paymentIntent) {
       throw new Error('Payment intent not found');
@@ -88,7 +88,7 @@ export default {
     const { checkoutSessionId, connectedDid } = extraParams;
     const { checkoutSession, customer, paymentIntent, paymentMethod } = await ensurePaymentIntent(
       checkoutSessionId,
-      userDid || connectedDid
+      connectedDid || userDid
     );
     if (!paymentIntent) {
       throw new Error('Payment intent not found');

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.294",
+  "version": "1.13.296",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -52,7 +52,7 @@
     "@arcblock/validator": "^1.18.124",
     "@blocklet/js-sdk": "1.16.28",
     "@blocklet/logger": "1.16.28",
-    "@blocklet/payment-react": "1.13.294",
+    "@blocklet/payment-react": "1.13.296",
     "@blocklet/sdk": "1.16.28",
     "@blocklet/ui-react": "^2.10.3",
     "@blocklet/uploader": "^0.1.18",
@@ -118,7 +118,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.28",
     "@arcblock/eslint-config-ts": "^0.3.2",
-    "@blocklet/payment-types": "1.13.294",
+    "@blocklet/payment-types": "1.13.296",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/debug": "^4.1.12",
@@ -158,5 +158,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "94e507a512252badd0ee5b537cba5a1d52cc061b"
+  "gitHead": "e0f0556ce4ed8833464248e00250c09dbde2c5a9"
 }

package/src/components/price/form.tsx

@@ -112,7 +112,9 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
             <FormLabel>{t('admin.price.model')}</FormLabel>
             <Select {...field} fullWidth size="small">
               <MenuItem value="standard">{t('admin.price.models.standard')}</MenuItem>
-              <MenuItem value="package">{t('admin.price.models.package')}</MenuItem>
+              <MenuItem value="package" disabled>
+                {t('admin.price.models.package')}
+              </MenuItem>
               <MenuItem value="graduated" disabled>
                 {t('admin.price.models.graduated')}
               </MenuItem>

package/src/components/product/cross-sell-select.tsx

@@ -1,7 +1,8 @@
+import { useState } from 'react';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { usePaymentContext } from '@blocklet/payment-react';
 import type { TProductExpanded } from '@blocklet/payment-types';
-import { MenuItem, Select, Stack, Typography } from '@mui/material';
+import { FormControl, MenuItem, Select, Stack, Typography } from '@mui/material';
 
 import { useProductsContext } from '../../contexts/products';
 import { formatProductPrice } from '../../libs/util';
@@ -10,42 +11,47 @@ import InfoCard from '../info-card';
 type Props = {
   data: TProductExpanded;
   onSelect: Function;
+  valid: boolean;
 };
 
-export default function CrossSellSelect({ data, onSelect }: Props) {
+export default function CrossSellSelect({ data, onSelect, valid }: Props) {
   const { t, locale } = useLocaleContext();
   const { products } = useProductsContext();
   const { settings } = usePaymentContext();
+  const [value, setValue] = useState('empty');
 
   const onSelectPrice = (e: any) => {
     if (e.target.value && e.target.value !== 'empty') {
+      setValue(e.target.value);
       onSelect(e.target.value);
     }
   };
 
   return (
-    <Select
-      value="empty"
-      sx={{ width: 300 }}
-      size="small"
-      onChange={onSelectPrice}
-      MenuProps={{ style: { maxHeight: 480 } }}>
-      <MenuItem value="empty">
-        <Stack direction="row" alignItems="center">
-          <Typography>{t('admin.product.find')}</Typography>
-        </Stack>
-      </MenuItem>
-      {products
-        .filter((x) => x.id !== data.id)
-        .map((x) => (
-          <MenuItem key={x.id} value={x.id}>
-            <InfoCard
-              name={x.name}
-              description={formatProductPrice(x as any, settings.baseCurrency, locale)}
-              logo={x.images[0]}
-            />
-          </MenuItem>
-        ))}
-    </Select>
+    <FormControl error={!valid}>
+      <Select
+        value={value}
+        sx={{ minWidth: 300 }}
+        size="small"
+        onChange={onSelectPrice}
+        MenuProps={{ style: { maxHeight: 480 } }}>
+        <MenuItem value="empty">
+          <Stack direction="row" alignItems="center">
+            <Typography>{t('admin.product.find')}</Typography>
+          </Stack>
+        </MenuItem>
+        {products
+          .filter((x) => x.id !== data.id)
+          .map((x: TProductExpanded) => (
+            <MenuItem key={x.id} value={x.id}>
+              <InfoCard
+                name={x.name}
+                description={formatProductPrice(x as any, settings.baseCurrency, locale)}
+                logo={x.images[0]}
+              />
+            </MenuItem>
+          ))}
+      </Select>
+    </FormControl>
   );
 }

package/src/components/product/cross-sell.tsx

@@ -3,21 +3,23 @@ import Toast from '@arcblock/ux/lib/Toast';
 import { api, formatError, usePaymentContext } from '@blocklet/payment-react';
 import type { TProductExpanded } from '@blocklet/payment-types';
 import { DeleteOutlineOutlined } from '@mui/icons-material';
-import { CircularProgress, Grid, IconButton, Stack } from '@mui/material';
+import { CircularProgress, Grid, IconButton, Stack, Typography } from '@mui/material';
 import { useSetState } from 'ahooks';
-
-import { ProductsProvider } from '../../contexts/products';
-import { formatProductPrice } from '../../libs/util';
+import { useState } from 'react';
+import { ProductsProvider, useProductsContext } from '../../contexts/products';
+import { formatProductPrice, isProductCurrenciesMatched } from '../../libs/util';
 import InfoCard from '../info-card';
 import InfoRow from '../info-row';
 import CrossSellSelect from './cross-sell-select';
 
 export function CrossSellForm({ data, onChange }: { data: TProductExpanded; onChange: Function }) {
-  const { locale } = useLocaleContext();
+  const { locale, t } = useLocaleContext();
   const { settings } = usePaymentContext();
   const [state, setState] = useSetState({
     loading: false,
   });
+  const { products } = useProductsContext();
+  const [crossSellErr, setCrossSellErr] = useState(false);
 
   const onRemoveUpsell = async () => {
     try {
@@ -34,6 +36,14 @@ export function CrossSellForm({ data, onChange }: { data: TProductExpanded; onCh
 
   const onSelectUpsell = async (id: string) => {
     try {
+      const upsellProduct = products.find((x) => x.id === id);
+      if (!upsellProduct) {
+        throw new Error('no product found');
+      }
+      if (!isProductCurrenciesMatched(upsellProduct, data)) {
+        setCrossSellErr(true);
+        return;
+      }
       setState({ loading: true });
       await api.put(`/api/products/${data.id}`, { cross_sell: { cross_sells_to_id: id } }).then((res) => res.data);
       setState({ loading: false });
@@ -65,7 +75,12 @@ export function CrossSellForm({ data, onChange }: { data: TProductExpanded; onCh
     );
   }
 
-  return <CrossSellSelect data={data} onSelect={onSelectUpsell} />;
+  return (
+    <>
+      <CrossSellSelect data={data} onSelect={onSelectUpsell} valid={!crossSellErr} />
+      {crossSellErr && <Typography color="error">{t('admin.product.currencyNotAligned')}</Typography>}
+    </>
+  );
 }
 
 export default function ProductCrossSell({ data, onChange }: { data: TProductExpanded; onChange: Function }) {

package/src/libs/util.ts

@@ -76,6 +76,25 @@ export function getWebhookStatusColor(status: string) {
   }
 }
 
+export function getDefaultPriceCurrencyIdsFromProduct(product: TProductExpanded): string[] {
+  return (
+    product.prices.find((price) => price.id === product.default_price_id)?.currency_options.map((x) => x.currency_id) ||
+    []
+  );
+}
+
+// Checks if the currencies of the products in the list match up to a certain index
+export function isProductCurrenciesMatched(productA: TProductExpanded, productB: TProductExpanded): boolean {
+  const currenciesA = getDefaultPriceCurrencyIdsFromProduct(productA);
+
+  const currenciesB = getDefaultPriceCurrencyIdsFromProduct(productB);
+
+  return (
+    currenciesA.every((currencyId) => currenciesB.includes(currencyId)) &&
+    currenciesB.every((currencyId) => currenciesA.includes(currencyId))
+  );
+}
+
 export function isPriceCurrencyAligned(list: LineItem[], products: TProductExpanded[], index: number) {
   const prices = list.map((x) => {
     const product = getProductByPriceId(products, x.price_id);

package/src/locales/en.tsx

@@ -64,6 +64,7 @@ export default flat({
       archivedTip:
         'This product can’t be added to new invoices, subscriptions, payment links, or pricing tables. Any existing subscriptions with this product remain active until canceled and any existing payment links or pricing tables are deactivated.',
       locked: 'This product is locked because at least one of its prices is used by a subscription or a payment.',
+      currencyNotAligned: 'all prices must have the same currency settings',
       image: {
         label: 'Image',
         add: 'Add image',

package/src/locales/zh.tsx

@@ -63,6 +63,7 @@ export default flat({
       archivedTip:
         '此产品无法添加到新的账单、订阅、支付链接或定价表。具有此产品的任何现有订阅将保持活动状态，直到取消，任何现有的支付链接或定价表将被停用。',
       locked: '此产品已锁定，因为至少有一个价格用于订阅或支付。',
+      currencyNotAligned: '所有价格必须具有相同的货币设置',
       image: {
         label: '图片',
         add: '添加图片',