diff options
| author | Jurjen de Vries <[email protected]> | 2025-09-11 00:48:15 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-09-11 00:48:15 +0200 |
| commit | 0c69c9848c6b98c92609d209103efc60003c9723 (patch) | |
| tree | 445121def885f13d0f80c06864ad2ff4d5ef95a1 /src/routes/(app)/payments | |
| parent | 2abcf6e435fca5d86960f3ba4228002bfb0a19e6 (diff) | |
| parent | 9277b2921e09ee9dd5f39cf4af30a2330f4d95d1 (diff) | |
| download | coinos-ui-0c69c9848c6b98c92609d209103efc60003c9723.tar.gz coinos-ui-0c69c9848c6b98c92609d209103efc60003c9723.zip | |
Merge branch 'coinos:master' into master
Diffstat (limited to 'src/routes/(app)/payments')
| -rw-r--r-- | src/routes/(app)/payments/[...page]/+page.svelte | 54 |
1 files changed, 30 insertions, 24 deletions
diff --git a/src/routes/(app)/payments/[...page]/+page.svelte b/src/routes/(app)/payments/[...page]/+page.svelte index 28cd29f4..57316f4a 100644 --- a/src/routes/(app)/payments/[...page]/+page.svelte +++ b/src/routes/(app)/payments/[...page]/+page.svelte @@ -215,7 +215,7 @@ <!-- >{$t("payments.subtotal")}</span --> <!-- > --> <span class="text-base text-secondary"> - {#if tipsIn || tipsOut}{$t("payments.tips")}{/if} + {#if tipsIn > 0 || tipsOut > 0}{$t("payments.tips")}{/if} </span> <span class="text-base text-secondary text-right" >{$t("payments.total")}</span @@ -229,32 +229,38 @@ {@const tipsOut = outgoing[c]?.fiatTips || 0} {@const subtotalOut = totalOut - tipsOut} - <span class="text-left text-base text-secondary" - >{$t("payments.income")}</span - > - <!-- <span><b>{subtotalIn ? f(subtotalIn, c) : "-"}</b></span> --> - <span><b>{tipsIn > 0 ? f(tipsIn, c, locale) : "-"}</b></span> - <span class="text-right" - ><b>{totalIn > 0 ? f(totalIn, c, locale) : "-"}</b></span - > + {#if totalIn > 0} + <span class="text-left text-base text-secondary" + >{$t("payments.income")}</span + > + <!-- <span><b>{subtotalIn ? f(subtotalIn, c) : "-"}</b></span> --> + <span><b>{tipsIn > 0 ? f(tipsIn, c, locale) : ""}</b></span> + <span class="text-right" + ><b>{totalIn > 0 ? f(totalIn, c, locale) : "-"}</b></span + > + {/if} - <span class="text-left text-base text-secondary" - >{$t("payments.expenditure")}</span - > - <!-- <span><b>{subtotalOut ? f(subtotalOut, c) : "-"}</b></span> --> - <span><b>{tipsOut > 0 ? f(tipsOut, c, locale) : "-"}</b></span> - <span class="text-right" - ><b>{totalOut > 0 ? f(totalOut, c, locale) : "-"}</b></span - > + {#if totalOut > 0} + <span class="text-left text-base text-secondary" + >{$t("payments.expenditure")}</span + > + <!-- <span><b>{subtotalOut ? f(subtotalOut, c) : "-"}</b></span> --> + <span><b>{tipsOut > 0 ? f(tipsOut, c, locale) : "-"}</b></span> + <span class="text-right" + ><b>{totalOut > 0 ? f(totalOut, c, locale) : "-"}</b></span + > + {/if} {/each} </div> </div> - <div class="flex justify-center"> - <button class="btn !w-auto" onclick={csv}> - <iconify-icon noobserver icon="ph:floppy-disk-bold" width="32" - ></iconify-icon> - <div class="my-auto">{$t("payments.export")}</div> - </button> - </div> + {#if payments.length} + <div class="flex justify-center"> + <button class="btn !w-auto" onclick={csv}> + <iconify-icon noobserver icon="ph:floppy-disk-bold" width="32" + ></iconify-icon> + <div class="my-auto">{$t("payments.export")}</div> + </button> + </div> + {/if} </div> |