@blocklet/payment-react 1.13.156 → 1.13.158

package/es/locales/en.js

@@ -210,6 +210,9 @@ export default flat({
         pay: "Pay this invoice",
         paySuccess: "You have successfully paid the invoice",
         payError: "Failed to paid the invoice",
+        renew: "Renew the subscription",
+        renewSuccess: "You have successfully renewed the subscription",
+        renewError: "Failed to renew the subscription",
         empty: "There are no invoices here"
       },
       payment: {

package/es/locales/zh.js

@@ -210,6 +210,9 @@ export default flat({
         pay: "\u652F\u4ED8\u6B64\u53D1\u7968",
         paySuccess: "\u652F\u4ED8\u6210\u529F",
         payError: "\u652F\u4ED8\u5931\u8D25",
+        renew: "\u6062\u590D\u8BA2\u9605",
+        renewSuccess: "\u8BA2\u9605\u6062\u590D\u6210\u529F",
+        renewError: "\u8BA2\u9605\u6062\u590D\u5931\u8D25",
         empty: "\u6CA1\u6709\u4EFB\u4F55\u53D1\u7968"
       },
       payment: {

package/es/util.d.ts

@@ -54,5 +54,6 @@ export declare const getSubscriptionAction: (subscription: TSubscriptionExpanded
     action: string;
     variant: string;
     color: string;
+    canRenew: boolean;
 } | null;
 export declare const mergeExtraParams: (extra?: Record<string, any>) => string;

package/es/util.js

@@ -432,27 +432,31 @@ export const getSubscriptionTimeSummary = (subscription) => {
       lines.push(`will renew on ${formatToDate(subscription.current_period_end * 1e3)}`);
     }
   } else if (subscription.status === "past_due") {
-    lines.push(`will cancel on ${formatToDate(subscription.current_period_end * 1e3)}`);
+    lines.push(`will cancel on ${formatToDate((subscription.cancel_at || subscription.current_period_end) * 1e3)}`);
   } else if (subscription.status === "canceled") {
     lines.push(`canceled on ${formatToDate(subscription.canceled_at * 1e3)}`);
   }
   return lines.join(", ");
 };
 export const getSubscriptionAction = (subscription) => {
-  if (subscription.status !== "canceled" && subscription.cancel_at_period_end) {
-    return { action: "recover", variant: "contained", color: "primary" };
-  }
   if (subscription.status === "active" || subscription.status === "trialing") {
     if (subscription.cancel_at) {
       return null;
     }
     if (subscription.cancel_at_period_end) {
-      return { action: "recover", variant: "contained", color: "primary" };
+      if (subscription.cancelation_details?.reason === "payment_failed") {
+        return null;
+      }
+      return { action: "recover", variant: "contained", color: "primary", canRenew: false };
     }
-    return { action: "cancel", variant: "outlined", color: "inherit" };
+    return { action: "cancel", variant: "outlined", color: "inherit", canRenew: false };
   }
   if (subscription.status === "past_due") {
-    return { action: "pastDue", variant: "contained", color: "primary" };
+    const canRenew = subscription.cancel_at && subscription.cancel_at !== subscription.current_period_end;
+    return { action: "pastDue", variant: "contained", color: "primary", canRenew };
+  }
+  if (subscription.status !== "canceled" && subscription.cancel_at_period_end) {
+    return { action: "recover", variant: "contained", color: "primary", canRenew: false };
   }
   return null;
 };

package/lib/locales/en.js

@@ -217,6 +217,9 @@ module.exports = (0, _flat.default)({
         pay: "Pay this invoice",
         paySuccess: "You have successfully paid the invoice",
         payError: "Failed to paid the invoice",
+        renew: "Renew the subscription",
+        renewSuccess: "You have successfully renewed the subscription",
+        renewError: "Failed to renew the subscription",
         empty: "There are no invoices here"
       },
       payment: {

package/lib/locales/zh.js

@@ -217,6 +217,9 @@ module.exports = (0, _flat.default)({
         pay: "\u652F\u4ED8\u6B64\u53D1\u7968",
         paySuccess: "\u652F\u4ED8\u6210\u529F",
         payError: "\u652F\u4ED8\u5931\u8D25",
+        renew: "\u6062\u590D\u8BA2\u9605",
+        renewSuccess: "\u8BA2\u9605\u6062\u590D\u6210\u529F",
+        renewError: "\u8BA2\u9605\u6062\u590D\u5931\u8D25",
         empty: "\u6CA1\u6709\u4EFB\u4F55\u53D1\u7968"
       },
       payment: {

package/lib/util.d.ts

@@ -54,5 +54,6 @@ export declare const getSubscriptionAction: (subscription: TSubscriptionExpanded
     action: string;
     variant: string;
     color: string;
+    canRenew: boolean;
 } | null;
 export declare const mergeExtraParams: (extra?: Record<string, any>) => string;

package/lib/util.js

@@ -517,7 +517,7 @@ const getSubscriptionTimeSummary = subscription => {
       lines.push(`will renew on ${formatToDate(subscription.current_period_end * 1e3)}`);
     }
   } else if (subscription.status === "past_due") {
-    lines.push(`will cancel on ${formatToDate(subscription.current_period_end * 1e3)}`);
+    lines.push(`will cancel on ${formatToDate((subscription.cancel_at || subscription.current_period_end) * 1e3)}`);
   } else if (subscription.status === "canceled") {
     lines.push(`canceled on ${formatToDate(subscription.canceled_at * 1e3)}`);
   }
@@ -525,35 +525,43 @@ const getSubscriptionTimeSummary = subscription => {
 };
 exports.getSubscriptionTimeSummary = getSubscriptionTimeSummary;
 const getSubscriptionAction = subscription => {
-  if (subscription.status !== "canceled" && subscription.cancel_at_period_end) {
-    return {
-      action: "recover",
-      variant: "contained",
-      color: "primary"
-    };
-  }
   if (subscription.status === "active" || subscription.status === "trialing") {
     if (subscription.cancel_at) {
       return null;
     }
     if (subscription.cancel_at_period_end) {
+      if (subscription.cancelation_details?.reason === "payment_failed") {
+        return null;
+      }
       return {
         action: "recover",
         variant: "contained",
-        color: "primary"
+        color: "primary",
+        canRenew: false
       };
     }
     return {
       action: "cancel",
       variant: "outlined",
-      color: "inherit"
+      color: "inherit",
+      canRenew: false
     };
   }
   if (subscription.status === "past_due") {
+    const canRenew = subscription.cancel_at && subscription.cancel_at !== subscription.current_period_end;
     return {
       action: "pastDue",
       variant: "contained",
-      color: "primary"
+      color: "primary",
+      canRenew
+    };
+  }
+  if (subscription.status !== "canceled" && subscription.cancel_at_period_end) {
+    return {
+      action: "recover",
+      variant: "contained",
+      color: "primary",
+      canRenew: false
     };
   }
   return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react",
-  "version": "1.13.156",
+  "version": "1.13.158",
   "description": "Reusable react components for payment kit v2",
   "keywords": [
     "react",
@@ -89,7 +89,7 @@
     "@babel/core": "^7.23.9",
     "@babel/preset-env": "^7.23.9",
     "@babel/preset-react": "^7.23.3",
-    "@blocklet/payment-types": "1.13.156",
+    "@blocklet/payment-types": "1.13.158",
     "@storybook/addon-essentials": "^7.6.13",
     "@storybook/addon-interactions": "^7.6.13",
     "@storybook/addon-links": "^7.6.13",
@@ -118,5 +118,5 @@
     "vite-plugin-babel": "^1.2.0",
     "vite-plugin-node-polyfills": "^0.19.0"
   },
-  "gitHead": "88f9908f07e00a0958472c9399f427d96d91b2c4"
+  "gitHead": "f53ad79f77852d57376924819e1fb81044462fa5"
 }

package/src/locales/en.tsx

@@ -216,6 +216,9 @@ export default flat({
         pay: 'Pay this invoice',
         paySuccess: 'You have successfully paid the invoice',
         payError: 'Failed to paid the invoice',
+        renew: 'Renew the subscription',
+        renewSuccess: 'You have successfully renewed the subscription',
+        renewError: 'Failed to renew the subscription',
         empty: 'There are no invoices here',
       },
       payment: {

package/src/locales/zh.tsx

@@ -211,6 +211,9 @@ export default flat({
         pay: '支付此发票',
         paySuccess: '支付成功',
         payError: '支付失败',
+        renew: '恢复订阅',
+        renewSuccess: '订阅恢复成功',
+        renewError: '订阅恢复失败',
         empty: '没有任何发票',
       },
       payment: {

package/src/util.ts

@@ -586,7 +586,7 @@ export const getSubscriptionTimeSummary = (subscription: TSubscriptionExpanded)
       lines.push(`will renew on ${formatToDate(subscription.current_period_end * 1000)}`);
     }
   } else if (subscription.status === 'past_due') {
-    lines.push(`will cancel on ${formatToDate(subscription.current_period_end * 1000)}`);
+    lines.push(`will cancel on ${formatToDate((subscription.cancel_at || subscription.current_period_end) * 1000)}`);
   } else if (subscription.status === 'canceled') {
     lines.push(`canceled on ${formatToDate(subscription.canceled_at * 1000)}`);
   }
@@ -595,23 +595,28 @@ export const getSubscriptionTimeSummary = (subscription: TSubscriptionExpanded)
 };
 
 export const getSubscriptionAction = (subscription: TSubscriptionExpanded) => {
-  if (subscription.status !== 'canceled' && subscription.cancel_at_period_end) {
-    return { action: 'recover', variant: 'contained', color: 'primary' };
-  }
-
   if (subscription.status === 'active' || subscription.status === 'trialing') {
     if (subscription.cancel_at) {
       return null;
     }
     if (subscription.cancel_at_period_end) {
-      return { action: 'recover', variant: 'contained', color: 'primary' };
+      if (subscription.cancelation_details?.reason === 'payment_failed') {
+        return null;
+      }
+
+      return { action: 'recover', variant: 'contained', color: 'primary', canRenew: false };
     }
 
-    return { action: 'cancel', variant: 'outlined', color: 'inherit' };
+    return { action: 'cancel', variant: 'outlined', color: 'inherit', canRenew: false };
   }
 
   if (subscription.status === 'past_due') {
-    return { action: 'pastDue', variant: 'contained', color: 'primary' };
+    const canRenew = subscription.cancel_at && subscription.cancel_at !== subscription.current_period_end;
+    return { action: 'pastDue', variant: 'contained', color: 'primary', canRenew };
+  }
+
+  if (subscription.status !== 'canceled' && subscription.cancel_at_period_end) {
+    return { action: 'recover', variant: 'contained', color: 'primary', canRenew: false };
   }
 
   return null;