From f600c1699003a2ece6bd7d979e9d854e8c908ddf Mon Sep 17 00:00:00 2001 From: sstefdev Date: Tue, 9 Jul 2024 13:43:19 +0200 Subject: [PATCH 1/3] fix: added dash when an invoice is not using our format --- .../src/lib/dashboard/invoice-view.svelte | 42 ++++++++++--------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte index 50232244..fed4483e 100644 --- a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte +++ b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte @@ -205,25 +205,27 @@ --secondaryColor: {config.colors.secondary};" >
-

Issued on: {formatDate(request?.contentData?.creationDate)}

-

Due by: {formatDate(request?.contentData?.paymentTerms?.dueDate)}

+

Issued on: {formatDate(request?.contentData?.creationDate || "-")}

+

+ Due by: {formatDate(request?.contentData?.paymentTerms?.dueDate || "-")} +

- Invoice #{request?.contentData?.invoiceNumber} + Invoice #{request?.contentData?.invoiceNumber || "-"}

{isPaid ? "Paid" : "Created"}

From:

-

{request?.payee?.value}

+

{request?.payee?.value || "-"}

{#if sellerInfo.length > 0}
{#each sellerInfo as { label, value }}

- {label}: - {value} + {label || "-"}: + {value || "-"}

{/each}
@@ -231,14 +233,14 @@

Billed to:

-

{request?.payer?.value}

+

{request?.payer?.value || "-"}

{#if buyerInfo.length > 0}
{#each buyerInfo as { label, value }}

- {label}: - {value} + {label || "-"}: + {value || "-"}

{/each}
@@ -246,11 +248,11 @@

Payment Chain: - {currency?.network} + {currency?.network || "-"}

Invoice Currency: - {currency?.symbol} + {currency?.symbol || "-"}

{#if request?.contentData?.invoiceItems} @@ -272,12 +274,12 @@ {#each firstItems as item, index (index)} -

{item.name}

+

{item.name || "-"}

- {item.quantity} + {item.quantity || "-"} {formatUnits(item.unitPrice, currency?.decimals ?? 18)} {formatUnits(item.discount, currency?.decimals ?? 18)} - {Number(item.tax.amount)} + {Number(item.tax.amount || "-")} {truncateNumberString( formatUnits( @@ -312,16 +314,16 @@

- {item.name} + {item.name || "-"}

- {item.quantity} + {item.quantity || "-"} {formatUnits(item.unitPrice, currency?.decimals ?? 18)} {formatUnits(item.discount, currency?.decimals ?? 18)} - {Number(item.tax.amount)} + {Number(item.tax.amount || "-")} {truncateNumberString( formatUnits( @@ -344,7 +346,7 @@

Memo:
- {request.contentData.note} + {request.contentData.note || "-"}

{/if} @@ -352,7 +354,7 @@ {#if request?.contentData?.miscellaneous?.labels} {#each request?.contentData?.miscellaneous?.labels as label, index (index)}
- {label} + {label || "-"}
{/each} {/if} @@ -362,7 +364,7 @@ {#if statuses.length > 0 && loading} {#each statuses as status, index (index)}
- {status} + {status || "-"} {#if (index === 0 && statuses.length === 2) || (index === 1 && statuses.length === 3)} From 838c2e1fb960c313a01d15fe40175393bc000474 Mon Sep 17 00:00:00 2001 From: sstefdev Date: Mon, 15 Jul 2024 09:15:40 +0200 Subject: [PATCH 2/3] fix: added dashes for unit-price and discount --- .../src/lib/dashboard/invoice-view.svelte | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte index 5d114227..37f5201f 100644 --- a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte +++ b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte @@ -326,9 +326,14 @@ {item.quantity || "-"} {formatUnits(item.unitPrice, currency?.decimals ?? 18)}{item.unitPrice + ? formatUnits(item.unitPrice, currency?.decimals ?? 18) + : "-"} - {formatUnits(item.discount, currency?.decimals ?? 18)}{item.discount + ? formatUnits(item.discount, currency?.decimals ?? 18) + : "-"} {Number(item.tax.amount || "-")} Date: Mon, 15 Jul 2024 13:03:16 +0200 Subject: [PATCH 3/3] fix: added dashes for unit-price and discount --- .../src/lib/dashboard/invoice-view.svelte | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte index 37f5201f..8fd6511f 100644 --- a/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte +++ b/packages/invoice-dashboard/src/lib/dashboard/invoice-view.svelte @@ -284,8 +284,16 @@

{item.name || "-"}

{item.quantity || "-"} - {formatUnits(item.unitPrice, currency?.decimals ?? 18)} - {formatUnits(item.discount, currency?.decimals ?? 18)} + {item.unitPrice + ? formatUnits(item.unitPrice, currency?.decimals ?? 18) + : "-"} + {item.discount + ? formatUnits(item.discount, currency?.decimals ?? 18) + : "-"} {Number(item.tax.amount || "-")} {truncateNumberString(