From de8dd9e9f1bf93aaffbd5e99ca3a4af35248b264 Mon Sep 17 00:00:00 2001 From: Moritz Utcke Date: Tue, 22 Apr 2025 10:32:34 -0300 Subject: [PATCH 1/5] Auto stash before merge of "dev" and "origin/dev" --- src/components/Dashboard/DashboardSidebar.svelte | 9 +++++---- src/layouts/DashboardLayout.astro | 8 +++++--- src/modules/Dashboard/DashboardAufnahmeModule.svelte | 2 +- src/pages/dashboard/objekte/[id].astro | 4 +++- src/pages/dashboard/objekte/index.astro | 4 +++- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/components/Dashboard/DashboardSidebar.svelte b/src/components/Dashboard/DashboardSidebar.svelte index e6edc9eb..e0a2e43d 100644 --- a/src/components/Dashboard/DashboardSidebar.svelte +++ b/src/components/Dashboard/DashboardSidebar.svelte @@ -15,10 +15,11 @@ BenutzerClient, ObjektKomplettClient, } from "#components/Ausweis/types.js"; - import { RechnungSchema } from "src/generated/zod/rechnung.js"; + import { Benutzer } from "#lib/server/prisma.js"; export let lightTheme: boolean; - export let benutzer: BenutzerClient; + export let benutzer: Benutzer; + export let besteller: Benutzer; let id: string; @@ -70,14 +71,14 @@
- {benutzer.vorname} {benutzer.name} + {besteller.vorname} {besteller.name}
Eigentümer oder im Auftrag
- Telefon {benutzer.telefon} + Telefon {besteller.telefon}
diff --git a/src/layouts/DashboardLayout.astro b/src/layouts/DashboardLayout.astro index 2aca69c2..e06780f8 100644 --- a/src/layouts/DashboardLayout.astro +++ b/src/layouts/DashboardLayout.astro @@ -3,14 +3,15 @@ import "../style/global.css"; import "../../svelte-dialogs.config.js"; import DashboardSidebar from "../components/Dashboard/DashboardSidebar.svelte"; -import { BenutzerClient } from "#components/Ausweis/types"; +import { Benutzer } from "#lib/server/prisma"; export interface Props { title: string; - user: BenutzerClient; + user: Benutzer; + besteller: Benutzer; } -const { title, user } = Astro.props; +const { title, user, besteller } = Astro.props; if (!user) { Astro.redirect("/auth/login", 302); @@ -121,6 +122,7 @@ let lightTheme = Astro.cookies.get("theme")?.value === "light"; diff --git a/src/modules/Dashboard/DashboardAufnahmeModule.svelte b/src/modules/Dashboard/DashboardAufnahmeModule.svelte index 19873145..40160fd5 100644 --- a/src/modules/Dashboard/DashboardAufnahmeModule.svelte +++ b/src/modules/Dashboard/DashboardAufnahmeModule.svelte @@ -56,7 +56,7 @@ {#if ausweis.aufnahme.bilder.length > 0} {#each ausweis.aufnahme.bilder as bild, i (i)} - {bild.kategorie} + {bild.kategorie} {/each} diff --git a/src/pages/dashboard/objekte/[id].astro b/src/pages/dashboard/objekte/[id].astro index 9f088af2..5c910d3e 100644 --- a/src/pages/dashboard/objekte/[id].astro +++ b/src/pages/dashboard/objekte/[id].astro @@ -36,6 +36,7 @@ if (user.rolle === Enums.BenutzerRolle.USER) { }, include: { rechnung: true, + benutzer: true, aufnahme: { include: { bilder: true, @@ -53,6 +54,7 @@ if (user.rolle === Enums.BenutzerRolle.USER) { }, include: { rechnung: true, + benutzer: true, aufnahme: { include: { bilder: true, @@ -70,7 +72,7 @@ if (!ausweis) { --- - + \ No newline at end of file From a8a9553d20a0b7bf92f729066877c3e162d071f1 Mon Sep 17 00:00:00 2001 From: Moritz Utcke Date: Tue, 22 Apr 2025 15:01:07 -0300 Subject: [PATCH 2/5] =?UTF-8?q?Stornierungsbest=C3=A4tigung?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/api/admin/stornieren.ts | 42 ++++++++++++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/src/pages/api/admin/stornieren.ts b/src/pages/api/admin/stornieren.ts index fd406b96..2eb551fd 100644 --- a/src/pages/api/admin/stornieren.ts +++ b/src/pages/api/admin/stornieren.ts @@ -1,8 +1,9 @@ import { UUidWithPrefix } from "#components/Ausweis/types.js"; +import { transport } from "#lib/mail.js"; import { adminMiddleware } from "#lib/middleware/authorization.js"; import { mollieClient } from "#lib/mollie.js"; import { getPrismaAusweisAdapter } from "#lib/server/ausweis.js"; -import { Prisma, prisma } from "#lib/server/prisma.js"; +import { Benutzer, Prisma, prisma } from "#lib/server/prisma.js"; import { RefundStatus } from "@mollie/api-client"; import { APIError, defineApiRoute } from "astro-typesafe-api/server"; import { z } from "zod"; @@ -35,6 +36,12 @@ export const PUT = defineApiRoute({ }) } + const user = await prisma.benutzer.findUnique({ + where: { + id: ausweis.benutzer_id as string + } + }) as Benutzer; + const response = await adapter.findUnique({ where: { id: input.ausweis_id @@ -107,5 +114,38 @@ export const PUT = defineApiRoute({ }) } } + + await transport.sendMail({ + from: `"IBCornelsen" `, + to: rechnung.email || user.email, + bcc: "info@online-energieausweis.org", + subject: `Stornierung des Energieausweises vom Ingenieurbüro Cornelsen (ID: ${ausweis.id})`, + html: `

Sehr geehrte*r ${user.vorname} ${user.name},

+ +

Ihr Energieausweis wurde soeben storniert. +
+

+

+ Mit freundlichen Grüßen, +
+ Dipl.-Ing. Jens Cornelsen +
+
+ + IB Cornelsen +
+ Katendeich 5A +
+ 21035 Hamburg +
+ www.online-energieausweis.org +
+
+ + fon 040 · 209339850 +
+ fax 040 · 209339859 +

` + }); }, }) \ No newline at end of file From 8470ad5915debf35f2b9520dceb73f56b9b8b621 Mon Sep 17 00:00:00 2001 From: Moritz Utcke Date: Tue, 22 Apr 2025 15:04:43 -0300 Subject: [PATCH 3/5] Highlight rausgenommen --- src/layouts/AusweisLayoutDaten.astro | 24 ++++++++-------- src/layouts/AusweisLayoutPruefung.astro | 24 ++++++++-------- src/layouts/BlankLayout.astro | 24 ++++++++-------- src/layouts/DashboardLayout.astro | 38 +++++++++++++++---------- src/layouts/Layout.astro | 24 ++++++++-------- 5 files changed, 71 insertions(+), 63 deletions(-) diff --git a/src/layouts/AusweisLayoutDaten.astro b/src/layouts/AusweisLayoutDaten.astro index d18e3413..cf1a4523 100644 --- a/src/layouts/AusweisLayoutDaten.astro +++ b/src/layouts/AusweisLayoutDaten.astro @@ -18,19 +18,19 @@ const { title } = Astro.props; --- diff --git a/src/layouts/BlankLayout.astro b/src/layouts/BlankLayout.astro index 987d58b5..128dfeb4 100644 --- a/src/layouts/BlankLayout.astro +++ b/src/layouts/BlankLayout.astro @@ -35,19 +35,19 @@ const schema = JSON.stringify({ --- diff --git a/src/layouts/DashboardLayout.astro b/src/layouts/DashboardLayout.astro index e06780f8..9b25aee1 100644 --- a/src/layouts/DashboardLayout.astro +++ b/src/layouts/DashboardLayout.astro @@ -45,21 +45,29 @@ const schema = JSON.stringify({ let lightTheme = Astro.cookies.get("theme")?.value === "light"; --- - @@ -109,7 +117,7 @@ let lightTheme = Astro.cookies.get("theme")?.value === "light"; - +
{ From 70fd424488c8b13c2d5e46bfb0e24e7013af0779 Mon Sep 17 00:00:00 2001 From: Jens Cornelsen <79703163+IB-Cornelsen@users.noreply.github.com> Date: Tue, 22 Apr 2025 21:16:09 +0200 Subject: [PATCH 4/5] Textkorrekturen --- public/images/dashboard/DatenblattHaken.svg | 29 ++++++++++++++----- .../Dashboard/DashboardAusweis.svelte | 11 ++++--- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/public/images/dashboard/DatenblattHaken.svg b/public/images/dashboard/DatenblattHaken.svg index 46552de7..1f6aa3bd 100644 --- a/public/images/dashboard/DatenblattHaken.svg +++ b/public/images/dashboard/DatenblattHaken.svg @@ -38588,7 +38588,7 @@