[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant-backoffice] branch master updated (3c0355f -> b28ef10)
From: |
gnunet |
Subject: |
[taler-merchant-backoffice] branch master updated (3c0355f -> b28ef10) |
Date: |
Wed, 18 May 2022 21:18:55 +0200 |
This is an automated email from the git hooks/post-receive script.
sebasjm pushed a change to branch master
in repository merchant-backoffice.
from 3c0355f show refund taken in order details
new abc489d fix: use amounts.isZero instead of value
new b28ef10 fix: add missing auto_refund
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/paths/instance/orders/create/CreatePage.tsx | 15 +++++++++++----
.../src/paths/instance/products/list/Table.tsx | 2 +-
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git
a/packages/merchant-backoffice/src/paths/instance/orders/create/CreatePage.tsx
b/packages/merchant-backoffice/src/paths/instance/orders/create/CreatePage.tsx
index 38ac657..c08d8ee 100644
---
a/packages/merchant-backoffice/src/paths/instance/orders/create/CreatePage.tsx
+++
b/packages/merchant-backoffice/src/paths/instance/orders/create/CreatePage.tsx
@@ -152,7 +152,7 @@ export function CreatePage({
summary: !value.pricing?.summary ? i18n`required` : undefined,
order_price: !value.pricing?.order_price
? i18n`required`
- : (Amounts.parse(value.pricing.order_price)?.value || 0) <= 0
+ : Amounts.isZero(value.pricing.order_price)
? i18n`must be greater than 0`
: undefined,
}),
@@ -239,9 +239,16 @@ export function CreatePage({
t_s: Math.floor(value.payments.refund_deadline.getTime() / 1000),
}
: undefined,
- wire_fee_amortization: value.payments.wire_fee_amortization,
- max_fee: value.payments.max_fee,
- max_wire_fee: value.payments.max_wire_fee,
+ auto_refund: value.payments.auto_refund_deadline
+ ? {
+ d_us: Math.floor(
+ value.payments.auto_refund_deadline.getTime() * 1000
+ ),
+ }
+ : undefined,
+ wire_fee_amortization: value.payments.wire_fee_amortization as number,
+ max_fee: value.payments.max_fee as string,
+ max_wire_fee: value.payments.max_wire_fee as string,
delivery_date: value.shipping.delivery_date
? { t_s: value.shipping.delivery_date.getTime() / 1000 }
diff --git
a/packages/merchant-backoffice/src/paths/instance/products/list/Table.tsx
b/packages/merchant-backoffice/src/paths/instance/products/list/Table.tsx
index 6514c22..9c85d97 100644
--- a/packages/merchant-backoffice/src/paths/instance/products/list/Table.tsx
+++ b/packages/merchant-backoffice/src/paths/instance/products/list/Table.tsx
@@ -173,7 +173,7 @@ function Table({
);
}
- const isFree = Amounts.parseOrThrow(i.price).value === 0;
+ const isFree = Amounts.isZero(Amounts.parseOrThrow(i.price));
return (
<Fragment key={i.id}>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-merchant-backoffice] branch master updated (3c0355f -> b28ef10),
gnunet <=