From 1aff78ffe7069228a9249d98a2069e24213c5064 Mon Sep 17 00:00:00 2001 From: sylwia-werner Date: Wed, 12 Nov 2025 17:23:38 +0100 Subject: [PATCH 1/2] fix: error on commision line details --- .../components/commission-detail.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/routes/commission-lines/components/commission-detail.tsx b/src/routes/commission-lines/components/commission-detail.tsx index 22f2750..07d99ab 100644 --- a/src/routes/commission-lines/components/commission-detail.tsx +++ b/src/routes/commission-lines/components/commission-detail.tsx @@ -68,20 +68,20 @@ export function CommissionLineDetail({ line, open, close }: Props) { Rate details
- {`Rule name: ${line.rule.name}`} - {`Reference: ${line.rule.reference}`} - {`Type: ${line.rule.rate.type}`} - {line.rule.rate.type === "percentage" && ( + {`Rule name: ${line.rule?.name}`} + {`Reference: ${line.rule?.reference}`} + {`Type: ${line.rule?.rate?.type}`} + {line.rule?.rate.type === "percentage" && ( <> - {`Rate value: ${line.rule.rate.percentage_rate}%`} - {`Include tax: ${line.rule.rate.include_tax ? "Yes" : "No"}`} + {`Rate value: ${line.rule?.rate?.percentage_rate}%`} + {`Include tax: ${line.rule?.rate?.include_tax ? "Yes" : "No"}`} )} - {line.rule.deleted_at !== null && ( + {line.rule?.deleted_at !== null && ( {`Rule was deleted at ${formatDate(line.rule.deleted_at)}!`} + >{`Rule was deleted at ${formatDate(line.rule?.deleted_at)}!`} )}
From 611e4b0974665db50f253c3b8b2a9c517786f1f2 Mon Sep 17 00:00:00 2001 From: sylwia-werner Date: Thu, 13 Nov 2025 10:53:07 +0100 Subject: [PATCH 2/2] fix: correct display of data in commision detail modal --- .../components/commission-detail.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/routes/commission-lines/components/commission-detail.tsx b/src/routes/commission-lines/components/commission-detail.tsx index 07d99ab..89e9957 100644 --- a/src/routes/commission-lines/components/commission-detail.tsx +++ b/src/routes/commission-lines/components/commission-detail.tsx @@ -60,7 +60,7 @@ export function CommissionLineDetail({ line, open, close }: Props) { Calculated commission value
- {`${line.value} ${line.currency_code.toUpperCase()}`} + {`${line.value === null ? '-' : line.value} ${line.currency_code.toUpperCase()}`}
@@ -68,20 +68,20 @@ export function CommissionLineDetail({ line, open, close }: Props) { Rate details
- {`Rule name: ${line.rule?.name}`} - {`Reference: ${line.rule?.reference}`} - {`Type: ${line.rule?.rate?.type}`} + {`Rule name: ${line.rule?.name ?? '-'}`} + {`Reference: ${line.rule?.reference ?? '-'}`} + {`Type: ${line.rule?.rate?.type ?? '-'}`} {line.rule?.rate.type === "percentage" && ( <> {`Rate value: ${line.rule?.rate?.percentage_rate}%`} {`Include tax: ${line.rule?.rate?.include_tax ? "Yes" : "No"}`} )} - {line.rule?.deleted_at !== null && ( + {line.rule?.deleted_at && ( {`Rule was deleted at ${formatDate(line.rule?.deleted_at)}!`} + >{`Rule was deleted at ${formatDate(line.rule?.deleted_at)}`} )}