Update staging #567
@@ -10,7 +10,7 @@
|
||||
export let email: string;
|
||||
export let startdatum: Date;
|
||||
export let enddatum: Date;
|
||||
|
||||
moment.locale("de");
|
||||
moment.tz.setDefault("Europe/Berlin");
|
||||
|
||||
const bestellungenNachMonat: Record<string, (typeof bestellungen)> = {};
|
||||
@@ -24,12 +24,6 @@
|
||||
}
|
||||
|
||||
// Wir brauchen alle Monate zwischen dem ersten Mal, dass der partner_code benutzt wurde bis zum heutigen Zeitpunkt.
|
||||
const months: Record<string, string> = {
|
||||
"01": "Januar", "02": "Februar", "03": "März", "04": "April",
|
||||
"05": "Mai", "06": "Juni", "07": "Juli", "08": "August",
|
||||
"09": "September", "10": "Oktober", "11": "November", "12": "Dezember"
|
||||
};
|
||||
|
||||
function getMonthlyPeriods(from: Date, to: Date): moment.Moment[] {
|
||||
const start = moment(from).startOf('month');
|
||||
const end = moment(to).endOf('month');
|
||||
|
||||
@@ -7,6 +7,7 @@ import { Enums, prisma } from "#lib/server/prisma";
|
||||
import { getCurrentUser } from "#lib/server/user";
|
||||
import moment from "moment-timezone";
|
||||
|
||||
moment.locale("de");
|
||||
moment.tz.setDefault("Europe/Berlin");
|
||||
|
||||
const start = moment(Astro.url.searchParams.get("start"));
|
||||
|
||||
@@ -7,12 +7,14 @@ import { getCurrentUser } from "#lib/server/user";
|
||||
import { prisma } from "#lib/server/prisma";
|
||||
import { extrahiereAusweisAusFeldMitMehrerenAusweisen } from "#lib/server/ausweis";
|
||||
import { getProvision } from "#lib/provision";
|
||||
moment.locale("de");
|
||||
moment.tz.setDefault("Europe/Berlin");
|
||||
const datum = moment(Astro.url.searchParams.get("d")).set("date", 1);
|
||||
|
||||
const datum = moment(Astro.url.searchParams.get("d"));
|
||||
const benutzer = await getCurrentUser(Astro);
|
||||
|
||||
// Wir dürfen die Abrechnung erst ab Juni starten lassen.
|
||||
if (datum.isBefore(moment().set("year", 2025).set("month", 5).set("date", 1))) {
|
||||
if (datum.isBefore(moment().set("year", 2025).set("month", 4).endOf("month"))) {
|
||||
return Astro.redirect("/404")
|
||||
}
|
||||
|
||||
@@ -126,7 +128,7 @@ Handlebars.registerHelper("get-provision-betrag", function (ausweisart, ausweist
|
||||
});
|
||||
|
||||
const template = Handlebars.compile(abrechnungTemplateHTML);
|
||||
const html = template({ monat: datum.format("MMMM YYYY"), bestellungen: blocks });
|
||||
const html = template({ monat: datum.format("MMMM YYYY"), bestellungen: blocks, heute: moment().format("DD.MM.YYYY") });
|
||||
await page.goto(`data:text/html;charset=UTF-8,${encodeURIComponent(html)}`, {
|
||||
waitUntil: "networkidle0",
|
||||
});
|
||||
|
||||
@@ -33,7 +33,7 @@
|
||||
{{#if @first}}
|
||||
<div class="flex flex-row justify-between items-center">
|
||||
<p class="font-semibold">Erzielte Conversions {{ @root.monat }}</p>
|
||||
<p>Erstellt am 16.11.23</p>
|
||||
<p>Erstellt am {{ @root.heute }}</p>
|
||||
</div>
|
||||
{{/if}}
|
||||
<table class="table border-collapse border border-black">
|
||||
|
||||
Reference in New Issue
Block a user