payment-kit 1.13.256 → 1.13.258

package/api/src/routes/prices.ts

@@ -241,10 +241,11 @@ router.put('/:id', auth, async (req, res) => {
     return res.status(403).json({ error: 'price archived' });
   }
 
+  const locked = doc.locked && process.env.PAYMENT_CHANGE_LOCKED_PRICE !== '1';
   const updates: Partial<Price> = Price.formatBeforeSave(
     pick(
       req.body,
-      doc.locked
+      locked
         ? ['nickname', 'description', 'metadata', 'currency_options', 'upsell']
         : ['type', 'model', 'active', 'livemode', 'nickname', 'recurring', 'description', 'tiers', 'unit_amount', 'transform_quantity', 'metadata', 'lookup_key', 'currency_options', 'upsell'] // prettier-ignore
     )

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.256",
+  "version": "1.13.258",
   "scripts": {
     "dev": "blocklet dev --open",
     "eject": "vite eject",
@@ -51,7 +51,7 @@
     "@arcblock/ux": "^2.9.79",
     "@arcblock/validator": "^1.18.117",
     "@blocklet/logger": "1.16.26",
-    "@blocklet/payment-react": "1.13.256",
+    "@blocklet/payment-react": "1.13.258",
     "@blocklet/sdk": "1.16.26",
     "@blocklet/ui-react": "^2.9.79",
     "@blocklet/uploader": "^0.1.6",
@@ -116,7 +116,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.26",
     "@arcblock/eslint-config-ts": "^0.3.0",
-    "@blocklet/payment-types": "1.13.256",
+    "@blocklet/payment-types": "1.13.258",
     "@types/cookie-parser": "^1.4.7",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -155,5 +155,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "5534c9d95122867a83c0d67eb3d1a27675c370b7"
+  "gitHead": "0ea69a3f829fc306695835888f57211e872b3705"
 }

package/src/components/invoice/table.tsx

@@ -61,7 +61,7 @@ export function getInvoiceRows(invoice: TInvoiceExpanded) {
     quantity: line.quantity,
     rawQuantity: line.metadata?.quantity || 0,
     price: !line.proration
-      ? formatAmount(getPriceUintAmountByCurrency(line.price, invoice.paymentCurrency) || line.amount, invoice.paymentCurrency.decimal) // prettier-ignore
+      ? formatAmount(toBN(line.amount).div(toBN(line.quantity)).toString(), invoice.paymentCurrency.decimal) // prettier-ignore
       : '',
     amount: formatAmount(line.amount, invoice.paymentCurrency.decimal),
     raw: line,

package/src/components/price/form.tsx

@@ -86,7 +86,7 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
 
   const currencies = useFieldArray({ control, name: getFieldName('currency_options') });
 
-  const isLocked = useWatch({ control, name: getFieldName('locked') });
+  const priceLocked = useWatch({ control, name: getFieldName('locked') });
   const isRecurring = useWatch({ control, name: getFieldName('type') }) === 'recurring';
   const isMetered = useWatch({ control, name: getFieldName('recurring.usage_type') }) === 'metered';
   const isCustomInterval = useWatch({ control, name: getFieldName('recurring.interval_config') }) === 'month_2';
@@ -97,6 +97,8 @@ export default function PriceForm({ prefix, simple }: PriceFormProps) {
     x.payment_currencies.some((c) => c.id === settings.baseCurrency.id)
   );
 
+  const isLocked = priceLocked && window.blocklet?.PAYMENT_CHANGE_LOCKED_PRICE !== '1';
+
   return (
     <Root direction="column" alignItems="flex-start" spacing={2}>
       {isLocked && <Alert severity="info">{t('admin.price.locked')}</Alert>}