[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-merchant-backoffice] branch master updated: do not show refunded
From: |
gnunet |
Subject: |
[taler-merchant-backoffice] branch master updated: do not show refunded if not |
Date: |
Wed, 31 Mar 2021 19:33:15 +0200 |
This is an automated email from the git hooks/post-receive script.
sebasjm pushed a commit to branch master
in repository merchant-backoffice.
The following commit(s) were added to refs/heads/master by this push:
new 9685d16 do not show refunded if not
9685d16 is described below
commit 9685d16d8c88b78ae1e992d3e9e676497b730ab1
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Wed Mar 31 14:33:01 2021 -0300
do not show refunded if not
---
packages/frontend/src/messages/en.po | 5 ++++-
packages/frontend/src/paths/instance/orders/details/DetailPage.tsx | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/packages/frontend/src/messages/en.po
b/packages/frontend/src/messages/en.po
index c081637..514b4b4 100644
--- a/packages/frontend/src/messages/en.po
+++ b/packages/frontend/src/messages/en.po
@@ -338,7 +338,7 @@ msgid "fields.instance.contract_terms.summary.label"
msgstr "Summary"
msgid "fields.instance.refund_amount.label"
-msgstr "Refund Amount"
+msgstr "Refunded"
msgid "fields.instance.deposit_total.label"
msgstr "Deposit Total"
@@ -349,3 +349,6 @@ msgstr "Max Fee"
msgid "fields.instance.contract_terms.max_wire_fee.label"
msgstr "Max Wire Fee"
+
+msgid "fields.instance.fee.label"
+msgstr "Fee"
diff --git a/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
b/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
index 0359509..f317762 100644
--- a/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
+++ b/packages/frontend/src/paths/instance/orders/details/DetailPage.tsx
@@ -238,7 +238,7 @@ function PaidPage({ id, order, onRefund }: { id: string;
order: MerchantBackend.
const config = useConfigContext()
const refundable = !order.refunded &&
- new Date().getTime() <order.contract_terms.refund_deadline.t_ms
+ new Date().getTime() <order.contract_terms.refund_deadline.t_ms
return <div>
<section class="section">
@@ -315,7 +315,7 @@ function PaidPage({ id, order, onRefund }: { id: string;
order: MerchantBackend.
<Input name="contract_terms.summary" readonly
inputType="multiline" />
<InputCurrency name="contract_terms.amount" readonly
currency={config.currency} />
<InputCurrency name="fee" readonly
currency={config.currency} />
- <InputCurrency<Paid> name="refund_amount" readonly
currency={config.currency} />
+ { order.refunded && <InputCurrency<Paid>
name="refund_amount" readonly currency={config.currency} /> }
<InputCurrency<Paid> name="deposit_total" readonly
currency={config.currency} />
<Input<Paid> name="order_status" readonly />
</FormProvider>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-merchant-backoffice] branch master updated: do not show refunded if not,
gnunet <=