pixeldrain/fnx_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add thead and tbody to every table for svelte 5 compatibility

Browse Source
This commit is contained in:
Wim Brand
2024-11-06 19:12:52 +01:00
parent a6880b528a
commit 83ec1fc516
17 changed files with 1452 additions and 1639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

158
svelte/src/admin_panel/MollieSettlement.svelte
View File

@@ -71,30 +71,34 @@ onMount(get_payments);
{#if per_country.NL}
<table>
<tr>
<td>Bedrag</td>
<td>BTW-code</td>
<td>BTW</td>
<td>Tegenrekening</td>
</tr>
<tr>
<td><Euro amount={per_country.NL.amount + per_country.NL.vat}/></td>
<td>BTW hoog 21%</td>
<td><Euro amount={per_country.NL.vat}/></td>
<td>8030 - Omzet Mollie inkomsten</td>
</tr>
<tr>
<td><Euro amount={totals.vat-per_country.NL.vat}/></td>
<td>Geen BTW</td>
<td><Euro amount={0}/></td>
<td>1651 - BTW OSS</td>
</tr>
<tr>
<td><Euro amount={(settlement.amount.value*1e6)-totals.vat-per_country.NL.amount}/></td>
<td>Geen BTW</td>
<td><Euro amount={0}/></td>
<td>8030 - Omzet Mollie inkomsten</td>
</tr>
<thead>
<tr>
<td>Bedrag</td>
<td>BTW-code</td>
<td>BTW</td>
<td>Tegenrekening</td>
</tr>
</thead>
<tbody>
<tr>
<td><Euro amount={per_country.NL.amount + per_country.NL.vat}/></td>
<td>BTW hoog 21%</td>
<td><Euro amount={per_country.NL.vat}/></td>
<td>8030 - Omzet Mollie inkomsten</td>
</tr>
<tr>
<td><Euro amount={totals.vat-per_country.NL.vat}/></td>
<td>Geen BTW</td>
<td><Euro amount={0}/></td>
<td>1651 - BTW OSS</td>
</tr>
<tr>
<td><Euro amount={(settlement.amount.value*1e6)-totals.vat-per_country.NL.amount}/></td>
<td>Geen BTW</td>
<td><Euro amount={0}/></td>
<td>8030 - Omzet Mollie inkomsten</td>
</tr>
</tbody>
</table>
{/if}
@@ -103,68 +107,76 @@ onMount(get_payments);
<div class="table_scroll">
<table>
<tr>
<td>Country</td>
<td>Payments</td>
<td>Amount</td>
<td>VAT</td>
<td>VAT%</td>
<td>Total</td>
</tr>
{#each Object.entries(per_country) as [country, row]}
<thead>
<tr>
<td>{country}</td>
<td>{row.count}</td>
<td><Euro amount={row.amount}/></td>
<td><Euro amount={row.vat}/></td>
<td>{row.vat_fraction*100}%</td>
<td><Euro amount={row.vat+row.amount}/></td>
<td>Country</td>
<td>Payments</td>
<td>Amount</td>
<td>VAT</td>
<td>VAT%</td>
<td>Total</td>
</tr>
{/each}
</thead>
<tbody>
{#each Object.entries(per_country) as [country, row]}
<tr>
<td>{country}</td>
<td>{row.count}</td>
<td><Euro amount={row.amount}/></td>
<td><Euro amount={row.vat}/></td>
<td>{row.vat_fraction*100}%</td>
<td><Euro amount={row.vat+row.amount}/></td>
</tr>
{/each}
<tr>
<td>Total</td>
<td>{totals.count}</td>
<td><Euro amount={totals.amount}/></td>
<td><Euro amount={totals.vat}/></td>
<td></td>
<td><Euro amount={totals.vat+totals.amount}/></td>
</tr>
{#if per_country.NL}
<tr>
<td>Total - NL</td>
<td>{totals.count - per_country.NL.count}</td>
<td><Euro amount={totals.amount-per_country.NL.amount}/></td>
<td><Euro amount={totals.vat-per_country.NL.vat}/></td>
<td>Total</td>
<td>{totals.count}</td>
<td><Euro amount={totals.amount}/></td>
<td><Euro amount={totals.vat}/></td>
<td></td>
<td><Euro amount={(totals.vat-per_country.NL.vat)+(totals.amount-per_country.NL.amount)}/></td>
<td><Euro amount={totals.vat+totals.amount}/></td>
</tr>
{/if}
{#if per_country.NL}
<tr>
<td>Total - NL</td>
<td>{totals.count - per_country.NL.count}</td>
<td><Euro amount={totals.amount-per_country.NL.amount}/></td>
<td><Euro amount={totals.vat-per_country.NL.vat}/></td>
<td></td>
<td><Euro amount={(totals.vat-per_country.NL.vat)+(totals.amount-per_country.NL.amount)}/></td>
</tr>
{/if}
</tbody>
</table>
</div>
<h3>All payments ({payments.length})</h3>
<div class="table_scroll">
<table>
<tr>
<td>ID</td>
<td>Created</td>
<td>Status</td>
<td>Country</td>
<td>Amount</td>
<td>VAT</td>
<td>Total</td>
</tr>
{#each payments as row (row.id)}
<thead>
<tr>
<td><a href={row._links.dashboard.href} target="_blank">{row.id}</a></td>
<td>{formatDate(row.createdAt, true, true, false)}</td>
<td>{row.status}</td>
<td>{row.metadata.country}</td>
<td><Euro amount={row.metadata.amount}/></td>
<td><Euro amount={row.metadata.vat}/></td>
<td><Euro amount={row.amount.value*1e6}/></td>
<td>ID</td>
<td>Created</td>
<td>Status</td>
<td>Country</td>
<td>Amount</td>
<td>VAT</td>
<td>Total</td>
</tr>
{/each}
</thead>
<tbody>
{#each payments as row (row.id)}
<tr>
<td><a href={row._links.dashboard.href} target="_blank">{row.id}</a></td>
<td>{formatDate(row.createdAt, true, true, false)}</td>
<td>{row.status}</td>
<td>{row.metadata.country}</td>
<td><Euro amount={row.metadata.amount}/></td>
<td><Euro amount={row.metadata.vat}/></td>
<td><Euro amount={row.amount.value*1e6}/></td>
</tr>
{/each}
</tbody>
</table>
</div>