@blocklet/payment-react 1.14.28 → 1.14.29

package/es/components/livemode.js

@@ -12,7 +12,7 @@ export default function Livemode({ color, backgroundColor, sx }) {
       sx: {
         ml: 2,
         height: 18,
-        lineHeight: 1,
+        lineHeight: 1.2,
         textTransform: "uppercase",
         fontSize: "0.8rem",
         fontWeight: "bold",

package/es/components/table.js

@@ -83,7 +83,7 @@ const Wrapped = styled(Datatable)`
   }
 
   tr.MuiTableRow-root:not(.MuiTableRow-footer):hover {
-    background: #f5f5f5;
+    background: var(--backgrounds-bg-highlight, #eff6ff);
   }
   tr.MuiTableRow-root:last-of-type td:first-of-type {
     border-bottom-left-radius: 8px;

package/es/history/invoice/list.js

@@ -94,28 +94,30 @@ const InvoiceTable = React.memo((props) => {
   );
   const columns = [
     {
-      label: t("payment.customer.invoice.invoiceNumber"),
-      name: "number",
+      label: t("common.amount"),
+      name: "total",
+      width: 60,
+      align: "right",
       options: {
         customBodyRenderLite: (_, index) => {
           const invoice = data?.list[index];
           const link = getInvoiceLink(invoice, action);
-          return /* @__PURE__ */ jsx("a", { href: link.url, target: link.external ? "_blank" : target, rel: "noreferrer", children: invoice?.number });
+          return /* @__PURE__ */ jsx("a", { href: link.url, target: link.external ? "_blank" : target, rel: "noreferrer", children: /* @__PURE__ */ jsxs(Typography, { children: [
+            formatBNStr(invoice.total, invoice.paymentCurrency.decimal),
+            "\xA0",
+            invoice.paymentCurrency.symbol
+          ] }) });
         }
       }
     },
     {
-      label: t("common.amount"),
-      name: "total",
+      label: t("payment.customer.invoice.invoiceNumber"),
+      name: "number",
       options: {
         customBodyRenderLite: (_, index) => {
           const invoice = data?.list[index];
           const link = getInvoiceLink(invoice, action);
-          return /* @__PURE__ */ jsx("a", { href: link.url, target: link.external ? "_blank" : target, rel: "noreferrer", children: /* @__PURE__ */ jsxs(Typography, { children: [
-            formatBNStr(invoice.total, invoice.paymentCurrency.decimal),
-            "\xA0",
-            invoice.paymentCurrency.symbol
-          ] }) });
+          return /* @__PURE__ */ jsx("a", { href: link.url, target: link.external ? "_blank" : target, rel: "noreferrer", children: invoice?.number });
         }
       }
     },

package/es/locales/en.js

@@ -87,7 +87,8 @@ export default flat({
     recoverFrom: "Recovered From",
     quantityLimitPerCheckout: "Exceed purchase limit",
     quantityNotEnough: "Exceed inventory",
-    amountPrecisionLimit: "Amount decimal places must be less than or equal to {precision}"
+    amountPrecisionLimit: "Amount decimal places must be less than or equal to {precision}",
+    saveAsDefaultPriceSuccess: "Set default price successfully"
   },
   payment: {
     checkout: {
@@ -226,7 +227,7 @@ export default flat({
       recover: {
         button: "Renew",
         title: "Renew your subscription",
-        description: "Your subscription will no longer be canceled, it will renew on {date}"
+        description: "Your subscription will not be canceled and will be automatically renewed on {date}, please confirm to continue"
       },
       changePlan: {
         button: "Update",

package/es/locales/zh.js

@@ -87,7 +87,8 @@ export default flat({
     recoverFrom: "\u6062\u590D\u81EA",
     quantityLimitPerCheckout: "\u8D85\u51FA\u8D2D\u4E70\u9650\u5236",
     quantityNotEnough: "\u5E93\u5B58\u4E0D\u8DB3",
-    amountPrecisionLimit: "\u91D1\u989D\u5C0F\u6570\u4F4D\u6570\u5FC5\u987B\u5728 {precision} \u4F4D\u4EE5\u5185"
+    amountPrecisionLimit: "\u91D1\u989D\u5C0F\u6570\u4F4D\u6570\u5FC5\u987B\u5728 {precision} \u4F4D\u4EE5\u5185",
+    saveAsDefaultPriceSuccess: "\u8BBE\u7F6E\u9ED8\u8BA4\u4EF7\u683C\u6210\u529F"
   },
   payment: {
     checkout: {
@@ -226,7 +227,7 @@ export default flat({
       recover: {
         button: "\u7EED\u8BA2",
         title: "\u7EED\u8BA2\u60A8\u7684\u8BA2\u9605",
-        description: "\u60A8\u7684\u8BA2\u9605\u5C06\u4E0D\u518D\u88AB\u53D6\u6D88\uFF0C\u5C06\u5728{date}\u7EED\u8BA2"
+        description: "\u60A8\u7684\u8BA2\u9605\u5C06\u4E0D\u4F1A\u88AB\u53D6\u6D88\uFF0C\u5E76\u5C06\u5728{date}\u81EA\u52A8\u7EED\u8BA2\uFF0C\u8BF7\u786E\u8BA4\u662F\u5426\u7EE7\u7EED"
       },
       changePlan: {
         button: "\u66F4\u65B0",

package/es/payment/product-card.js

@@ -24,7 +24,7 @@ export default function ProductCard({ size, variant, name, logo, description, ex
               className: "cko-ellipsis",
               variant: "body1",
               title: name,
-              sx: { fontWeight: 500, mb: 0.5, lineHeight: 1, fontSize: 16 },
+              sx: { fontWeight: 500, mb: 0.5, lineHeight: 1.2, fontSize: 16 },
               color: "text.primary",
               children: name
             }
@@ -34,7 +34,7 @@ export default function ProductCard({ size, variant, name, logo, description, ex
             {
               variant: "body1",
               title: description,
-              sx: { fontSize: "0.85rem", mb: 0.5, lineHeight: 1, textAlign: "left" },
+              sx: { fontSize: "0.85rem", mb: 0.5, lineHeight: 1.2, textAlign: "left" },
               color: "text.lighter",
               children: description
             }

package/lib/components/livemode.js

@@ -22,7 +22,7 @@ function Livemode({
     sx: {
       ml: 2,
       height: 18,
-      lineHeight: 1,
+      lineHeight: 1.2,
       textTransform: "uppercase",
       fontSize: "0.8rem",
       fontWeight: "bold",

package/lib/components/table.js

@@ -103,7 +103,7 @@ const Wrapped = (0, _system.styled)(_Datatable.default)`
   }
 
   tr.MuiTableRow-root:not(.MuiTableRow-footer):hover {
-    background: #f5f5f5;
+    background: var(--backgrounds-bg-highlight, #eff6ff);
   }
   tr.MuiTableRow-root:last-of-type td:first-of-type {
     border-bottom-left-radius: 8px;

package/lib/history/invoice/list.js

@@ -97,8 +97,10 @@ const InvoiceTable = _react.default.memo(props => {
     refreshDeps: [search]
   });
   const columns = [{
-    label: t("payment.customer.invoice.invoiceNumber"),
-    name: "number",
+    label: t("common.amount"),
+    name: "total",
+    width: 60,
+    align: "right",
     options: {
       customBodyRenderLite: (_, index) => {
         const invoice = data?.list[index];
@@ -107,13 +109,15 @@ const InvoiceTable = _react.default.memo(props => {
           href: link.url,
           target: link.external ? "_blank" : target,
           rel: "noreferrer",
-          children: invoice?.number
+          children: /* @__PURE__ */(0, _jsxRuntime.jsxs)(_material.Typography, {
+            children: [(0, _util.formatBNStr)(invoice.total, invoice.paymentCurrency.decimal), "\xA0", invoice.paymentCurrency.symbol]
+          })
         });
       }
     }
   }, {
-    label: t("common.amount"),
-    name: "total",
+    label: t("payment.customer.invoice.invoiceNumber"),
+    name: "number",
     options: {
       customBodyRenderLite: (_, index) => {
         const invoice = data?.list[index];
@@ -122,9 +126,7 @@ const InvoiceTable = _react.default.memo(props => {
           href: link.url,
           target: link.external ? "_blank" : target,
           rel: "noreferrer",
-          children: /* @__PURE__ */(0, _jsxRuntime.jsxs)(_material.Typography, {
-            children: [(0, _util.formatBNStr)(invoice.total, invoice.paymentCurrency.decimal), "\xA0", invoice.paymentCurrency.symbol]
-          })
+          children: invoice?.number
         });
       }
     }

package/lib/locales/en.js

@@ -94,7 +94,8 @@ module.exports = (0, _flat.default)({
     recoverFrom: "Recovered From",
     quantityLimitPerCheckout: "Exceed purchase limit",
     quantityNotEnough: "Exceed inventory",
-    amountPrecisionLimit: "Amount decimal places must be less than or equal to {precision}"
+    amountPrecisionLimit: "Amount decimal places must be less than or equal to {precision}",
+    saveAsDefaultPriceSuccess: "Set default price successfully"
   },
   payment: {
     checkout: {
@@ -233,7 +234,7 @@ module.exports = (0, _flat.default)({
       recover: {
         button: "Renew",
         title: "Renew your subscription",
-        description: "Your subscription will no longer be canceled, it will renew on {date}"
+        description: "Your subscription will not be canceled and will be automatically renewed on {date}, please confirm to continue"
       },
       changePlan: {
         button: "Update",

package/lib/locales/zh.js

@@ -94,7 +94,8 @@ module.exports = (0, _flat.default)({
     recoverFrom: "\u6062\u590D\u81EA",
     quantityLimitPerCheckout: "\u8D85\u51FA\u8D2D\u4E70\u9650\u5236",
     quantityNotEnough: "\u5E93\u5B58\u4E0D\u8DB3",
-    amountPrecisionLimit: "\u91D1\u989D\u5C0F\u6570\u4F4D\u6570\u5FC5\u987B\u5728 {precision} \u4F4D\u4EE5\u5185"
+    amountPrecisionLimit: "\u91D1\u989D\u5C0F\u6570\u4F4D\u6570\u5FC5\u987B\u5728 {precision} \u4F4D\u4EE5\u5185",
+    saveAsDefaultPriceSuccess: "\u8BBE\u7F6E\u9ED8\u8BA4\u4EF7\u683C\u6210\u529F"
   },
   payment: {
     checkout: {
@@ -233,7 +234,7 @@ module.exports = (0, _flat.default)({
       recover: {
         button: "\u7EED\u8BA2",
         title: "\u7EED\u8BA2\u60A8\u7684\u8BA2\u9605",
-        description: "\u60A8\u7684\u8BA2\u9605\u5C06\u4E0D\u518D\u88AB\u53D6\u6D88\uFF0C\u5C06\u5728{date}\u7EED\u8BA2"
+        description: "\u60A8\u7684\u8BA2\u9605\u5C06\u4E0D\u4F1A\u88AB\u53D6\u6D88\uFF0C\u5E76\u5C06\u5728{date}\u81EA\u52A8\u7EED\u8BA2\uFF0C\u8BF7\u786E\u8BA4\u662F\u5426\u7EE7\u7EED"
       },
       changePlan: {
         button: "\u66F4\u65B0",

package/lib/payment/product-card.js

@@ -56,7 +56,7 @@ function ProductCard({
         sx: {
           fontWeight: 500,
           mb: 0.5,
-          lineHeight: 1,
+          lineHeight: 1.2,
           fontSize: 16
         },
         color: "text.primary",
@@ -67,7 +67,7 @@ function ProductCard({
         sx: {
           fontSize: "0.85rem",
           mb: 0.5,
-          lineHeight: 1,
+          lineHeight: 1.2,
           textAlign: "left"
         },
         color: "text.lighter",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.14.28",
+  "version": "1.14.29",
   "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.28",
+    "@blocklet/payment-types": "1.14.29",
     "@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": "79178aa9251fb54006f6e0fe32a14619d1e8f06e"
+  "gitHead": "104f4189d9ef96c1e332ffa90824ebd3063c989d"
 }

package/src/components/livemode.tsx

@@ -16,7 +16,7 @@ export default function Livemode({ color, backgroundColor, sx }: Props) {
       sx={{
         ml: 2,
         height: 18,
-        lineHeight: 1,
+        lineHeight: 1.2,
         textTransform: 'uppercase',
         fontSize: '0.8rem',
         fontWeight: 'bold',

package/src/components/table.tsx

@@ -93,7 +93,7 @@ const Wrapped = styled(Datatable)`
   }
 
   tr.MuiTableRow-root:not(.MuiTableRow-footer):hover {
-    background: #f5f5f5;
+    background: var(--backgrounds-bg-highlight, #eff6ff);
   }
   tr.MuiTableRow-root:last-of-type td:first-of-type {
     border-bottom-left-radius: 8px;

package/src/history/invoice/list.tsx

@@ -124,39 +124,40 @@ const InvoiceTable = React.memo((props: Props & { onPay: (invoiceId: string) =>
 
   const columns = [
     {
-      label: t('payment.customer.invoice.invoiceNumber'),
-      name: 'number',
+      label: t('common.amount'),
+      name: 'total',
+      width: 60,
+      align: 'right',
       options: {
         customBodyRenderLite: (_: string, index: number) => {
           const invoice = data?.list[index] as TInvoiceExpanded;
           const link = getInvoiceLink(invoice, action);
           return (
             <a href={link.url} target={link.external ? '_blank' : target} rel="noreferrer">
-              {invoice?.number}
+              <Typography>
+                {formatBNStr(invoice.total, invoice.paymentCurrency.decimal)}&nbsp;
+                {invoice.paymentCurrency.symbol}
+              </Typography>
             </a>
           );
         },
       },
     },
     {
-      label: t('common.amount'),
-      name: 'total',
+      label: t('payment.customer.invoice.invoiceNumber'),
+      name: 'number',
       options: {
         customBodyRenderLite: (_: string, index: number) => {
           const invoice = data?.list[index] as TInvoiceExpanded;
           const link = getInvoiceLink(invoice, action);
           return (
             <a href={link.url} target={link.external ? '_blank' : target} rel="noreferrer">
-              <Typography>
-                {formatBNStr(invoice.total, invoice.paymentCurrency.decimal)}&nbsp;
-                {invoice.paymentCurrency.symbol}
-              </Typography>
+              {invoice?.number}
             </a>
           );
         },
       },
     },
-
     {
       label: t('common.updatedAt'),
       name: 'name',

package/src/locales/en.tsx

@@ -90,6 +90,7 @@ export default flat({
     quantityLimitPerCheckout: 'Exceed purchase limit',
     quantityNotEnough: 'Exceed inventory',
     amountPrecisionLimit: 'Amount decimal places must be less than or equal to {precision}',
+    saveAsDefaultPriceSuccess: 'Set default price successfully',
   },
   payment: {
     checkout: {
@@ -234,7 +235,8 @@ export default flat({
       recover: {
         button: 'Renew',
         title: 'Renew your subscription',
-        description: 'Your subscription will no longer be canceled, it will renew on {date}',
+        description:
+          'Your subscription will not be canceled and will be automatically renewed on {date}, please confirm to continue',
       },
       changePlan: {
         button: 'Update',

package/src/locales/zh.tsx

@@ -90,6 +90,7 @@ export default flat({
     quantityLimitPerCheckout: '超出购买限制',
     quantityNotEnough: '库存不足',
     amountPrecisionLimit: '金额小数位数必须在 {precision} 位以内',
+    saveAsDefaultPriceSuccess: '设置默认价格成功',
   },
   payment: {
     checkout: {
@@ -228,7 +229,7 @@ export default flat({
       recover: {
         button: '续订',
         title: '续订您的订阅',
-        description: '您的订阅将不再被取消，将在{date}续订',
+        description: '您的订阅将不会被取消，并将在{date}自动续订，请确认是否继续',
       },
       changePlan: {
         button: '更新',

package/src/payment/product-card.tsx

@@ -33,7 +33,7 @@ export default function ProductCard({ size, variant, name, logo, description, ex
           className="cko-ellipsis"
           variant="body1"
           title={name}
-          sx={{ fontWeight: 500, mb: 0.5, lineHeight: 1, fontSize: 16 }}
+          sx={{ fontWeight: 500, mb: 0.5, lineHeight: 1.2, fontSize: 16 }}
           color="text.primary">
           {name}
         </Typography>
@@ -41,7 +41,7 @@ export default function ProductCard({ size, variant, name, logo, description, ex
           <Typography
             variant="body1"
             title={description}
-            sx={{ fontSize: '0.85rem', mb: 0.5, lineHeight: 1, textAlign: 'left' }}
+            sx={{ fontSize: '0.85rem', mb: 0.5, lineHeight: 1.2, textAlign: 'left' }}
             color="text.lighter">
             {description}
           </Typography>