Skip to content

Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️

Fix: Partial refund input error (#919)

Dave Earleydd5c5d370ddd
diff --git a/frontend/src/components/common/OrdersTable/OrdersTable.module.scss b/frontend/src/components/common/OrdersTable/OrdersTable.module.scss
index 086a36041..4cbb258c9 100644
--- a/frontend/src/components/common/OrdersTable/OrdersTable.module.scss
+++ b/frontend/src/components/common/OrdersTable/OrdersTable.module.scss
@@ -148,8 +148,20 @@
align-items: center;
gap: 4px;
font-size: 11px;
- color: var(--mantine-color-red-9);
line-height: 1.3;
+
+ &[data-refund-status="REFUNDED"],
+ &[data-refund-status="PARTIALLY_REFUNDED"] {
+ color: var(--mantine-color-orange-7);
+ }
+
+ &[data-refund-status="REFUND_PENDING"] {
+ color: var(--mantine-color-yellow-7);
+ }
+
+ &[data-refund-status="REFUND_FAILED"] {
+ color: var(--mantine-color-red-7);
+ }
}
// Payment Section
diff --git a/frontend/src/components/common/OrdersTable/index.tsx b/frontend/src/components/common/OrdersTable/index.tsx
index 08d146dd1..1ddaabb58 100644
--- a/frontend/src/components/common/OrdersTable/index.tsx
+++ b/frontend/src/components/common/OrdersTable/index.tsx
@@ -1,5 +1,5 @@
import {t} from "@lingui/macro";
-import {Anchor, Button, Group, Menu, Popover, Text} from '@mantine/core';
+import {Anchor, Button, Group, Menu, Popover, Text, Tooltip} from '@mantine/core';
import {Event, IdParam, Invoice, MessageType, Order} from "../../../types.ts";
import {
IconAlertCircle,
@@ -10,7 +10,6 @@ import {
IconClockPause,
IconCopy,
IconCreditCard,
- IconCurrencyDollar,
IconDotsVertical,
IconFileInvoice,
IconFileOff,
@@ -317,12 +316,23 @@ export const OrdersTable = ({orders, event}: OrdersTableProps) => {
enableHiding: true,
cell: (info: CellContext<Order, unknown>) => {
const order = info.row.original;
- const itemCount = order.order_items?.length || order.attendees?.length || 0;
+ const totalQuantity = order.order_items?.reduce((sum, item) => sum + item.quantity, 0) || 0;
+ const itemBreakdown = order.order_items?.map(item =>
+ `${item.quantity}x ${item.item_name}`
+ ).join('\n') || '';
+
return (
- <div className={classes.itemsBadge}>
- <IconTicket size={14}/>
- {formatNumber(itemCount)} {t`item(s)`}
- </div>
+ <Tooltip
+ label={itemBreakdown}
+ multiline
+ withArrow
+ disabled={!itemBreakdown}
+ >
+ <div className={classes.itemsBadge}>
+ <IconTicket size={14}/>
+ {formatNumber(totalQuantity)} {t`item(s)`}
+ </div>
+ </Tooltip>
);
},
},
@@ -341,10 +351,12 @@ export const OrdersTable = ({orders, event}: OrdersTableProps) => {
{t`Tax`}: {formatCurrency(order.total_tax, order.currency)} •
{' '}{t`Fees`}: {formatCurrency(order.total_fee, order.currency)}
</Text>
- {order.total_refunded > 0 && (
- <Text className={classes.refundedAmount}>
- <IconCurrencyDollar size={12}/>
- {t`Refunded`}: {formatCurrency(order.total_refunded, order.currency)}
+ {order.refund_status && (
+ <Text className={classes.refundedAmount} data-refund-status={order.refund_status}>
+ {order.refund_status === 'REFUNDED' && t`Refunded: ${formatCurrency(order.total_refunded, order.currency)}`}
+ {order.refund_status === 'PARTIALLY_REFUNDED' && t`Partially refunded: ${formatCurrency(order.total_refunded, order.currency)}`}
+ {order.refund_status === 'REFUND_PENDING' && t`Refund pending`}
+ {order.refund_status === 'REFUND_FAILED' && t`Refund failed`}
</Text>
)}
</div>
diff --git a/frontend/src/components/modals/RefundOrderModal/index.tsx b/frontend/src/components/modals/RefundOrderModal/index.tsx
index 32b3492cf..516256b7b 100644
--- a/frontend/src/components/modals/RefundOrderModal/index.tsx
+++ b/frontend/src/components/modals/RefundOrderModal/index.tsx
@@ -110,6 +110,7 @@ export const RefundOrderModal = ({onClose, orderId}: RefundOrderModalProps) => {
leftSection={<IconCash size={20}/>}
rightSectionWidth={50}
rightSection={<Text size="sm" c="dimmed">{order.currency}</Text>}
+ required
styles={{
input: {
fontWeight: 600,
@@ -133,9 +134,9 @@ export const RefundOrderModal = ({onClose, orderId}: RefundOrderModalProps) => {
)}
</Stack>
- {isPartialRefund && (
+ {(isPartialRefund && Number(form.values.amount) > 0) && (
<Alert icon={<IconInfoCircle/>} color="blue" variant="light">
- {t`You are issuing a partial refund. The customer will be refunded ${form.values.amount.toFixed(2)} ${order.currency}.`}
+ {t`You are issuing a partial refund. The customer will be refunded ${Number(form.values.amount).toFixed(2)} ${order.currency}.`}
</Alert>
)}