@blocklet/payment-react 1.14.19 → 1.14.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/history/invoice/list.d.ts +3 -1
- package/es/history/invoice/list.js +4 -1
- package/es/libs/util.js +4 -1
- package/es/locales/en.js +1 -0
- package/es/locales/zh.js +1 -0
- package/es/payment/index.js +1 -1
- package/lib/history/invoice/list.d.ts +3 -1
- package/lib/history/invoice/list.js +4 -1
- package/lib/libs/util.js +4 -1
- package/lib/locales/en.js +1 -0
- package/lib/locales/zh.js +1 -0
- package/lib/payment/index.js +1 -1
- package/package.json +3 -3
- package/src/history/invoice/list.tsx +5 -1
- package/src/libs/util.ts +4 -1
- package/src/locales/en.tsx +1 -0
- package/src/locales/zh.tsx +1 -0
- package/src/payment/index.tsx +1 -1
|
@@ -4,18 +4,20 @@ type Props = {
|
|
|
4
4
|
subscription_id?: string;
|
|
5
5
|
currency_id?: string;
|
|
6
6
|
include_staking?: boolean;
|
|
7
|
+
include_recovered_from?: boolean;
|
|
7
8
|
status?: string;
|
|
8
9
|
pageSize?: number;
|
|
9
10
|
target?: string;
|
|
10
11
|
action?: string;
|
|
11
12
|
};
|
|
12
|
-
declare function CustomerInvoiceList({ customer_id, subscription_id, currency_id, include_staking, status, pageSize, target, action, }: Props): import("react").JSX.Element;
|
|
13
|
+
declare function CustomerInvoiceList({ customer_id, subscription_id, currency_id, include_staking, include_recovered_from, status, pageSize, target, action, }: Props): import("react").JSX.Element;
|
|
13
14
|
declare namespace CustomerInvoiceList {
|
|
14
15
|
var defaultProps: {
|
|
15
16
|
customer_id: string;
|
|
16
17
|
subscription_id: string;
|
|
17
18
|
currency_id: string;
|
|
18
19
|
include_staking: boolean;
|
|
20
|
+
include_recovered_from: boolean;
|
|
19
21
|
status: string;
|
|
20
22
|
pageSize: number;
|
|
21
23
|
target: string;
|
|
@@ -62,6 +62,7 @@ export default function CustomerInvoiceList({
|
|
|
62
62
|
subscription_id,
|
|
63
63
|
currency_id,
|
|
64
64
|
include_staking,
|
|
65
|
+
include_recovered_from,
|
|
65
66
|
status,
|
|
66
67
|
pageSize,
|
|
67
68
|
target,
|
|
@@ -83,11 +84,12 @@ export default function CustomerInvoiceList({
|
|
|
83
84
|
currency_id,
|
|
84
85
|
subscription_id,
|
|
85
86
|
include_staking,
|
|
87
|
+
include_recovered_from,
|
|
86
88
|
ignore_zero: true
|
|
87
89
|
});
|
|
88
90
|
},
|
|
89
91
|
{
|
|
90
|
-
reloadDeps: [customer_id, subscription_id, status, include_staking]
|
|
92
|
+
reloadDeps: [customer_id, subscription_id, status, include_staking, include_recovered_from]
|
|
91
93
|
}
|
|
92
94
|
);
|
|
93
95
|
useEffect(() => {
|
|
@@ -199,6 +201,7 @@ CustomerInvoiceList.defaultProps = {
|
|
|
199
201
|
subscription_id: "",
|
|
200
202
|
currency_id: "",
|
|
201
203
|
include_staking: false,
|
|
204
|
+
include_recovered_from: false,
|
|
202
205
|
status: "open,paid,uncollectible",
|
|
203
206
|
pageSize: 10,
|
|
204
207
|
target: "_self",
|
package/es/libs/util.js
CHANGED
|
@@ -691,7 +691,10 @@ export function formatQuantityInventory(price, quantity, locale = "en") {
|
|
|
691
691
|
return "";
|
|
692
692
|
}
|
|
693
693
|
export function formatAmountPrecisionLimit(amount, locale = "en", precision = 6) {
|
|
694
|
-
|
|
694
|
+
if (!amount) {
|
|
695
|
+
return "";
|
|
696
|
+
}
|
|
697
|
+
const [, decimal] = String(amount).split(".");
|
|
695
698
|
if (decimal && decimal.length > precision) {
|
|
696
699
|
return t("common.amountPrecisionLimit", locale, { precision });
|
|
697
700
|
}
|
package/es/locales/en.js
CHANGED
|
@@ -83,6 +83,7 @@ export default flat({
|
|
|
83
83
|
years: "years",
|
|
84
84
|
type: "type",
|
|
85
85
|
donation: "Donation",
|
|
86
|
+
recoverFrom: "Recovered From",
|
|
86
87
|
quantityLimitPerCheckout: "Exceed purchase limit",
|
|
87
88
|
quantityNotEnough: "Exceed inventory",
|
|
88
89
|
amountPrecisionLimit: "Amount decimal places must be less than or equal to {precision}"
|
package/es/locales/zh.js
CHANGED
|
@@ -83,6 +83,7 @@ export default flat({
|
|
|
83
83
|
years: "\u5E74",
|
|
84
84
|
type: "\u7C7B\u578B",
|
|
85
85
|
donation: "\u6253\u8D4F",
|
|
86
|
+
recoverFrom: "\u6062\u590D\u81EA",
|
|
86
87
|
quantityLimitPerCheckout: "\u8D85\u51FA\u8D2D\u4E70\u9650\u5236",
|
|
87
88
|
quantityNotEnough: "\u5E93\u5B58\u4E0D\u8DB3",
|
|
88
89
|
amountPrecisionLimit: "\u91D1\u989D\u5C0F\u6570\u4F4D\u6570\u5FC5\u987B\u5728 {precision} \u4F4D\u4EE5\u5185"
|
package/es/payment/index.js
CHANGED
|
@@ -213,7 +213,7 @@ export function PaymentInner({
|
|
|
213
213
|
if (Number(amount) < min || Number(amount) > max) {
|
|
214
214
|
return;
|
|
215
215
|
}
|
|
216
|
-
if (formatAmountPrecisionLimit(amount, locale)) {
|
|
216
|
+
if (amount && formatAmountPrecisionLimit(String(amount), locale)) {
|
|
217
217
|
return;
|
|
218
218
|
}
|
|
219
219
|
try {
|
|
@@ -4,18 +4,20 @@ type Props = {
|
|
|
4
4
|
subscription_id?: string;
|
|
5
5
|
currency_id?: string;
|
|
6
6
|
include_staking?: boolean;
|
|
7
|
+
include_recovered_from?: boolean;
|
|
7
8
|
status?: string;
|
|
8
9
|
pageSize?: number;
|
|
9
10
|
target?: string;
|
|
10
11
|
action?: string;
|
|
11
12
|
};
|
|
12
|
-
declare function CustomerInvoiceList({ customer_id, subscription_id, currency_id, include_staking, status, pageSize, target, action, }: Props): import("react").JSX.Element;
|
|
13
|
+
declare function CustomerInvoiceList({ customer_id, subscription_id, currency_id, include_staking, include_recovered_from, status, pageSize, target, action, }: Props): import("react").JSX.Element;
|
|
13
14
|
declare namespace CustomerInvoiceList {
|
|
14
15
|
var defaultProps: {
|
|
15
16
|
customer_id: string;
|
|
16
17
|
subscription_id: string;
|
|
17
18
|
currency_id: string;
|
|
18
19
|
include_staking: boolean;
|
|
20
|
+
include_recovered_from: boolean;
|
|
19
21
|
status: string;
|
|
20
22
|
pageSize: number;
|
|
21
23
|
target: string;
|
|
@@ -58,6 +58,7 @@ function CustomerInvoiceList({
|
|
|
58
58
|
subscription_id,
|
|
59
59
|
currency_id,
|
|
60
60
|
include_staking,
|
|
61
|
+
include_recovered_from,
|
|
61
62
|
status,
|
|
62
63
|
pageSize,
|
|
63
64
|
target,
|
|
@@ -91,10 +92,11 @@ function CustomerInvoiceList({
|
|
|
91
92
|
currency_id,
|
|
92
93
|
subscription_id,
|
|
93
94
|
include_staking,
|
|
95
|
+
include_recovered_from,
|
|
94
96
|
ignore_zero: true
|
|
95
97
|
});
|
|
96
98
|
}, {
|
|
97
|
-
reloadDeps: [customer_id, subscription_id, status, include_staking]
|
|
99
|
+
reloadDeps: [customer_id, subscription_id, status, include_staking, include_recovered_from]
|
|
98
100
|
});
|
|
99
101
|
(0, _react.useEffect)(() => {
|
|
100
102
|
if (subscription && customer_id) {
|
|
@@ -299,6 +301,7 @@ CustomerInvoiceList.defaultProps = {
|
|
|
299
301
|
subscription_id: "",
|
|
300
302
|
currency_id: "",
|
|
301
303
|
include_staking: false,
|
|
304
|
+
include_recovered_from: false,
|
|
302
305
|
status: "open,paid,uncollectible",
|
|
303
306
|
pageSize: 10,
|
|
304
307
|
target: "_self",
|
package/lib/libs/util.js
CHANGED
|
@@ -827,7 +827,10 @@ function formatQuantityInventory(price, quantity, locale = "en") {
|
|
|
827
827
|
return "";
|
|
828
828
|
}
|
|
829
829
|
function formatAmountPrecisionLimit(amount, locale = "en", precision = 6) {
|
|
830
|
-
|
|
830
|
+
if (!amount) {
|
|
831
|
+
return "";
|
|
832
|
+
}
|
|
833
|
+
const [, decimal] = String(amount).split(".");
|
|
831
834
|
if (decimal && decimal.length > precision) {
|
|
832
835
|
return (0, _locales.t)("common.amountPrecisionLimit", locale, {
|
|
833
836
|
precision
|
package/lib/locales/en.js
CHANGED
|
@@ -90,6 +90,7 @@ module.exports = (0, _flat.default)({
|
|
|
90
90
|
years: "years",
|
|
91
91
|
type: "type",
|
|
92
92
|
donation: "Donation",
|
|
93
|
+
recoverFrom: "Recovered From",
|
|
93
94
|
quantityLimitPerCheckout: "Exceed purchase limit",
|
|
94
95
|
quantityNotEnough: "Exceed inventory",
|
|
95
96
|
amountPrecisionLimit: "Amount decimal places must be less than or equal to {precision}"
|
package/lib/locales/zh.js
CHANGED
|
@@ -90,6 +90,7 @@ module.exports = (0, _flat.default)({
|
|
|
90
90
|
years: "\u5E74",
|
|
91
91
|
type: "\u7C7B\u578B",
|
|
92
92
|
donation: "\u6253\u8D4F",
|
|
93
|
+
recoverFrom: "\u6062\u590D\u81EA",
|
|
93
94
|
quantityLimitPerCheckout: "\u8D85\u51FA\u8D2D\u4E70\u9650\u5236",
|
|
94
95
|
quantityNotEnough: "\u5E93\u5B58\u4E0D\u8DB3",
|
|
95
96
|
amountPrecisionLimit: "\u91D1\u989D\u5C0F\u6570\u4F4D\u6570\u5FC5\u987B\u5728 {precision} \u4F4D\u4EE5\u5185"
|
package/lib/payment/index.js
CHANGED
|
@@ -265,7 +265,7 @@ function PaymentInner({
|
|
|
265
265
|
if (Number(amount) < min || Number(amount) > max) {
|
|
266
266
|
return;
|
|
267
267
|
}
|
|
268
|
-
if ((0, _util2.formatAmountPrecisionLimit)(amount, locale)) {
|
|
268
|
+
if (amount && (0, _util2.formatAmountPrecisionLimit)(String(amount), locale)) {
|
|
269
269
|
return;
|
|
270
270
|
}
|
|
271
271
|
try {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blocklet/payment-react",
|
|
3
|
-
"version": "1.14.
|
|
3
|
+
"version": "1.14.21",
|
|
4
4
|
"description": "Reusable react components for payment kit v2",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"@babel/core": "^7.25.2",
|
|
92
92
|
"@babel/preset-env": "^7.25.2",
|
|
93
93
|
"@babel/preset-react": "^7.24.7",
|
|
94
|
-
"@blocklet/payment-types": "1.14.
|
|
94
|
+
"@blocklet/payment-types": "1.14.21",
|
|
95
95
|
"@storybook/addon-essentials": "^7.6.20",
|
|
96
96
|
"@storybook/addon-interactions": "^7.6.20",
|
|
97
97
|
"@storybook/addon-links": "^7.6.20",
|
|
@@ -120,5 +120,5 @@
|
|
|
120
120
|
"vite-plugin-babel": "^1.2.0",
|
|
121
121
|
"vite-plugin-node-polyfills": "^0.21.0"
|
|
122
122
|
},
|
|
123
|
-
"gitHead": "
|
|
123
|
+
"gitHead": "48565120b3bdaf21533fe73626db725330c0f374"
|
|
124
124
|
}
|
|
@@ -53,6 +53,7 @@ type Props = {
|
|
|
53
53
|
subscription_id?: string;
|
|
54
54
|
currency_id?: string;
|
|
55
55
|
include_staking?: boolean;
|
|
56
|
+
include_recovered_from?: boolean;
|
|
56
57
|
status?: string;
|
|
57
58
|
pageSize?: number;
|
|
58
59
|
target?: string;
|
|
@@ -83,6 +84,7 @@ export default function CustomerInvoiceList({
|
|
|
83
84
|
subscription_id,
|
|
84
85
|
currency_id,
|
|
85
86
|
include_staking,
|
|
87
|
+
include_recovered_from,
|
|
86
88
|
status,
|
|
87
89
|
pageSize,
|
|
88
90
|
target,
|
|
@@ -106,11 +108,12 @@ export default function CustomerInvoiceList({
|
|
|
106
108
|
currency_id,
|
|
107
109
|
subscription_id,
|
|
108
110
|
include_staking,
|
|
111
|
+
include_recovered_from,
|
|
109
112
|
ignore_zero: true,
|
|
110
113
|
});
|
|
111
114
|
},
|
|
112
115
|
{
|
|
113
|
-
reloadDeps: [customer_id, subscription_id, status, include_staking],
|
|
116
|
+
reloadDeps: [customer_id, subscription_id, status, include_staking, include_recovered_from],
|
|
114
117
|
}
|
|
115
118
|
);
|
|
116
119
|
|
|
@@ -278,6 +281,7 @@ CustomerInvoiceList.defaultProps = {
|
|
|
278
281
|
subscription_id: '',
|
|
279
282
|
currency_id: '',
|
|
280
283
|
include_staking: false,
|
|
284
|
+
include_recovered_from: false,
|
|
281
285
|
status: 'open,paid,uncollectible',
|
|
282
286
|
pageSize: 10,
|
|
283
287
|
target: '_self',
|
package/src/libs/util.ts
CHANGED
|
@@ -894,7 +894,10 @@ export function formatQuantityInventory(price: TPrice, quantity: string | number
|
|
|
894
894
|
}
|
|
895
895
|
|
|
896
896
|
export function formatAmountPrecisionLimit(amount: string, locale = 'en', precision: number = 6) {
|
|
897
|
-
|
|
897
|
+
if (!amount) {
|
|
898
|
+
return '';
|
|
899
|
+
}
|
|
900
|
+
const [, decimal] = String(amount).split('.');
|
|
898
901
|
if (decimal && decimal.length > precision) {
|
|
899
902
|
return t('common.amountPrecisionLimit', locale, { precision });
|
|
900
903
|
}
|
package/src/locales/en.tsx
CHANGED
|
@@ -85,6 +85,7 @@ export default flat({
|
|
|
85
85
|
years: 'years',
|
|
86
86
|
type: 'type',
|
|
87
87
|
donation: 'Donation',
|
|
88
|
+
recoverFrom: 'Recovered From',
|
|
88
89
|
quantityLimitPerCheckout: 'Exceed purchase limit',
|
|
89
90
|
quantityNotEnough: 'Exceed inventory',
|
|
90
91
|
amountPrecisionLimit: 'Amount decimal places must be less than or equal to {precision}',
|
package/src/locales/zh.tsx
CHANGED