diff options
| author | Sebastian <sebasjm@gmail.com> | 2024-08-29 18:45:51 -0300 |
|---|---|---|
| committer | Sebastian <sebasjm@gmail.com> | 2024-08-29 18:46:31 -0300 |
| commit | aac6f33bbe45a5b6301209f9936ce3837bfab2b8 (patch) | |
| tree | 3078a40944375d6b70bf75d9adc03f5791145d1e /packages | |
| parent | 84118e5a3d2362c056a3913cc8ee8885980ef9af (diff) | |
| download | wallet-core-aac6f33bbe45a5b6301209f9936ce3837bfab2b8.tar.xz | |
fix #9079
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/merchant-backoffice-ui/src/components/form/InputDuration.tsx | 2 | ||||
| -rw-r--r-- | packages/merchant-backoffice-ui/src/paths/instance/orders/create/CreatePage.tsx | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/packages/merchant-backoffice-ui/src/components/form/InputDuration.tsx b/packages/merchant-backoffice-ui/src/components/form/InputDuration.tsx index 5988a9197..98533a1d4 100644 --- a/packages/merchant-backoffice-ui/src/components/form/InputDuration.tsx +++ b/packages/merchant-backoffice-ui/src/components/form/InputDuration.tsx @@ -53,7 +53,7 @@ export function InputDuration<T>({ const { error, required, value: anyValue, onChange } = useField<T>(name); let strValue = ""; const value: Duration = - anyValue.d_us !== undefined + anyValue && anyValue.d_us !== undefined ? Duration.fromTalerProtocolDuration(anyValue) : anyValue; if (!value) { diff --git a/packages/merchant-backoffice-ui/src/paths/instance/orders/create/CreatePage.tsx b/packages/merchant-backoffice-ui/src/paths/instance/orders/create/CreatePage.tsx index 3adf79b04..f486cb623 100644 --- a/packages/merchant-backoffice-ui/src/paths/instance/orders/create/CreatePage.tsx +++ b/packages/merchant-backoffice-ui/src/paths/instance/orders/create/CreatePage.tsx @@ -71,6 +71,8 @@ function with_defaults( const defaultPayDeadline = Duration.fromTalerProtocolDuration( config.default_pay_delay, ); + // Hardcoded because of https://bugs.gnunet.org/view.php?id=9079 + const defaultRefundDeadline = Duration.fromSpec({ days: 15 }); const defaultWireDeadline = Duration.fromTalerProtocolDuration( config.default_wire_transfer_delay, ); @@ -83,8 +85,11 @@ function with_defaults( max_fee: undefined, createToken: true, pay_deadline: defaultPayDeadline, - refund_deadline: defaultPayDeadline, - wire_transfer_deadline: defaultWireDeadline, + refund_deadline: defaultRefundDeadline, + wire_transfer_deadline: Duration.max( + defaultRefundDeadline, + defaultWireDeadline, + ), }, shipping: {}, extra: {}, @@ -113,7 +118,7 @@ interface Payments { refund_deadline: Duration; pay_deadline: Duration; wire_transfer_deadline: Duration; - auto_refund_deadline: Duration; + auto_refund_deadline?: Duration; max_fee?: string; createToken: boolean; minimum_age?: number; @@ -213,7 +218,7 @@ export function CreatePage({ const summary = order.pricing?.summary; if (!value.payments) return; if (!value.shipping) return; - if (!price || ! summary) return; + if (!price || !summary) return; const request: TalerMerchantApi.PostOrderRequest = { order: { |