IBCornelsen/online-energieausweis
1
0
Fork 0
Code Issues 272 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge pull request #571 from IBCornelsen/staging

Browse Source 
Abrechnung Fix
This commit is contained in:
Moritz Utcke
2025-09-12 13:12:35 -03:00
committed by GitHub
parent 9157df7a1c fe4b4fb53a
commit a1a286b67f
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/Dashboard/DashboardSidebar.svelte
View File

@@ -5,7 +5,7 @@
CaretDown, CaretDown,
MagnifyingGlass, MagnifyingGlass,
} from "radix-svelte-icons"; } from "radix-svelte-icons";
import { Benutzer, Enums } from "#lib/server/prisma.js"; import { Benutzer, Enums } from "#lib/client/prisma.js";
export let lightTheme: boolean; export let lightTheme: boolean;
export let benutzer: Benutzer; export let benutzer: Benutzer;
@@ -38,6 +38,12 @@
{benutzer.name} {benutzer.name}
</div> </div>
<div class="text-base-content text-sm flex">{benutzer.email}</div> <div class="text-base-content text-sm flex">{benutzer.email}</div>
{#if benutzer.rolle === Enums.BenutzerRolle.RESELLER}
<div class="text-xs text-gray-500 flex">Reseller</div>
{/if}
{#if benutzer.rolle === Enums.BenutzerRolle.ADMIN}
<div class="text-xs text-gray-500 flex">Admin</div>
{/if}
<a href="/auth/logout" class="text-xs">Logout</a> <a href="/auth/logout" class="text-xs">Logout</a>
</div> </div>
</div> </div>

4
src/pages/dashboard/abrechnung/index.astro
View File

@@ -13,8 +13,8 @@ moment.tz.setDefault("Europe/Berlin");
const start = moment(Astro.url.searchParams.get("start")); const start = moment(Astro.url.searchParams.get("start"));
const end = moment(Astro.url.searchParams.get("end")); const end = moment(Astro.url.searchParams.get("end"));
let startdatum = start.isValid() ? start.toDate() : moment().startOf("month").toDate(); let startdatum = start.isValid() ? start.startOf("day").toDate() : moment().startOf("month").toDate();
let enddatum = end.isValid() ? end.toDate() : moment().endOf("month").toDate(); let enddatum = end.isValid() ? end.endOf("day").toDate() : moment().endOf("month").toDate();
// Wir dürfen die Abrechnung erst ab Juni starten lassen. // Wir dürfen die Abrechnung erst ab Juni starten lassen.
if (startdatum < moment().set("year", 2025).set("month", 5).set("date", 1).toDate()) { if (startdatum < moment().set("year", 2025).set("month", 5).set("date", 1).toDate()) {