payment-kit 1.19.6 → 1.19.7
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.
|
@@ -340,13 +340,13 @@ export class CreditGrant extends Model<InferAttributes<CreditGrant>, InferCreati
|
|
|
340
340
|
status: 'granted',
|
|
341
341
|
remaining_amount: { [Op.gt]: '0' },
|
|
342
342
|
[Op.and]: [
|
|
343
|
-
// effective_at check: null表示立即生效，或者已经生效
|
|
343
|
+
// effective_at check: null/0表示立即生效，或者已经生效
|
|
344
344
|
{
|
|
345
|
-
[Op.or]: [{ effective_at: null }, { effective_at: { [Op.lte]: now } }],
|
|
345
|
+
[Op.or]: [{ effective_at: null }, { effective_at: 0 }, { effective_at: { [Op.lte]: now } }],
|
|
346
346
|
},
|
|
347
|
-
// expires_at check: null表示永不过期，或者还未过期
|
|
347
|
+
// expires_at check: null/0表示永不过期，或者还未过期
|
|
348
348
|
{
|
|
349
|
-
[Op.or]: [{ expires_at: null }, { expires_at: { [Op.gt]: now } }],
|
|
349
|
+
[Op.or]: [{ expires_at: null }, { expires_at: 0 }, { expires_at: { [Op.gt]: now } }],
|
|
350
350
|
},
|
|
351
351
|
],
|
|
352
352
|
};
|
package/blocklet.yml
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "payment-kit",
|
|
3
|
-
"version": "1.19.
|
|
3
|
+
"version": "1.19.7",
|
|
4
4
|
"scripts": {
|
|
5
5
|
"dev": "blocklet dev --open",
|
|
6
6
|
"lint": "tsc --noEmit && eslint src api/src --ext .mjs,.js,.jsx,.ts,.tsx",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"@blocklet/did-space-js": "^1.1.8",
|
|
55
55
|
"@blocklet/js-sdk": "^1.16.46",
|
|
56
56
|
"@blocklet/logger": "^1.16.46",
|
|
57
|
-
"@blocklet/payment-react": "1.19.
|
|
57
|
+
"@blocklet/payment-react": "1.19.7",
|
|
58
58
|
"@blocklet/sdk": "^1.16.46",
|
|
59
59
|
"@blocklet/ui-react": "^3.0.32",
|
|
60
60
|
"@blocklet/uploader": "^0.2.4",
|
|
@@ -123,7 +123,7 @@
|
|
|
123
123
|
"devDependencies": {
|
|
124
124
|
"@abtnode/types": "^1.16.46",
|
|
125
125
|
"@arcblock/eslint-config-ts": "^0.3.3",
|
|
126
|
-
"@blocklet/payment-types": "1.19.
|
|
126
|
+
"@blocklet/payment-types": "1.19.7",
|
|
127
127
|
"@types/cookie-parser": "^1.4.9",
|
|
128
128
|
"@types/cors": "^2.8.19",
|
|
129
129
|
"@types/debug": "^4.1.12",
|
|
@@ -169,5 +169,5 @@
|
|
|
169
169
|
"parser": "typescript"
|
|
170
170
|
}
|
|
171
171
|
},
|
|
172
|
-
"gitHead": "
|
|
172
|
+
"gitHead": "83b0e5ac23d05e12d07929789f06f85b30929169"
|
|
173
173
|
}
|
|
@@ -193,12 +193,12 @@ export default function CustomerCreditGrantDetail() {
|
|
|
193
193
|
label={t('common.effectiveDate')}
|
|
194
194
|
value={formatTime(data.effective_at ? data.effective_at * 1000 : data.created_at, 'YYYY-MM-DD HH:mm:ss')}
|
|
195
195
|
/>
|
|
196
|
-
{data.expires_at
|
|
196
|
+
{data.expires_at ? (
|
|
197
197
|
<InfoMetric
|
|
198
198
|
label={t('common.expirationDate')}
|
|
199
199
|
value={formatTime(data.expires_at * 1000, 'YYYY-MM-DD HH:mm:ss')}
|
|
200
200
|
/>
|
|
201
|
-
)}
|
|
201
|
+
) : null}
|
|
202
202
|
</Stack>
|
|
203
203
|
</Box>
|
|
204
204
|
</Box>
|