Open Changes

src/routes/auth/auth.ts

@@ -97,7 +97,7 @@ export default async function authRoutes(server: FastifyInstance) {
             const { data, error } = await server.supabase
                 .from("auth_users")
                 .select("*, tenants!auth_tenant_users(*)")
-                .eq("email", body.email)
+                .eq("email", body.email.toLowerCase())
 
             // @ts-ignore
             user = (data || []).find(i => i.tenants.find(x => x.id === req.tenant.id))
@@ -130,7 +130,7 @@ export default async function authRoutes(server: FastifyInstance) {
                 return reply.code(401).send({ error: "Invalid credentials" });
             } else {
                 const token = jwt.sign(
-                    { user_id: user.id, email: user.email, tenant_id: req.tenant?.id ? req.tenant.id : null },
+                    { user_id: user.id, email: user.email, tenant_id: null },
                     secrets.JWT_SECRET!,
                     { expiresIn: "6h" }
                 );

src/routes/exports.ts

@@ -8,13 +8,15 @@ import {getSignedUrl} from "@aws-sdk/s3-request-presigner";
 import dayjs from "dayjs";
 import {randomUUID} from "node:crypto";
 import {secrets} from "../utils/secrets";
+import {createSEPAExport} from "../utils/export/sepa";
 
-const createExport = async (server:FastifyInstance,req:any,startDate,endDate,beraternr,mandantennr) => {
+const createDatevExport = async (server:FastifyInstance,req:any,startDate,endDate,beraternr,mandantennr) => {
     console.log(startDate,endDate,beraternr,mandantennr)
 
     // 1) ZIP erzeugen
     const buffer = await buildExportZip(server,req.user.tenant_id, startDate, endDate, beraternr, mandantennr)
     console.log("ZIP created")
+    console.log(buffer)
 
     // 2) Dateiname & Key festlegen
     const fileKey = `${req.user.tenant_id}/exports/Export_${dayjs(startDate).format("YYYY-MM-DD")}_${dayjs(endDate).format("YYYY-MM-DD")}_${randomUUID()}.zip`
@@ -80,7 +82,27 @@ export default async function exportRoutes(server: FastifyInstance) {
 
         setImmediate(async () => {
             try {
-                await createExport(server,req,start_date,end_date,beraternr,mandantennr)
+                await createDatevExport(server,req,start_date,end_date,beraternr,mandantennr)
+                console.log("Job done ✅")
+            } catch (err) {
+                console.error("Job failed ❌", err)
+            }
+        })
+
+    })
+
+    server.post("/exports/sepa", async (req, reply) => {
+        const { idsToExport } = req.body as {
+            idsToExport: Array<number>
+        }
+
+
+
+        reply.send({success:true})
+
+        setImmediate(async () => {
+            try {
+                await createSEPAExport(server, idsToExport, req.user.tenant_id)
                 console.log("Job done ✅")
             } catch (err) {
                 console.error("Job failed ❌", err)

src/routes/functions.ts

@@ -1,7 +1,9 @@
 import { FastifyInstance } from "fastify";
 import {createInvoicePDF, createTimeSheetPDF} from "../utils/pdf";
-import {useNextNumberRangeNumber} from "../utils/functions";
+import {encodeBase64ToNiimbot, generateLabel, useNextNumberRangeNumber} from "../utils/functions";
 import dayjs from "dayjs";
+import { ready as zplReady } from 'zpl-renderer-js'
+import { renderZPL } from "zpl-image";
 
 import customParseFormat from "dayjs/plugin/customParseFormat.js";
 import isoWeek from "dayjs/plugin/isoWeek.js";
@@ -48,8 +50,6 @@ export default async function functionRoutes(server: FastifyInstance) {
                 )
             }
 
-            console.log(pdf)
-
             return pdf // Fastify wandelt automatisch in JSON
         } catch (err) {
             console.log(err)
@@ -149,4 +149,43 @@ export default async function functionRoutes(server: FastifyInstance) {
         }
     })
 
+    server.post('/print/zpl/preview', async (req, reply) => {
+        const { zpl, widthMm = 50, heightMm = 30, dpmm = 8, asBase64 = false } = req.body as {zpl:string,widthMm:number,heightMm:number,dpmm:number,asBase64:string}
+
+        console.log(widthMm,heightMm,dpmm)
+
+        if (!zpl) {
+            return reply.code(400).send({ error: 'Missing ZPL string' })
+        }
+
+        try {
+            // 1️⃣ Renderer initialisieren
+            const { api } = await zplReady
+
+            // 2️⃣ Rendern (liefert base64-encoded PNG)
+            const base64Png = await api.zplToBase64Async(zpl, widthMm, heightMm, dpmm)
+
+            return await encodeBase64ToNiimbot(base64Png, 'top')
+        } catch (err) {
+            console.error('[ZPL Preview Error]', err)
+            return reply.code(500).send({ error: err.message || 'Failed to render ZPL' })
+        }
+    })
+
+    server.post('/print/label', async (req, reply) => {
+        const { context, width=584, heigth=354 } = req.body as {context:any,width:number,heigth:number}
+
+        try {
+            const base64 = await generateLabel(context,width,heigth)
+
+            return {
+                encoded: await encodeBase64ToNiimbot(base64, 'top'),
+                base64: base64
+            }
+        } catch (err) {
+            console.error('[ZPL Preview Error]', err)
+            return reply.code(500).send({ error: err.message || 'Failed to render ZPL' })
+        }
+    })
+
 }

src/routes/staff/time.ts

@@ -4,16 +4,24 @@ import { StaffTimeEntry } from '../../types/staff'
 export default async function staffTimeRoutes(server: FastifyInstance) {
 
     // ▶ Neue Zeit starten
-    server.post<{ Body: Pick<StaffTimeEntry, 'started_at' | 'stopped_at' | 'type' | 'description'> }>(
+    server.post(
         '/staff/time',
         async (req, reply) => {
-            const { started_at, stopped_at, type = 'work', description } = req.body
+            const { started_at, stopped_at, type = 'work', description, user_id } = req.body
             const userId = req.user.user_id
             const tenantId = req.user.tenant_id
 
+
+            let dataToInsert = {
+                tenant_id: tenantId,
+                user_id: user_id ? user_id : userId,
+                // @ts-ignore
+                ...req.body
+            }
+
             const { data, error } = await server.supabase
                 .from('staff_time_entries')
-                .insert([{ tenant_id: tenantId, user_id: userId, started_at, stopped_at, type, description }])
+                .insert([dataToInsert])
                 .select()
                 .maybeSingle()