Merge branch 'dev' into feature/anonyme-spende

wip
2025-04-28 10:57:14 +02:00 · 2025-04-28 10:56:45 +02:00 · 2025-04-28 10:45:47 +02:00 · 2025-04-28 10:44:02 +02:00 · 2025-04-28 10:40:23 +02:00 · 2025-04-28 10:38:27 +02:00
6 changed files with 8 additions and 30 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,16 +2,8 @@

 All notable changes to this project will be documented in this file. Dates are displayed in UTC.

-#### [1.12.0](https://git.odit.services/lfk/frontend/compare/1.11.5...1.12.0)
-
- feat: anonymous donations [`9c03e35`](https://git.odit.services/lfk/frontend/commit/9c03e359a4e8f43452475b02bcabcb354987ab75)
- refactor: use modern tailwindcss features [`1505080`](https://git.odit.services/lfk/frontend/commit/1505080afdd8b272b76584e2777df732001ce004)
-
 #### [1.11.5](https://git.odit.services/lfk/frontend/compare/1.11.4...1.11.5)

-> 25 April 2025
-
- chore(release): 1.11.5 [`8cb6093`](https://git.odit.services/lfk/frontend/commit/8cb6093f0b3474c0952a8a51a47683262fc31f8f)
 - fix(cards): Update table for edit events [`27396e1`](https://git.odit.services/lfk/frontend/commit/27396e17f2cd8be72c9c8100afe6ec75ac66dceb)

 #### [1.11.4](https://git.odit.services/lfk/frontend/compare/1.11.3...1.11.4)
--- a/index.html
+++ b/index.html
@@ -13,7 +13,7 @@

  <body>
    <span style="display: none; visibility: hidden" id="buildinfo"
-      >RELEASE_INFO-1.12.0-RELEASE_INFO</span
+      >RELEASE_INFO-1.11.5-RELEASE_INFO</span
    >
    <noscript>You need to enable JavaScript to run this app.</noscript>
    <script src="/env.js"></script>
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@odit/lfk-frontend",
-  "version": "1.12.0",
+  "version": "1.11.5",
  "type": "module",
  "scripts": {
    "i18n-order": "node order.js",
--- a/src/components/donations/DonationTableAction.svelte
+++ b/src/components/donations/DonationTableAction.svelte
@@ -9,15 +9,10 @@
  export let paymentAction;
 </script>

-{#if paymentAction}
 <button
  on:click={paymentAction}
  class="text-[#025a21] hover:text-green-900 mr-4">{$_("enter-payment")}</button
 >
-{:else}
-<span class="inline-block opacity-0 cursor-default mr-4" style="">{$_("enter-payment")}</span>
-
-{/if}
 <TableActions
  bind:detailsAction
  bind:detailsLink
--- a/src/components/donations/DonationsOverview.svelte
+++ b/src/components/donations/DonationsOverview.svelte
@@ -112,25 +112,18 @@
      accessorKey: "actions",
      header: () => $_("action"),
      cell: (info) => {
-        let detailsLink
-        let paymentAction
-        if (info.row.original.donor != undefined){
-          detailsLink = `./${info.row.original.id}`
-          paymentAction = () => {
-            active_edits = current_donations.filter(
-              (r) => r.id == info.row.original.id
-            );
-          }
-        }
-        
        return renderComponent(DonationTableAction, {
-          detailsLink: detailsLink,
+          detailsLink: `./${info.row.original.id}`,
          deleteAction: () => {
            active_deletes = current_donations.filter(
              (r) => r.id == info.row.original.id
            );
          },
-          paymentAction: paymentAction,
+          paymentAction: () => {
+            active_edits = current_donations.filter(
+              (r) => r.id == info.row.original.id
+            );
+          },
          deleteEnabled:
            store.state.jwtinfo.userdetails.permissions.includes(
              "DONATION:DELETE"
--- a/src/components/shared/TableActions.svelte
+++ b/src/components/shared/TableActions.svelte
@@ -15,8 +15,6 @@
 	<button on:click={detailsAction} class="text-indigo-600 hover:text-indigo-900"
 		>{$_("details")}</button
 	>
-{:else}
-<span class="inline-block opacity-0 cursor-default" style="">{$_("details")}</span>
 {/if}
 {#if deleteEnabled}
 	<button
Author	SHA1	Message	Date
Philipp Dormann	8c56aa3c46	Merge branch 'dev' into feature/anonyme-spende	2025-04-28 10:57:14 +02:00
Philipp Dormann	f642849dbb	wip	2025-04-28 10:56:45 +02:00
Philipp Dormann	7ac92ae6ca	wip	2025-04-28 10:45:47 +02:00
Philipp Dormann	95af9f9914	i18n	2025-04-28 10:44:02 +02:00
Philipp Dormann	1004aee16c	implement DonationDonor	2025-04-28 10:40:23 +02:00
Philipp Dormann	0baf2fc460	wip	2025-04-28 10:38:27 +02:00
Philipp Dormann	09b59175ee	wip	2025-04-28 10:35:45 +02:00
Philipp Dormann	a21f61f3f3	wip	2025-04-28 10:24:07 +02:00