()); // no tags stored
+ Assert.Equal("18.06.2026", Assert.Single(s2.History).NewValue);
+ }
+
+ [Fact]
+ public void ApplyPatch_Address_MultilineHtml_KeepsLineBreaks()
+ {
+ var (svc, _, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var s2 = svc.ApplyPatch(s.Token, new InvoiceDraftDelta
+ {
+ Target = "address",
+ Value = JToken.FromObject("
Firma AG
Weg 1
5080 Laufenburg
")
+ });
+
+ Assert.Equal("Firma AG\nWeg 1\n5080 Laufenburg", s2!.New["invoiceaddress"]!.Value());
+ }
+
+ [Fact]
+ public void ApplyPatch_ScalarField_DecodesEntities()
+ {
+ var (svc, _, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var s2 = svc.ApplyPatch(s.Token, new InvoiceDraftDelta { Target = "title", Value = JToken.FromObject("Tom & Jerry") });
+
+ Assert.Equal("Tom & Jerry", s2!.New["invoicetitle"]!.Value());
+ }
+
+ [Fact]
+ public void ApplyPatch_ProvisionLocation_SanitisesAndMirrorsLoc()
+ {
+ var (svc, _, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var s2 = svc.ApplyPatch(s.Token, new InvoiceDraftDelta { Target = "provisionlocation", Value = JToken.FromObject("Baustelle 7
") });
+
+ Assert.Equal("Baustelle 7", s2!.New["provisionlocation"]!.Value());
+ Assert.Equal("Baustelle 7", s2.New["loc"]!.Value());
+ }
+
+ // ── Change history records the changed field, not the whole block JSON ─────
+ [Fact]
+ public void ApplyPatch_BlockReplace_HistoryNewValueIsSectionText_NotJson()
+ {
+ var (svc, _, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var newBlock = JObject.Parse(@"{'Id':'1','text':'Neue Überschrift
',
+ 'itm':[{'id':'900','typ':'material','vt':100,'vv':19,'vat':'19%'}],
+ 'items':[{'id':'900','type':'material','total_net':100,'vat':'19%'}]}");
+ var s2 = svc.ApplyPatch(s.Token, new InvoiceDraftDelta { Target = "block.replace", Ref = "1", Value = newBlock });
+
+ var h = Assert.Single(s2!.History);
+ Assert.Equal("Neue Überschrift", h.NewValue); // the heading, sanitised — never the block JSON
+ Assert.DoesNotContain("{", h.NewValue);
+ Assert.Equal("Auftrag", h.OldValue);
+ // and the cached block text is stored clean too
+ Assert.Equal("Neue Überschrift", ((JObject)s2.Req[0])["text"]!.Value());
+ }
+
+ // ── Section reorder ───────────────────────────────────────────────────────
+ private static JObject TwoBlockPayload() => JObject.Parse(@"{
+ 'admin':{'p13b':false,'type':'r'},
+ 'new':{'invoiceemail':'a@b.de','invoiceaddress':'Weg 1'},
+ 'req':[
+ {'Id':'1','text':'A','itm':[{'id':'900','typ':'material','vt':100,'vv':19,'vat':'19%'}],'items':[{'id':'900','type':'material','total_net':100,'vat':'19%'}]},
+ {'Id':'2','text':'B','itm':[{'id':'950','typ':'material','vt':30,'vv':5.7,'vat':'19%'}],'items':[{'id':'950','type':'material','total_net':30,'vat':'19%'}]}
+ ]}");
+
+ [Fact]
+ public void ApplyPatch_BlockOrder_ReordersReqAndRenumbersPositions()
+ {
+ var (svc, _, _) = NewService();
+ var s = svc.OpenFromPayload(TwoBlockPayload(), "user1");
+ Assert.Equal(new[] { "1", "2" }, s.Req.Select(b => b["Id"]!.Value()).ToArray());
+
+ var s2 = svc.ApplyPatch(s.Token, new InvoiceDraftDelta { Target = "block.order", Value = JArray.Parse("['2','1']") });
+
+ Assert.Equal(new[] { "2", "1" }, s2!.Req.Select(b => b["Id"]!.Value()).ToArray());
+ Assert.Equal("1", ((JObject)((JArray)((JObject)s2.Req[0])["itm"]!)[0])["p"]!.ToString()); // block 2's item now position 1
+ Assert.Equal(130m, s2.Sums.TotalNet); // totals unaffected by reorder
+ var h = Assert.Single(s2.History);
+ Assert.Equal("1,2", h.OldValue);
+ Assert.Equal("2,1", h.NewValue);
+ }
+
+ [Fact]
+ public void ApplyPatch_BlockOrder_UnchangedSequence_IsNoOp()
+ {
+ var (svc, _, _) = NewService();
+ var s = svc.OpenFromPayload(TwoBlockPayload(), "user1");
+
+ var s2 = svc.ApplyPatch(s.Token, new InvoiceDraftDelta { Target = "block.order", Value = JArray.Parse("['1','2']") });
+
+ Assert.Equal(0, s2!.Version); // no-op: no version bump, no history
+ Assert.Empty(s2.History);
+ }
+
+ [Fact]
+ public void ApplyPatch_BlockOrder_UnknownIds_KeepMentionedFirstThenRest()
+ {
+ var (svc, _, _) = NewService();
+ var s = svc.OpenFromPayload(TwoBlockPayload(), "user1");
+
+ // Only name block 2; block 1 is unmentioned and must be kept (appended after).
+ var s2 = svc.ApplyPatch(s.Token, new InvoiceDraftDelta { Target = "block.order", Value = JArray.Parse("['2','ghost']") });
+
+ Assert.Equal(new[] { "2", "1" }, s2!.Req.Select(b => b["Id"]!.Value()).ToArray());
+ }
+
+ // ── Multiple VAT rates aggregate independently (ADR 0008: server owns every tax sum) ──
+ private static JObject MultiRatePayload() => JObject.Parse(@"{
+ 'admin':{'p13b':false,'type':'r'},
+ 'new':{'invoiceemail':'a@b.de','invoiceaddress':'Weg 1'},
+ 'req':[
+ {'Id':'1','text':'A','itm':[
+ {'id':'900','typ':'material','vt':100,'vv':19,'vat':'19%'},
+ {'id':'901','typ':'material','vt':200,'vv':14,'vat':'7%'},
+ {'id':'902','typ':'material','vt':50,'vv':0,'vat':'0%'}],
+ 'items':[{'id':'900','type':'material','total_net':100,'vat':'19%'},
+ {'id':'901','type':'material','total_net':200,'vat':'7%'},
+ {'id':'902','type':'material','total_net':50,'vat':'0%'}]}
+ ]}");
+
+ [Fact]
+ public void OpenFromPayload_MultipleVatRates_GroupsSumsPerRate()
+ {
+ var (svc, _, _) = NewService();
+ var s = svc.OpenFromPayload(MultiRatePayload(), "user1");
+
+ Assert.Equal(350m, s.Sums.TotalNet);
+ Assert.Equal(33m, s.Sums.TotalVat);
+ Assert.Equal(383m, s.Sums.TotalGross);
+ Assert.Equal(19m, s.Sums.VatByRate["19"]);
+ Assert.Equal(14m, s.Sums.VatByRate["7"]);
+ Assert.False(s.Sums.VatByRate.ContainsKey("0")); // zero-rate contributes no VAT key (mirrors calculator)
+ }
+
+ [Fact]
+ public void ApplyPatch_BlockReplace_MultiRate_RecomputesEachRateIndependently()
+ {
+ var (svc, _, _) = NewService();
+ var s = svc.OpenFromPayload(MultiRatePayload(), "user1");
+
+ // Halve the 7%-rate line's net/VAT via a block replace; the 19% bucket must stay untouched.
+ var newBlock = JObject.Parse(@"{'Id':'1','text':'A','itm':[
+ {'id':'900','typ':'material','vt':100,'vv':19,'vat':'19%'},
+ {'id':'901','typ':'material','vt':100,'vv':7,'vat':'7%'},
+ {'id':'902','typ':'material','vt':50,'vv':0,'vat':'0%'}],
+ 'items':[]}");
+ var s2 = svc.ApplyPatch(s.Token, new InvoiceDraftDelta { Target = "block.replace", Ref = "1", Value = newBlock });
+
+ Assert.Equal(19m, s2!.Sums.VatByRate["19"]); // unchanged
+ Assert.Equal(7m, s2.Sums.VatByRate["7"]); // recomputed from new line
+ Assert.Equal(250m, s2.Sums.TotalNet);
+ Assert.Equal(26m, s2.Sums.TotalVat);
+ }
+
+ // ── BuildSetDisplay reflects both set-pricing modes (mirrors the PDF's InvoiceSetPricing) ──
+ // SetPayload()'s header item is still unconverted (own total_net == 0, as delivered by
+ // fds__prepInvoice) — until the set-item switch (ApplyItemSetPrice) actually gives it its own
+ // price, InvoiceSetPricing.Build must not apply the chosen setmode yet: header stays blank and
+ // each member keeps showing its own individual price.
+ [Theory]
+ [InlineData("setprice")]
+ [InlineData("setonly")]
+ public void BuildState_SetDisplay_UnconvertedSet_HeaderBlankMembersIndividuallyPriced(string setmode)
+ {
+ var (svc, _, _) = NewService();
+ var payload = SetPayload();
+ payload["admin"]!["setmode"] = setmode;
+ var s = svc.OpenFromPayload(payload, "user1");
+
+ var state = JObject.FromObject(svc.BuildState(s));
+ var setDisplay = (JObject)state["setDisplay"]!;
+
+ Assert.False(setDisplay["1"]!["p"]!.Value()); // header not priced yet
+ Assert.True(setDisplay["2"]!["p"]!.Value()); // member 2 keeps its own price
+ Assert.True(setDisplay["3"]!["p"]!.Value()); // member 3 keeps its own price
+ }
+
+ // Once converted (ApplyItemSetPrice has given the header its own price), the chosen setmode
+ // takes effect: SetPrice blanks the members (still present in the map); SetOnly drops them
+ // from the map entirely.
+ [Theory]
+ [InlineData("setprice", true, false)] // header priced, member 2 blank
+ [InlineData("setonly", true, false)] // header priced; member 2 dropped entirely (absent from map)
+ public void BuildState_SetDisplay_ConvertedSet_ReflectsSetmodeForHeaderAndMember(string setmode, bool headerShown, bool memberShown)
+ {
+ var (svc, _, _) = NewService();
+ var payload = SetPayload();
+ payload["admin"]!["setmode"] = setmode;
+ var s = svc.OpenFromPayload(payload, "user1");
+ svc.ApplyPatch(s.Token, new InvoiceDraftDelta { Target = "item.setprice", Ref = "1" }); // convert the set first
+
+ var state = JObject.FromObject(svc.BuildState(s));
+ var setDisplay = (JObject)state["setDisplay"]!;
+
+ Assert.Equal(headerShown, setDisplay["1"]!["p"]!.Value());
+ if (setmode == "setonly")
+ Assert.False(setDisplay.ContainsKey("2")); // member removed from the display entirely
+ else
+ Assert.Equal(memberShown, setDisplay["2"]!["p"]!.Value());
+ }
+
+ // ── Full lifecycle recalculation: several edits of different kinds land in one consistent recompute ──
+ [Fact]
+ public void ApplyPatch_FullEditSequence_TextReorderSetPriceAndTaxToggle_EndsConsistent()
+ {
+ var (svc, _, _) = NewService();
+ var s = svc.OpenFromPayload(TwoBlockPayload(), "user1");
+
+ // 1) text change
+ svc.ApplyPatch(s.Token, new InvoiceDraftDelta { Target = "title", Value = JToken.FromObject("Endabrechnung") });
+ // 2) reorder sections
+ svc.ApplyPatch(s.Token, new InvoiceDraftDelta { Target = "block.order", Value = JArray.Parse("['2','1']") });
+ // 3) toggle reverse-charge on, then off again (settings roundtrip)
+ svc.ApplyPatch(s.Token, new InvoiceDraftDelta { Target = "p13b", Value = JToken.FromObject(true) });
+ var final = svc.ApplyPatch(s.Token, new InvoiceDraftDelta { Target = "p13b", Value = JToken.FromObject(false) });
+
+ Assert.NotNull(final);
+ Assert.Equal("Endabrechnung", final!.New["invoicetitle"]!.Value());
+ Assert.Equal(new[] { "2", "1" }, final.Req.Select(b => b["Id"]!.Value()).ToArray());
+ Assert.Equal("1", ((JObject)((JArray)((JObject)final.Req[0])["itm"]!)[0])["p"]!.ToString()); // renumbered after reorder
+ Assert.Equal(130m, final.Sums.TotalNet); // totals stable across the whole sequence
+ Assert.Equal(24.7m, final.Sums.TotalVat); // VAT restored after the toggle roundtrip
+ Assert.Equal(4, final.History.Count);
+ Assert.DoesNotContain(final.ValidationMessages, m => m.Severity == "error");
+ }
+}
diff --git a/Fuchs.Tests/InvoiceOptionsTests.cs b/Fuchs.Tests/InvoiceOptionsTests.cs
index d6f91c5..35a68de 100644
--- a/Fuchs.Tests/InvoiceOptionsTests.cs
+++ b/Fuchs.Tests/InvoiceOptionsTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Linq;
using Fuchs.intranet;
@@ -31,16 +31,25 @@ public class InvoiceOptionsTests
=> Assert.Equal("", InvoiceOptionsFor(new { type = "r" }));
[Fact]
- public void DefaultSetPrice_OmitsToken()
- => Assert.Equal("", InvoiceOptionsFor(new { type = "r", setmode = "setprice" }));
+ public void ExplicitDefaultSetPrice_EmitsToken()
+ // An explicit choice of the default mode must still be persisted — otherwise it is
+ // indistinguishable from an invoice that was never switched to set-pricing at all
+ // (the editor relies on this to hide the "Set-Preisanzeige" menu entry once chosen).
+ => Assert.Equal("setmode:setprice", InvoiceOptionsFor(new { type = "r", setmode = "setprice" }));
[Theory]
- [InlineData("itemprices", "setmode:itemprices")]
[InlineData("setonly", "setmode:setonly")]
- [InlineData("ITEMPRICES", "setmode:itemprices")] // case-insensitive
+ [InlineData("SETONLY", "setmode:setonly")] // case-insensitive
public void SetMode_EmitsToken(string mode, string expected)
=> Assert.Equal(expected, InvoiceOptionsFor(new { type = "r", setmode = mode }));
+ [Fact]
+ public void RemovedItemPricesMode_OmitsToken()
+ // "itemprices" was a valid mode before the button/mode was removed. Any invoice options
+ // still carrying the stale value (or a client re-posting it) must not be persisted as a
+ // recognized token — it is treated the same as an unknown/garbage mode.
+ => Assert.Equal("", InvoiceOptionsFor(new { type = "r", setmode = "itemprices" }));
+
[Fact]
public void UnknownSetMode_OmitsToken()
=> Assert.Equal("", InvoiceOptionsFor(new { type = "r", setmode = "garbage" }));
@@ -103,9 +112,11 @@ public class InvoiceOptionsTests
public void ModeFromInvoiceOptions_RoundTripsBackendEmission()
{
// The token this side emits must parse back to the same mode on the PDF side.
- Assert.Equal(SetDisplayMode.ItemPrices,
- InvoiceSetPricing.ModeFromInvoiceOptions(InvoiceOptionsFor(new { type = "r", setmode = "itemprices" })));
Assert.Equal(SetDisplayMode.SetOnly,
InvoiceSetPricing.ModeFromInvoiceOptions(InvoiceOptionsFor(new { type = "r", p13b = true, setmode = "setonly" })));
+ // A removed mode never round-trips as itself — it is never persisted, so reading it back
+ // always yields the default SetPrice.
+ Assert.Equal(SetDisplayMode.SetPrice,
+ InvoiceSetPricing.ModeFromInvoiceOptions(InvoiceOptionsFor(new { type = "r", setmode = "itemprices" })));
}
}
diff --git a/Fuchs.Tests/InvoiceSetPricingTests.cs b/Fuchs.Tests/InvoiceSetPricingTests.cs
index bb61669..f8a6e42 100644
--- a/Fuchs.Tests/InvoiceSetPricingTests.cs
+++ b/Fuchs.Tests/InvoiceSetPricingTests.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.Linq;
using Fuchs.intranet;
using Xunit;
@@ -40,11 +40,11 @@ public class InvoiceSetPricingTests
// ── Mode parsing ────────────────────────────────────────────────────────
[Theory]
- [InlineData("itemprices", SetDisplayMode.ItemPrices)]
- [InlineData("items", SetDisplayMode.ItemPrices)]
[InlineData("setonly", SetDisplayMode.SetOnly)]
+ [InlineData("set_only", SetDisplayMode.SetOnly)]
[InlineData("setprice", SetDisplayMode.SetPrice)]
[InlineData("", SetDisplayMode.SetPrice)]
+ [InlineData("itemprices", SetDisplayMode.SetPrice)] // removed mode — falls back to default, never throws
[InlineData("garbage", SetDisplayMode.SetPrice)]
public void ParseMode_Works(string raw, SetDisplayMode expected)
=> Assert.Equal(expected, InvoiceSetPricing.ParseMode(raw));
@@ -52,10 +52,12 @@ public class InvoiceSetPricingTests
[Fact]
public void ModeFromInvoiceOptions_ReadsToken()
{
- Assert.Equal(SetDisplayMode.ItemPrices, InvoiceSetPricing.ModeFromInvoiceOptions("§13b,setmode:itemprices"));
- Assert.Equal(SetDisplayMode.SetOnly, InvoiceSetPricing.ModeFromInvoiceOptions("setmode:setonly"));
- Assert.Equal(SetDisplayMode.SetPrice, InvoiceSetPricing.ModeFromInvoiceOptions("§13b")); // default
- Assert.Equal(SetDisplayMode.SetPrice, InvoiceSetPricing.ModeFromInvoiceOptions(null));
+ Assert.Equal(SetDisplayMode.SetOnly, InvoiceSetPricing.ModeFromInvoiceOptions("§13b,setmode:setonly"));
+ Assert.Equal(SetDisplayMode.SetPrice, InvoiceSetPricing.ModeFromInvoiceOptions("§13b")); // default
+ Assert.Equal(SetDisplayMode.SetPrice, InvoiceSetPricing.ModeFromInvoiceOptions(null));
+ // A stale/removed "itemprices" token (e.g. from an invoice created before the mode was
+ // dropped) must not throw — it degrades gracefully to the default SetPrice mode.
+ Assert.Equal(SetDisplayMode.SetPrice, InvoiceSetPricing.ModeFromInvoiceOptions("setmode:itemprices"));
}
[Fact]
@@ -85,22 +87,6 @@ public class InvoiceSetPricingTests
Assert.Equal(50.00m, lines[3].TotalNet);
}
- // ── ItemPrices: members priced, set header blank ──────────────────────────
- [Fact]
- public void Build_ItemPrices_MembersPricedHeaderBlank()
- {
- var lines = InvoiceSetPricing.Build(Sample(), SetDisplayMode.ItemPrices);
-
- Assert.Equal(4, lines.Count);
- Assert.True(lines[0].IsSetHeader);
- Assert.False(lines[0].ShowPrice); // set header is just a title now
- Assert.True(lines[1].ShowPrice);
- Assert.Equal(600.00m, lines[1].TotalNet);
- Assert.True(lines[2].ShowPrice);
- Assert.Equal(400.00m, lines[2].TotalNet);
- Assert.True(lines[3].ShowPrice); // standalone
- }
-
// ── SetOnly: members removed ──────────────────────────────────────────────
[Fact]
public void Build_SetOnly_RemovesMembers()
@@ -115,18 +101,45 @@ public class InvoiceSetPricingTests
Assert.Equal("Anfahrt", lines[1].Title);
}
- // ── Set price falls back to sum of members when header total is 0 ─────────
+ // ── Unconverted set (header total still 0): shown blank, members individually priced ──
[Fact]
- public void Build_HeaderTotalZero_UsesSumOfMembers()
+ public void Build_HeaderTotalZero_UnconvertedSet_HeaderBlankMembersPriced()
{
var items = new List>
{
- SetHeader("7", "Set ohne Preis"), // total 0
+ SetHeader("7", "Set ohne Preis"), // total 0 — not yet converted
Member("7", "A", "120.00", "120.00"),
Member("7", "B", "80.00", "80.00")
};
var lines = InvoiceSetPricing.Build(items, SetDisplayMode.SetPrice);
- Assert.Equal(200.00m, lines[0].TotalNet); // 120 + 80
+
+ Assert.Equal(3, lines.Count);
+ Assert.True(lines[0].IsSetHeader);
+ Assert.False(lines[0].ShowPrice); // header not priced yet
+ Assert.Equal(0m, lines[0].TotalNet);
+
+ Assert.True(lines[1].ShowPrice); // members keep their own price
+ Assert.Equal(120.00m, lines[1].TotalNet);
+ Assert.True(lines[2].ShowPrice);
+ Assert.Equal(80.00m, lines[2].TotalNet);
+ }
+
+ // ── SetOnly on an unconverted set also just passes items through unchanged ──
+ [Fact]
+ public void Build_HeaderTotalZero_UnconvertedSet_SetOnlyModeStillPassesThrough()
+ {
+ var items = new List>
+ {
+ SetHeader("7", "Set ohne Preis"),
+ Member("7", "A", "120.00", "120.00"),
+ Member("7", "B", "80.00", "80.00")
+ };
+ var lines = InvoiceSetPricing.Build(items, SetDisplayMode.SetOnly);
+
+ Assert.Equal(3, lines.Count); // members not dropped before conversion
+ Assert.False(lines[0].ShowPrice);
+ Assert.True(lines[1].ShowPrice);
+ Assert.True(lines[2].ShowPrice);
}
// ── No sets: pass-through unchanged ───────────────────────────────────────
@@ -164,7 +177,7 @@ public class InvoiceSetPricingTests
}
[Fact]
- public void Build_TextLine_AsSetMember_NoPriceEvenInItemPrices()
+ public void Build_TextLine_AsSetMember_NoPriceInSetPriceMode()
{
var items = new List>
{
@@ -172,10 +185,10 @@ public class InvoiceSetPricingTests
new() { ["type"] = "title", ["setId"] = "10", ["title"] = "Hinweis", ["total_net"] = "" },
Member("10", "Waschbecken", "600.00", "600.00")
};
- var lines = InvoiceSetPricing.Build(items, SetDisplayMode.ItemPrices);
+ var lines = InvoiceSetPricing.Build(items, SetDisplayMode.SetPrice);
var note = lines.First(l => l.Title == "Hinweis");
- Assert.False(note.ShowPrice); // text member stays blank
- Assert.True(lines.First(l => l.Title == "Waschbecken").ShowPrice);
+ Assert.False(note.ShowPrice); // text member stays blank (already blank in SetPrice mode)
+ Assert.False(lines.First(l => l.Title == "Waschbecken").ShowPrice); // members blank in SetPrice mode too
}
// ── Set price equals sum of member prices across modes (no double counting) ─
diff --git a/Fuchs.Tests/ProcessWebComServiceTests.cs b/Fuchs.Tests/ProcessWebComServiceTests.cs
index ce94512..28d2248 100644
--- a/Fuchs.Tests/ProcessWebComServiceTests.cs
+++ b/Fuchs.Tests/ProcessWebComServiceTests.cs
@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Diagnostics.Metrics;
using System.IO;
+using System.Linq;
using System.Net;
using System.Net.Http;
using System.Threading;
@@ -48,6 +49,12 @@ public class ProcessWebComServiceTests
}
}
+ private sealed class ThrowingHandler : HttpMessageHandler
+ {
+ protected override Task SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+ => throw new HttpRequestException("simulated transport failure");
+ }
+
private sealed class StubHttpClientFactory : IHttpClientFactory
{
private readonly HttpMessageHandler _handler;
@@ -55,6 +62,41 @@ public class ProcessWebComServiceTests
public HttpClient CreateClient(string name) => new(_handler, disposeHandler: false);
}
+ ///
+ /// Captures what would be written to fds__logEmail without hitting a database, by
+ /// overriding the audit-log write. Lets tests assert that every send path is logged and that
+ /// failures carry the service response / exception detail.
+ ///
+ private sealed class CapturingComService : ProcessWebComService
+ {
+ public readonly List<(bool success, List log)> Entries = new();
+
+ public CapturingComService(
+ IOptions settings,
+ IOptions emailSettings,
+ IHttpClientFactory httpClientFactory)
+ : base(NullLogger.Instance, intranet: null!, settings, emailSettings, httpClientFactory)
+ {
+ }
+
+ protected override Task WriteAuditLogAsync(string reference, string guid, string config,
+ DateTime sent, bool success, IEnumerable errors)
+ {
+ Entries.Add((success, errors.ToList()));
+ return Task.CompletedTask;
+ }
+ }
+
+ private static CapturingComService CreateCapturing(HttpMessageHandler handler, bool enabled = true, string? overrideRecipient = null)
+ {
+ var settings = Options.Create(new ProcessWebComSettings
+ {
+ Enabled = enabled, BaseUrl = "https://mailer.test", AccountId = "acct", Token = "tok"
+ });
+ var emailSettings = Options.Create(new FuchsEmailSettings { OverrideRecipient = overrideRecipient });
+ return new CapturingComService(settings, emailSettings, new StubHttpClientFactory(handler));
+ }
+
private static ProcessWebComService CreateService(StubHandler handler, bool enabled = true, string? overrideRecipient = null)
{
var settings = Options.Create(new ProcessWebComSettings
@@ -129,6 +171,102 @@ public class ProcessWebComServiceTests
Assert.Equal(0, handler.CallCount);
}
+ // ── Audit logging: every attempt is logged; failures carry the service response ─
+ [Fact]
+ public async Task SendEmailAsync_Success_LogsSuccessfulAttempt()
+ {
+ var svc = CreateCapturing(new StubHandler(HttpStatusCode.OK));
+
+ await svc.SendEmailAsync("inv_log_ok", "S", "x
", "kunde@example.de", "Kunde");
+
+ var entry = Assert.Single(svc.Entries);
+ Assert.True(entry.success);
+ }
+
+ [Fact]
+ public async Task SendEmailAsync_ApiError_LogsFailureIncludingServiceResponse()
+ {
+ var svc = CreateCapturing(new StubHandler(HttpStatusCode.InternalServerError, "mailer rejected: quota exceeded"));
+
+ bool result = await svc.SendEmailAsync("inv_log_api", "S", "x
", "kunde@example.de", "Kunde");
+
+ Assert.False(result);
+ var entry = Assert.Single(svc.Entries);
+ Assert.False(entry.success);
+ Assert.Contains(entry.log, l => l.Contains("mailer rejected: quota exceeded")); // raw service response
+ Assert.Contains(entry.log, l => l.Contains("500")); // HTTP status
+ }
+
+ [Fact]
+ public async Task SendEmailAsync_TransportException_LogsFailureIncludingExceptionDetail()
+ {
+ var svc = CreateCapturing(new ThrowingHandler());
+
+ bool result = await svc.SendEmailAsync("inv_log_ex", "S", "x
", "kunde@example.de", "Kunde");
+
+ Assert.False(result);
+ var entry = Assert.Single(svc.Entries);
+ Assert.False(entry.success);
+ Assert.Contains(entry.log, l => l.Contains("Exception while sending"));
+ Assert.Contains(entry.log, l => l.Contains("simulated transport failure"));
+ }
+
+ [Theory]
+ [InlineData("not-an-email")]
+ [InlineData("")]
+ public async Task SendEmailAsync_InvalidEmail_StillLogsFailedAttempt(string badEmail)
+ {
+ var svc = CreateCapturing(new StubHandler(HttpStatusCode.OK));
+
+ bool result = await svc.SendEmailAsync("inv_log_bad", "S", "x
", badEmail, "Kunde");
+
+ Assert.False(result);
+ var entry = Assert.Single(svc.Entries);
+ Assert.False(entry.success);
+ Assert.Contains(entry.log, l => l.Contains("Invalid recipient email address"));
+ }
+
+ [Fact]
+ public async Task SendEmailAsync_Disabled_LogsFailedAttempt()
+ {
+ var svc = CreateCapturing(new StubHandler(HttpStatusCode.OK), enabled: false);
+
+ await svc.SendEmailAsync("inv_log_dis", "S", "x
", "kunde@example.de", "Kunde");
+
+ var entry = Assert.Single(svc.Entries);
+ Assert.False(entry.success);
+ Assert.Contains(entry.log, l => l.ToLowerInvariant().Contains("disabled"));
+ }
+
+ // ── Audit-log parameters honour the NOT NULL columns of fds__emaillog ──────
+ [Fact]
+ public void BuildAuditLogParameters_FailedAttempt_NeverPassesNullForNotNullColumns()
+ {
+ // fds__emaillog.config and .DateSent are NOT NULL; a failed/unset send must not send NULL
+ // (regression: it previously did, so every audit write failed and no email was ever logged).
+ var pl = ProcessWebComService.BuildAuditLogParameters(
+ "admin_test", guid: "", config: "", sent: default, success: false, errors: new[] { "err" });
+
+ object? config = pl.Single(p => p.ParameterName == "@config").Value;
+ object? dateSent = pl.Single(p => p.ParameterName == "@DateSent").Value;
+
+ Assert.Equal("", config);
+ Assert.NotEqual(DBNull.Value, config);
+ Assert.IsType(dateSent);
+ Assert.NotEqual((object)DBNull.Value, dateSent);
+ }
+
+ [Fact]
+ public void BuildAuditLogParameters_SuccessfulSend_KeepsProvidedSentTimestamp()
+ {
+ var when = new DateTime(2026, 7, 16, 12, 0, 0, DateTimeKind.Utc);
+
+ var pl = ProcessWebComService.BuildAuditLogParameters(
+ "inv_1", guid: "g1", config: "", sent: when, success: true, errors: Array.Empty());
+
+ Assert.Equal(when, pl.Single(p => p.ParameterName == "@DateSent").Value);
+ }
+
// ── Dev/test recipient override safety net ─────────────────────────────────
[Fact]
public async Task SendEmailAsync_OverrideRecipientSet_RedirectsToOverrideAddress()
@@ -141,7 +279,7 @@ public class ProcessWebComServiceTests
Assert.True(result);
Assert.Equal(1, handler.CallCount);
var json = JObject.Parse(handler.LastRequestBody!);
- Assert.Equal("dev-inbox@example.test", json["recipient"]!.ToString());
+ Assert.Equal("dev-inbox@example.test", json["communication"]!["to"]!.ToString());
}
[Fact]
@@ -153,7 +291,7 @@ public class ProcessWebComServiceTests
await svc.SendEmailAsync("inv_ov2", "Rechnung 123", "hi
", "realcustomer@example.de", "Kunde");
var json = JObject.Parse(handler.LastRequestBody!);
- string subject = json["subject"]!.ToString();
+ string subject = json["communication"]!["subject"]!.ToString();
Assert.Contains("realcustomer@example.de", subject);
Assert.Contains("Rechnung 123", subject);
}
@@ -169,7 +307,7 @@ public class ProcessWebComServiceTests
Assert.True(result);
Assert.Equal(1, handler.CallCount);
var json = JObject.Parse(handler.LastRequestBody!);
- Assert.Equal("dev-inbox@example.test", json["recipient"]!.ToString());
+ Assert.Equal("dev-inbox@example.test", json["communication"]!["to"]!.ToString());
}
[Fact]
@@ -181,7 +319,7 @@ public class ProcessWebComServiceTests
await svc.SendEmailAsync("inv_ov4", "Subject", "hi
", "realcustomer@example.de", "Kunde");
var json = JObject.Parse(handler.LastRequestBody!);
- Assert.Equal("realcustomer@example.de", json["recipient"]!.ToString());
+ Assert.Equal("realcustomer@example.de", json["communication"]!["to"]!.ToString());
}
// ── Override enforcement across every real appsettings*.json environment ───
@@ -194,9 +332,9 @@ public class ProcessWebComServiceTests
// hand-typed literal - so a future edit that silently breaks the override key
// or its value in any appsettings*.json file would fail this test.
//
- // Note: this API has a single "recipient" field - there is no distinct
+ // Note: this API has a single "communication.to" field - there is no distinct
// to/cc/bcc concept anywhere in the codebase (see ProcessWebComService.
- // SendEmailAsync / payload.recipient). "to/cc/bcc cleared" is therefore fully
+ // SendEmailAsync / communication.to). "to/cc/bcc cleared" is therefore fully
// satisfied by asserting that field no longer carries the original recipient
// once an override is configured.
public static IEnumerable AppSettingsEnvironments()
@@ -236,7 +374,7 @@ public class ProcessWebComServiceTests
Assert.True(result);
Assert.Equal(1, handler.CallCount);
var json = JObject.Parse(handler.LastRequestBody!);
- string sentRecipient = json["recipient"]!.ToString();
+ string sentRecipient = json["communication"]!["to"]!.ToString();
if (!string.IsNullOrWhiteSpace(overrideRecipient))
{
@@ -266,7 +404,7 @@ public class ProcessWebComServiceTests
Assert.True(result);
Assert.NotNull(handler.LastRequestBody);
var json = JObject.Parse(handler.LastRequestBody!);
- var att = (JArray)json["attachments"]!;
+ var att = (JArray)json["communication"]!["attachments"]!;
Assert.Single(att);
Assert.Equal("Rechnung.pdf", att[0]!["filename"]!.ToString());
Assert.Equal("application/pdf", att[0]!["mimeType"]!.ToString());
diff --git a/Fuchs.Tests/ReminderDraftCalculatorTests.cs b/Fuchs.Tests/ReminderDraftCalculatorTests.cs
new file mode 100644
index 0000000..21bd9eb
--- /dev/null
+++ b/Fuchs.Tests/ReminderDraftCalculatorTests.cs
@@ -0,0 +1,92 @@
+using Fuchs.intranet;
+using Newtonsoft.Json.Linq;
+using Xunit;
+
+namespace Fuchs.Tests;
+
+///
+/// Exhaustively exercises the pure reminder-draft aggregation/validation (ADR 0006,
+/// the reminder mirror of ). Being static/pure,
+/// the open-amount math and the plausibility checks are unit-testable without a DB.
+///
+public class ReminderDraftCalculatorTests
+{
+ private static ReminderDraftSession Session(string newJson) =>
+ new() { New = JObject.Parse(newJson) };
+
+ [Theory]
+ [InlineData("{'amount':119,'amount_payed':0}", 119, 0, 119)]
+ [InlineData("{'amount':119,'amount_payed':20}", 119, 20, 99)]
+ [InlineData("{'amount':'119,50','amount_payed':'19,50'}", 119.50, 19.50, 100)] // German decimals
+ [InlineData("{'amount':'100.00','amount_payed':'40.00'}", 100, 40, 60)] // invariant decimals
+ [InlineData("{}", 0, 0, 0)] // missing → 0
+ [InlineData("{'amount':50,'amount_payed':80}", 50, 80, -30)] // overpaid → negative
+ public void RecomputeTotals_ComputesOpenAmount(string newJson, double total, double payed, double open)
+ {
+ var s = Session(newJson);
+ ReminderDraftCalculator.RecomputeTotals(s);
+ Assert.Equal((decimal)total, s.Sums.AmountTotal);
+ Assert.Equal((decimal)payed, s.Sums.AmountPayed);
+ Assert.Equal((decimal)open, s.Sums.AmountOpen);
+ }
+
+ [Fact]
+ public void Validate_EmptyEmail_Warns()
+ {
+ var s = Session("{'amount':119,'invoiceaddress':'Weg 1','subject':'X'}");
+ ReminderDraftCalculator.RecomputeTotals(s);
+ ReminderDraftCalculator.Validate(s);
+ Assert.Contains(s.ValidationMessages, m => m.Field == "email" && m.Severity == "warning");
+ }
+
+ [Theory]
+ [InlineData("bad")]
+ [InlineData("no-at-sign.de")]
+ [InlineData("trailing@dot.")]
+ public void Validate_InvalidEmail_Errors(string email)
+ {
+ var s = Session($"{{'amount':119,'invoiceemail':'{email}','invoiceaddress':'Weg 1','subject':'X'}}");
+ ReminderDraftCalculator.RecomputeTotals(s);
+ ReminderDraftCalculator.Validate(s);
+ Assert.Contains(s.ValidationMessages, m => m.Field == "email" && m.Severity == "error");
+ }
+
+ [Fact]
+ public void Validate_ValidEmail_NoEmailMessage()
+ {
+ var s = Session("{'amount':119,'invoiceemail':'a@b.de','invoiceaddress':'Weg 1','subject':'X'}");
+ ReminderDraftCalculator.RecomputeTotals(s);
+ ReminderDraftCalculator.Validate(s);
+ Assert.DoesNotContain(s.ValidationMessages, m => m.Field == "email");
+ }
+
+ [Fact]
+ public void Validate_EmptyAddressAndSubject_Warn()
+ {
+ var s = Session("{'amount':119,'invoiceemail':'a@b.de'}");
+ ReminderDraftCalculator.RecomputeTotals(s);
+ ReminderDraftCalculator.Validate(s);
+ Assert.Contains(s.ValidationMessages, m => m.Field == "address" && m.Severity == "warning");
+ Assert.Contains(s.ValidationMessages, m => m.Field == "subject" && m.Severity == "warning");
+ }
+
+ [Theory]
+ [InlineData("{'amount':0,'amount_payed':0,'invoiceemail':'a@b.de','invoiceaddress':'W','subject':'X'}")]
+ [InlineData("{'amount':50,'amount_payed':80,'invoiceemail':'a@b.de','invoiceaddress':'W','subject':'X'}")]
+ public void Validate_NonPositiveOpenAmount_Warns(string newJson)
+ {
+ var s = Session(newJson);
+ ReminderDraftCalculator.RecomputeTotals(s);
+ ReminderDraftCalculator.Validate(s);
+ Assert.Contains(s.ValidationMessages, m => m.Field == "amount" && m.Severity == "warning");
+ }
+
+ [Fact]
+ public void Validate_HealthyDraft_HasNoMessages()
+ {
+ var s = Session("{'amount':119,'amount_payed':0,'invoiceemail':'a@b.de','invoiceaddress':'Weg 1','subject':'Zahlungserinnerung'}");
+ ReminderDraftCalculator.RecomputeTotals(s);
+ ReminderDraftCalculator.Validate(s);
+ Assert.Empty(s.ValidationMessages);
+ }
+}
diff --git a/Fuchs.Tests/ReminderDraftServiceTests.cs b/Fuchs.Tests/ReminderDraftServiceTests.cs
new file mode 100644
index 0000000..f846db5
--- /dev/null
+++ b/Fuchs.Tests/ReminderDraftServiceTests.cs
@@ -0,0 +1,307 @@
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+using Fuchs.intranet;
+using Fuchs.Services;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging.Abstractions;
+using MigraDoc.DocumentObjectModel;
+using Newtonsoft.Json.Linq;
+using OCORE.security;
+using Xunit;
+using static OCORE.OCORE_dictionaries;
+
+namespace Fuchs.Tests;
+
+///
+/// Exercises the reminder draft edit orchestrator's pure paths (open/patch/history/flush)
+/// without a database — the reminder mirror of ,
+/// proving the backend-authoritative model behaves correctly at the service seam (ADR 0006).
+///
+public class ReminderDraftServiceTests
+{
+ /// Captures the reminder handed to registration and returns it with a fake DB id — no SQL.
+ private sealed class FakeReminderService : IReminderService
+ {
+ public FdsReminderData? Registered;
+ public bool? LastChange;
+ public FdsReminderData? PreviewReminder;
+ public bool? PreviewDraft;
+
+ public Task RegisterReminderAsync(FdsReminderData reminder, bool change, string remId, string userAccountId, DatabaseSecurity dbSec)
+ {
+ Registered = reminder;
+ LastChange = change;
+ reminder.ReminderRegistration = new GenericObjectDictionary(new System.Collections.Generic.Dictionary { ["Id"] = "REM42" });
+ return Task.FromResult(reminder);
+ }
+ public Document GenerateReminderPdf(FdsReminderData reminder, bool draft) { PreviewReminder = reminder; PreviewDraft = draft; return new Document(); }
+ public Task LoadReminderAsync(string id, string u, DatabaseSecurity s) => throw new NotSupportedException();
+ public Task RenderReminderPdfBytesAsync(FdsReminderData r, bool d) => throw new NotSupportedException();
+ public Task StoreReminderDocumentFileAsync(FdsReminderData r, bool d, string u, DatabaseSecurity s) => throw new NotSupportedException();
+ public Task GetReminderFileAsync(FdsReminderData r, bool d, fds.IFdsMfr m, string u, DatabaseSecurity s) => throw new NotSupportedException();
+ public Task<(System.IO.FileInfo? file, byte[]? content)> GetStoredFileAsync(string id, string u, DatabaseSecurity s) => throw new NotSupportedException();
+ }
+
+ private static (ReminderDraftEditService svc, FakeReminderService rem) NewService()
+ {
+ var cache = new ReminderDraftCache(new ConfigurationBuilder().Build());
+ var rem = new FakeReminderService();
+ var svc = new ReminderDraftEditService(cache, rem, NullLogger.Instance);
+ return (svc, rem);
+ }
+
+ private static JObject Payload() => JObject.Parse(@"{
+ 'rem':{'invid':'INV5','type':'R','invoiceid':'R2026-1','invoicedate':'2026-06-01'},
+ 'new':{'invoiceemail':'a@b.de','invoiceaddress':'Weg 1','subject':'Zahlungserinnerung','amount':119,'amount_payed':0}
+ }");
+
+ [Fact]
+ public void OpenFromPayload_SeedsSessionAndComputesOpenAmount()
+ {
+ var (svc, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+ Assert.False(string.IsNullOrEmpty(s.Token));
+ Assert.Equal(0, s.Version);
+ Assert.Equal(119m, s.Sums.AmountTotal);
+ Assert.Equal(119m, s.Sums.AmountOpen);
+ }
+
+ [Fact]
+ public void ApplyPatch_Email_MutatesBumpsVersionAndRecordsHistory()
+ {
+ var (svc, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var s2 = svc.ApplyPatch(s.Token, new ReminderDraftDelta { Target = "email", Value = JToken.FromObject("neu@x.de") });
+
+ Assert.NotNull(s2);
+ Assert.Equal(1, s2!.Version);
+ Assert.Equal("neu@x.de", s2.New["invoiceemail"]!.Value());
+ var h = Assert.Single(s2.History);
+ Assert.Equal("email", h.Target);
+ Assert.Equal("a@b.de", h.OldValue);
+ Assert.Equal("neu@x.de", h.NewValue);
+ }
+
+ [Fact]
+ public void ApplyPatch_Amount_RecomputesOpenAmount()
+ {
+ var (svc, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var s2 = svc.ApplyPatch(s.Token, new ReminderDraftDelta { Target = "amount", Value = JToken.FromObject(200) });
+
+ Assert.Equal(200m, s2!.Sums.AmountTotal);
+ Assert.Equal(200m, s2.Sums.AmountOpen);
+ }
+
+ [Fact]
+ public void ApplyPatch_AmountPayed_RecomputesOpenAmount()
+ {
+ var (svc, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var s2 = svc.ApplyPatch(s.Token, new ReminderDraftDelta { Target = "amount_payed", Value = JToken.FromObject(19) });
+
+ Assert.Equal(100m, s2!.Sums.AmountOpen); // 119 - 19
+ }
+
+ [Fact]
+ public void ApplyPatch_AmountFromGermanString_NormalisesToInvariant()
+ {
+ var (svc, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var s2 = svc.ApplyPatch(s.Token, new ReminderDraftDelta { Target = "amount", Value = JToken.FromObject("249,90") });
+
+ Assert.Equal("249.90", s2!.New["amount"]!.Value()); // stored invariant
+ Assert.Equal(249.90m, s2.Sums.AmountTotal);
+ }
+
+ [Fact]
+ public void ApplyPatch_UnknownToken_ReturnsNull()
+ {
+ var (svc, _) = NewService();
+ Assert.Null(svc.ApplyPatch("ghost", new ReminderDraftDelta { Target = "email", Value = JToken.FromObject("x@y.de") }));
+ }
+
+ [Fact]
+ public void ApplyPatch_UnknownTarget_IsNoOp()
+ {
+ var (svc, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var s2 = svc.ApplyPatch(s.Token, new ReminderDraftDelta { Target = "nonsense", Value = JToken.FromObject("x") });
+
+ Assert.Equal(0, s2!.Version);
+ Assert.Empty(s2.History);
+ }
+
+ [Theory]
+ [InlineData("subject", "subject")]
+ [InlineData("address", "invoiceaddress")]
+ [InlineData("text", "text")]
+ public void ApplyPatch_ScalarFieldDeltas_UpdateNew(string target, string newKey)
+ {
+ var (svc, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var s2 = svc.ApplyPatch(s.Token, new ReminderDraftDelta { Target = target, Value = JToken.FromObject("X-VALUE") });
+
+ Assert.Equal("X-VALUE", s2!.New[newKey]!.Value());
+ }
+
+ [Theory]
+ [InlineData("subject", "subject")]
+ [InlineData("email", "invoiceemail")]
+ public void ApplyPatch_ScalarField_StripsHtmlWrapper(string target, string newKey)
+ {
+ var (svc, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var s2 = svc.ApplyPatch(s.Token, new ReminderDraftDelta { Target = target, Value = JToken.FromObject("clean me
") });
+
+ Assert.Equal("clean me", s2!.New[newKey]!.Value());
+ Assert.DoesNotContain("<", s2.New[newKey]!.Value());
+ }
+
+ [Fact]
+ public void ApplyPatch_Address_MultilineHtml_KeepsLineBreaks()
+ {
+ var (svc, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var s2 = svc.ApplyPatch(s.Token, new ReminderDraftDelta
+ {
+ Target = "address",
+ Value = JToken.FromObject("Firma AG
Weg 1
40000 Düsseldorf
")
+ });
+
+ Assert.Equal("Firma AG\nWeg 1\n40000 Düsseldorf", s2!.New["invoiceaddress"]!.Value());
+ }
+
+ [Fact]
+ public void ApplyPatch_Contact_BuildsCustomValuesJson()
+ {
+ var (svc, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var s2 = svc.ApplyPatch(s.Token, new ReminderDraftDelta
+ {
+ Target = "contact",
+ Value = JObject.Parse(@"{'name':'Max Mustermann','email':'max@kunde.de'}")
+ });
+
+ var cv = JObject.Parse(s2!.New["CustomValues"]!.Value()!);
+ Assert.Equal("Max Mustermann", cv["contactName"]!.Value());
+ Assert.Equal("max@kunde.de", cv["contactEmail"]!.Value());
+ }
+
+ [Fact]
+ public void ApplyPatch_MultipleEdits_AccumulateHistoryInOrder()
+ {
+ var (svc, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ svc.ApplyPatch(s.Token, new ReminderDraftDelta { Target = "email", Value = JToken.FromObject("a1@x.de") });
+ svc.ApplyPatch(s.Token, new ReminderDraftDelta { Target = "subject", Value = JToken.FromObject("Mahnung 2") });
+ var s3 = svc.ApplyPatch(s.Token, new ReminderDraftDelta { Target = "amount", Value = JToken.FromObject(200) });
+
+ Assert.Equal(3, s3!.Version);
+ Assert.Equal(new[] { "email", "subject", "amount" }, s3.History.Select(h => h.Target).ToArray());
+ Assert.Equal(new[] { 1, 2, 3 }, s3.History.Select(h => h.Version).ToArray());
+ }
+
+ [Fact]
+ public void BuildState_ExposesPayloadSumsValidationAndVersion()
+ {
+ var (svc, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+ svc.ApplyPatch(s.Token, new ReminderDraftDelta { Target = "amount_payed", Value = JToken.FromObject(19) });
+
+ var state = JObject.FromObject(svc.BuildState(svc.Get(s.Token)!));
+
+ Assert.Equal(1, state["version"]!.Value());
+ Assert.Equal(119m, state["sums"]!["amount_total"]!.Value());
+ Assert.Equal(100m, state["sums"]!["amount_open"]!.Value());
+ Assert.Equal(1, state["historyCount"]!.Value());
+ Assert.NotNull(state["validation"]);
+ }
+
+ [Fact]
+ public async Task FlushToDbAsync_RegistersAndSetsRemId_CreatePath()
+ {
+ var (svc, rem) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var result = await svc.FlushToDbAsync(s.Token, "user1", null!);
+
+ Assert.NotNull(result);
+ Assert.Equal("REM42", result!.Id);
+ Assert.False(rem.LastChange); // new draft (no prior RemId) → create
+ Assert.Equal("REM42", svc.Get(s.Token)!.RemId);
+ // the email/subject the editor set must reach registration
+ Assert.Equal("a@b.de", rem.Registered!.RawInvoiceEmail);
+ Assert.Equal("Zahlungserinnerung", rem.Registered!.NewValues!.getString("subject"));
+ Assert.Equal("INV5", rem.Registered!.RawInvId);
+ }
+
+ [Fact]
+ public async Task FlushToDbAsync_ExistingRemId_UpdatePath()
+ {
+ var (svc, rem) = NewService();
+ var payload = Payload();
+ payload["remid"] = "REM7";
+ var s = svc.OpenFromPayload(payload, "user1");
+
+ await svc.FlushToDbAsync(s.Token, "user1", null!);
+
+ Assert.True(rem.LastChange); // prior RemId → update path
+ }
+
+ [Fact]
+ public void RenderPreview_SynthesizesDraftRegistrationFromSession()
+ {
+ var (svc, rem) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ var doc = svc.RenderPreview(s.Token);
+
+ Assert.NotNull(doc);
+ Assert.True(rem.PreviewDraft);
+ Assert.True(rem.PreviewReminder!.IsDraft);
+ var reg = rem.PreviewReminder!.ReminderRegistration!;
+ Assert.Equal("Zahlungserinnerung", reg.getString("subject"));
+ Assert.Equal("Weg 1", reg.getString("SendToAddress"));
+ Assert.Equal("a@b.de", reg.getString("SendToEmail"));
+ Assert.Equal("R2026-1", reg.getString("InvoiceId"));
+ // the synthesised single-invoice row the reminder table renders
+ Assert.Single(rem.PreviewReminder!.ReminderItems);
+ }
+
+ [Fact]
+ public void RenderPreview_UnknownToken_ReturnsNull()
+ {
+ var (svc, _) = NewService();
+ Assert.Null(svc.RenderPreview("ghost"));
+ }
+
+ [Fact]
+ public void GetHistory_UnknownToken_IsEmpty()
+ {
+ var (svc, _) = NewService();
+ Assert.Empty(svc.GetHistory("ghost"));
+ }
+
+ [Fact]
+ public void Close_RemovesSession_ThenReportsFalse()
+ {
+ var (svc, _) = NewService();
+ var s = svc.OpenFromPayload(Payload(), "user1");
+
+ Assert.True(svc.Close(s.Token));
+ Assert.Null(svc.Get(s.Token));
+ Assert.False(svc.Close(s.Token));
+ }
+}
diff --git a/Fuchs.Tests/StartupSelfTestServiceTests.cs b/Fuchs.Tests/StartupSelfTestServiceTests.cs
index ff0199a..b12c587 100644
--- a/Fuchs.Tests/StartupSelfTestServiceTests.cs
+++ b/Fuchs.Tests/StartupSelfTestServiceTests.cs
@@ -205,6 +205,54 @@ public class StartupSelfTestServiceTests
Assert.Equal(1, service.MailerCalls);
}
+ [Fact]
+ public async Task RunOnce_Disabled_PublishesNotRunReport()
+ {
+ var reporter = new StartupCheckReporter();
+ using var service = new TestableStartupSelfTestService(
+ new ServiceCollection().BuildServiceProvider(),
+ CreateConfiguration(),
+ Options.Create(CreateSettings(enabled: false)),
+ NullLogger.Instance,
+ reporter);
+
+ await service.RunForTestAsync(CancellationToken.None);
+
+ Assert.NotNull(reporter.Latest);
+ Assert.False(reporter.Latest!.Ran);
+ }
+
+ [Fact]
+ public async Task RunOnce_Enabled_PublishesReportWithPerCheckResults()
+ {
+ var reporter = new StartupCheckReporter();
+ using var service = new TestableStartupSelfTestService(
+ new ServiceCollection().BuildServiceProvider(),
+ CreateConfiguration(),
+ Options.Create(CreateSettings(enabled: true, checkKeyVault: true, checkDatabase: true, checkMfr: false, sendStartupEmail: true, startupRecipient: "ops@example.test", checkPdfLicense: false)),
+ NullLogger.Instance,
+ reporter)
+ {
+ KeyVaultResult = true,
+ DatabaseResult = false,
+ MailerResult = true,
+ };
+
+ await service.RunForTestAsync(CancellationToken.None);
+
+ var report = reporter.Latest;
+ Assert.NotNull(report);
+ Assert.True(report!.Ran);
+ Assert.NotNull(report.CompletedUtc);
+ var kv = Assert.Single(report.Items, i => i.Name == "KeyVault");
+ Assert.True(kv.Enabled && kv.Ok);
+ var db = Assert.Single(report.Items, i => i.Name == "Database");
+ Assert.True(db.Enabled);
+ Assert.False(db.Ok); // intentionally-failing path
+ var mfr = Assert.Single(report.Items, i => i.Name == "MFR");
+ Assert.False(mfr.Enabled); // disabled check reported as not-enabled
+ }
+
[Fact]
public async Task ExecuteAsync_ProbeThrows_ServiceDoesNotThrowAndContinuesRemainingChecks()
{
@@ -250,8 +298,9 @@ public class StartupSelfTestServiceTests
IServiceProvider serviceProvider,
IConfiguration configuration,
IOptions settings,
- Microsoft.Extensions.Logging.ILogger logger)
- : base(serviceProvider, configuration, settings, logger)
+ Microsoft.Extensions.Logging.ILogger logger,
+ StartupCheckReporter? reporter = null)
+ : base(serviceProvider, configuration, settings, logger, reporter)
{
}
diff --git a/Fuchs.Tests/SystemStatusServiceTests.cs b/Fuchs.Tests/SystemStatusServiceTests.cs
new file mode 100644
index 0000000..b02b954
--- /dev/null
+++ b/Fuchs.Tests/SystemStatusServiceTests.cs
@@ -0,0 +1,465 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Metrics;
+using System.Threading;
+using System.Threading.Tasks;
+using Fuchs.Services;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging.Abstractions;
+using Microsoft.Extensions.Options;
+using Moq;
+using Xunit;
+
+namespace Fuchs.Tests;
+
+///
+/// Tests for the Admin module's read-only diagnostics service. Covers the passive config
+/// snapshot (SQL server parsing, email override reflection, presence flags), each probe's
+/// disabled/unconfigured/ok/error outcomes where deterministically reachable without live
+/// infrastructure, the test-email pipeline (success/failure/validation + HTML-encoding +
+/// override reporting), and the emitted probe telemetry.
+///
+public class SystemStatusServiceTests
+{
+ private const string FuchsMeterName = "Fuchs.Intranet";
+
+ private static IConfiguration Config(Dictionary? overrides = null)
+ {
+ var dict = new Dictionary
+ {
+ ["ConnectionStrings:fuchs_fds_ConnectionString"] =
+ "Data Source=SQLHOST,1433;Initial Catalog=site_fuchs_test;User ID=fuchs_app;password='secret';",
+ ["ConnectionStrings:AzureBlobStorage_ConnectionString"] = "DefaultEndpointsProtocol=https;AccountName=acct;AccountKey=key==;",
+ ["Fuchs:IsTestDeployment"] = "true",
+ ["Fds:MFR_host"] = "portal.mobilefieldreport.com",
+ ["Fds:MFR_UserName"] = "mfruser",
+ ["Fds:SyncEnabled"] = "true",
+ ["SecretManagement:VaultUri"] = "https://vault.example/",
+ ["SecretManagement:AppName"] = "fuchs",
+ ["SecretManagement:ManagedSecretKeys:0"] = "Fuchs--Mailer--Token",
+ ["SecretManagement:ManagedSecretKeys:1"] = "ConnectionStrings--fuchs-fds-password",
+ };
+ if (overrides != null)
+ foreach (var kv in overrides) dict[kv.Key] = kv.Value;
+ return new ConfigurationBuilder().AddInMemoryCollection(dict).Build();
+ }
+
+ private static SystemStatusService Build(
+ IConfiguration? config = null,
+ Mock? blob = null,
+ Mock? mfr = null,
+ Mock? com = null,
+ ProcessWebComSettings? mailer = null,
+ FuchsEmailSettings? email = null,
+ AzureBlobStorageSettings? blobSettings = null,
+ IServiceProvider? provider = null,
+ StartupCheckReporter? startupChecks = null)
+ {
+ var env = new Mock();
+ env.SetupGet(e => e.EnvironmentName).Returns("Development");
+
+ return new SystemStatusService(
+ config ?? Config(),
+ env.Object,
+ provider ?? new ServiceCollection().BuildServiceProvider(),
+ (blob ?? new Mock()).Object,
+ (mfr ?? new Mock()).Object,
+ (com ?? new Mock()).Object,
+ Options.Create(mailer ?? new ProcessWebComSettings { Enabled = true, Token = "tok", BaseUrl = "https://api.example", AccountId = "acc", ServerId = "srv" }),
+ Options.Create(email ?? new FuchsEmailSettings()),
+ Options.Create(blobSettings ?? new AzureBlobStorageSettings { Enabled = true }),
+ startupChecks ?? new StartupCheckReporter(),
+ NullLogger.Instance);
+ }
+
+ // ── GetInfo (passive snapshot) ─────────────────────────────────────────────
+ [Fact]
+ public void GetInfo_ParsesConnectionStringAndReflectsConfiguration()
+ {
+ var svc = Build();
+
+ SystemInfoSnapshot info = svc.GetInfo();
+
+ Assert.Equal("Development", info.Environment);
+ Assert.True(info.IsTestDeployment);
+ Assert.True(info.Database.Configured);
+ Assert.Equal("SQLHOST,1433", info.Database.Server);
+ Assert.Equal("site_fuchs_test", info.Database.Catalog);
+ Assert.Equal("fuchs_app", info.Database.UserId); // login only, never the password
+ Assert.True(info.Mfr.CredentialsConfigured);
+ Assert.Equal("portal.mobilefieldreport.com", info.Mfr.Host);
+ Assert.True(info.Mfr.SyncEnabled);
+ Assert.Equal("fuchs", info.KeyVault.AppName);
+ Assert.Equal(2, info.KeyVault.ManagedSecretCount);
+ Assert.False(info.KeyVault.ClientRegistered); // empty provider
+ }
+
+ [Fact]
+ public void GetInfo_NeverLeaksDatabasePassword()
+ {
+ var svc = Build();
+
+ SystemInfoSnapshot info = svc.GetInfo();
+
+ Assert.DoesNotContain("secret", info.Database.UserId ?? "");
+ Assert.DoesNotContain("secret", info.Database.Server ?? "");
+ Assert.DoesNotContain("secret", info.Database.Catalog ?? "");
+ }
+
+ [Theory]
+ [InlineData(true)]
+ [InlineData(false)]
+ public void GetInfo_EmailOverride_ReflectedOnlyWhenConfigured(bool overrideSet)
+ {
+ var email = new FuchsEmailSettings { OverrideRecipient = overrideSet ? "safety@example.test" : "" };
+ var svc = Build(email: email);
+
+ SystemInfoSnapshot info = svc.GetInfo();
+
+ Assert.Equal(overrideSet, info.Email.OverrideActive);
+ Assert.Equal(overrideSet ? "safety@example.test" : null, info.Email.OverrideRecipient);
+ Assert.True(info.Email.MailerEnabled); // Build() default enables the mailer
+ Assert.True(info.Email.TokenConfigured);
+ }
+
+ [Fact]
+ public void GetInfo_StartupChecks_NullWhenServiceHasNotRun()
+ {
+ var svc = Build(startupChecks: new StartupCheckReporter()); // nothing set yet
+
+ Assert.Null(svc.GetInfo().StartupChecks);
+ }
+
+ [Fact]
+ public void GetInfo_StartupChecks_ReflectsReporterContents()
+ {
+ var reporter = new StartupCheckReporter();
+ reporter.Set(new StartupCheckReport
+ {
+ Ran = true,
+ CompletedUtc = DateTimeOffset.UtcNow,
+ MachineName = "BUILD-HOST",
+ Items =
+ [
+ new StartupCheckItem { Name = "Database", Enabled = true, Ok = true },
+ new StartupCheckItem { Name = "Mailer", Enabled = false, Ok = false },
+ ],
+ });
+ var svc = Build(startupChecks: reporter);
+
+ var report = svc.GetInfo().StartupChecks;
+
+ Assert.NotNull(report);
+ Assert.True(report!.Ran);
+ Assert.Equal("BUILD-HOST", report.MachineName);
+ Assert.Equal(2, report.Items.Count);
+ Assert.Contains(report.Items, i => i.Name == "Database" && i.Enabled && i.Ok);
+ }
+
+ [Fact]
+ public void GetInfo_DatabaseUnconfigured_WhenConnectionStringMissing()
+ {
+ var config = Config(new() { ["ConnectionStrings:fuchs_fds_ConnectionString"] = "" });
+ var svc = Build(config);
+
+ Assert.False(svc.GetInfo().Database.Configured);
+ }
+
+ // ── Blob probe ─────────────────────────────────────────────────────────────
+ [Fact]
+ public async Task ProbeBlob_Disabled_ReturnsDisabled()
+ {
+ var blob = new Mock();
+ blob.Setup(b => b.CheckConnectivityAsync(It.IsAny()))
+ .ReturnsAsync(new BlobConnectivity { Enabled = false });
+ var svc = Build(blob: blob);
+
+ var r = await svc.ProbeAsync("blob");
+
+ Assert.Equal("blob", r.Component);
+ Assert.Equal("disabled", r.Status);
+ Assert.False(r.Ok);
+ }
+
+ [Fact]
+ public async Task ProbeBlob_EnabledButUnconfigured_ReturnsUnconfigured()
+ {
+ var blob = new Mock();
+ blob.Setup(b => b.CheckConnectivityAsync(It.IsAny()))
+ .ReturnsAsync(new BlobConnectivity { Enabled = true, Configured = false, Detail = "keine Verbindungszeichenfolge" });
+ var svc = Build(blob: blob);
+
+ var r = await svc.ProbeAsync("blob");
+
+ Assert.Equal("unconfigured", r.Status);
+ Assert.False(r.Ok);
+ }
+
+ [Fact]
+ public async Task ProbeBlob_Reachable_ReturnsOkWithAccountDetail()
+ {
+ var blob = new Mock();
+ blob.Setup(b => b.CheckConnectivityAsync(It.IsAny()))
+ .ReturnsAsync(new BlobConnectivity { Enabled = true, Configured = true, Reachable = true, AccountName = "acct", Detail = "StorageV2 / Standard_LRS" });
+ var svc = Build(blob: blob);
+
+ var r = await svc.ProbeAsync("blob");
+
+ Assert.Equal("ok", r.Status);
+ Assert.True(r.Ok);
+ Assert.Contains("acct", r.Detail);
+ }
+
+ [Fact]
+ public async Task ProbeBlob_Reachable_ReportsFileCountsPerContainerAsMetrics()
+ {
+ var blob = new Mock();
+ blob.Setup(b => b.CheckConnectivityAsync(It.IsAny()))
+ .ReturnsAsync(new BlobConnectivity
+ {
+ Enabled = true, Configured = true, Reachable = true, AccountName = "acct",
+ Detail = "StorageV2 / Standard_LRS",
+ Containers = new List
+ {
+ new() { Name = "dev-fuchs-invoices", Exists = true, FileCount = 42 },
+ new() { Name = "dev-fuchs-reminders", Exists = false, FileCount = 0 },
+ },
+ });
+ var svc = Build(blob: blob);
+
+ var r = await svc.ProbeAsync("blob");
+
+ Assert.Equal("ok", r.Status);
+ Assert.NotNull(r.Metrics);
+ Assert.Equal(2, r.Metrics!.Count);
+ var inv = Assert.Single(r.Metrics, m => m.Label == "dev-fuchs-invoices");
+ Assert.Equal("42 Dateien", inv.Value);
+ var rem = Assert.Single(r.Metrics, m => m.Label == "dev-fuchs-reminders");
+ Assert.Equal("nicht vorhanden", rem.Value);
+ Assert.Contains("42 Dateien gesamt", r.Message); // total across containers
+ }
+
+ [Fact]
+ public async Task ProbeBlob_FileCountUnavailable_ReportsMetricWithoutFailing()
+ {
+ var blob = new Mock();
+ blob.Setup(b => b.CheckConnectivityAsync(It.IsAny()))
+ .ReturnsAsync(new BlobConnectivity
+ {
+ Enabled = true, Configured = true, Reachable = true, AccountName = "acct",
+ Containers = new List
+ {
+ new() { Name = "dev-fuchs-invoices", Exists = true, FileCount = -1 },
+ },
+ });
+ var svc = Build(blob: blob);
+
+ var r = await svc.ProbeAsync("blob");
+
+ Assert.Equal("ok", r.Status);
+ var inv = Assert.Single(r.Metrics!);
+ Assert.Equal("Anzahl nicht ermittelbar", inv.Value);
+ }
+
+ [Fact]
+ public async Task ProbeBlob_ConfiguredButUnreachable_ReturnsError()
+ {
+ var blob = new Mock();
+ blob.Setup(b => b.CheckConnectivityAsync(It.IsAny()))
+ .ReturnsAsync(new BlobConnectivity { Enabled = true, Configured = true, Reachable = false, AccountName = "acct", Detail = "403 Forbidden" });
+ var svc = Build(blob: blob);
+
+ var r = await svc.ProbeAsync("blob");
+
+ Assert.Equal("error", r.Status);
+ Assert.False(r.Ok);
+ }
+
+ // ── Key Vault probe ────────────────────────────────────────────────────────
+ [Fact]
+ public async Task ProbeKeyVault_ClientNotRegistered_ReturnsUnconfigured()
+ {
+ var svc = Build(); // empty service provider → no SecretClient
+
+ var r = await svc.ProbeAsync("keyvault");
+
+ Assert.Equal("keyvault", r.Component);
+ Assert.Equal("unconfigured", r.Status);
+ Assert.False(r.Ok);
+ }
+
+ [Fact]
+ public async Task ProbeKeyVault_NoManagedKeys_ReturnsUnconfigured()
+ {
+ var config = Config(new()
+ {
+ ["SecretManagement:ManagedSecretKeys:0"] = null,
+ ["SecretManagement:ManagedSecretKeys:1"] = null,
+ });
+ var svc = Build(config);
+
+ var r = await svc.ProbeAsync("keyvault");
+
+ Assert.Equal("unconfigured", r.Status);
+ }
+
+ // ── MFR probe ──────────────────────────────────────────────────────────────
+ [Fact]
+ public async Task ProbeMfr_FactoryThrows_ReturnsError()
+ {
+ var mfr = new Mock();
+ mfr.Setup(f => f.Create()).Throws(new InvalidOperationException("no credentials"));
+ var svc = Build(mfr: mfr);
+
+ var r = await svc.ProbeAsync("mfr");
+
+ Assert.Equal("mfr", r.Component);
+ Assert.Equal("error", r.Status);
+ Assert.False(r.Ok);
+ Assert.Equal("no credentials", r.Detail);
+ }
+
+ // ── Database probe (unconfigured is deterministic without a live server) ────
+ [Fact]
+ public async Task ProbeDatabase_NoConnectionString_ReturnsUnconfigured()
+ {
+ var config = Config(new() { ["ConnectionStrings:fuchs_fds_ConnectionString"] = "" });
+ var svc = Build(config);
+
+ var r = await svc.ProbeAsync("database");
+
+ Assert.Equal("database", r.Component);
+ Assert.Equal("unconfigured", r.Status);
+ Assert.False(r.Ok);
+ }
+
+ // ── Unknown component ──────────────────────────────────────────────────────
+ [Fact]
+ public async Task ProbeAsync_UnknownComponent_ReturnsError()
+ {
+ var svc = Build();
+
+ var r = await svc.ProbeAsync("does-not-exist");
+
+ Assert.Equal("error", r.Status);
+ Assert.False(r.Ok);
+ }
+
+ [Fact]
+ public async Task ProbeAllAsync_ReturnsOneResultPerComponent()
+ {
+ var blob = new Mock();
+ blob.Setup(b => b.CheckConnectivityAsync(It.IsAny()))
+ .ReturnsAsync(new BlobConnectivity { Enabled = false });
+ var mfr = new Mock();
+ mfr.Setup(f => f.Create()).Throws(new InvalidOperationException("x"));
+ var config = Config(new() { ["ConnectionStrings:fuchs_fds_ConnectionString"] = "" });
+ var svc = Build(config, blob: blob, mfr: mfr);
+
+ var results = await svc.ProbeAllAsync();
+
+ Assert.Equal(svc.ProbeComponents.Count, results.Count);
+ foreach (var comp in svc.ProbeComponents)
+ Assert.Contains(results, r => r.Component == comp);
+ Assert.All(results, r => Assert.True(r.DurationMs >= 0));
+ }
+
+ [Fact]
+ public async Task ProbeAsync_EmitsProbeTelemetry()
+ {
+ var blob = new Mock();
+ blob.Setup(b => b.CheckConnectivityAsync(It.IsAny()))
+ .ReturnsAsync(new BlobConnectivity { Enabled = false });
+ var svc = Build(blob: blob);
+
+ long delta = 0;
+ using var listener = new MeterListener
+ {
+ InstrumentPublished = (inst, l) =>
+ {
+ if (inst.Meter.Name == FuchsMeterName && inst.Name == "fuchs.systemstatus.probes")
+ l.EnableMeasurementEvents(inst);
+ }
+ };
+ listener.SetMeasurementEventCallback((_, value, _, _) => Interlocked.Add(ref delta, value));
+ listener.Start();
+
+ await svc.ProbeAsync("blob");
+
+ Assert.True(delta >= 1, "fuchs.systemstatus.probes counter should increment per probe.");
+ }
+
+ // ── Test email ─────────────────────────────────────────────────────────────
+ [Theory]
+ [InlineData("", "subj", "body")]
+ [InlineData("to@example.test", "", "body")]
+ public async Task SendTestEmailAsync_MissingRequiredFields_DoesNotSend(string to, string subject, string body)
+ {
+ var com = new Mock();
+ var svc = Build(com: com);
+
+ var r = await svc.SendTestEmailAsync(to, subject, body);
+
+ Assert.False(r.Sent);
+ com.Verify(c => c.SendEmailAsync(It.IsAny(), It.IsAny(), It.IsAny(),
+ It.IsAny(), It.IsAny(), It.IsAny>()), Times.Never);
+ }
+
+ [Fact]
+ public async Task SendTestEmailAsync_Success_SendsHtmlEncodedBodyToRecipient()
+ {
+ string? capturedHtml = null, capturedTo = null, capturedSubject = null;
+ var com = new Mock();
+ com.Setup(c => c.SendEmailAsync(It.IsAny(), It.IsAny(), It.IsAny(),
+ It.IsAny(), It.IsAny(), It.IsAny?>()))
+ .Callback?>(
+ (_, subj, html, to, _, _) => { capturedSubject = subj; capturedHtml = html; capturedTo = to; })
+ .ReturnsAsync(true);
+ var svc = Build(com: com);
+
+ var r = await svc.SendTestEmailAsync("dest@example.test", "Betreff", "Zeile1
diff --git a/Fuchs/appsettings.Development.json b/Fuchs/appsettings.Development.json
index 56b599e..1966d3a 100644
--- a/Fuchs/appsettings.Development.json
+++ b/Fuchs/appsettings.Development.json
@@ -26,16 +26,22 @@
"CheckMfr": false,
"CheckPdfLicense": true
},
+ "Mailer": {
+ "Enabled": true
+ },
"Email": {
- "OverrideRecipient": "service@emails.processweb.de"
+ "OverrideRecipient": "info@processweb.de"
},
"AzureStorage": {
- "Enabled": false,
+ "Enabled": true,
"InvoiceContainer": "dev-fuchs-invoices",
"ReminderContainer": "dev-fuchs-reminders"
}
},
"Fds": {
+ "SyncEnabled": false,
+ "ExecutionFrequency_Minutes": 15,
+ "DebugDetails": true,
"MFR_host": "portal.mobilefieldreport.com",
"MFR_UserName": "system@sebastian-fuchs---bad-und-heizung-gmbh-und-co-kg.com",
"MFR_Password": "0oT4G3H2"
diff --git a/Fuchs/appsettings.json b/Fuchs/appsettings.json
index d546cb8..5e6ce0a 100644
--- a/Fuchs/appsettings.json
+++ b/Fuchs/appsettings.json
@@ -32,6 +32,7 @@
"AzureBlobStorage_ConnectionString": "MANAGED_BY_KEYVAULT"
},
"Fuchs": {
+ "IsTestDeployment": true,
"ocms_guid": "00094b8f-a822-4e9c-b627-87802f93fca8",
"ocms_valid_locales_csv": "de,en",
"ocms_default_locale": "de",
@@ -44,10 +45,11 @@
"BaseUrl": "https://api.processweb.de",
"AccountId": "82d87114-c8c3-4d33-95e5-4c781a9229ab",
"Token": "MANAGED_BY_KEYVAULT",
- "Enabled": false
+ "ServerId": "87AAB12E-29E0-47AB-8DD1-5F5D49B4AC2E",
+ "Enabled": true
},
"Email": {
- "OverrideRecipient": ""
+ "OverrideRecipient": "info@processweb.de"
},
"StartupChecks": {
"Enabled": false,
@@ -59,9 +61,9 @@
"StartupEmailRecipientName": "Startup Monitor"
},
"AzureStorage": {
- "Enabled": false,
- "InvoiceContainer": "fuchs-invoices",
- "ReminderContainer": "fuchs-reminders",
+ "Enabled": true,
+ "InvoiceContainer": "dev-fuchs-invoices",
+ "ReminderContainer": "dev-fuchs-reminders",
"MetadataFields": [ "Id", "Version", "InvoiceId", "InvoiceTitle", "InvId", "DocumentName", "file_guid" ]
},
"Telemetry": {
@@ -70,6 +72,9 @@
}
},
"Fds": {
+ "SyncEnabled": true,
+ "ExecutionFrequency_Minutes": 15,
+ "DebugDetails": false,
"MFR_host": "portal.mobilefieldreport.com",
"MFR_UserName": "MANAGED_BY_KEYVAULT",
"MFR_Password": "MANAGED_BY_KEYVAULT"
diff --git a/Fuchs/bdlconfig.json b/Fuchs/bdlconfig.json
index 1b40a86..4788cc7 100644
--- a/Fuchs/bdlconfig.json
+++ b/Fuchs/bdlconfig.json
@@ -151,5 +151,24 @@
"js/intranet/modules/fis.bam.scss"
],
"minify": { "enabled": true }
+ },
+ {
+ "context": "intranet:admin",
+ "outputFileName": "wwwroot/web/fis.admin.de.js",
+ "inputFiles": [
+ "js/intranet/modules/fis.admin_txt_de.js",
+ "js/intranet/modules/fis.admin.js"
+ ],
+ "minify": { "enabled": true }
+ },
+ {
+ "context": "intranet:admin",
+ "outputFileName": "wwwroot/web/fis.admin.min.css",
+ "inputFiles": [
+ "css/intranet/oci_variables.scss",
+ "css/intranet/fis_variables.scss",
+ "js/intranet/modules/fis.admin.scss"
+ ],
+ "minify": { "enabled": true }
}
]
diff --git a/Fuchs/code/7z.dll b/Fuchs/code/7z.dll
deleted file mode 100644
index b32d7bf..0000000
Binary files a/Fuchs/code/7z.dll and /dev/null differ
diff --git a/Fuchs/code/FdsInvoiceData.cs b/Fuchs/code/FdsInvoiceData.cs
index bf4bb14..30cbc49 100644
--- a/Fuchs/code/FdsInvoiceData.cs
+++ b/Fuchs/code/FdsInvoiceData.cs
@@ -1,4 +1,4 @@
-using System.Globalization;
+using System.Globalization;
using Microsoft.Data.SqlClient;
using Newtonsoft.Json.Linq;
using static OCORE.OCORE_dictionaries;
@@ -19,7 +19,7 @@ public class FdsInvoiceData
public GenericObjectDictionary? Admin { get; private set; }
public GenericObjectDictionary? NewValues { get; private set; }
public GenericObjectDictionary? Sms { get; private set; }
- public List>? Req { get; private set; }
+ public List>? Req { get; internal set; }
public GenericObjectDictionary? InvoiceRegistration { get; internal set; }
public bool IsDraft { get; internal set; } = true;
@@ -46,9 +46,25 @@ public class FdsInvoiceData
get
{
var result = new List>();
+ foreach (var block in InvoiceBlocks) result.AddRange(block.Items);
+ return result;
+ }
+ }
+
+ ///
+ /// The service-request groups as they should render on the invoice: each block carries its
+ /// heading (the section title the editor shows) and its line items. The PDF renders a heading
+ /// row per block followed by that block's items, so the online editor and the PDF stay in sync.
+ ///
+ public List InvoiceBlocks
+ {
+ get
+ {
+ var result = new List();
if (Req == null) return result;
foreach (var req in Req)
{
+ var items = new List>();
if (req.TryGetValue("items", out var itmsObj))
{
IEnumerable>? itms =
@@ -56,8 +72,12 @@ public class FdsInvoiceData
?? (itmsObj is JArray ja
? ja.ToObject>>()
: null);
- if (itms != null) result.AddRange(itms);
+ if (itms != null) items.AddRange(itms);
}
+ string heading = "";
+ if (req.TryGetValue("text", out var th) && th != null) heading = th.ToString() ?? "";
+ if (heading.Length == 0 && req.TryGetValue("nme", out var nh) && nh != null) heading = nh.ToString() ?? "";
+ result.Add(new InvoiceBlock { Heading = heading, Items = items });
}
return result;
}
@@ -151,7 +171,11 @@ public class FdsInvoiceData
var tokens = new List();
if (Admin?.no("p13b", false) is true) tokens.Add("§13b");
string setmode = (Admin?.nz("setmode") ?? "").Trim().ToLowerInvariant();
- if (setmode is "itemprices" or "setonly") tokens.Add("setmode:" + setmode);
+ // Persist any explicitly-chosen mode, including the default "setprice" — otherwise an
+ // explicit user choice of the default is indistinguishable from an invoice that was never
+ // switched to set-pricing at all (needed so the editor can hide the "Set-Preisanzeige"
+ // menu entry once a mode has been chosen; see InvoiceDraftEditService.BuildInvoiceOptions).
+ if (setmode is "setprice" or "setonly") tokens.Add("setmode:" + setmode);
return string.Join(",", tokens);
}
@@ -196,3 +220,12 @@ public class FdsInvoiceData
return double.TryParse(s, NumberStyles.Any, CultureInfo.InvariantCulture, out var d) ? d : 0;
}
}
+
+/// A service-request group as it renders on the invoice: a heading plus its line items.
+public sealed class InvoiceBlock
+{
+ /// The section heading (editor's text/nme); empty when the group has none.
+ public string Heading { get; init; } = "";
+ /// The group's line items (the editor's items contract).
+ public List> Items { get; init; } = new();
+}
diff --git a/Fuchs/code/FuchsPdf.cs b/Fuchs/code/FuchsPdf.cs
index d8b7f66..d42d29c 100644
--- a/Fuchs/code/FuchsPdf.cs
+++ b/Fuchs/code/FuchsPdf.cs
@@ -112,21 +112,40 @@ public static class FuchsPdf
"Kreissparkasse D\u00fcsseldorf", "IBAN: DE52 3015 0200 0002 0914 78", "BIC: WELADED1KSD",
"Stadtsparkasse D\u00fcsseldorf", "IBAN: DE76 3005 0110 0045 0148 00", "BIC: DUSSDEDDXXX"
};
+ // Reminder greeting/intro, keyed by the actual reminder type (f = Zahlungserinnerung,
+ // m = Mahnung, l = letzte außergerichtliche Mahnung) — the single source of truth for
+ // both the PDF (ApplyReminder) and the online editor (via BuildReminderNotes).
public Dictionary ReminderTexts_before { get; } = new()
{
["f"] = new[] {
"Sehr geehrte Damen und Herren,",
- "wir erlauben uns, Sie auf die nachfolgende offene Rechnung aufmerksam zu machen."
+ "ein Mahnschreiben sollte kurz, freundlich und erfolgreich sein. Kurz ist es, freundlich sowieso; ob es auch erfolgreich ist, h\u00e4ngt von Ihnen ab."
},
- ["s"] = new[] {
+ ["m"] = new[] {
"Sehr geehrte Damen und Herren,",
- "trotz unserer Ersten Mahnung haben wir bis heute noch keinen Zahlungseingang feststellen k\u00f6nnen. " +
- "Wir bitten Sie, den offenen Betrag inkl. der Mahnzinsen und Mahnkosten umgehend auf unser Konto zu \u00fcberweisen."
+ "nun m\u00fcssen wir Sie noch einmal anschreiben.",
+ "Wahrscheinlich haben Sie triftige Gr\u00fcnde daf\u00fcr, warum Sie die Zahlung unserer Forderung nicht vornehmen und auch nicht auf unsere Mahnung reagieren. Sollten wir dar\u00fcber nicht einmal sprechen?",
+ "Bitte nehmen Sie umgehend in dieser Sache mit uns Kontakt auf."
},
- ["l"] = Array.Empty()
+ ["l"] = new[] {
+ "Sehr geehrte Damen und Herren,",
+ "Eine DRITTE MAHNUNG zu erhalten bereitet Ihnen bestimmt ebenso wenig Freude wie uns, sie zu verschicken. Leider haben wir auf unsere zweite Mahnung noch keine Antwort von Ihnen erhalten.",
+ "Wir bitten Sie, den offenen Betrag innerhalb der n\u00e4chsten 7 Werktage nach Erhalt dieses Schreibens zu begleichen. Nach Ablauf dieser Frist erfolgt keine weitere Mahnung mehr.",
+ "Sollte die Forderung bis dahin nicht beglichen sein, er\u00f6ffnen wir das gerichtliche Mahnverfahren. Sollten Sie die Rechnung inzwischen beglichen haben, so betrachten Sie bitte dieses Schreiben als gegenstandslos."
+ }
+ };
+
+ /// Extra closing sentence appended for reminder type m (Mahnung) — f's closing is generated
+ /// dynamically (amount/IBAN + "gegenstandslos"); l gets no extra closing note.
+ public Dictionary ReminderClosingExtra { get; } = new()
+ {
+ ["m"] = "Um Ihnen zus\u00e4tzliche Kosten f\u00fcr weitere Mahnungen zu ersparen, bitten wir Sie nunmehr um die \u00dcberweisung des noch zu zahlenden Gesamtbetrages inklusive der ggf. bereits f\u00e4lligen Mahnzinsen und Mahngeb\u00fchren innerhalb von einer Woche."
};
}
+ /// One notice/explanatory paragraph, as rendered both in the PDF and the online editor.
+ public sealed record PdfNote(string Text, string Style = "InvoiceNotes");
+
// ── Currency / parse helpers ───────────────────────────────────────────────
public static string Currency(object? input, string returnobject = "?")
{
@@ -137,6 +156,34 @@ public static class FuchsPdf
public static string TranslatePaymentTerm(string pt) =>
pt.Replace("wd", " Werktagen").Replace("d", " Tagen").Replace("wk", " Wochen").ne("10 Tagen");
+ ///
+ /// Maps one editor item-contract entry to a display line, mirroring the online editor: the
+ /// item's own price/total is shown, a set header is emphasised, and free-text/heading lines
+ /// (type text/title) show neither a price nor a position number. This is the flat
+ /// (non-collapsing) rendering used for every set mode except the explicit setonly.
+ ///
+ private static InvoiceSetLine MapItemToLine(Dictionary i)
+ {
+ string type = i.nz("type", "").ToLowerInvariant();
+ bool isText = type is "text" or "title";
+ ParseDec(i.no("price_net", 0), out decimal price);
+ ParseDec(i.no("total_net", 0), out decimal total);
+ // ADR 0009: a null/absent total_net means "no price" — render an empty cell (not 0,00 €),
+ // distinct from a genuine 0. This is how block-mode (Set mit Preis) nulled members print.
+ bool hasPrice = i.TryGetValue("total_net", out var tv) && tv != null;
+ return new InvoiceSetLine
+ {
+ Title = i.nz("title", ""),
+ Desc = i.nz("desc", ""),
+ Qty = i.nz("qty", ""),
+ PriceNet = price,
+ TotalNet = total,
+ ShowPrice = !isText && hasPrice,
+ Numbered = !isText, // numbered like the editor: every line except free-text/heading, even price-blanked set members
+ IsSetHeader = type == "set"
+ };
+ }
+
///
/// Parses a numeric value coming from JSON deserialization (long/double), SQL
/// (decimal), or an already-invariant numeric string. Numeric CLR types are
@@ -505,7 +552,7 @@ public static class FuchsPdf
ParagraphFormat ClonePf()
{
var pf = doc.Styles["Normal"]!.ParagraphFormat.Clone();
- pf.Borders.Distance = 3;
+ pf.Borders.Distance = 0;
pf.Alignment = ParagraphAlignment.Left;
return pf;
}
@@ -533,126 +580,21 @@ public static class FuchsPdf
AddStyle(doc, "InvoiceNotes_ucb", "InvoiceNotes", s => s.Font = new Font(tgtFont, 9) { Bold = true });
}
- // ── ApplyInvoice ──────────────────────────────────────────────────────────
- public static void ApplyInvoice(Document doc, FdsTextBlocks tb, FdsInvoiceData inv, bool draft = false)
+ ///
+ /// Builds the ordered list of standard invoice notice paragraphs (ported from legacy
+ /// fuchs_fds_pdf.vb) — pure data, no MigraDoc dependency, so it can be reused by both
+ /// and the online editor's draft view-state (ADR: notice texts
+ /// are backend-authoritative — the editor renders exactly what the PDF will show).
+ ///
+ public static List BuildInvoiceNotes(FdsTextBlocks tb, FdsInvoiceData inv, bool p13b)
{
- string invoiceType = inv.InvoiceType;
- bool p13b = inv.InvoiceRegistration?.getString("InvoiceOptions")
- .Split(',').Contains("§13b") ?? false;
- Apply_Invoice_Styles(doc);
-
- var sec = doc.Sections.Cast().First();
- sec.PageSetup.RightMargin = cm(1.5);
-
- // Title
- {
- var p = sec.AddParagraph();
- p.Style = "SubjectBig";
- p.Format.SpaceBefore = cm(8.65);
- p.AddText($"{inv.InvoiceTitle} Nr. {inv.InvoiceId}");
- p.Format.SpaceAfter = cm(0.5);
- }
-
- // Provision location
- if (inv.ProvisionLocation.Length > 0)
- {
- var p = sec.AddParagraph();
- p.Style = "AddressBox";
- p.Format.Font.Size = 10;
- p.Format.LineSpacingRule = LineSpacingRule.Exactly;
- p.Format.LineSpacing = 12;
- p.AddFormattedText(tb.ProvisionLoc_Label, TextFormat.Bold);
- p.AddLineBreak();
- foreach (string t in inv.ProvisionLocation) { p.AddText(t); p.AddLineBreak(); }
- }
- sec.AddParagraph().Format.SpaceBefore = cm(0.7);
-
- // Invoice items table
- var tbl = sec.AddTable();
- tbl.Style = "Table";
- tbl.Format.SpaceBefore = mm(1); tbl.Format.SpaceAfter = mm(1);
- tbl.Borders.Color = Colors.White; tbl.Borders.Width = 0.25;
- tbl.Borders.Left.Width = 0.5; tbl.Borders.Right.Width = 0.5;
- tbl.Rows.LeftIndent = 0; tbl.Rows.Height = cm(0.6);
- tbl.Rows.HeightRule = RowHeightRule.AtLeast;
-
- double pageW = sec.PageSetup.PageWidth.Centimeter
- - sec.PageSetup.LeftMargin.Centimeter
- - sec.PageSetup.RightMargin.Centimeter;
- double[] colWidths = { pageW * 0.06, pageW * 0.42, pageW * 0.12, pageW * 0.18, pageW * 0.22 };
- foreach (double w in colWidths) tbl.AddColumn(cm(w));
-
- // Header row
- string[] headers = { "Pos.", "Bezeichnung", "Menge", "Einzelpreis", "Gesamtpreis" };
- var hRow = tbl.AddRow();
- hRow.Shading = GrayShading();
- for (int i = 0; i < headers.Length; i++)
- {
- var p = hRow.Cells[i].AddParagraph(); p.Style = "TblCell_Head";
- p.AddFormattedText(headers[i], TextFormat.Bold);
- hRow.Cells[i].Format.Alignment = i >= 2 ? ParagraphAlignment.Right : ParagraphAlignment.Left;
- }
-
- // Data rows — resolved through the set-display mode (see InvoiceSetPricing).
- // For invoices without sets this passes items through unchanged; for sets it
- // emits set header + members per the chosen mode, blanking price cells where
- // a line should show no price. Totals come from the registration balance, so
- // the mode is purely presentational.
- var setMode = InvoiceSetPricing.ModeFromInvoiceOptions(inv.InvoiceRegistration?.getString("InvoiceOptions"));
- int pos = 1;
- foreach (var line in InvoiceSetPricing.Build(inv.InvoiceItems, setMode))
- {
- var row = tbl.AddRow();
- row.HeightRule = RowHeightRule.Auto;
- row.Cells[0].AddParagraph(pos.ToString()).Style = "TblCell_Base";
- var titleCell = row.Cells[1].AddParagraph();
- titleCell.Style = "TblCell_RTitle";
- if (line.IsSetHeader) titleCell.AddFormattedText(line.Title, TextFormat.Bold);
- else titleCell.AddText(line.Title);
- if (!string.IsNullOrEmpty(line.Desc)) row.Cells[1].AddHtml($"{line.Desc}
");
- row.Cells[2].AddParagraph(line.Qty).Style = "TblCell_Base";
- row.Cells[3].AddParagraph(line.ShowPrice ? Currency(line.PriceNet) : "").Style = "TblCell_Base";
- row.Cells[4].AddParagraph(line.ShowPrice ? Currency(line.TotalNet) : "").Style = "TblCell_RSum";
- row.Cells[2].Format.Alignment = ParagraphAlignment.Right;
- row.Cells[3].Format.Alignment = ParagraphAlignment.Right;
- row.Cells[4].Format.Alignment = ParagraphAlignment.Right;
- pos++;
- }
-
- // Totals
- void TotalRow(string label, string value, string style = "TblCell_TSum", bool topBorder = false)
- {
- var r = tbl.AddRow(); r.Shading = LightShading();
- if (topBorder) r.Borders.Top.Width = 0.5;
- var lp = r.Cells[3].AddParagraph(); lp.Style = style; lp.AddText(label);
- r.Cells[3].Format.Alignment = ParagraphAlignment.Left;
- var vp = r.Cells[4].AddParagraph(); vp.Style = style; vp.AddText(value);
- r.Cells[4].Format.Alignment = ParagraphAlignment.Right;
- }
-
- ParseDec(inv.InvoiceRegistration?.getItem("InvoiceBalance_net"), out decimal netSum);
- TotalRow("Nettobetrag:", Currency(netSum), "TblCell_TNet", topBorder: true);
-
- // VAT rows
- foreach (var vr in inv.VatRows)
- {
- string pct = vr.Key;
- ParseDec(vr.Value.no("vat_amount", 0), out decimal vatAmt);
- TotalRow($"MwSt. {pct}%:", Currency(vatAmt), "TblCell_TVat");
- }
-
- ParseDec(inv.InvoiceRegistration?.getItem("InvoiceBalance"), out decimal gross);
- TotalRow("Rechnungsbetrag:", Currency(gross), "TblCell_TSum");
-
-
- // ── Standard invoice notes (ported from legacy fuchs_fds_pdf.vb) ──────────
- var reg = inv.InvoiceRegistration;
+ var notes = new List();
void Note(string text, string style = "InvoiceNotes")
{
- if (string.IsNullOrEmpty(text)) return;
- var np = sec.AddParagraph(); np.Style = style; np.AddText(text);
+ if (!string.IsNullOrEmpty(text)) notes.Add(new PdfNote(text, style));
}
+ var reg = inv.InvoiceRegistration;
ParseDec(reg?.getItem("InvoiceService"), out decimal invService);
string serviceGross = Currency(reg?.getItem("InvoiceService"));
@@ -729,8 +671,182 @@ public static class FuchsPdf
"die Umwelt zu schützen. Deshalb konzentrieren wir uns auf die Aufforstung von Flächen.");
Note("Wir bedanken uns herzlich für Ihren Auftrag.");
+ return notes;
+ }
+
+ ///
+ /// Builds the reminder intro/closing notice paragraphs (greeting + closing bank/amount and
+ /// "gegenstandslos"/Mahnzinsen sentences), keyed by the actual reminder type. Pure data — no
+ /// MigraDoc dependency — reused by and the online editor's draft
+ /// view-state so the editor shows exactly what the PDF will show.
+ ///
+ public static (string[] Intro, string[] Closing) BuildReminderNotes(FdsTextBlocks tb, FdsReminderData rem)
+ {
+ string rtype = rem.ReminderType;
+ string[] intro = tb.ReminderTexts_before.TryGetValue(rtype, out var i) ? i : Array.Empty();
+
+ ParseDec(rem.ReminderRegistration?.getItem("amount_open"), out decimal openTotal);
+ string terms = TranslatePaymentTerm(rem.ReminderRegistration?.getString("PaymentTerm") ?? "");
+
+ var closing = new List();
+ switch (rtype)
+ {
+ case "f":
+ closing.Add(
+ $"Bitte überweisen Sie den offenen Betrag von {Currency(openTotal)} innerhalb von {terms} auf unser Konto:\n" +
+ "IBAN: DE76\u00a03005\u00a00110\u00a00045\u00a00148\u00a000, BIC DUSSSDEDDXXX (Stadtsparkasse Düsseldorf)");
+ closing.Add("Sollten Sie den Betrag bereits überwiesen haben, so bitten wir Sie, diese Zahlungserinnerung als gegenstandslos zu betrachten.");
+ break;
+ default:
+ if (tb.ReminderClosingExtra.TryGetValue(rtype, out var extra)) closing.Add(extra);
+ break;
+ }
+ return (intro, closing.ToArray());
+ }
+
+ // ── ApplyInvoice ──────────────────────────────────────────────────────────
+ public static void ApplyInvoice(Document doc, FdsTextBlocks tb, FdsInvoiceData inv, bool draft = false)
+ {
+ string invoiceType = inv.InvoiceType;
+ bool p13b = inv.InvoiceRegistration?.getString("InvoiceOptions")
+ .Split(',').Contains("§13b") ?? false;
+ Apply_Invoice_Styles(doc);
+
+ var sec = doc.Sections.Cast().First();
+ sec.PageSetup.RightMargin = cm(1.5);
+
+ // Title
+ {
+ var p = sec.AddParagraph();
+ p.Style = "SubjectBig";
+ p.Format.SpaceBefore = cm(8.65);
+ p.AddText($"{inv.InvoiceTitle} Nr. {inv.InvoiceId}");
+ p.Format.SpaceAfter = cm(0.5);
+ }
+
+ // Provision location
+ if (inv.ProvisionLocation.Length > 0)
+ {
+ var p = sec.AddParagraph();
+ p.Style = "AddressBox";
+ p.Format.Font.Size = 10;
+ p.Format.LineSpacingRule = LineSpacingRule.Exactly;
+ p.Format.LineSpacing = 12;
+ p.AddFormattedText(tb.ProvisionLoc_Label, TextFormat.Bold);
+ p.AddLineBreak();
+ foreach (string t in inv.ProvisionLocation) { p.AddText(t); p.AddLineBreak(); }
+ }
+ sec.AddParagraph().Format.SpaceBefore = cm(0.7);
+
+ // Invoice items table
+ var tbl = sec.AddTable();
+ tbl.Style = "Table";
+ tbl.Format.SpaceBefore = mm(1); tbl.Format.SpaceAfter = mm(1);
+ tbl.Borders.Color = Colors.White; tbl.Borders.Width = 0.25;
+ tbl.Borders.Left.Width = 0.5; tbl.Borders.Right.Width = 0.5;
+ tbl.Rows.LeftIndent = 0; tbl.Rows.Height = cm(0.6);
+ tbl.Rows.HeightRule = RowHeightRule.AtLeast;
+
+ double pageW = sec.PageSetup.PageWidth.Centimeter
+ - sec.PageSetup.LeftMargin.Centimeter
+ - sec.PageSetup.RightMargin.Centimeter;
+ double[] colWidths = { pageW * 0.06, pageW * 0.42, pageW * 0.12, pageW * 0.18, pageW * 0.22 };
+ foreach (double w in colWidths) tbl.AddColumn(cm(w));
+
+ // Header row
+ string[] headers = { "Pos.", "Bezeichnung", "Menge", "Einzelpreis", "Gesamtpreis" };
+ var hRow = tbl.AddRow();
+ hRow.Shading = GrayShading();
+ for (int i = 0; i < headers.Length; i++)
+ {
+ var p = hRow.Cells[i].AddParagraph(); p.Style = "TblCell_Head";
+ p.AddFormattedText(headers[i], TextFormat.Bold);
+ hRow.Cells[i].Format.Alignment = i >= 2 ? ParagraphAlignment.Right : ParagraphAlignment.Left;
+ }
+
+ // Data rows — grouped by service-request block (see FdsInvoiceData.InvoiceBlocks).
+ // Each section prints its heading; positions are numbered the same way the editor numbers
+ // them (every line except free-text/heading lines, including a set header). The chosen
+ // set-display mode (see INVOICE_SET_PRICING.md) governs how "set" items and their members
+ // are shown: SetPrice (default) prices the set, blanks members; SetOnly prices the set
+ // and drops the members entirely.
+ // Blocks without any set items are unaffected and always render flat.
+ var setMode = InvoiceSetPricing.ModeFromInvoiceOptions(inv.InvoiceRegistration?.getString("InvoiceOptions"));
+ int pos = 0;
+ foreach (var block in inv.InvoiceBlocks)
+ {
+ if (!string.IsNullOrWhiteSpace(block.Heading))
+ {
+ var hr = tbl.AddRow();
+ hr.HeightRule = RowHeightRule.Auto;
+ hr.Cells[1].MergeRight = 3; // span Bezeichnung … Gesamtpreis
+ hr.Cells[1].AddParagraph().WithStyle("TblCell_RTitle").AddFormattedText(block.Heading, TextFormat.Bold);
+ }
+
+ // Function-1 (SetItmId-linked) sets still collapse via Build; block-mode sets (ADR 0009)
+ // and plain blocks render flat — their set row is emphasised on its own and nulled
+ // members map to blank cells (see MapItemToLine).
+ var lines = InvoiceSetPricing.HasSetMembers(block.Items)
+ ? InvoiceSetPricing.Build(block.Items, setMode)
+ : block.Items.Select(MapItemToLine).ToList();
+
+ foreach (var line in lines)
+ {
+ bool numbered = line.Numbered; // every line except free-text/heading (mirrors the editor's RecomputePositions), even price-blanked set members
+ var row = tbl.AddRow();
+ row.HeightRule = RowHeightRule.Auto;
+ row.Cells[0].AddParagraph(numbered ? (++pos).ToString() : "").Style = "TblCell_Base";
+ if (!string.IsNullOrEmpty(line.Title)) // skip the empty paragraph that added a blank line before free text
+ {
+ var titleCell = row.Cells[1].AddParagraph();
+ titleCell.Style = "TblCell_RTitle";
+ if (line.IsSetHeader) titleCell.AddFormattedText(line.Title, TextFormat.Bold);
+ else titleCell.AddText(line.Title);
+ }
+ if (!string.IsNullOrEmpty(line.Desc)) row.Cells[1].AddHtml($"{line.Desc}
");
+ row.Cells[2].AddParagraph(line.Qty).Style = "TblCell_Base";
+ row.Cells[3].AddParagraph(line.ShowPrice ? Currency(line.PriceNet) : "").Style = "TblCell_Base";
+ row.Cells[4].AddParagraph(line.ShowPrice ? Currency(line.TotalNet) : "").Style = "TblCell_RSum";
+ row.Cells[2].Format.Alignment = ParagraphAlignment.Right;
+ row.Cells[3].Format.Alignment = ParagraphAlignment.Right;
+ row.Cells[4].Format.Alignment = ParagraphAlignment.Right;
+ }
+ }
+
+ // Totals
+ void TotalRow(string label, string value, string style = "TblCell_TSum", bool topBorder = false)
+ {
+ var r = tbl.AddRow(); r.Shading = LightShading();
+ if (topBorder) r.Borders.Top.Width = 0.5;
+ var lp = r.Cells[3].AddParagraph(); lp.Style = style; lp.AddText(label);
+ r.Cells[3].Format.Alignment = ParagraphAlignment.Left;
+ var vp = r.Cells[4].AddParagraph(); vp.Style = style; vp.AddText(value);
+ r.Cells[4].Format.Alignment = ParagraphAlignment.Right;
+ }
+
+ ParseDec(inv.InvoiceRegistration?.getItem("InvoiceBalance_net"), out decimal netSum);
+ TotalRow("Nettobetrag:", Currency(netSum), "TblCell_TNet", topBorder: true);
+
+ // VAT rows
+ foreach (var vr in inv.VatRows)
+ {
+ string pct = vr.Key;
+ ParseDec(vr.Value.no("vat_amount", 0), out decimal vatAmt);
+ TotalRow($"MwSt. {pct}%:", Currency(vatAmt), "TblCell_TVat");
+ }
+
+ ParseDec(inv.InvoiceRegistration?.getItem("InvoiceBalance"), out decimal gross);
+ TotalRow("Rechnungsbetrag:", Currency(gross), "TblCell_TSum");
+
+
+ // ── Standard invoice notes (ported from legacy fuchs_fds_pdf.vb) ──────────
+ foreach (var note in BuildInvoiceNotes(tb, inv, p13b))
+ {
+ var np = sec.AddParagraph(); np.Style = note.Style; np.AddText(note.Text);
+ }
+
// GiroCode payment QR (only on finalized invoices with a positive balance)
- ParseDec(reg?.getItem("InvoiceBalance"), out decimal payAmount);
+ ParseDec(inv.InvoiceRegistration?.getItem("InvoiceBalance"), out decimal payAmount);
if (!inv.IsDraft && payAmount > 0 && !string.IsNullOrWhiteSpace(inv.InvoiceId))
AddGirocode(sec, payAmount, $"{inv.InvoiceTitle.ne("Rechnung")} {inv.InvoiceId}");
}
@@ -752,31 +868,37 @@ public static class FuchsPdf
p.AddText(rem.ReminderTitle.ne("Zahlungserinnerung"));
}
+ var (introLines, closingLines) = BuildReminderNotes(tb, rem);
+
// Opening text
- if (tb.ReminderTexts_before.TryGetValue(rtype, out var intro))
+ if (introLines.Length > 0)
{
var p = sec.AddParagraph(); p.Style = "BodyText";
p.Format.SpaceBefore = cm(0.5);
- foreach (string line in intro) { p.AddText(line); p.AddLineBreak(); }
+ foreach (string line in introLines) { p.AddText(line); p.AddLineBreak(); }
}
+ sec.AddParagraph().Format.SpaceBefore = cm(0.7);
- // Reminder items table
+ // Reminder items table — mirrors the online editor's remHR columns exactly
+ // (Rechnung, vom, Rechnungsbetrag, bereits bezahlt, noch offen).
var tbl = sec.AddTable();
tbl.Style = "Table";
+ tbl.Format.SpaceBefore = mm(1); tbl.Format.SpaceAfter = mm(1);
tbl.Borders.Color = Colors.White; tbl.Borders.Width = 0.25;
+ tbl.Borders.Left.Width = 0.5; tbl.Borders.Right.Width = 0.5;
tbl.Rows.LeftIndent = 0; tbl.Rows.Height = cm(0.6);
tbl.Rows.HeightRule = RowHeightRule.AtLeast;
- tbl.Format.SpaceBefore = mm(4);
double pageW = sec.PageSetup.PageWidth.Centimeter
- sec.PageSetup.LeftMargin.Centimeter
- sec.PageSetup.RightMargin.Centimeter;
+ tbl.AddColumn(cm(pageW * 0.20));
tbl.AddColumn(cm(pageW * 0.15));
- tbl.AddColumn(cm(pageW * 0.45));
- tbl.AddColumn(cm(pageW * 0.20));
- tbl.AddColumn(cm(pageW * 0.20));
+ tbl.AddColumn(cm(pageW * 0.22));
+ tbl.AddColumn(cm(pageW * 0.21));
+ tbl.AddColumn(cm(pageW * 0.22));
- string[] headers = { "Datum", "Bezeichnung", "Betrag", "Offen" };
+ string[] headers = { "Rechnung", "vom", "Rechnungsbetrag", "bereits bezahlt", "noch offen" };
var hRow = tbl.AddRow(); hRow.Shading = GrayShading();
for (int i = 0; i < headers.Length; i++)
{
@@ -785,33 +907,39 @@ public static class FuchsPdf
hRow.Cells[i].Format.Alignment = i >= 2 ? ParagraphAlignment.Right : ParagraphAlignment.Left;
}
- foreach (var itm in rem.ReminderItems)
- {
- var row = tbl.AddRow(); row.HeightRule = RowHeightRule.Auto;
- row.Cells[0].AddParagraph(itm.nz("InvoiceDate", ""));
- row.Cells[1].AddParagraph(itm.nz("DocumentName", "").ne(itm.nz("InvoiceTitle", "")));
- row.Cells[2].AddParagraph(Currency(itm.no("InvoiceBalance", 0)));
- row.Cells[3].AddParagraph(Currency(itm.no("amount_open", 0)));
- row.Cells[2].Format.Alignment = ParagraphAlignment.Right;
- row.Cells[3].Format.Alignment = ParagraphAlignment.Right;
- }
+ ParseDec(rem.ReminderRegistration?.getItem("amount"), out decimal amountTotal);
+ ParseDec(rem.ReminderRegistration?.getItem("amount_payed"), out decimal amountPayed);
+ ParseDec(rem.ReminderRegistration?.getItem("amount_open"), out decimal openTotal);
+ string invoiceDate = rem.ReminderRegistration?.getString("InvoiceDate") is { Length: > 0 } d
+ && DateTime.TryParse(d, out var dd) ? dd.ToString("dd.MM.yy") : "";
+
+ var row = tbl.AddRow(); row.HeightRule = RowHeightRule.Auto;
+ row.Cells[0].AddParagraph(rem.InvoiceId);
+ row.Cells[1].AddParagraph(invoiceDate);
+ row.Cells[2].AddParagraph(Currency(amountTotal));
+ row.Cells[3].AddParagraph(Currency(amountPayed));
+ row.Cells[4].AddParagraph(Currency(openTotal));
+ for (int i = 2; i <= 4; i++) row.Cells[i].Format.Alignment = ParagraphAlignment.Right;
// Open total
- ParseDec(rem.ReminderRegistration?.getItem("amount_open"), out decimal openTotal);
var sumRow = tbl.AddRow(); sumRow.Shading = LightShading();
sumRow.Borders.Top.Width = 0.5;
- sumRow.Cells[2].AddParagraph().AddFormattedText("Offener Betrag:", TextFormat.Bold);
- var sv = sumRow.Cells[3].AddParagraph();
+ sumRow.Cells[3].AddParagraph().AddFormattedText("Offener Betrag:", TextFormat.Bold);
+ var sv = sumRow.Cells[4].AddParagraph();
sv.AddFormattedText(Currency(openTotal), TextFormat.Bold);
- sumRow.Cells[3].Format.Alignment = ParagraphAlignment.Right;
+ sumRow.Cells[4].Format.Alignment = ParagraphAlignment.Right;
// Closing text + QR code
- var closing = sec.AddParagraph(); closing.Style = "BodyText";
- closing.Format.SpaceBefore = cm(0.8);
- string terms = TranslatePaymentTerm(rem.ReminderRegistration?.getString("PaymentTerm") ?? "");
- closing.AddText(
- $"Bitte \u00fcberweisen Sie den offenen Betrag von {Currency(openTotal)} innerhalb von {terms} auf unser Konto:\n" +
- "IBAN: DE76\u00a03005\u00a00110\u00a00045\u00a00148\u00a000, BIC DUSSSDEDDXXX (Stadtsparkasse D\u00fcsseldorf)");
+ if (closingLines.Length > 0)
+ {
+ var closing = sec.AddParagraph(); closing.Style = "BodyText";
+ closing.Format.SpaceBefore = cm(0.8);
+ for (int i = 0; i < closingLines.Length; i++)
+ {
+ if (i > 0) closing.AddLineBreak();
+ closing.AddText(closingLines[i]);
+ }
+ }
// GiroCode payment QR (only on finalized reminders with a positive open amount)
if (!rem.IsDraft && openTotal > 0 && !string.IsNullOrWhiteSpace(rem.InvoiceId))
diff --git a/Fuchs/code/InvoiceDraftCalculator.cs b/Fuchs/code/InvoiceDraftCalculator.cs
new file mode 100644
index 0000000..9cdc653
--- /dev/null
+++ b/Fuchs/code/InvoiceDraftCalculator.cs
@@ -0,0 +1,216 @@
+using System.Globalization;
+using Newtonsoft.Json.Linq;
+
+namespace Fuchs.intranet;
+
+///
+/// Server-side, pure aggregation of an invoice draft's totals/VAT — the authoritative
+/// replacement for the browser's invSumUpdate footer math (ADR 0006). The user's
+/// requirement is that the sums live in the backend cache, not the frontend.
+///
+/// It reads each block's persisted line contract (block.itm = the editor's co
+/// objects: vt=net, vv=VAT, vs=service-net, vsv=service-VAT,
+/// vat=rate) — exactly the shape the editor already posts and the PDF/persistence
+/// already consume — so no line data is re-derived or re-shaped. It then applies the §13b
+/// reverse-charge rule and validates. Static/pure, hence exhaustively unit-testable.
+///
+public static class InvoiceDraftCalculator
+{
+ ///
+ /// Recomputes every line's own net/VAT/service values from its raw quantity (qn),
+ /// unit price (v) and VAT rate (vat) — the authoritative, server-side port of
+ /// the former client-side quantChange/setVat multiplication (ADR 0006/0008: the
+ /// online editor performs no arithmetic at all, not even a single line's net = qty × price).
+ /// Only lines that actually carry a raw quantity and a positive unit price are recomputed
+ /// (mirrors quantChange's own guard); lines without both (headings, free text,
+ /// combined-sum rows, and set members that have been zeroed by
+ /// 's "Auf Setpreis umstellen" conversion)
+ /// keep whatever value they already carry, so a set header's synthesised sum is never
+ /// clobbered by a subsequent recompute.
+ ///
+ public static void RecomputeLineValues(InvoiceDraftSession session)
+ {
+ foreach (var blockTok in session.Req)
+ {
+ if (blockTok is not JObject block || block["itm"] is not JArray lines) continue;
+ foreach (var lineTok in lines)
+ {
+ if (lineTok is not JObject co) continue;
+ decimal qty = Dec(co["qn"]);
+ decimal price = Dec(co["v"]);
+ if (qty <= 0 || price <= 0) continue; // no raw qty/price posted -> leave the value as delivered
+
+ string rate = NormalizeRate(Str(co["vat"]));
+ decimal vatFactor = rate.Length > 0 && decimal.TryParse(rate, NumberStyles.Any, CultureInfo.InvariantCulture, out decimal r)
+ ? r / 100m : 0m;
+ decimal netVal = Math.Round(qty * price, 2, MidpointRounding.AwayFromZero);
+ decimal vatVal = Math.Round(netVal * vatFactor, 2, MidpointRounding.AwayFromZero);
+
+ co["vt"] = netVal;
+ co["vv"] = vatVal;
+ bool isService = string.Equals(Str(co["typ"]), "Service", StringComparison.OrdinalIgnoreCase);
+ co["vs"] = isService ? netVal : 0;
+ co["vsv"] = isService ? vatVal : 0;
+ }
+ }
+ }
+
+ ///
+ /// Aggregates every block's line values into the draft's totals — the port of
+ /// invSumUpdate's csms accumulation plus §13b (VAT suppressed → gross = net).
+ /// VAT is grouped by the line's rate string (matching the editor's sms.vat map).
+ ///
+ public static void RecomputeTotals(InvoiceDraftSession session)
+ {
+ var sums = new InvoiceDraftSums();
+ bool p13b = Flag(session.Admin, "p13b");
+
+ foreach (var blockTok in session.Req)
+ {
+ if (blockTok is not JObject block) continue;
+ decimal blockNet = 0;
+ string blockId = Str(block["Id"]);
+ if (block["itm"] is JArray lines)
+ {
+ foreach (var lineTok in lines)
+ {
+ if (lineTok is not JObject co) continue;
+ decimal netVal = Dec(co["vt"]);
+ decimal vatVal = Dec(co["vv"]);
+ decimal svcNet = Dec(co["vs"]);
+ decimal svcVat = Dec(co["vsv"]);
+
+ sums.ServiceNet += svcNet;
+ sums.ServiceVat += svcVat;
+ sums.TotalNet += netVal;
+ sums.TotalVat += vatVal;
+ sums.TotalGross += netVal + vatVal;
+ blockNet += netVal;
+
+ string rate = NormalizeRate(Str(co["vat"]));
+ if (rate.Length > 0)
+ sums.VatByRate[rate] = sums.VatByRate.GetValueOrDefault(rate) + vatVal;
+ }
+ }
+ if (!string.IsNullOrEmpty(blockId))
+ sums.NetByBlock[blockId] = sums.NetByBlock.GetValueOrDefault(blockId) + blockNet;
+ }
+
+ if (p13b)
+ {
+ // Reverse-charge: no VAT lines, gross equals net (mirrors invSumUpdate's else-branch).
+ sums.TotalGross = sums.TotalNet;
+ sums.TotalVat = 0;
+ sums.VatByRate.Clear();
+ }
+
+ session.Sums = sums;
+ }
+
+ ///
+ /// Renumbers the visible line positions authoritatively (the port of the client-side
+ /// numbering in invSumUpdate): priced lines are numbered sequentially across the whole
+ /// invoice — matching the PDF's Pos. column — while heading/free-text lines
+ /// (typ = "text"/"title") carry no number. The result is written onto each line's
+ /// p field so it flows back to the browser (via the view state) and into the PDF; this
+ /// keeps the online editor and the PDF preview showing the same position numbers, including
+ /// after a reorder.
+ ///
+ public static void RecomputePositions(InvoiceDraftSession session)
+ {
+ int pos = 0;
+ foreach (var blockTok in session.Req)
+ {
+ if (blockTok is not JObject block || block["itm"] is not JArray lines) continue;
+ foreach (var lineTok in lines)
+ {
+ if (lineTok is not JObject co) continue;
+ string typ = Str(co["typ"]).Trim().ToLowerInvariant();
+ bool numbered = typ is not ("text" or "title"); // only headings/free-text carry no number (mirrors invSumUpdate)
+ co["p"] = numbered ? (JToken)(++pos) : (JToken)"";
+ }
+ }
+ }
+
+ ///
+ /// Refreshes the draft's plausibility / consistency findings. "error" severity marks
+ /// issues that should block a clean finalise; "warning" is advisory. Kept in German,
+ /// user-readable, so the frontend can render them directly.
+ ///
+ public static void Validate(InvoiceDraftSession session)
+ {
+ session.ValidationMessages.Clear();
+ void Add(string field, string sev, string msg) =>
+ session.ValidationMessages.Add(new InvoiceDraftValidationMessage(field, sev, msg));
+
+ string email = Str(session.New["invoiceemail"]).Trim();
+ if (email.Length == 0)
+ Add("email", "warning", "Es ist keine E-Mail-Adresse hinterlegt — die Rechnung kann nicht per E-Mail versandt werden.");
+ else if (!IsValidEmail(email))
+ Add("email", "error", "Die E-Mail-Adresse ist ungültig.");
+
+ if (Str(session.New["invoiceaddress"]).Trim().Length == 0)
+ Add("address", "warning", "Es ist keine Rechnungsanschrift hinterlegt.");
+
+ if (!HasAnyItem(session))
+ Add("items", "error", "Die Rechnung enthält keine Positionen.");
+
+ if (!Flag(session.Admin, "p13b"))
+ foreach (var rate in session.Sums.VatByRate.Keys)
+ if (!IsKnownVatRate(rate))
+ Add("vat", "warning", $"Ungewöhnlicher Umsatzsteuersatz: {rate}%.");
+
+ if (session.Sums.TotalGross < 0)
+ Add("total", "warning", "Der Rechnungsbetrag ist negativ.");
+ }
+
+ // ── helpers ──────────────────────────────────────────────────────────────
+ private static bool HasAnyItem(InvoiceDraftSession session)
+ {
+ foreach (var blockTok in session.Req)
+ if (blockTok is JObject block && block["itm"] is JArray lines && lines.Count > 0)
+ return true;
+ return false;
+ }
+
+ /// Parses a JToken to a decimal, tolerating German ("12,50") and invariant ("12.50") strings and "%".
+ internal static decimal Dec(JToken? token)
+ {
+ if (token == null || token.Type == JTokenType.Null) return 0;
+ if (token.Type is JTokenType.Float or JTokenType.Integer) return token.Value();
+ return FuchsPdf.ParseDec(Str(token), out decimal d) ? d : 0;
+ }
+
+ private static string Str(JToken? token) =>
+ token == null || token.Type == JTokenType.Null ? "" : token.Type == JTokenType.String ? token.Value() ?? "" : token.ToString();
+
+ private static bool Flag(JObject obj, string key)
+ {
+ var t = obj[key];
+ if (t == null || t.Type == JTokenType.Null) return false;
+ if (t.Type == JTokenType.Boolean) return t.Value();
+ string s = Str(t).Trim().ToLowerInvariant();
+ return s is "1" or "true" or "yes" or "ja" or "on";
+ }
+
+ /// Normalises a VAT rate string ("19,0%", "7%", "19") to a canonical numeric string ("19", "7").
+ internal static string NormalizeRate(string? raw)
+ {
+ string s = (raw ?? "").Replace("%", "").Trim().Replace(',', '.');
+ if (s.Length == 0) return "";
+ if (!double.TryParse(s, NumberStyles.Any, CultureInfo.InvariantCulture, out double d) || d == 0) return "";
+ return d == Math.Floor(d)
+ ? ((long)d).ToString(CultureInfo.InvariantCulture)
+ : d.ToString(CultureInfo.InvariantCulture);
+ }
+
+ private static bool IsKnownVatRate(string rate) => rate is "0" or "7" or "19";
+
+ private static bool IsValidEmail(string email)
+ {
+ int at = email.IndexOf('@');
+ if (at <= 0 || at != email.LastIndexOf('@')) return false;
+ int dot = email.IndexOf('.', at);
+ return dot > at + 1 && dot < email.Length - 1;
+ }
+}
diff --git a/Fuchs/code/InvoiceDraftSession.cs b/Fuchs/code/InvoiceDraftSession.cs
new file mode 100644
index 0000000..727da86
--- /dev/null
+++ b/Fuchs/code/InvoiceDraftSession.cs
@@ -0,0 +1,111 @@
+using Newtonsoft.Json.Linq;
+
+namespace Fuchs.intranet;
+
+///
+/// Server-side, in-memory editing state for a single invoice draft — the
+/// authoritative source of truth while a back-office user is editing a draft in
+/// the browser (see ADR 0006). The browser is a pure view/input layer: it posts
+/// single changes (), the server
+/// mutates this session, recomputes totals/VAT (replacing the former client-side
+/// invSumUpdate) and validates, then signals the browser to re-fetch.
+///
+/// This is a data holder only — all calculation, validation, persistence
+/// and rendering live in
+/// (mirroring the /
+/// split). The editable payload is kept as the exact JSON shape the editor already
+/// speaks (admin / new / req), so flushing to the DB can reuse
+/// unchanged.
+///
+public sealed class InvoiceDraftSession
+{
+ /// Opaque per-editor token; also the SignalR group name for targeted signals.
+ public string Token { get; init; } = "";
+
+ /// Owning user account id (drafts are single-user; used for auth + events).
+ public string UserAccountId { get; init; } = "";
+
+ /// DB invoice id once the session has been flushed (Zwischenspeichern); empty while cache-only.
+ public string InvId { get; set; } = "";
+
+ /// Always true here — sessions only ever hold unfinalised drafts.
+ public bool IsDraft { get; set; } = true;
+
+ /// Bumped on every applied mutation; the browser refetches when the signalled version changes.
+ public int Version { get; set; }
+
+ /// UTC of the last read/write; drives the idle sliding-TTL and expiry warnings.
+ public DateTime LastAccessUtc { get; set; } = DateTime.UtcNow;
+
+ /// Guards against sending more than one expiry warning per idle window.
+ public bool ExpiryWarningSent { get; set; }
+
+ // ── Editable payload (exact editor JSON shape) ───────────────────────────
+ /// Header/admin flags: type, customerid, p13b, setmode, paymentterms…
+ public JObject Admin { get; set; } = new();
+
+ /// Recipient/new fields: title/invoicetitle, invoiceaddress, invoiceemail, provisionlocation/-period, CustomValues…
+ public JObject New { get; set; } = new();
+
+ /// Service-request blocks; each block is a JObject with an items JArray (the line items).
+ public JArray Req { get; set; } = new();
+
+ // ── Computed (by the draft service; never trusted from the client) ───────
+ /// Server-computed totals/VAT — the values the client used to compute in invSumUpdate.
+ public InvoiceDraftSums Sums { get; set; } = new();
+
+ /// Plausibility / consistency results, refreshed on every recompute.
+ public List ValidationMessages { get; } = new();
+
+ /// Automatic change history, appended on every applied patch. Cache-only (never persisted).
+ public List History { get; } = new();
+
+ public void Touch() => LastAccessUtc = DateTime.UtcNow;
+}
+
+/// Server-computed invoice totals — the authoritative replacement for the browser's sms object.
+public sealed class InvoiceDraftSums
+{
+ /// Total net (ttn).
+ public decimal TotalNet { get; set; }
+ /// Total gross (ttb); equals net when §13b reverse-charge is active.
+ public decimal TotalGross { get; set; }
+ /// Total VAT (ttvat).
+ public decimal TotalVat { get; set; }
+ /// Service net (tscn) — the service-refund base.
+ public decimal ServiceNet { get; set; }
+ /// Service VAT (tscvat).
+ public decimal ServiceVat { get; set; }
+ /// VAT amount per rate string (e.g. "19" → 123.45), matching the editor's sms.vat map.
+ public Dictionary VatByRate { get; } = new();
+ /// Net per block, keyed by block id — feeds the per-block sub-sum row.
+ public Dictionary NetByBlock { get; } = new();
+}
+
+/// A single plausibility/consistency finding for the draft.
+/// Logical field the message relates to (e.g. "email", "address", "items").
+/// "error" blocks a clean finalise; "warning"/"info" are advisory.
+/// German, user-readable text.
+public readonly record struct InvoiceDraftValidationMessage(string Field, string Severity, string Message);
+
+///
+/// One automatically-recorded change in the draft's history (shown in the
+/// "Änderungshistorie" dialog). Captured on every applied patch; lives only for
+/// the cache lifetime of the session and is never persisted to the database.
+///
+public sealed class ChangeHistoryEntry
+{
+ public DateTime TimestampUtc { get; init; } = DateTime.UtcNow;
+ /// User account id that made the change.
+ public string UserAccountId { get; init; } = "";
+ /// The change target/op as sent by the editor (e.g. "item.qty", "email", "p13b").
+ public string Target { get; init; } = "";
+ /// Optional item/block id the change applied to.
+ public string Ref { get; init; } = "";
+ /// Previous value, stringified for display (may be empty).
+ public string OldValue { get; init; } = "";
+ /// New value, stringified for display (may be empty).
+ public string NewValue { get; init; } = "";
+ /// Version the session reached after applying this change.
+ public int Version { get; init; }
+}
diff --git a/Fuchs/code/InvoiceSetPricing.cs b/Fuchs/code/InvoiceSetPricing.cs
index d4da348..fd3e345 100644
--- a/Fuchs/code/InvoiceSetPricing.cs
+++ b/Fuchs/code/InvoiceSetPricing.cs
@@ -1,4 +1,4 @@
-using static OCORE.commons;
+using static OCORE.commons;
using static OCORE.OCORE_dictionaries;
namespace Fuchs.intranet;
@@ -13,8 +13,6 @@ public enum SetDisplayMode
{
/// Default: show the set as one priced line; member items listed without price.
SetPrice,
- /// Show each member item with its own price; the set line is a header without price.
- ItemPrices,
/// Show only the set as one priced line; member items are removed entirely.
SetOnly
}
@@ -22,6 +20,9 @@ public enum SetDisplayMode
/// A resolved invoice display line (after applying the set display mode).
public sealed class InvoiceSetLine
{
+ /// The source item's id — lets callers (e.g. the online editor) map a resolved
+ /// display line back to the DOM row it should update.
+ public string Id { get; init; } = "";
public string Title { get; init; } = "";
public string Desc { get; init; } = "";
public string Qty { get; init; } = "1";
@@ -29,6 +30,14 @@ public sealed class InvoiceSetLine
public decimal TotalNet { get; init; }
/// When false, the price/total cells are rendered blank (e.g. set members in SetPrice mode).
public bool ShowPrice { get; init; } = true;
+ ///
+ /// Whether this line carries a position number. Mirrors the editor's numbering
+ /// (InvoiceDraftCalculator.RecomputePositions): every line is numbered except
+ /// free-text/heading lines — independent of whether a price is shown, so a price-blanked set
+ /// member (SetPrice mode / block-mode nulled member) is still numbered exactly like in the
+ /// online editor.
+ ///
+ public bool Numbered { get; init; } = true;
/// True for the set header line (rendered emphasised).
public bool IsSetHeader { get; init; }
}
@@ -40,17 +49,24 @@ public sealed class InvoiceSetLine
/// header's id. Items that belong to no set pass through unchanged.
///
/// The invoice total is taken from the registration balance, not from these
-/// lines, so switching modes is purely presentational and never changes the
-/// invoice sum — set price always equals the sum of its members.
+/// lines, so calling is a pure, non-mutating transformation
+/// of the items it is given and never changes the invoice sum. A set header
+/// only adopts the chosen once it has actually been
+/// converted (its own total_net is non-zero, via the one-way set-item
+/// switch, InvoiceDraftEditService.ApplyItemSetPrice) — until then the
+/// header renders blank and each member keeps its own individual price, exactly
+/// like a non-set item. (The choice of which mode to apply is itself a
+/// persisted, effectively one-way decision on the draft session — see
+/// Fuchs/Docs/INVOICE_SET_PRICING.md — but that persistence lives outside
+/// this class.)
///
public static class InvoiceSetPricing
{
public static SetDisplayMode ParseMode(string? raw) =>
(raw ?? "").Trim().ToLowerInvariant() switch
{
- "itemprices" or "items" or "item" => SetDisplayMode.ItemPrices,
- "setonly" or "set_only" => SetDisplayMode.SetOnly,
- _ => SetDisplayMode.SetPrice
+ "setonly" or "set_only" => SetDisplayMode.SetOnly,
+ _ => SetDisplayMode.SetPrice
};
/// Reads the set mode from an InvoiceOptions CSV token like "setmode:itemprices".
@@ -68,9 +84,21 @@ public static class InvoiceSetPricing
public static bool ContainsSets(IEnumerable> items) =>
items.Any(IsSetHeader) || items.Any(i => !string.IsNullOrEmpty(SetIdOf(i)));
+ ///
+ /// True if the block carries a SetItmId-linked set (a member points at a header via
+ /// setId) — i.e. the function-1 "set-item switch" grouping. This is the only case that
+ /// still routes through ; the two menu modes (ADR 0009) clear setId
+ /// and render flat (their inserted set row is emphasised on its own, members null out to blank).
+ ///
+ public static bool HasSetMembers(IEnumerable> items) =>
+ items.Any(i => !string.IsNullOrEmpty(SetIdOf(i)));
+
///
/// Produces the ordered display lines for the given items and mode.
- /// Standalone items are always shown with their price.
+ /// Standalone items are always shown with their price. A set header whose
+ /// own total_net is still zero (not yet converted via the set-item
+ /// switch) is rendered blank with its members individually priced,
+ /// regardless of .
///
public static List Build(IReadOnlyList> items, SetDisplayMode mode)
{
@@ -87,22 +115,29 @@ public static class InvoiceSetPricing
{
if (IsSetHeader(item))
{
- string setId = HeaderIdOf(item);
- var members = membersBySet.TryGetValue(setId, out var m) ? m : new List>();
- decimal setTot = HeaderTotal(item, members);
+ string setId = HeaderIdOf(item);
+ var members = membersBySet.TryGetValue(setId, out var m) ? m : new List>();
+ FuchsPdf.ParseDec(item.no("total_net", 0), out decimal headerOwnTotal);
+
+ if (headerOwnTotal == 0)
+ {
+ // Not yet converted (the set-item switch, ApplyItemSetPrice, hasn't run): the
+ // header still carries its as-delivered zero price, so the chosen display mode
+ // does not apply yet — show the header blank and each member with its own,
+ // individual price, exactly as if there were no set grouping at all.
+ result.Add(HeaderLine(item, 0, showPrice: false));
+ foreach (var mem in members) result.Add(MemberLine(mem, showPrice: true));
+ continue;
+ }
switch (mode)
{
case SetDisplayMode.SetPrice:
- result.Add(HeaderLine(item, setTot, showPrice: true));
+ result.Add(HeaderLine(item, headerOwnTotal, showPrice: true));
foreach (var mem in members) result.Add(MemberLine(mem, showPrice: false));
break;
- case SetDisplayMode.ItemPrices:
- result.Add(HeaderLine(item, setTot, showPrice: false)); // grouping title, no price (avoid double count)
- foreach (var mem in members) result.Add(MemberLine(mem, showPrice: true));
- break;
case SetDisplayMode.SetOnly:
- result.Add(HeaderLine(item, setTot, showPrice: true));
+ result.Add(HeaderLine(item, headerOwnTotal, showPrice: true));
break;
}
}
@@ -145,23 +180,16 @@ public static class InvoiceSetPricing
return string.IsNullOrEmpty(s) ? i.nz("id", "") : s;
}
- private static decimal HeaderTotal(Dictionary header, List> members)
- {
- FuchsPdf.ParseDec(header.no("total_net", 0), out decimal headerTot);
- if (headerTot != 0) return headerTot;
- decimal sum = 0;
- foreach (var m in members) { FuchsPdf.ParseDec(m.no("total_net", 0), out decimal t); sum += t; }
- return sum;
- }
-
private static InvoiceSetLine HeaderLine(Dictionary i, decimal setTotal, bool showPrice) => new()
{
+ Id = i.nz("id", ""),
Title = i.nz("title", ""),
Desc = i.nz("desc", ""),
Qty = i.nz("qty", "1"),
PriceNet = setTotal,
TotalNet = setTotal,
ShowPrice = showPrice,
+ Numbered = true, // a set header is always numbered
IsSetHeader = true
};
@@ -171,12 +199,14 @@ public static class InvoiceSetPricing
FuchsPdf.ParseDec(i.no("total_net", 0), out decimal total);
return new InvoiceSetLine
{
+ Id = i.nz("id", ""),
Title = i.nz("title", ""),
Desc = i.nz("desc", ""),
Qty = i.nz("qty", "1"),
PriceNet = price,
TotalNet = total,
ShowPrice = showPrice && !IsNoPriceLine(i), // headings/free text print no price
+ Numbered = !IsNoPriceLine(i), // …but are still numbered unless heading/free-text
IsSetHeader = false
};
}
diff --git a/Fuchs/code/ReminderDraftCalculator.cs b/Fuchs/code/ReminderDraftCalculator.cs
new file mode 100644
index 0000000..899d888
--- /dev/null
+++ b/Fuchs/code/ReminderDraftCalculator.cs
@@ -0,0 +1,92 @@
+using System.Globalization;
+using Newtonsoft.Json.Linq;
+
+namespace Fuchs.intranet;
+
+///
+/// Server-side, pure aggregation of a reminder draft's open amount — the authoritative
+/// replacement for the browser's inline figure (ADR 0006, mirroring
+/// ). The user's requirement is that the computed
+/// figure lives in the backend cache, not the frontend.
+///
+/// A reminder chases a single invoiced amount: AmountOpen = AmountTotal - AmountPayed
+/// (both read from the editor's new block). Static/pure, hence exhaustively
+/// unit-testable.
+///
+public static class ReminderDraftCalculator
+{
+ /// Recomputes the reminder's open amount from the edited amount / amount_payed.
+ public static void RecomputeTotals(ReminderDraftSession session)
+ {
+ decimal total = Dec(session.New["amount"]);
+ decimal payed = Dec(session.New["amount_payed"]);
+ session.Sums = new ReminderDraftSums
+ {
+ AmountTotal = total,
+ AmountPayed = payed,
+ AmountOpen = total - payed
+ };
+ }
+
+ ///
+ /// Refreshes the draft's plausibility / consistency findings. "error" severity marks
+ /// issues that should block a clean finalise; "warning" is advisory. Kept in German,
+ /// user-readable, so the frontend can render them directly.
+ ///
+ public static void Validate(ReminderDraftSession session)
+ {
+ session.ValidationMessages.Clear();
+ void Add(string field, string sev, string msg) =>
+ session.ValidationMessages.Add(new ReminderDraftValidationMessage(field, sev, msg));
+
+ string email = Str(session.New["invoiceemail"]).Trim();
+ if (email.Length == 0)
+ Add("email", "warning", "Es ist keine E-Mail-Adresse hinterlegt — die Mahnung kann nicht per E-Mail versandt werden.");
+ else if (!IsValidEmail(email))
+ Add("email", "error", "Die E-Mail-Adresse ist ungültig.");
+
+ if (Str(session.New["invoiceaddress"]).Trim().Length == 0)
+ Add("address", "warning", "Es ist keine Anschrift hinterlegt.");
+
+ if (Str(session.New["subject"]).Trim().Length == 0)
+ Add("subject", "warning", "Es ist kein Betreff hinterlegt.");
+
+ if (session.Sums.AmountOpen <= 0)
+ Add("amount", "warning", "Der offene Betrag ist null oder negativ — es besteht keine offene Forderung.");
+ }
+
+ // ── helpers ──────────────────────────────────────────────────────────────
+ /// Parses a JToken to a decimal, tolerating German ("12,50" / "1.234,56") and invariant ("12.50") strings.
+ internal static decimal Dec(JToken? token)
+ {
+ if (token == null || token.Type == JTokenType.Null) return 0;
+ if (token.Type is JTokenType.Float or JTokenType.Integer) return token.Value();
+ return ParseAmount(Str(token));
+ }
+
+ ///
+ /// Parses a currency string, resolving the German/invariant ambiguity: a value with both
+ /// separators treats "." as thousands and "," as decimal ("1.234,56"); a value with only ","
+ /// treats it as the decimal separator ("12,50"); otherwise it is parsed invariant ("1234.56").
+ ///
+ internal static decimal ParseAmount(string? raw)
+ {
+ string s = (raw ?? "").Trim();
+ if (s.Length == 0) return 0;
+ bool hasComma = s.Contains(','), hasDot = s.Contains('.');
+ if (hasComma && hasDot) s = s.Replace(".", "").Replace(',', '.'); // German "1.234,56"
+ else if (hasComma) s = s.Replace(',', '.'); // German "12,50"
+ return decimal.TryParse(s, NumberStyles.Any, CultureInfo.InvariantCulture, out decimal d) ? d : 0;
+ }
+
+ private static string Str(JToken? token) =>
+ token == null || token.Type == JTokenType.Null ? "" : token.Type == JTokenType.String ? token.Value() ?? "" : token.ToString();
+
+ private static bool IsValidEmail(string email)
+ {
+ int at = email.IndexOf('@');
+ if (at <= 0 || at != email.LastIndexOf('@')) return false;
+ int dot = email.IndexOf('.', at);
+ return dot > at + 1 && dot < email.Length - 1;
+ }
+}
diff --git a/Fuchs/code/ReminderDraftSession.cs b/Fuchs/code/ReminderDraftSession.cs
new file mode 100644
index 0000000..2654042
--- /dev/null
+++ b/Fuchs/code/ReminderDraftSession.cs
@@ -0,0 +1,81 @@
+using Newtonsoft.Json.Linq;
+
+namespace Fuchs.intranet;
+
+///
+/// Server-side, in-memory editing state for a single reminder (Zahlungserinnerung)
+/// draft — the authoritative source of truth while a back-office user edits a draft in
+/// the browser. This mirrors for reminders (ADR 0006):
+/// the browser is a pure view/input layer that posts single changes
+/// (); the server mutates this session,
+/// recomputes the open amount and validates, then signals the browser to re-fetch.
+///
+/// This is a data holder only — all calculation, validation, persistence and
+/// rendering live in (mirroring the
+/// / split).
+/// The editable payload is kept as the exact JSON shape the editor already speaks
+/// (new / rem), so flushing to the DB can reuse
+/// unchanged.
+/// The change-history record type () is shared with the
+/// invoice draft; validation messages use the reminder-specific
+/// .
+///
+public sealed class ReminderDraftSession
+{
+ /// Opaque per-editor token; also the SignalR group name for targeted signals.
+ public string Token { get; init; } = "";
+
+ /// Owning user account id (drafts are single-user; used for auth + events).
+ public string UserAccountId { get; init; } = "";
+
+ /// DB reminder id once the session has been flushed (Zwischenspeichern); empty while cache-only.
+ public string RemId { get; set; } = "";
+
+ /// Always true here — sessions only ever hold unfinalised drafts.
+ public bool IsDraft { get; set; } = true;
+
+ /// Bumped on every applied mutation; the browser refetches when the signalled version changes.
+ public int Version { get; set; }
+
+ /// UTC of the last read/write; drives the idle sliding-TTL and expiry warnings.
+ public DateTime LastAccessUtc { get; set; } = DateTime.UtcNow;
+
+ /// Guards against sending more than one expiry warning per idle window.
+ public bool ExpiryWarningSent { get; set; }
+
+ // ── Editable payload (exact editor JSON shape) ───────────────────────────
+ /// Recipient/new fields: subject, invoiceaddress, invoiceemail, text, amount, amount_payed, CustomValues…
+ public JObject New { get; set; } = new();
+
+ /// Reference fields: invid, type, level, invoiceid, invoicedate, sender…
+ public JObject Rem { get; set; } = new();
+
+ // ── Computed (by the draft service; never trusted from the client) ───────
+ /// Server-computed open-amount aggregation — the values the client used to compute inline.
+ public ReminderDraftSums Sums { get; set; } = new();
+
+ /// Plausibility / consistency results, refreshed on every recompute.
+ public List ValidationMessages { get; } = new();
+
+ /// Automatic change history, appended on every applied patch. Cache-only (never persisted).
+ public List History { get; } = new();
+
+ public void Touch() => LastAccessUtc = DateTime.UtcNow;
+}
+
+/// Server-computed reminder totals — the authoritative open-amount for the draft.
+public sealed class ReminderDraftSums
+{
+ /// Invoiced amount (gross) the reminder chases.
+ public decimal AmountTotal { get; set; }
+ /// Amount already paid against the invoice.
+ public decimal AmountPayed { get; set; }
+ /// Still-open amount (AmountTotal - AmountPayed) — the reminder's headline figure.
+ public decimal AmountOpen { get; set; }
+}
+
+/// A single plausibility/consistency finding for the reminder draft.
+/// Logical field the message relates to (e.g. "email", "address", "amount").
+/// "error" blocks a clean finalise; "warning"/"info" are advisory.
+/// German, user-readable text.
+public readonly record struct ReminderDraftValidationMessage(string Field, string Severity, string Message);
diff --git a/Fuchs/dotnet-tools.json b/Fuchs/dotnet-tools.json
new file mode 100644
index 0000000..cce89d8
--- /dev/null
+++ b/Fuchs/dotnet-tools.json
@@ -0,0 +1,13 @@
+{
+ "version": 1,
+ "isRoot": true,
+ "tools": {
+ "dotnet-ef": {
+ "version": "10.0.10",
+ "commands": [
+ "dotnet-ef"
+ ],
+ "rollForward": false
+ }
+ }
+}
\ No newline at end of file
diff --git a/Fuchs/js/intranet/fis_main.js b/Fuchs/js/intranet/fis_main.js
index c1d065a..02f9b77 100644
--- a/Fuchs/js/intranet/fis_main.js
+++ b/Fuchs/js/intranet/fis_main.js
@@ -284,3 +284,65 @@ $fis.notifications = {
}, 9000);
}
};
+
+/* Live draft-editing client (ADR 0006/0007). Separate SignalR connection to the
+ dedicated /draftpreview hub; the server signals the *one* browser editing a draft
+ (group = session token) to re-fetch (draftReady), warns before idle expiry
+ (draftExpiring), and tells it to close on eviction (draftClosed). The editor
+ (fis.inv_shared.js) registers the open draft via $fis.draft.bind(token, {...}). */
+$fis.draft = {
+ connection: null,
+ active: null, /* { token, onReady(version), onExpiring(secondsLeft), onClosed(reason) } */
+ init: function () {
+ if (typeof signalR === 'undefined' || this.connection !== null || !$ocms.auth.useraccount_id) {
+ return;
+ }
+ this.connection = new signalR.HubConnectionBuilder()
+ .withUrl('/draftpreview')
+ .withAutomaticReconnect()
+ .build();
+ this.connection.on('draftReady', (p) => this._dispatch('onReady', p, (p) => p.version));
+ this.connection.on('draftExpiring', (p) => this._dispatch('onExpiring', p, (p) => p.secondsLeft));
+ this.connection.on('draftClosed', (p) => this._dispatch('onClosed', p, (p) => p.reason));
+ /* Re-join the active draft's group after a (re)connect — group membership is
+ per-connection and is lost when the socket drops. */
+ this.connection.onreconnected(() => { if (this.active) { this._invoke('JoinDraft', this.active.token); } });
+ this.connection.onclose(() => {
+ console.warn('Draft connection closed; retrying in 5s.');
+ this.connection = null;
+ setTimeout(() => { this.init(); if (this.active) { this.bind(this.active.token, this.active); } }, 5000);
+ });
+ this.start();
+ },
+ start: function () {
+ this.connection.start()
+ .then(() => { if (this.active) { this._invoke('JoinDraft', this.active.token); } })
+ .catch((err) => {
+ console.warn('Draft connection failed to start; retrying in 5s.', err);
+ this.connection = null;
+ setTimeout(() => this.init(), 5000);
+ });
+ },
+ /* Registers the currently open draft and joins its signal group. handlers:
+ { onReady, onExpiring, onClosed }. */
+ bind: function (token, handlers) {
+ if (!token) { return; }
+ this.active = $.extend({ token: token }, handlers || {});
+ if (this.connection === null) { this.init(); }
+ this._invoke('JoinDraft', token);
+ },
+ /* Unregisters + leaves the group (editor closed). */
+ release: function (token) {
+ if (this.active && (!token || this.active.token === token)) { this.active = null; }
+ this._invoke('LeaveDraft', token);
+ },
+ _invoke: function (method, token) {
+ if (!token || !this.connection || this.connection.state !== 'Connected') { return; }
+ this.connection.invoke(method, token).catch((err) => console.warn('Draft ' + method + ' failed', err));
+ },
+ _dispatch: function (handler, payload, argOf) {
+ payload = payload || {};
+ if (!this.active || this.active.token !== payload.token) { return; }
+ if (typeof this.active[handler] === 'function') { this.active[handler](argOf(payload)); }
+ }
+};
diff --git a/Fuchs/js/intranet/fis_main_go.js b/Fuchs/js/intranet/fis_main_go.js
index 8dec451..24a03b1 100644
--- a/Fuchs/js/intranet/fis_main_go.js
+++ b/Fuchs/js/intranet/fis_main_go.js
@@ -1,4 +1,6 @@
$(document).ready(function () {
$fis.notifications.init();
+ $fis.draft.init();
$fis.ov();
+ $fis.addAdminMenuIfAuthorized();
});
diff --git a/Fuchs/js/intranet/fis_main_menu.js b/Fuchs/js/intranet/fis_main_menu.js
index e5da403..3be1d2e 100644
--- a/Fuchs/js/intranet/fis_main_menu.js
+++ b/Fuchs/js/intranet/fis_main_menu.js
@@ -9,4 +9,21 @@
, { lbl: $t.m_todo, id: 'm_todo', fnc: () => { $('#contentframe').empty().load($ocms.url('todos')); $('#listframe').rC('fix').aC('hd'); }, ico: 'glyphicon glyphicon-sunglasses' }
//, { lbl: $t.m_efa, id: 'm_efa', fnc: 'init:efa' }
]);
-})();
\ No newline at end of file
+})();
+
+/* The Administration module is restricted to users whose fds_sys authorization exceeds 4.
+ The button is added — and only then does clicking it load the module script — after the
+ asynchronous auth check resolves, so lower-privileged users never see it or fetch the code.
+ Called from fis_main_go.js once the DOM (and the initial main menu) is ready. */
+$fis.addAdminMenuIfAuthorized = function () {
+ if ($('#m_admin').length > 0) { return; } // idempotent
+ $fis.getAuth('fds_sys').then(function (auth) {
+ if ((auth || -1) > 4 && $('#m_admin').length === 0) {
+ $ocms.ocmsmenu.push({ lbl: $t.m_admin, id: 'm_admin', fnc: 'init:admin', ico: 'glyphicon glyphicon-cog' });
+ /* Re-render the main menu cleanly: drop the previously generated menu list
+ (never the .nav-right settings dropdown) and rebuild it from the array. */
+ $('#mainmenu').children('ul:not(.nav-right)').remove();
+ $('#mainmenu').ocmsmenu($ocms.ocmsmenu);
+ }
+ }).catch(function () { /* auth lookup failed → leave the menu unchanged */ });
+};
\ No newline at end of file
diff --git a/Fuchs/js/intranet/fis_texts_gui_de.js b/Fuchs/js/intranet/fis_texts_gui_de.js
index ef6ce50..a1f5336 100644
--- a/Fuchs/js/intranet/fis_texts_gui_de.js
+++ b/Fuchs/js/intranet/fis_texts_gui_de.js
@@ -4,6 +4,7 @@
, m_rep: 'Berichte'
, m_todo: 'ToDos'
, m_bcd: 'BankBuchungen'
+ , m_admin: 'Administration'
, rsp: 'Passwort ändern'
, pnm: 'Die Passwörter stimmen nicht überein'
, cps: 'Das neue Passwort wurde gespeichert.'
diff --git a/Fuchs/js/intranet/modules/fis.admin.js b/Fuchs/js/intranet/modules/fis.admin.js
new file mode 100644
index 0000000..5690598
--- /dev/null
+++ b/Fuchs/js/intranet/modules/fis.admin.js
@@ -0,0 +1,245 @@
+let $adm = {
+ init2: function () {
+ // No external libraries needed — go straight to render.
+ $ocms.getScript([], function () { $adm.init3(); });
+ },
+ init3: function () {
+ $fis.cf(true);
+ $fis.lf(true);
+ $('#activemodule').text($adt.mdl);
+ $adm.topbar();
+ let frm = $$.dc('admfrm', $('#contentframe')).ldng(1);
+ $adm.load(frm);
+ },
+ topbar: function () {
+ return $('#topbar').ocmsmenu([
+ { lbl: $adt.refreshAll, id: 'adm_refresh_all', ico: 'glyphicon glyphicon-refresh', fnc: function () { $adm.init3(); } }
+ ]);
+ },
+ load: function (frm) {
+ $ocms.postXT({
+ url: $ocms.url('admin/status'), success: function (r) {
+ frm.empty();
+ $adm.render(frm, r.info || {}, r.probes || []);
+ }, error: function () {
+ frm.empty();
+ $$.dc('adm_err', frm).text($adt.loadfail);
+ }, complete: function () { frm.ldng(0); }
+ });
+ },
+ render: function (frm, info, probes) {
+ let pmap = {};
+ $.each(probes, function (i, p) { pmap[p.component] = p; });
+
+ $$.dc('adm_sec', frm).text($adt.sub_info);
+ $adm.sysCard(frm, info);
+ $adm.startupCard(frm, info.startupChecks);
+
+ $$.dc('adm_sec', frm).text($adt.sub_status);
+ let grid = $$.dc('adm_grid', frm);
+ $adm.dbCard(grid, info.database || {}, pmap.database);
+ $adm.mailCard(grid, info.email || {});
+ $adm.blobCard(grid, info.blob || {}, pmap.blob);
+ $adm.mfrCard(grid, info.mfr || {}, pmap.mfr);
+ $adm.kvCard(grid, info.keyVault || {}, pmap.keyvault);
+ },
+
+ /* ── generic building blocks ─────────────────────────────────────────── */
+ kvTable: function (parent, rows) {
+ let t = $$.tbl().addClass('adm_kv');
+ $.each(rows || [], function (i, r) {
+ if (!r) { return true; }
+ let tr = $$.tr(t);
+ $$.td(tr).addClass('k').text(r[0] == null ? '' : String(r[0]));
+ let v = $$.td(tr).addClass('v');
+ if (r[1] instanceof jQuery) { v.append(r[1]); } else { v.text(r[1] == null ? '' : String(r[1])); }
+ });
+ if (parent instanceof jQuery) { parent.append(t); }
+ return t;
+ },
+ yesNo: function (b) {
+ return $$.sc('adm_bool adm_bool_' + (b ? 'y' : 'n'), b ? $adt.yes : $adt.no);
+ },
+ setPill: function (pill, probe) {
+ probe = probe || {};
+ let st = probe.status || 'unconfigured';
+ let lbl = {
+ ok: $adt.st_ok, error: $adt.st_error, disabled: $adt.st_disabled,
+ unconfigured: $adt.st_unconfigured, checking: $adt.st_checking
+ }[st] || st;
+ pill.attr('class', 'adm_pill adm_pill_' + st).text(lbl);
+ return pill;
+ },
+
+ /* Connectivity card with a live status pill + per-card refresh button. */
+ probeCard: function (grid, title, component, cfgRows, probe) {
+ let card = $$.dc('adm_card', grid);
+ let hd = $$.dc('adm_card_hd', card);
+ $$.s(title).appendTo(hd);
+ let pill = $$.sc('adm_pill').appendTo(hd);
+ let rbtn = $$.bbtn($adt.refresh, 'adm_btn').appendTo(hd);
+ let bd = $$.dc('adm_card_bd', card);
+ $adm.kvTable(bd, cfgRows);
+
+ let pf = $$.dc('adm_probe', bd);
+ let msg = $$.dc('adm_probe_msg', pf);
+ let met = $$.dc('adm_probe_metrics', pf);
+ let det = $$.dc('adm_probe_det', pf);
+ let dur = $$.dc('adm_probe_dur', pf);
+ let apply = function (p) {
+ p = p || {};
+ $adm.setPill(pill, p);
+ msg.text(p.message || '');
+ met.empty();
+ $.each(p.metrics || [], function (i, m) {
+ let row = $$.dc('adm_metric', met);
+ $$.sc('adm_metric_k').text(m.label || '').appendTo(row);
+ $$.sc('adm_metric_v').text(m.value == null ? '' : String(m.value)).appendTo(row);
+ });
+ det.text(p.detail || '');
+ dur.text(p.durationMs != null ? (p.durationMs + ' ms') : '');
+ };
+ apply(probe);
+
+ rbtn.click(function () {
+ $adm.setPill(pill, { status: 'checking' });
+ msg.text(''); met.empty(); det.text(''); dur.text('');
+ $ocms.postXT({
+ url: $ocms.url('admin/probe/' + component), success: function (r) {
+ apply(r.probe);
+ }, error: function () {
+ $adm.setPill(pill, { status: 'error' });
+ msg.text($adt.st_error);
+ }
+ });
+ });
+ return card;
+ },
+
+ /* ── individual cards ────────────────────────────────────────────────── */
+ sysCard: function (frm, info) {
+ let card = $$.dc('adm_card adm_card_wide', frm);
+ let hd = $$.dc('adm_card_hd', card);
+ $$.s($adt.host).appendTo(hd);
+ let env = $$.sc('adm_env').text(info.environment || '');
+ if (info.isTestDeployment === true) { env.aC('adm_env_test'); }
+ env.appendTo(hd);
+ let bd = $$.dc('adm_card_bd', card);
+ $adm.kvTable(bd, [
+ [$adt.machine, info.machineName],
+ [$adt.os, info.osDescription],
+ [$adt.framework, info.frameworkDescription],
+ [$adt.env, info.environment],
+ [$adt.testdep, $adm.yesNo(info.isTestDeployment === true)],
+ [$adt.pid, info.processId],
+ [$adt.since, info.processStartUtc ? fdt(info.processStartUtc) : ''],
+ [$adt.uptime, (info.uptimeHours != null ? (info.uptimeHours + ' ' + $adt.hours) : '')]
+ ]);
+ },
+ /* Non-refreshable widget: the one-shot startup self-test result captured at boot. */
+ startupCard: function (frm, sc) {
+ let card = $$.dc('adm_card adm_card_wide', frm);
+ let hd = $$.dc('adm_card_hd', card);
+ $$.s($adt.startup).appendTo(hd);
+ let bd = $$.dc('adm_card_bd', card);
+
+ if (!sc || sc.ran !== true) {
+ $adm.setPill($$.sc('adm_pill').appendTo(hd), { status: 'disabled' });
+ $$.dc('adm_note', bd).text($adt.startup_notrun);
+ return;
+ }
+
+ let items = sc.items || [];
+ let anyFail = false;
+ $.each(items, function (i, it) { if (it.enabled === true && it.ok !== true) { anyFail = true; } });
+ $adm.setPill($$.sc('adm_pill').appendTo(hd), { status: anyFail ? 'error' : 'ok' });
+
+ $adm.kvTable(bd, [
+ [$adt.startup_on, sc.machineName],
+ [$adt.startup_at, sc.completedUtc ? fdt(sc.completedUtc) : '']
+ ]);
+
+ let list = $$.dc('adm_checks', bd);
+ $.each(items, function (i, it) {
+ let row = $$.dc('adm_check', list);
+ $$.sc('adm_check_k').text($adt['chk_' + it.name] || it.name).appendTo(row);
+ let stt = it.enabled !== true ? 'skipped' : (it.ok === true ? 'ok' : 'fail');
+ let lbl = { ok: $adt.chk_ok, fail: $adt.chk_fail, skipped: $adt.chk_skipped }[stt];
+ $$.sc('adm_check_v adm_check_' + stt).text(lbl).appendTo(row);
+ });
+ },
+ dbCard: function (grid, d, probe) {
+ $adm.probeCard(grid, $adt.db, 'database', [
+ [$adt.configured, $adm.yesNo(d.configured === true)],
+ [$adt.server, d.server],
+ [$adt.catalog, d.catalog],
+ [$adt.login, d.userId]
+ ], probe);
+ },
+ mailCard: function (grid, e) {
+ let card = $$.dc('adm_card', grid);
+ let hd = $$.dc('adm_card_hd', card);
+ $$.s($adt.mail).appendTo(hd);
+ $adm.setPill($$.sc('adm_pill').appendTo(hd), { status: e.mailerEnabled === true ? 'ok' : 'disabled' });
+ let bd = $$.dc('adm_card_bd', card);
+ let rows = [
+ [$adt.mailer, $adm.yesNo(e.mailerEnabled === true)],
+ [$adt.baseurl, e.baseUrl],
+ [$adt.account, e.accountId],
+ [$adt.serverid, e.serverId],
+ [$adt.token, $adm.yesNo(e.tokenConfigured === true)],
+ [$adt.overrideActive, $adm.yesNo(e.overrideActive === true)]
+ ];
+ if (e.overrideActive === true) { rows.push([$adt.override, e.overrideRecipient]); }
+ $adm.kvTable(bd, rows);
+ let ft = $$.dc('adm_card_ft', card);
+ $$.bbtn($adt.testmail_btn, 'adm_btn adm_btn_primary').appendTo(ft).click($adm.testMailDlg);
+ },
+ blobCard: function (grid, b, probe) {
+ $adm.probeCard(grid, $adt.blob, 'blob', [
+ [$adt.enabled, $adm.yesNo(b.enabled === true)],
+ [$adt.configured, $adm.yesNo(b.configured === true)],
+ [$adt.invContainer, b.invoiceContainer],
+ [$adt.remContainer, b.reminderContainer]
+ ], probe);
+ },
+ mfrCard: function (grid, m, probe) {
+ $adm.probeCard(grid, $adt.mfr, 'mfr', [
+ [$adt.host_l, m.host],
+ [$adt.creds, $adm.yesNo(m.credentialsConfigured === true)],
+ [$adt.sync, $adm.yesNo(m.syncEnabled === true)]
+ ], probe);
+ },
+ kvCard: function (grid, k, probe) {
+ $adm.probeCard(grid, $adt.kv, 'keyvault', [
+ [$adt.vault, k.vaultUri],
+ [$adt.appname, k.appName],
+ [$adt.seccount, k.managedSecretCount],
+ [$adt.clientreg, $adm.yesNo(k.clientRegistered === true)]
+ ], probe);
+ },
+
+ /* ── test email ──────────────────────────────────────────────────────── */
+ testMailDlg: function () {
+ $ocms.dlgform([
+ { name: 'to', label: $adt.tm_to, type: 'email', required: true, value: ($ocms.auth.email || '') },
+ { name: 'subject', label: $adt.tm_subject, type: 'string', required: true, value: $adt.tm_default_subject },
+ { name: 'body', label: $adt.tm_body, type: 'text', required: true, value: $adt.tm_default_body }
+ ], {
+ title: $adt.testmail,
+ button: $adt.testmail_btn,
+ size: [420, 560],
+ addcontent: $$.dc('adm_note').text($adt.tm_hint),
+ url: $ocms.url('admin/testmail'),
+ typedvalues: true,
+ /* Runs inside jQuery's success dispatch — it must never throw, or postXT's
+ `complete` (which clears the page loading indicator) is skipped. */
+ success: function (r) {
+ let res = (r && r.result) || {};
+ alert(res.message || (res.sent === true ? $adt.tm_sent : $adt.tm_failed));
+ }
+ });
+ }
+};
+let $$adm = { init2: $adm.init2, auth: {} };
+export default $$adm;
diff --git a/Fuchs/js/intranet/modules/fis.admin.scss b/Fuchs/js/intranet/modules/fis.admin.scss
new file mode 100644
index 0000000..2616245
--- /dev/null
+++ b/Fuchs/js/intranet/modules/fis.admin.scss
@@ -0,0 +1,200 @@
+.admfrm {
+ padding: 1.5rem;
+
+ .adm_sec {
+ font-size: 1.2rem;
+ font-weight: bold;
+ color: $fuchs_blau;
+ margin: 1.5rem 0 0.75rem;
+ border-bottom: 2px solid $fuchs_blau;
+ padding-bottom: 0.25rem;
+
+ &:first-child { margin-top: 0; }
+ }
+
+ .adm_err {
+ padding: 1rem;
+ color: #b00020;
+ font-weight: bold;
+ }
+
+ .adm_grid {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(22rem, 1fr));
+ gap: 1rem;
+ align-items: start;
+ }
+
+ .adm_card {
+ border: 1px solid #d5d5d5;
+ border-radius: 0.4rem;
+ background: #fff;
+ box-shadow: 0 1px 3px rgba(50, 50, 50, 0.12);
+ overflow: hidden;
+
+ &.adm_card_wide { grid-column: 1 / -1; }
+ }
+
+ .adm_card_hd {
+ display: flex;
+ align-items: center;
+ gap: 0.5rem;
+ padding: 0.6rem 0.85rem;
+ background: $fuchs_blau;
+ color: #fff;
+ font-weight: bold;
+
+ > span:first-child { flex: 1 1 auto; }
+ }
+
+ .adm_card_bd {
+ padding: 0.6rem 0.85rem;
+ }
+
+ .adm_card_ft {
+ padding: 0.5rem 0.85rem 0.75rem;
+ text-align: right;
+ }
+
+ table.adm_kv {
+ border-collapse: collapse;
+ width: 100%;
+
+ td {
+ padding: 0.25rem 0.35rem;
+ border-bottom: 1px solid #eee;
+ vertical-align: top;
+ font-size: 0.92rem;
+
+ &.k { color: #666; white-space: nowrap; width: 40%; }
+ &.v { word-break: break-word; }
+ }
+
+ tr:last-child td { border-bottom: none; }
+ }
+
+ .adm_probe {
+ margin-top: 0.6rem;
+ padding-top: 0.5rem;
+ border-top: 1px dashed #ddd;
+ font-size: 0.88rem;
+
+ .adm_probe_msg { font-weight: 600; }
+ .adm_probe_det { color: #555; word-break: break-word; margin-top: 0.15rem; }
+ .adm_probe_dur { color: #999; margin-top: 0.15rem; font-size: 0.8rem; }
+
+ .adm_probe_metrics {
+ margin-top: 0.35rem;
+
+ .adm_metric {
+ display: flex;
+ justify-content: space-between;
+ gap: 0.5rem;
+ padding: 0.1rem 0;
+ border-bottom: 1px dotted #eee;
+
+ &:last-child { border-bottom: none; }
+
+ .adm_metric_k { color: #555; word-break: break-word; }
+ .adm_metric_v { font-weight: 600; white-space: nowrap; }
+ }
+ }
+ }
+
+ /* startup checks list */
+ .adm_checks {
+ margin-top: 0.5rem;
+
+ .adm_check {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ gap: 0.5rem;
+ padding: 0.25rem 0;
+ border-bottom: 1px solid #eee;
+
+ &:last-child { border-bottom: none; }
+
+ .adm_check_k { color: #333; }
+ .adm_check_v {
+ font-weight: bold;
+ font-size: 0.8rem;
+ padding: 0.05rem 0.5rem;
+ border-radius: 0.25rem;
+ white-space: nowrap;
+ }
+ .adm_check_ok { background: #e2f3da; color: #2f6d18; }
+ .adm_check_fail { background: #f3ded9; color: #c0341d; }
+ .adm_check_skipped { background: #ececec; color: #777; }
+ }
+ }
+
+ /* status pill */
+ .adm_pill {
+ display: inline-block;
+ padding: 0.1rem 0.55rem;
+ border-radius: 1rem;
+ font-size: 0.78rem;
+ font-weight: bold;
+ color: #fff;
+ background: #999;
+ white-space: nowrap;
+ }
+ .adm_pill_ok { background: $fuchs_akzent; }
+ .adm_pill_error { background: #c0341d; }
+ .adm_pill_disabled { background: #888; }
+ .adm_pill_unconfigured { background: #d69100; }
+ .adm_pill_checking { background: #2a72c4; }
+
+ /* boolean chips */
+ .adm_bool {
+ display: inline-block;
+ padding: 0 0.4rem;
+ border-radius: 0.25rem;
+ font-size: 0.8rem;
+ font-weight: bold;
+ }
+ .adm_bool_y { background: #e2f3da; color: #2f6d18; }
+ .adm_bool_n { background: #f3e0dd; color: #9c2a17; }
+
+ .adm_env {
+ font-size: 0.8rem;
+ font-weight: normal;
+ padding: 0.1rem 0.5rem;
+ border-radius: 0.25rem;
+ background: rgba(255, 255, 255, 0.25);
+
+ &.adm_env_test { background: #13a143; }
+ }
+
+ .adm_btn {
+ cursor: pointer;
+ border-radius: 0.28rem;
+ padding: 0.2rem 0.6rem;
+ font-size: 0.85rem;
+ border: 1px solid #ababab;
+ background-color: #fff;
+ color: #333;
+
+ &.adm_btn_primary {
+ background-color: $fuchs_akzent;
+ border-color: darken($fuchs_akzent, 8%);
+ color: #fff;
+ }
+ }
+
+ .adm_card_hd .adm_btn {
+ background-color: rgba(255, 255, 255, 0.15);
+ color: #fff;
+ border-color: rgba(255, 255, 255, 0.4);
+ }
+}
+
+.adm_note {
+ margin-top: 0.75rem;
+ padding: 0.5rem 0.6rem;
+ background: #f3f6fb;
+ border-left: 3px solid $fuchs_blau;
+ font-size: 0.85rem;
+ color: #444;
+}
diff --git a/Fuchs/js/intranet/modules/fis.admin_txt_de.js b/Fuchs/js/intranet/modules/fis.admin_txt_de.js
new file mode 100644
index 0000000..7a8fcf3
--- /dev/null
+++ b/Fuchs/js/intranet/modules/fis.admin_txt_de.js
@@ -0,0 +1,84 @@
+let $adt = {
+ mdl: 'Administration'
+ , sub_info: 'System'
+ , sub_status: 'Status & Konnektivität'
+ , sub_tests: 'Tests'
+ // startup checks widget (non-refreshable)
+ , startup: 'Startup-Prüfungen'
+ , startup_notrun: 'Die Startup-Prüfungen sind deaktiviert oder wurden noch nicht ausgeführt (Fuchs:StartupChecks:Enabled).'
+ , startup_on: 'Host'
+ , startup_at: 'Ausgeführt (UTC)'
+ , chk_ok: 'OK'
+ , chk_fail: 'Fehler'
+ , chk_skipped: 'übersprungen'
+ , chk_KeyVault: 'Azure Key Vault'
+ , chk_Database: 'SQL-Datenbank'
+ , chk_MFR: 'MFR (ERP)'
+ , chk_PdfLicense: 'Spire.PDF-Lizenz'
+ , chk_Mailer: 'E-Mail (Startup-Probe)'
+ // system info
+ , host: 'Host / Server'
+ , machine: 'Hostname'
+ , os: 'Betriebssystem'
+ , framework: 'Framework'
+ , env: 'Umgebung'
+ , testdep: 'Test-Deployment'
+ , pid: 'Prozess-ID'
+ , uptime: 'Laufzeit'
+ , since: 'Start (UTC)'
+ , hours: 'Std.'
+ // status cards
+ , db: 'SQL-Datenbank'
+ , mail: 'E-Mail-Dienst'
+ , blob: 'Azure Blob Storage'
+ , mfr: 'MFR (ERP)'
+ , kv: 'Azure Key Vault'
+ // labels
+ , server: 'Server'
+ , catalog: 'Datenbank'
+ , login: 'Login'
+ , mailer: 'Mailer aktiv'
+ , baseurl: 'Base-URL'
+ , account: 'Account'
+ , serverid: 'Server-ID'
+ , token: 'Token hinterlegt'
+ , override: 'OverrideRecipient'
+ , overrideActive: 'Umleitung aktiv'
+ , enabled: 'Aktiviert'
+ , configured: 'Konfiguriert'
+ , invContainer: 'Rechnungs-Container'
+ , remContainer: 'Mahnungs-Container'
+ , host_l: 'Host'
+ , creds: 'Zugangsdaten hinterlegt'
+ , sync: 'Sync aktiv'
+ , vault: 'Vault-URI'
+ , appname: 'App-Präfix'
+ , seccount: 'Verwaltete Secrets'
+ , clientreg: 'Client registriert'
+ , duration: 'Dauer'
+ , checked: 'Geprüft'
+ , detail: 'Detail'
+ // status values
+ , st_ok: 'OK'
+ , st_error: 'Fehler'
+ , st_disabled: 'Deaktiviert'
+ , st_unconfigured: 'Nicht konfiguriert'
+ , st_checking: 'Prüfe…'
+ // actions
+ , refresh: 'Aktualisieren'
+ , refreshAll: 'Alle prüfen'
+ , yes: 'Ja'
+ , no: 'Nein'
+ // test email
+ , testmail: 'Test-E-Mail'
+ , testmail_btn: 'Test-E-Mail senden'
+ , tm_to: 'Empfänger'
+ , tm_subject: 'Betreff'
+ , tm_body: 'Nachricht'
+ , tm_hint: 'Der Versand nutzt die normale E-Mail-Pipeline; bei gesetztem OverrideRecipient wird die Nachricht dorthin umgeleitet.'
+ , tm_sent: 'Test-E-Mail übergeben.'
+ , tm_failed: 'Test-E-Mail konnte nicht gesendet werden.'
+ , tm_default_subject: 'Fuchs Intranet – Test-E-Mail'
+ , tm_default_body: 'Dies ist eine Test-E-Mail aus dem Administrationsbereich des Fuchs Intranet.'
+ , loadfail: 'Der Systemstatus konnte nicht geladen werden.'
+};
diff --git a/Fuchs/js/intranet/modules/fis.bam.js b/Fuchs/js/intranet/modules/fis.bam.js
index 486ba7e..8a8dc9a 100644
--- a/Fuchs/js/intranet/modules/fis.bam.js
+++ b/Fuchs/js/intranet/modules/fis.bam.js
@@ -36,11 +36,16 @@ let $bam = {
let fds = bool(ix.fds, false), id = ix.taID, m = [];
m.push({ lbl: $bct.smd, fnc: () => { $bam.smd(id); } });
m.push({ lbl: $bct.ati, fnc: () => { $bam.ati(id); } });
+ if (bool(ix.IsManual, false) === true) {
+ m.push({ lbl: $bct.mbc, fnc: () => { $bam.mbc(id); } });
+ m.push({ lbl: $bct.mbd, fnc: () => { $bam.mbd(id); } });
+ }
return $('#topbar').ocmsmenu(m);
}, eM : (r, re, opt) => {
let m = [];
if ($fis.isAuth('fds_bam', 2) === true) {
m.push({ lbl: $bct.upl, fnc: $bam.ubs});
+ m.push({ lbl: $bct.mbe, fnc: $bam.mbe});
}
if (bool(r, false) === true) {
m.push({ lbl: $bct.rel, fnc: $bam.renderLst });
@@ -312,6 +317,32 @@ let $bam = {
}
}
});
+ }, mbe: () => {
+ $bam.manForm({});
+ }, mbc: (taid) => {
+ $ocms.postXT({
+ url: $ocms.url('bam/mget'), data: { taid: taid }, success: (dta) => {
+ $bam.manForm(dta || {});
+ }
+ });
+ }, mbd: (taid) => {
+ if (confirm($bct.mbdc)) {
+ $ocms.postXT({
+ url: $ocms.url('bam/mdel'), data: { taid: taid }, success: () => {
+ $bam.renderLst();
+ }
+ });
+ }
+ }, manForm: (dta) => {
+ let flds = $bcol.man.clone().applyValues(dta || {});
+ $ocms.dlgform(flds, {
+ title: (ne(dta.taID, '') !== '') ? $bct.mbc : $bct.mbe,
+ url: $ocms.url('bam/man'),
+ typedvalues: true,
+ success: () => {
+ $bam.renderLst();
+ }
+ });
}
}
diff --git a/Fuchs/js/intranet/modules/fis.bam_txt_de.js b/Fuchs/js/intranet/modules/fis.bam_txt_de.js
index b42e792..86a6808 100644
--- a/Fuchs/js/intranet/modules/fis.bam_txt_de.js
+++ b/Fuchs/js/intranet/modules/fis.bam_txt_de.js
@@ -18,10 +18,21 @@
},
in: 'Rechnungsnummer',
bt: 'Buchungstexte',
- bv: 'Buchungswert (volle €)'
+ bv: 'Buchungswert (volle €)',
+ mbe: 'Manuelle Buchung erfassen',
+ mbc: 'Manuelle Buchung ändern',
+ mbd: 'Manuelle Buchung löschen',
+ mbdc: 'Manuelle Buchung wirklich löschen?\nDieser Vorgang kann nicht rückgängig gemacht werden.'
};
let $bcol = {
+ man: new fields_definition('Manuelle Buchung', 'Manuelle Buchungen', [
+ { name: 'taID', type: 'hidden' },
+ { name: 'ValueDate', label: 'Valuta', type: 'date', required: true },
+ { name: 'Amount', label: 'Betrag', type: 'number', precision: '0.01', required: true },
+ { name: 'NameOfPayer', label: 'Name', type: 'string' },
+ { name: 'SepaRemittanceInformation', label: 'Verwendungszweck', type: 'string' }
+ ]),
qtl: new fields_definition('Kontobericht', 'Kontoberichte', [
{ name: 'InvoiceId', label: 'RechnungsNr', type: 'string' },
{ name: 'ValueDate', label: 'Valuta', type: 'date' },
diff --git a/Fuchs/js/intranet/modules/fis.inv_shared.js b/Fuchs/js/intranet/modules/fis.inv_shared.js
index 96b5cd1..5b1e744 100644
--- a/Fuchs/js/intranet/modules/fis.inv_shared.js
+++ b/Fuchs/js/intranet/modules/fis.inv_shared.js
@@ -82,6 +82,11 @@ $inv.iMn = (ix) => {
}
return $('#topbar').ocmsmenu(m);
}
+/* Menu option CSV builder: 'setm' (Set-Preisanzeige) is only offered while the invoice has not
+ yet been explicitly switched to a set-display mode (admin.setmode empty/undefined) — once set,
+ changing it again is not supported (the user edits the line items directly instead); it
+ reappears only if 'Änderungen verwerfen' reverts to a DB state that was never switched. */
+$inv.emOpt = (admin) => 'iss,p13b,ctp' + (((admin || {}).setmode || '') === '' ? ',setm' : '');
$inv.eM = (r, re, opt) => {
let m = [];
if (booln(r, false) === true || booln(re, false) === true) {
@@ -99,11 +104,507 @@ $inv.eM = (r, re, opt) => {
if ((opt || '').split(',').includes('setm') === true) {
m.push({ lbl: $ict.setm, fnc: $inv.ssetmode });
}
+ if ((opt || '').split(',').includes('iss') === true) { /* backend-authoritative draft (ADR 0006) */
+ m.push({ lbl: 'Änderungshistorie', fnc: () => $inv.d.history() });
+ m.push({ lbl: 'Änderungen verwerfen', fnc: () => $inv.d.discard() });
+ }
if (booln(r, false) === true) {
m.push({ lbl: $ict.rel, fnc: $inv.rReload });
}
return $('#topbar').ocmsmenu(m); /* empty Array => empty menu */
};
+/* ── Backend-authoritative draft editing controller (ADR 0006/0007) ───────────
+ The server holds the truth for an invoice draft in an in-memory session; this
+ object seeds it, sends single edits as deltas, and renders the totals footer +
+ validation from the authoritative server state. It is invoice-only: reminders
+ never obtain a token (invSumUpdate, the seed trigger, is only bound for invoices),
+ so they keep the legacy stateless flow untouched. */
+$inv.d = {
+ tbl: () => $('div.invoice_layout table.invi'),
+ layout: () => $('div.invoice_layout'),
+ token: function () { return $inv.d.tbl().data('dtoken') || ''; },
+ /* Hash each assembled block so only genuinely-changed blocks are sent as deltas. */
+ hashes: function () {
+ let bai = $inv.d.tbl().data('bai') || [], h = {};
+ $.each(bai, (i, b) => { h[(b.Id || '').toString()] = JSON.stringify(b); });
+ return h;
+ },
+ /* Seed the authoritative server session from the assembled editor payload. Called
+ once from invSumUpdate on open; thereafter the backend is the source of truth.
+ The in-flight ajax promise is stashed on 'dseedpromise' so a delta sent (e.g. via
+ a context-menu action) before seeding has actually completed can wait for the token
+ instead of silently no-op'ing (see $inv.d.sync). */
+ seed: function (payload) {
+ let l = $inv.d.layout(); l.aC('freeze');
+ let p = $ocms.postXT({
+ url: $ocms.url('inv/dopen'), data: { payload: JSON.stringify(payload) }, success: (r) => {
+ $inv.d.tbl().data('dtoken', r.token).data('dver', r.version).data('dhashes', $inv.d.hashes()).data('dorder', $inv.d.order());
+ $fis.draft.bind(r.token, {
+ onReady: () => $inv.d.refresh(),
+ onExpiring: (s) => $inv.d.warnExpiry(s),
+ onClosed: (reason) => $inv.d.closed(reason)
+ });
+ $inv.d.refresh();
+ }, error: () => { l.rC('freeze'); }, complete: () => { $inv.d.tbl().removeData('dseeding').removeData('dseedpromise'); }
+ });
+ $inv.d.tbl().data('dseedpromise', p);
+ return p;
+ },
+ /* Re-fetch the authoritative state and render the totals footer + validation from it. */
+ refresh: function (cb) {
+ let t = $inv.d.token(); if (t === '') { return; }
+ $ocms.postXT({
+ url: $ocms.url('inv/dstate'), data: { token: t }, success: (state) => {
+ $inv.d.applyState(state); if (typeof cb === 'function') { cb(state); }
+ }, error: (xhr) => { if (xhr && xhr.status === 410) { $inv.d.closed('expired'); } },
+ complete: () => { $inv.d.layout().rC('freeze'); }
+ });
+ },
+ applyState: function (state) {
+ let tbl = $inv.d.tbl(); if (tbl.length < 1) { return; }
+ /* Concurrent refreshes (one per flushed block plus one for a follow-up delta such as
+ item.setprice, and SignalR draftReady on top) can have their dstate responses arrive
+ out of order. Applying a response older than the version already rendered would
+ silently roll back a just-applied server-side mutation (e.g. a set-price conversion
+ reverting to its pre-conversion 0/individually-priced state) — so stale responses are
+ dropped here instead of rendered. */
+ let curVer = tbl.data('dver');
+ if (typeof curVer === 'number' && typeof state.version === 'number' && state.version < curVer) {
+ return;
+ }
+ tbl.data('dver', state.version).data('serverSums', state.sums);
+ $inv.d.footer(tbl, state.sums || {}, state.admin || {});
+ $inv.d.notes(state.notes || []);
+ $inv.d.validation(state.validation || []);
+ $inv.d.applyItems(tbl, state.req || []);
+ $inv.d.applySetDisplay(tbl, state.setDisplay || {});
+ /* Keep the menu's "Set-Preisanzeige" entry in sync with the authoritative admin.setmode:
+ hides it right after a mode switch, and restores it if a discard reverted the draft to
+ a DB state that was never switched (ADR 0006 backend-authoritative refresh). */
+ $inv.eM(false, true, $inv.emOpt(state.admin || {}));
+ },
+ /* Renders the backend-authoritative notice paragraphs (ADR: notice texts are
+ backend-authoritative) exactly as FuchsPdf.BuildInvoiceNotes emits them for the PDF,
+ so the online editor always shows precisely what will be printed. */
+ notes: function (notes) {
+ let frm = $inv.d.layout(); if (frm.length < 1) { return; }
+ let box = frm.children('.dnotes');
+ if (box.length < 1) { box = $$.dc('dnotes'); frm.append(box); }
+ box.empty();
+ (notes || []).forEach((n) => $$.dc('dnote').aC(n.style || 'InvoiceNotes').text(n.text));
+ },
+ /* Push the server's authoritative position numbers back onto the rendered rows so the online
+ editor and the PDF preview always agree (the server numbers priced lines continuously; the
+ browser must not keep its own numbering). Only the position cell is touched — no re-render. */
+ /* Reconciles each block's rendered rows against the authoritative server line list
+ (`req[].itm`, the co shape). The server may not only change a line's values but also
+ ADD lines (the block set row inserted by "Set mit Preis"/block.setprice) and REMOVE lines
+ ("Nur Set mit Preis"/block.setonly), and reorder them — the browser never computes any of
+ that (ADR 0006/0008/0009), it just mirrors the server. For each server line: patch/insert
+ the matching row, preserving null price fields verbatim (ADR 0009: null = empty cell, kept
+ distinct from 0). Rows the server no longer lists are removed; order follows the server.
+ Position numbers, net/VAT and the set-row emphasis all come from rrw off the mirrored data. */
+ applyItems: function (tbl, req) {
+ let val = (x) => (x === undefined ? null : x); // JSON null stays null; absent -> null
+ (req || []).forEach((b) => {
+ if (!b) { return; }
+ let bid = (b.Id || '').toString(); if (bid === '') { return; }
+ let bdy = tbl.children('tbody').filter((i, e) => (($(e).data() || {}).Id || '').toString() === bid).first();
+ if (bdy.length < 1) { return; }
+ let itms = b.itm || [], serverIds = {};
+ let title = bdy.find('tr.title').first();
+ let prev = title.length ? title : null;
+ itms.forEach((co) => {
+ let id = (co.id || '').toString(); if (id === '') { return; }
+ serverIds[id] = true;
+ let rw = bdy.find('#itm' + id).first(), isNew = rw.length < 1;
+ if (isNew) { rw = $$.tr(bdy, { id: 'itm' + id, class: 'itm' }); }
+ let dta = rw.data() || {};
+ let changed = isNew || (dta.Type || '') !== (co.typ || '')
+ || dta.net !== val(co.v) || dta.net_val !== val(co.vt) || dta.vat_val !== val(co.vv)
+ || dta.svcnet_val !== val(co.vs) || dta.svcvat_val !== val(co.vsv)
+ || (dta.position || '') !== (co.p != null ? co.p : '');
+ $.extend(dta, {
+ Id: id, Type: co.typ,
+ net: val(co.v), net_val: val(co.vt), vat_val: val(co.vv),
+ svcnet_val: val(co.vs), svcvat_val: val(co.vsv),
+ vat: co.vat, position: (co.p != null ? co.p : ''),
+ SetItmId: (co.SetItmId != null ? co.SetItmId : null)
+ });
+ if (isNew) { $.extend(dta, { htmltext: co.t, quantity: co.q }); } // text only for server-created rows (e.g. the set row)
+ rw.data(dta);
+ if (prev) { if (rw.prev()[0] !== prev[0]) { rw.insertAfter(prev); } } // keep server order, but don't churn already-ordered rows
+ else if (bdy.children().first()[0] !== rw[0]) { bdy.prepend(rw); }
+ prev = rw;
+ if (changed) { $inv.rrw.call(rw); }
+ });
+ bdy.find('tr.itm').each((i, tr) => {
+ let id = (($(tr).data() || {}).Id || '').toString();
+ if (id !== '' && !serverIds[id]) { $(tr).remove(); } // dropped server-side (block.setonly)
+ });
+ });
+ },
+ /* Applies the backend-authoritative set-pricing display flags (see BuildSetDisplay /
+ InvoiceSetPricing) onto the rendered rows: blanks the price/total cells for lines the
+ server says should show no price (set members in SetPrice/SetOnly mode), and emphasises
+ the set header line — so the online editor always shows exactly what the PDF will print,
+ without duplicating the pricing rules client-side. Rows not present in the map (no set in
+ that block, or standalone items) are left untouched. */
+ applySetDisplay: function (tbl, setDisplay) {
+ tbl.find('tr.itm').each((i, tr) => {
+ let rw = $(tr), dta = rw.data() || {}, id = (dta.Id || '').toString();
+ if (id === '' || !Object.prototype.hasOwnProperty.call(setDisplay, id)) { return; }
+ let flags = setDisplay[id] || {};
+ rw.tC('sethdr', bool(flags.h, false));
+ if (bool(flags.p, true) === false) {
+ rw.find('td.currency').text('');
+ }
+ });
+ },
+ /* Send one change to the server; the draftReady signal and this success both refresh.
+ Returns the underlying ajax promise so callers that must not race a follow-up delta
+ against this one (e.g. $inv.toSetPrice after a flush) can chain on it.
+ If the initial seeding (inv/dopen) is still in flight (no token yet, but a
+ 'dseedpromise' is pending), the delta previously vanished silently — the user saw no
+ network activity at all when clicking a context-menu action right after opening the
+ editor. Now the delta waits for the seed to finish and retries against the freshly
+ issued token instead of being dropped. */
+ sync: function (delta) {
+ let t = $inv.d.token();
+ if (t === '') {
+ let seeding = $inv.d.tbl().data('dseedpromise');
+ if (seeding) { return $.when(seeding).then(() => $inv.d.sync(delta)); }
+ return $.when();
+ }
+ $inv.d.layout().aC('freeze');
+ return $ocms.postXT({
+ url: $ocms.url('inv/dpatch'), data: { token: t, delta: JSON.stringify(delta) },
+ success: () => { $inv.d.refresh(); },
+ error: (xhr) => { $inv.d.layout().rC('freeze'); if (xhr && xhr.status === 410) { $inv.d.closed('expired'); } }
+ });
+ },
+ /* The current section id sequence (used to detect a reorder that changes no block content). */
+ order: function () { return (($inv.d.tbl().data('bai')) || []).map((b) => (b.Id || '').toString()); },
+ /* Diff the freshly-rebuilt blocks against the last-synced state and send only the
+ changed/removed blocks as granular block.replace / block.remove deltas. A pure section
+ reorder (same blocks, new sequence) changes no block hash, so it is sent separately as a
+ block.order delta; the server reorders the cache, renumbers positions and pushes them back.
+ No early return on an empty token here: sync() itself waits for an in-flight seed
+ (dseedpromise) instead of silently dropping the delta, so edits made in the brief window
+ before seeding completes are not lost. */
+ syncChanged: function (tbl) {
+ let bai = tbl.data('bai') || [], prev = tbl.data('dhashes') || {}, next = {}, changed = [], removed = [], pending = [];
+ $.each(bai, (i, b) => { let id = (b.Id || '').toString(), h = JSON.stringify(b); next[id] = h; if (prev[id] !== h) { changed.push(b); } });
+ $.each(prev, (id) => { if (next[id] === undefined) { removed.push(id); } });
+ let order = $inv.d.order(), prevOrder = tbl.data('dorder') || [];
+ tbl.data('dhashes', next).data('dorder', order);
+ changed.forEach((b) => pending.push($inv.d.sync({ Target: 'block.replace', Ref: (b.Id || '').toString(), Value: b })));
+ removed.forEach((id) => pending.push($inv.d.sync({ Target: 'block.remove', Ref: id })));
+ let sameSet = prevOrder.length === order.length && prevOrder.slice().sort().join(',') === order.slice().sort().join(',');
+ if (sameSet && prevOrder.join(',') !== order.join(',')) { pending.push($inv.d.sync({ Target: 'block.order', Value: order })); }
+ /* $.when(...pending) so a caller (e.g. toSetPrice) can wait until every flushed block
+ has actually reached the server before sending a further delta that depends on it —
+ otherwise a delayed block.replace carrying pre-conversion values can land after and
+ silently overwrite a just-applied server-side mutation (e.g. item.setprice). */
+ return $.when.apply($, pending).promise();
+ },
+ /* Map an inline recipient field to its delta target and send it. No token-guard here for the
+ same reason as syncChanged: sync() waits for an in-flight seed instead of dropping the edit. */
+ syncField: function (nme, val) {
+ let map = { invoicetitle: 'title', invoiceaddress: 'address', invoiceemail: 'email', loc: 'provisionlocation', provisionlocation: 'provisionlocation', provisionperiod: 'provisionperiod' };
+ let target = map[nme]; if (!target) { return; }
+ $inv.d.sync({ Target: target, Value: val });
+ },
+ /* Render the totals footer from the server sums (port of invSumUpdate's footer half). */
+ footer: function (tbl, sums, admin) {
+ let ft = tbl.children('tfoot').empty(); tbl.nextAll('.fnote').remove();
+ let p13b = bool(admin.p13b, false);
+ let rwcy = (lbl, val, cls) => $$.tdc('currency', $$.tr(ft, { class: cls || 'tsum' }).append([$$.tdc('aux'), $$.td({ colspan: 4 }).text(lbl)]), fnum(val, $rct.cst));
+ let fn = (t) => $$.dc('fnote').insertAfter(tbl).rwText(t);
+ rwcy('Netto', sums.total_net || 0);
+ if (p13b === false) { $.each(sums.vat || {}, (rate, amt) => rwcy($rct.vat + ' ' + rate + '%', amt, 'tvat')); }
+ rwcy('Summe', sums.total_gross || 0);
+ let itype = (admin.type || '');
+ if (itype === 'i') { fn($rct.note2); fn($rct.note4); }
+ else if (itype === 'c') { fn($rct.note2); }
+ else {
+ fn(string($rct.note3, [fnum(((sums.service_net || 0) + (sums.service_vat || 0)) * (admin.tax_servicerefund || 0), $rct.cst)])).aC('ntax');
+ fn($rct.note2);
+ fn(string($rct.note1, [fnum((sums.service_net || 0) + (sums.service_vat || 0), $rct.cst), fnum(sums.service_net || 0, $rct.cst), fnum(sums.service_vat || 0, $rct.cst)]));
+ }
+ if (p13b === true) { fn($rct.note13b); }
+ },
+ validation: function (msgs) {
+ let frm = $('div.invoice_layout'); if (frm.length < 1) { return; }
+ let box = frm.children('.dvalidation');
+ if (box.length < 1) { box = $$.dc('dvalidation'); frm.prepend(box); }
+ box.empty().tC('hidden', (msgs || []).length < 1);
+ $.each(msgs || [], (i, m) => $$.dc('dvmsg', box).aC(m.severity).text(m.message));
+ },
+ /* PDF preview straight from the cache; confirm = flush + finalise, cancel = discard. */
+ preview: function () {
+ let t = $inv.d.token(); if (t === '') { return; }
+ let l = $inv.d.layout();
+ let email = ($inv.d.tbl().data('new') || {}).invoiceemail || '';
+ if ($fis.ValidateEmail(email) === false) { if (bool(confirm($ict.ivE + $ict.ivEc), false) === false) { return; } }
+ l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('inv/dpreview'), data: { token: t }, success: (response) => {
+ l.rC('freeze');
+ let c = $$.dc('imagecollection pdfpreview'), vhr = Math.round(vh() * 0.88), total = response.total;
+ if (total > 10) { $$.dc('note warn', c).text($ict.tpe); }
+ $.each(response.img || [], (ii, img) => { $$.dc('pdfp', c).append($$.img(img).css('max-height', (vhr - rpx(6)).toString() + 'px')); });
+ for (let ic = (response.img || []).length + 1; ic <= total; ic++) { $$.dc('pdfp ph', c).append($$.dc('note', $ict.pna)); }
+ $ocms.dlg(c, {
+ size: [vhr, Math.round(vw() * 0.88)], zindex: 50, form: false, button: $rct.crI,
+ confirm: function (e) {
+ let ct = $(this); l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('inv/dsave'), data: { token: t }, success: (sv) => {
+ $ocms.postXT({
+ url: $ocms.url('req/sconf'), data: { id: sv.invid }, success: (cresp) => {
+ ct.trigger('modal_close');
+ if (cresp.hasFile === true) { window.open($ocms.url('req/idoc') + '?id=' + sv.invid, '_blank'); }
+ $inv.d.close();
+ $ocms.init('req'); $inv.rReload();
+ }, error: () => { alert($t.f1); ct.trigger('modal_close'); }, complete: () => { l.rC('freeze'); }
+ });
+ }, error: () => { l.rC('freeze'); alert($ict.eis); }
+ });
+ },
+ cancel: function (e) { if (confirm($ict.cdI)) { $inv.d.close(); $inv.rReload(); } }
+ });
+ }, error: () => { l.rC('freeze'); alert($ict.eis); }
+ });
+ },
+ /* Zwischenspeichern: flush the cache to the DB (no re-upload); stay in the editor. */
+ save: function () {
+ let t = $inv.d.token(); if (t === '') { return; }
+ let l = $inv.d.layout(); l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('inv/dsave'), data: { token: t }, success: (r) => { $inv.d.tbl().data('invid', r.invid); },
+ error: () => { alert($ict.eis); }, complete: () => { l.rC('freeze'); }
+ });
+ },
+ history: function () {
+ let t = $inv.d.token(); if (t === '') { return; }
+ $ocms.postXT({
+ url: $ocms.url('inv/dhistory'), data: { token: t }, success: (r) => {
+ let c = $$.dc('dhist');
+ if ((r.history || []).length < 1) { $$.dc('note', c).text('Noch keine Änderungen erfasst.'); }
+ else {
+ let ts = $$.tblset({ class: 'invtbl fullwidth' }, c);
+ $$.tr(ts.hd).append([$$.th().text('Zeit'), $$.th().text('Feld'), $$.th().text('Alt'), $$.th().text('Neu')]);
+ $.each(r.history, (i, h) => $$.tr(ts.bdy).append([$$.tdc('keep', fdt(h.timestamp)), $$.td().text(h.target), $$.td().text(h.oldValue), $$.td().text(h.newValue)]));
+ }
+ $ocms.dlg(c, { width: 800, form: false });
+ }
+ });
+ },
+ discard: function () {
+ let invid = $inv.d.tbl().data('invid') || '';
+ if (invid === '') { alert('Es wurde noch kein Zwischenstand gespeichert, der wiederhergestellt werden könnte.'); return; }
+ if (confirm('Alle Änderungen verwerfen und den zuletzt gespeicherten Stand neu laden?') === false) { return; }
+ $inv.d.close();
+ $inv.cntInv({ id: invid });
+ },
+ warnExpiry: function (secondsLeft) {
+ let mins = Math.max(1, Math.round((secondsLeft || 0) / 60));
+ $fis.notifications.push({ severity: 'info', title: 'Entwurf läuft ab', message: 'Der Rechnungsentwurf läuft in etwa ' + mins + ' Minute(n) ab. Bitte zwischenspeichern, sonst gehen die Änderungen verloren.' });
+ },
+ closed: function (reason) {
+ let t = $inv.d.token();
+ $inv.d.tbl().removeData('dtoken');
+ if (t !== '') { $fis.draft.release(t); }
+ $fis.frm_edit().remove(); $fis.lf(true);
+ $fis.notifications.push({ severity: 'error', title: 'Entwurf geschlossen', message: reason === 'expired' ? 'Der Rechnungsentwurf ist wegen Inaktivität abgelaufen. Nicht gespeicherte Änderungen sind verloren.' : 'Der Rechnungsentwurf wurde geschlossen.' });
+ try { $inv.rReload(); } catch (e) { }
+ },
+ close: function () {
+ let t = $inv.d.token();
+ if (t !== '') { $ocms.postXT({ url: $ocms.url('inv/dclose'), data: { token: t } }); $fis.draft.release(t); }
+ $inv.d.tbl().removeData('dtoken');
+ }
+};
+/* ── Backend-authoritative reminder draft editing (ADR 0006/0007) ─────────────
+ The reminder mirror of $inv.d: the server holds the truth for a reminder draft in
+ an in-memory session; this object seeds it (rem/dopen), sends single edits as deltas
+ (rem/dpatch), and renders the open-amount footer + validation from the authoritative
+ server state (rem/dstate). Preview renders straight from the cache (rem/dpreview);
+ confirm flushes (rem/dsave) then finalises + emails (rem/conf). It coexists with $inv.d
+ on the same DOM: each keys off its own token (rdtoken vs dtoken), so the shared inline
+ editor safely no-ops for the mode that is not active. */
+$inv.rd = {
+ tbl: () => $('div.invoice_layout table.invi'),
+ layout: () => $('div.invoice_layout'),
+ token: function () { return $inv.rd.tbl().data('rdtoken') || ''; },
+ /* Seed the authoritative server session from the assembled reminder editor payload. */
+ seed: function (payload) {
+ let l = $inv.rd.layout(); l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('rem/dopen'), data: { payload: JSON.stringify(payload) }, success: (r) => {
+ $inv.rd.tbl().data('rdtoken', r.token).data('rdver', r.version);
+ $fis.draft.bind(r.token, {
+ onReady: () => $inv.rd.refresh(),
+ onExpiring: (s) => $inv.rd.warnExpiry(s),
+ onClosed: (reason) => $inv.rd.closed(reason)
+ });
+ $inv.rd.refresh();
+ }, error: () => { l.rC('freeze'); }
+ });
+ },
+ /* Re-fetch the authoritative state and render the open-amount footer + validation from it. */
+ refresh: function (cb) {
+ let t = $inv.rd.token(); if (t === '') { return; }
+ $ocms.postXT({
+ url: $ocms.url('rem/dstate'), data: { token: t }, success: (state) => {
+ $inv.rd.applyState(state); if (typeof cb === 'function') { cb(state); }
+ }, error: (xhr) => { if (xhr && xhr.status === 410) { $inv.rd.closed('expired'); } },
+ complete: () => { $inv.rd.layout().rC('freeze'); }
+ });
+ },
+ applyState: function (state) {
+ let tbl = $inv.rd.tbl(); if (tbl.length < 1) { return; }
+ /* See $inv.d.applyState — drop stale/out-of-order dstate responses so an older refresh
+ can never roll back a newer one's totals/validation. */
+ let curVer = tbl.data('rdver');
+ if (typeof curVer === 'number' && typeof state.version === 'number' && state.version < curVer) {
+ return;
+ }
+ tbl.data('rdver', state.version).data('serverSums', state.sums).data('remid', state.remid || '');
+ $inv.rd.footer(tbl, state.sums || {});
+ $inv.rd.notes(state.notes || {});
+ $inv.rd.validation(state.validation || []);
+ },
+ /* Renders the backend-authoritative intro/closing notice paragraphs (ADR: notice texts
+ are backend-authoritative) exactly as FuchsPdf.BuildReminderNotes emits them for the
+ PDF, so the online editor always shows precisely what will be printed. */
+ notes: function (notes) {
+ let frm = $inv.rd.layout(); if (frm.length < 1) { return; }
+ let rq = frm.find('.srq'); if (rq.length < 1) { return; }
+ rq.children('.dnote').remove();
+ let intro = (notes || {}).intro || [], first = rq.children().first();
+ intro.slice().reverse().forEach((t) => {
+ let p = $$[0]('p').aC('dnote intro').rwText(t);
+ if (first.length) { p.insertBefore(first); } else { p.appendTo(rq); }
+ });
+ ((notes || {}).closing || []).forEach((t) => $$[0]('p').aC('dnote closing').rwText(t).appendTo(rq));
+ },
+ /* Send one change to the server; the draftReady signal and this success both refresh. */
+ sync: function (delta) {
+ let t = $inv.rd.token(); if (t === '') { return; }
+ $inv.rd.layout().aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('rem/dpatch'), data: { token: t, delta: JSON.stringify(delta) },
+ success: () => { $inv.rd.refresh(); },
+ error: (xhr) => { $inv.rd.layout().rC('freeze'); if (xhr && xhr.status === 410) { $inv.rd.closed('expired'); } }
+ });
+ },
+ /* Map an inline recipient field to its delta target and send it. */
+ syncField: function (nme, val) {
+ if ($inv.rd.token() === '') { return; }
+ let map = { subject: 'subject', invoiceaddress: 'address', invoiceemail: 'email', text: 'text' };
+ let target = map[nme]; if (!target) { return; }
+ $inv.rd.sync({ Target: target, Value: val });
+ },
+ /* Amount / amount-paid come from the item-row dialog; send both as their own deltas. */
+ syncAmount: function (amount, amount_payed) {
+ if ($inv.rd.token() === '') { return; }
+ $inv.rd.sync({ Target: 'amount', Value: (amount != null ? amount : 0).toString() });
+ $inv.rd.sync({ Target: 'amount_payed', Value: (amount_payed != null ? amount_payed : 0).toString() });
+ },
+ /* Render the open-amount footer from the server sums. Detail rows ($inv.rRemRw) have
+ 6 columns (aux, invoiceid, date, amount, amount_payed, open); span the label over the
+ 4 columns between aux and the open-amount column so the total lands in the same last
+ column as the per-invoice open amounts. */
+ footer: function (tbl, sums) {
+ let ft = tbl.children('tfoot').empty();
+ let tr = $$.tr(ft, { class: 'tsum' }).append([$$.tdc('aux'), $$.td({ colspan: 4 }).text('Offener Betrag')]);
+ $$.tdc('currency', tr, fnum(sums.amount_open || 0, $rct.cst));
+ },
+ validation: function (msgs) {
+ let frm = $inv.rd.layout(); if (frm.length < 1) { return; }
+ let box = frm.children('.dvalidation');
+ if (box.length < 1) { box = $$.dc('dvalidation'); frm.prepend(box); }
+ box.empty().tC('hidden', (msgs || []).length < 1);
+ $.each(msgs || [], (i, m) => $$.dc('dvmsg', box).aC(m.severity).text(m.message));
+ },
+ /* PDF preview straight from the cache; confirm = flush + finalise + email, cancel = discard. */
+ preview: function () {
+ let t = $inv.rd.token(); if (t === '') { return; }
+ let l = $inv.rd.layout();
+ let email = (($inv.rd.tbl().data('new') || {}).invoiceemail) || '';
+ if ($fis.ValidateEmail(email) === false) { if (bool(confirm($ict.ivE + $ict.ivEc), false) === false) { return; } }
+ l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('rem/dpreview'), data: { token: t }, success: (response) => {
+ l.rC('freeze');
+ let c = $$.dc('imagecollection pdfpreview'), vhr = Math.round(vh() * 0.88);
+ $.each(response.img || [], (ii, img) => { $$.dc('pdfp', c).append($$.img(img).css('max-height', (vhr - rpx(6)).toString() + 'px')); });
+ $ocms.dlg(c, {
+ size: [vhr, Math.round(vw() * 0.88)], zindex: 50, form: false, button: $ict.remd,
+ confirm: function (e) {
+ let ct = $(this); l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('rem/dsave'), data: { token: t }, success: (sv) => {
+ $ocms.postXT({
+ url: $ocms.url('rem/conf'), data: { id: sv.remid }, success: () => {
+ ct.trigger('modal_close');
+ window.open($ocms.url('rem/idoc') + '?id=' + sv.remid, '_blank');
+ $inv.rd.close();
+ $ocms.init('req'); $inv.rReload();
+ }, error: () => { alert($t.f1); ct.trigger('modal_close'); }, complete: () => { l.rC('freeze'); }
+ });
+ }, error: () => { l.rC('freeze'); alert($t.f1); }
+ });
+ },
+ cancel: function (e) { if (confirm($ict.cdI)) { $inv.rd.close(); $inv.rReload(); } }
+ });
+ }, error: () => { l.rC('freeze'); alert($t.f1); }
+ });
+ },
+ /* Zwischenspeichern: flush the cache to the DB (no re-upload); stay in the editor. */
+ save: function () {
+ let t = $inv.rd.token(); if (t === '') { return; }
+ let l = $inv.rd.layout(); l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('rem/dsave'), data: { token: t }, success: (r) => { $inv.rd.tbl().data('remid', r.remid); },
+ error: () => { alert($t.f1); }, complete: () => { l.rC('freeze'); }
+ });
+ },
+ history: function () {
+ let t = $inv.rd.token(); if (t === '') { return; }
+ $ocms.postXT({
+ url: $ocms.url('rem/dhistory'), data: { token: t }, success: (r) => {
+ let c = $$.dc('dhist');
+ if ((r.history || []).length < 1) { $$.dc('note', c).text('Noch keine Änderungen erfasst.'); }
+ else {
+ let ts = $$.tblset({ class: 'invtbl fullwidth' }, c);
+ $$.tr(ts.hd).append([$$.th().text('Zeit'), $$.th().text('Feld'), $$.th().text('Alt'), $$.th().text('Neu')]);
+ $.each(r.history, (i, h) => $$.tr(ts.bdy).append([$$.tdc('keep', fdt(h.timestamp)), $$.td().text(h.target), $$.td().text(h.oldValue), $$.td().text(h.newValue)]));
+ }
+ $ocms.dlg(c, { width: 800, form: false });
+ }
+ });
+ },
+ warnExpiry: function (secondsLeft) {
+ let mins = Math.max(1, Math.round((secondsLeft || 0) / 60));
+ $fis.notifications.push({ severity: 'info', title: 'Entwurf läuft ab', message: 'Der Mahnentwurf läuft in etwa ' + mins + ' Minute(n) ab. Bitte zwischenspeichern, sonst gehen die Änderungen verloren.' });
+ },
+ closed: function (reason) {
+ let t = $inv.rd.token();
+ $inv.rd.tbl().removeData('rdtoken');
+ if (t !== '') { $fis.draft.release(t); }
+ $fis.frm_edit().remove(); $fis.lf(true);
+ $fis.notifications.push({ severity: 'error', title: 'Entwurf geschlossen', message: reason === 'expired' ? 'Der Mahnentwurf ist wegen Inaktivität abgelaufen. Nicht gespeicherte Änderungen sind verloren.' : 'Der Mahnentwurf wurde geschlossen.' });
+ try { $inv.rReload(); } catch (e) { }
+ },
+ close: function () {
+ let t = $inv.rd.token();
+ if (t !== '') { $ocms.postXT({ url: $ocms.url('rem/dclose'), data: { token: t } }); $fis.draft.release(t); }
+ $inv.rd.tbl().removeData('rdtoken');
+ }
+};
$inv.cInv2 = function (data) {
let fr = $$.dc('rfrm').ldng(1);
let o = $ocms.dlg(fr, { width: 1000 });
@@ -261,7 +762,7 @@ $inv.ccInv = function (ev) { //normale rechnung
rif.tbl.children('tbody').each($inv.bdysort);
rif.tbl.trigger('fds.inv'); /* trigger calculations */
- $inv.eM(false, true, 'iss,p13b,setm,ctp');
+ $inv.eM(false, true, $inv.emOpt(admin));
}, complete: () => {
o.c.trigger('modal_close');
}
@@ -406,7 +907,7 @@ $inv.cntInv = function (data) { //invoice continuation
rif.tbl.children('tbody').each($inv.bdysort);
rif.tbl.trigger('fds.inv'); /* trigger calculations */
- $inv.eM(false, true, 'iss,p13b,setm,ctp');
+ $inv.eM(false, true, $inv.emOpt(response.admin));
}, complete: () => {
o.c.trigger('modal_close');
}
@@ -481,9 +982,12 @@ $inv.cSt = function (data) {
};
$inv.eHtml = function (ev) {
let t = $(this), frmct = ev.data instanceof jQuery ? ev.data : ev.data.t;
- /* invoiceemail must stay plain text — using the TinyMCE/html editor here used to wrap the
- address in tags, which then got posted and persisted verbatim into SendToEmail. */
- let isPlainText = ev.data.nme === 'invoiceemail';
+ /* Single-line fields must stay plain text — the TinyMCE/html editor wraps the value in
+ tags, which used to get posted and persisted verbatim (e.g.
18.06.2026
in the
+ Leistungsdatum). The backend sanitises HTML too (single source of truth, ADR 0006), but
+ keeping these plain here avoids the UI briefly holding the wrapped value. Multi-line fields
+ (invoiceaddress, loc) stay HTML-capable and are normalised to newlines server-side. */
+ let isPlainText = ['invoiceemail', 'provisionperiod', 'invoicetitle'].includes(ev.data.nme);
let flds = isPlainText
? [{ name: 'txt', label: 'Text', type: 'text', value: frmct.text() }]
: [{ name: 'txt', label: 'Text', type: 'html', value: frmct.html(), tinymce: true, attr: { style: 'height: 300px' } }];
@@ -499,6 +1003,11 @@ $inv.eHtml = function (ev) {
if (typeof change === 'function') {
change(response.txt);
}
+ /* backend-authoritative: mirror the inline recipient-field edit to the server session.
+ Invoice and reminder editors share this DOM; each syncField no-ops unless its own
+ draft token is present, so only the active mode's session receives the delta. */
+ $inv.d.syncField(ev.data.nme, isPlainText ? (response.txt || '') : response.txt);
+ $inv.rd.syncField(ev.data.nme, isPlainText ? (response.txt || '') : response.txt);
},
tinymce: { valid_elements: 'br', hidemenu: true, hidetoolbar: true }
}
@@ -521,6 +1030,8 @@ $inv.eHtml = function (ev) {
}
$ocms.dlgform(flds, sets);
};
+/* No client-side arithmetic (ADR 0006/0008): only the chosen VAT rate is stored on each row;
+ the server (InvoiceDraftCalculator.RecomputeLineValues) recomputes vat_val/svcvat_val from it. */
$inv.setVat = function (ev) {
let t = $(this), thisrow = ev.data;
let vat = prompt($rct.rqV);
@@ -533,12 +1044,6 @@ $inv.setVat = function (ev) {
thisrow.siblings('.itm').each(function () {
let rwi = $(this), dta = rwi.data();
dta.vat = fnum(vat, { style: 'percent' }).replace(' ', '');
- if ((dta.net_val || 0) > 0) {
- dta.vat_val = dta.net_val * vat;
- }
- if ((dta.svcnet_val || 0) > 0) {
- dta.svcvat_val = dta.svcnet_val * vat;
- }
});
$inv.t_fds_inv();
}
@@ -584,7 +1089,11 @@ $inv.eRw = function(row, dta, flds) {
}, typedvalues: true
});
};
-$inv.bdysort = (i, e) => { $(e).Sortable({ dragItem: false, dragHandleClass: 'ico', parentident: 'tr', swapdone: (p1, p2, i1, i2) => { $inv.t_fds_inv(); } }) }
+/* Reorder items via drag. The DOM swap happens inside the Sortable during the drag; we commit
+ the new order once, reliably, on drop (onend) — that recomputes positions/totals and pushes the
+ changed block(s) to the backend session (t_fds_inv -> syncChanged). Committing on drop (rather
+ than on every mid-drag hover-swap) avoids rebuilding the row that is currently being dragged. */
+$inv.bdysort = (i, e) => { $(e).Sortable({ dragItem: false, dragHandleClass: 'ico', parentident: 'tr', onend: () => { $inv.t_fds_inv(); } }) }
$inv.rrw = function () {
let rw = $(this), dta = rw.data(), co = {}, ph = rw.is('.placeholder'), hn = rw.is('.hidenote');
let oHtml = (e) => $$.d().append(e).html();
@@ -594,6 +1103,16 @@ $inv.rrw = function () {
if (ph === false) {
bc.unshift($$.dc('ibtn edit', { title: $rct.cP }).append(gi('pencil')).click(rw, $inv.eRow));
bc.push($$.dc('ibtn del', { title: $rct.dR }).append(gi('trash')).click(function (e) { if (confirm($rct.cD)) { rw.remove(); $inv.t_fds_inv(); } }));
+ /* "Auf Setpreis umstellen": offered on a Set header item that does not yet carry a
+ price. fds__prepInvoice's [SetItmId] now anchors on the still-unconverted (price 0)
+ header, so the header row's own SetItmId self-references its own id rather than being
+ null — the real signal for showing this button is still the header's own price/net_val
+ being 0 (once converted it carries a nonzero price and the button disappears).
+ Irreversible: the actual sum/clear mutation happens server-side (backend-authoritative,
+ see InvoiceDraftEditService.ApplyItemSetPrice) via the "item.setprice" patch target. */
+ if ((dta.Type || '').toLowerCase() === 'set' && (dta.net_val || 0) === 0) {
+ bc.push($$.dc('ibtn tosetp', { title: $rct.toSetP }).append(gi('scale')).click(rw, $inv.toSetPrice));
+ }
}
let axf = $$.dc('axf').append(bc);
if (ph === true) {
@@ -601,7 +1120,7 @@ $inv.rrw = function () {
} else if (rw.is('.itm.osum') === true) {
co = { invrqid: dta.InvRqId, id: 'osum' + rw.index(), typ: 'osum', p: '', q: null, t: oHtml(dta.tbl.tbl), tt: null, v: null, vt: dta.net_val, vs: dta.svcnet_val, vat: dta.vat, vv: dta.vat_val, vsv: dta.svcvat_val, det: false };
} else {
- co = { invrqid: dta.InvRqId, id: dta.Id || '', typ: dta.Type || 'other', p: '', q: null, t: '', tt: null, v: null, vt: dta.net_val, vs: dta.svcnet_val, vat: dta.vat, vv: dta.vat_val, vsv: dta.svcvat_val, det: (dta.Note || '') !== '' && hn === false };
+ co = { invrqid: dta.InvRqId, id: dta.Id || '', typ: dta.Type || 'other', p: '', q: null, t: '', tt: null, v: null, vt: dta.net_val, vs: dta.svcnet_val, vat: dta.vat, vv: dta.vat_val, vsv: dta.svcvat_val, det: (dta.Note || '') !== '' && hn === false, SetItmId: dta.SetItmId || null };
$$.dc('ibtn ico move', axf, { title: $rct.mR }); /* should be the last added */
co.p = dta.position || (dta.SortOrder || '');
@@ -611,7 +1130,7 @@ $inv.rrw = function () {
co.t = dta.htmltext || (((dta.NameOrNumber || '').substr(0, 1) !== '#' ? oHtml($$[0]('p').text(dta.NameOrNumber)) : '') + (dta.Note || ''));
} else {
co.tt = co.det ? '' : $$.s(dta.Note || '').text();
- co.q = dta.quantity || (fnum(dta.quantityhours) + ' ' + (dta.UnitString || ''));
+ co.q = dta.quantity || ((dta.quantityhours || 0) !== 0 ? (fnum(dta.quantityhours) + ' ' + (dta.UnitString || '')) : ''); /* guard: no quantityhours -> blank, not fnum(undefined)="NaN" (e.g. the block set row) */
co.t = dta.htmltext ||(co.det ? (oHtml($$.s(dta.NameOrNumber || '')) + oHtml($$.dc('desc').html(dta.Note))) : oHtml($$.s(dta.NameOrNumber || '')));
co.v = dta.net
co.vt = dta.net_val
@@ -630,45 +1149,62 @@ $inv.rrw = function () {
tda.push($$.td(rw, { colspan: 4 }).append(co.t));
} else {
Array.prototype.push.apply(tda, co.q ? [$$.tdc('keep').text(co.q)] : []);
+ /* ADR 0009: a null/undefined price renders an EMPTY cell (block-mode "Set mit Preis"
+ members, and the set row's own unit-price), distinct from a real 0,00 €. */
+ let cur = (x) => (x == null ? '' : fnum(x, $rct.cst));
Array.prototype.push.apply(tda, [
$$.tdc('txt', { colspan: !co.q ? 2 : 1, title: co.tt }).append(co.t),
- $$.tdc('currency').text(fnum(co.v, $rct.cst)),
- $$.tdc('currency inetval').text(fnum(co.vt, $rct.cst)).attr('title', $rct.svcPart + ': ' + fnum(co.vs, $rct.cst))
+ $$.tdc('currency').text(cur(co.v)),
+ $$.tdc('currency inetval').text(cur(co.vt)).attr('title', $rct.svcPart + ': ' + cur(co.vs))
]);
}
- rw.empty().attr('class', ph ? 'placeholder' : 'itm').aC(co.Typ).tC('hidenote', hn).append(tda);
+ rw.empty().attr('class', ph ? 'placeholder' : 'itm').aC(co.Typ)
+ .tC('sethdr', (co.typ || '').toString().toLowerCase() === 'set') /* emphasise set rows (fn1 header + block set row) */
+ .tC('hidenote', hn).append(tda);
dta.co = co;
};
+/* "Auf Setpreis umstellen" (see $inv.rrw): backend-authoritative (ADR 0006) — the browser only
+ posts the target set-header item id; the server (InvoiceDraftEditService.ApplyItemSetPrice)
+ sums the member rows (same block, [SetItmId] equal to this row's id), writes that sum onto
+ the set header and clears each member's price, then the normal draftReady refresh re-renders
+ both the header and its members from the authoritative session state. This mirrors the PDF's
+ read of the same cached session, so the online editor and PDF can never drift apart. */
+$inv.toSetPrice = function (ev) {
+ let rw = ev.data, dta = rw.data(), id = (dta.Id || '').toString();
+ if (id === '') { return; }
+ if (confirm($rct.toSetPc) === false) { return; }
+ /* Wait for the flush of any pending local edits to actually reach the server before sending
+ the conversion delta — sending both in parallel let a delayed block.replace (still carrying
+ the pre-conversion, zero member/header values) land after item.setprice and silently
+ overwrite the just-converted totals back to 0. */
+ $.when($inv.t_fds_inv()).done(() => { $inv.d.sync({ Target: 'item.setprice', Ref: id }); });
+};
+/* No client-side totals/footer/tax computation (ADR 0006/0008): this only re-assembles each
+ block's row contract array (needed to post the "req" shape to the server) and, on the very
+ first pass, seeds the authoritative backend session. Footer, VAT breakdown, service-refund
+ note figures and the per-block sum cell are never computed here — they are rendered exclusively
+ from the server's `dstate` response by $inv.d.footer / $inv.d.applyState once the draft has a
+ token. Before a token exists the footer/notes/isum cells are simply left empty; there is no
+ local approximation to display. */
$inv.invSumUpdate = function () {
- let tbl = $(this), ft = tbl.children('tfoot').empty(), p13b = bool((tbl.data().admin || {}).p13b || '', false);
- tbl.nextAll('.fnote').remove();
- let sms = { ttn: 0, ttb: 0, ttvat: 0, tscn: 0, tscvat: 0, vat: {}, itmnet: {} }, ba = [];
- let rwcy = (lbl, val, cls) => $$.tdc('currency', $$.tr(ft, { class: cls || 'tsum' }).append([$$.tdc('aux'), $$.td({ colspan: 4 }).text(lbl)]), fnum(val, $rct.cst)), fn = (t) => $$.dc('fnote').insertAfter(tbl).rwText(t);
- let csms = function (rrx, sms, sid) {
- sms.tscn += (rrx.svcnet_val || 0);
- sms.tscvat += (rrx.svcvat_val || 0);
- sms.ttn += (rrx.net_val || 0);
- sms.ttvat += (rrx.vat_val || 0);
- sms.ttb += ((rrx.net_val || 0) + (rrx.vat_val || 0));
- if ((rrx.vat || '') !== '') {
- sms.vat[rrx.vat] = (sms.vat[rrx.vat] || 0) + (rrx.vat_val || 0);
- }
- //sms.itmnet[sid] = (sms.itmnet[sid] || 0) + (rrx.net_val || 0);
- };
+ let tbl = $(this);
+ let ba = [];
let bds = tbl.children('tbody');
bds.each((bi, bdy) => {
- let b = $(bdy), rx = b.data() || {}, i = [], citems = [], cset = null, bnet = 0, itm = b.find('tr.itm'), iso = 0, ipos = 0;
+ let b = $(bdy), rx = b.data() || {}, i = [], citems = [], itm = b.find('tr.itm'), iso = 0, ipos = 0;
b.tC('empty', itm.length < 1);
itm.each((ti, tx) => {
-
- let rrx = $(tx).data() || {}; csms(rrx, sms, rx.Id); bnet += (rrx.net_val || 0); i.push(rrx.co);
- //console.debug('rrx %o', rrx);
+ let rrx = $(tx).data() || {};
+ i.push(rrx.co);
/* backend item contract (title/desc/qty/price_net/total_net + set flags), see InvoiceSetPricing.
- Set grouping: an item of Type 'set' is a header that claims the following items in this
- block as its members until the next set header (mfr__items has no explicit member link). */
+ Set grouping: fds__prepInvoice computes [SetItmId] per item, anchored on the still-unconverted
+ (price 0) Set header that owns it — this is the authoritative membership signal (not row order),
+ so items not tagged with a SetItmId by the server are never swept into a preceding set. The
+ header row's own SetItmId self-references its own id, but it is never its own member (excluded
+ by the id !== '' && !== citem.id check below). */
let citem = $inv.itemToContract(rrx);
- if (citem.type === 'set' && citem.id !== '') { cset = citem.id; }
- else if (cset !== null && (citem.id || '') !== '') { citem.setId = cset; }
+ let sid = (rrx.SetItmId || '').toString();
+ if (citem.type !== 'set' && sid !== '' && sid !== citem.id) { citem.setId = sid; }
citems.push(citem);
if (((typeof rrx.SortOrder === 'undefined' || rrx.SortOrder === null) ? -1 : rrx.SortOrder) > -1) {
if (['text', 'title'].includes((rrx.Type || 'other').toLowerCase()) === false) { ipos++; }
@@ -677,42 +1213,18 @@ $inv.invSumUpdate = function () {
$inv.rrw.call(tx);
}
});
- //console.debug('%o', {
- // f: b.find('tr.isum > td.isumval'), t: fnum(bnet, $rct.cst), n: bnet
- //});
- b.find('tr.isum > td.isumval').text(fnum(bnet, $rct.cst));
- ba.push({ Id: rx.Id, nme: rx.Name, text: rx.text, itm: i, items: citems, netval: bnet });
+ ba.push({ Id: rx.Id, nme: rx.Name, text: rx.text, itm: i, items: citems });
});
let nonempty = tbl.find('tbody:not(.empty)').length;
bds.find('tr.isum').tC('hidden', nonempty < 2);
- //let fnet = $$.tdc('currency', $$.tr(ft, { class: 'tsum' }).append([$$.tdc('aux'), $$.td({ colspan: 4 }).text('Netto')]), fnum(sms.ttn, $rct.cst));
- rwcy('Netto', sms.ttn);
- if (p13b === false) {
- $.each(sms.vat, (vi, vx) => {
- //$$.tdc('currency vat', $$.tr(ft, { class: 'tvat' }).append([$$.tdc('aux'), $$.td({ colspan: 4 }).text('Umsatzsteuer ' + vi)]), fnum(vx, $rct.cst));
- rwcy($rct.vat + ' ' + vi, vx, 'tvat');
- });
- } else {
- sms.ttb = sms.ttn;
- }
- //let fsum = $$.tdc('currency', $$.tr(ft, { class: 'tsum' }).append([$$.tdc('aux'), $$.td({ colspan: 4 }).text('Summe')]), fnum(sms.ttb, $rct.cst));
- rwcy('Summe', sms.ttb);
- let itype = tbl.data().admin.type;
- if (itype === 'i') {
- fn($rct.note2);
- fn($rct.note4);
- } else if (itype === 'c') {
- fn($rct.note2);
- } else {
- fn(string($rct.note3, [fnum((sms.tscn + sms.tscvat) * (tbl.data().admin.tax_servicerefund || 0), $rct.cst)])).aC('ntax');
- fn($rct.note2);
- fn(string($rct.note1, [fnum(sms.tscn + sms.tscvat, $rct.cst), fnum(sms.tscn, $rct.cst), fnum(sms.tscvat, $rct.cst)]));
- }
- if (p13b === true) {
- fn($rct.note13b);
- }
- tbl.data('sms', sms);
tbl.data('bai', ba);
+ /* Backend-authoritative seeding (ADR 0006): on the first calculation of an invoice
+ draft (invSumUpdate is only bound for invoices, never reminders), hand the assembled
+ model to the server session and switch to server-driven totals from then on. */
+ if ((tbl.data('dtoken') || '') === '' && bool(tbl.data('dseeding'), false) === false && ((tbl.data('admin') || {}).type != null)) {
+ tbl.data('dseeding', true);
+ $inv.d.seed($.extend($inv.invcPayload(tbl.data()), { invid: tbl.data('invid') || '' }));
+ }
};
$inv.worknotes = function (rx) {
let wn = '';
@@ -800,7 +1312,21 @@ $inv.rendersrq = function () {
$$.tdc('currency isumval', istr);
}
};
-$inv.t_fds_inv = () => { $('div.invoice_layout table.invi').trigger('fds.inv'); };
+$inv.t_fds_inv = () => {
+ let tbl = $('div.invoice_layout table.invi');
+ tbl.trigger('fds.inv');
+ /* After any local item mutation, push the changed block(s) to the authoritative
+ server session as granular deltas (invoice drafts only — reminders have no token,
+ nor a 'dseedpromise', so they correctly fall through to the no-op). While the initial
+ seed (inv/dopen) is still in flight there is no token yet either, but a 'dseedpromise'
+ is pending — wait for it instead of skipping the flush, otherwise an edit made in that
+ brief window is silently never sent. Returns the flush promise so callers that must
+ sequence a follow-up server delta after this flush (e.g. $inv.toSetPrice) can wait for
+ it instead of racing it. */
+ if ((tbl.data('dtoken') || '') !== '') { return $inv.d.syncChanged(tbl); }
+ let seeding = tbl.data('dseedpromise');
+ return seeding ? $.when(seeding).then(() => $inv.d.syncChanged(tbl)) : $.when();
+};
$inv.sedit = () => {
$inv.sprev(true);
};
@@ -855,6 +1381,7 @@ $inv.sp13b = () => {
} else {
}
tbl.trigger('fds.inv');
+ $inv.d.sync({ Target: 'p13b', Value: d.admin.p13b });
};
/* Maps an item row's data to the backend item contract consumed by InvoiceSetPricing
/ FuchsPdf.ApplyInvoice: { id, type, title (plain), desc (html), qty, price_net,
@@ -865,7 +1392,10 @@ $inv.itemToContract = function (rrx) {
rrx = rrx || {};
let oHtml = (e) => $$.d().append(e).html();
let type = (rrx.Type || '').toString().toLowerCase();
- let ci = { id: (rrx.Id || '').toString(), type: type, title: '', desc: '', qty: '', price_net: '', total_net: (rrx.net_val || 0), vat: rrx.vat || '' };
+ /* ADR 0009: preserve null prices verbatim (null = empty cell, kept distinct from a real 0) so
+ block-mode nulled members and the set row round-trip unchanged when the block is re-posted. */
+ let nz = (x) => (x == null ? null : x);
+ let ci = { id: (rrx.Id || '').toString(), type: type, title: '', desc: '', qty: '', price_net: '', total_net: nz(rrx.net_val), vat: rrx.vat || '' };
if (rrx.co && rrx.co.typ === 'osum') {
/* combined single-sum line — the on-screen "title" is an HTML sub-table; render it as desc */
ci.desc = rrx.co.t || '';
@@ -886,29 +1416,35 @@ $inv.itemToContract = function (rrx) {
ci.desc = rrx.Note || '';
}
ci.qty = rrx.quantity || ((rrx.quantityhours || 0) !== 0 ? (fnum(rrx.quantityhours) + (rrx.UnitString ? ' ' + rrx.UnitString : '')) : '');
- ci.price_net = (rrx.net || 0);
- ci.total_net = (rrx.net_val || 0);
+ ci.price_net = nz(rrx.net);
+ ci.total_net = nz(rrx.net_val);
}
return ci;
};
-/* 3-way set-pricing display switch. Mirrors §13b: writes the choice onto admin.setmode,
- which BuildInvoiceParams turns into the "setmode:" InvoiceOptions token the PDF reads. */
+/* 2-way set-pricing display switch (SetPrice / SetOnly). Mirrors §13b: writes the choice onto
+ admin.setmode, which BuildInvoiceParams turns into the "setmode:" InvoiceOptions token
+ the PDF reads. ItemPrices ("Positionen mit Preis – Set als Überschrift") was removed: it was
+ always just the implicit pre-conversion default and is not a state the user can switch back to
+ once a set has been converted via the "Auf Setpreis umstellen" item switch (see $inv.toSetPrice /
+ InvoiceDraftEditService.ApplyItemSetPrice) — that conversion is one-way. */
$inv.ssetmode = () => {
let l = $('div.invoice_layout'), tbl = l.find('table.invi'), d = tbl.data();
d.admin = d.admin || {};
let cur = (d.admin.setmode || 'setprice'), o;
let btn = (mode) => $$.dc('btn', $ict.setmo[mode]).tC('selected', cur === mode).click(() => { o.c.trigger('modal_close'); $inv.setSetmode(mode); });
- let fr = $$.dc('choicefrm').append([btn('setprice'), btn('itemprices'), btn('setonly')]);
+ let fr = $$.dc('choicefrm').append([btn('setprice'), btn('setonly')]);
o = $ocms.dlg(fr, { width: 800 });
};
+/* "Set mit Preis" / "Nur Set mit Preis" (ADR 0009): NOT a display toggle — an irreversible,
+ backend-authoritative mutation grouped by service-request block. The server inserts a dedicated
+ set row per block (block sum) and either nulls each member's price (setprice) or removes the
+ members (setonly); the normal draftReady refresh re-renders both via $inv.d.applyItems. The
+ browser only posts the chosen mode. Flush pending local edits first so a delayed block.replace
+ can't land after the conversion and overwrite it (same race guard as $inv.toSetPrice). */
$inv.setSetmode = (mode) => {
- let l = $('div.invoice_layout'), tbl = l.find('table.invi'), d = tbl.data();
- d.admin = d.admin || {};
- d.admin.setmode = mode; /* posted in admin -> BuildInvoiceParams writes setmode: into InvoiceOptions */
- d.inv = d.inv || {}; /* keep a local InvoiceOptions reflection in sync (cosmetic) */
- let opts = (d.inv.InvoiceOptions || '').split(',').filter(x => x !== '' && x.indexOf('setmode:') !== 0);
- if (mode && mode !== 'setprice') { opts.push('setmode:' + mode); }
- d.inv.InvoiceOptions = opts.join(',');
+ if (confirm($rct.toSetMc || $rct.toSetPc) === false) { return; }
+ let target = (mode === 'setonly') ? 'block.setonly' : 'block.setprice';
+ $.when($inv.t_fds_inv()).done(() => { $inv.d.sync({ Target: target }); });
};
$inv.sctp = () => {
let flds = $invcol.ctp;
@@ -925,126 +1461,45 @@ $inv.sctp = () => {
cvo.contactEmail = response.email;
d.new.CustomValues = JSON.stringify(cvo); //Assign it to new Values so that this is submitted also
l.find('.ctpfrm').text(ne(response.name, response.email));
+ $inv.d.sync({ Target: 'contact', Value: { name: response.name, email: response.email } });
}, typedvalues: true
});
};
/* Normalises the editor's working model into the exact field names the C# backend
- (FdsInvoiceData.BuildInvoiceParams) reads, then returns the `invc` payload:
- - balances/service sums come from `sms` (ttn/ttb), exposed on `new` as total_net/total_gross;
- - every VAT rate's net amount is exposed as new.vat__net (the backend reads the highest);
+ (FdsInvoiceData.BuildInvoiceParams) reads, then returns the `invc` payload. No totals/VAT
+ are computed here (ADR 0006/0008: the online editor performs no arithmetic at all) — the
+ backend session computes total_net/total_gross/vat itself (InvoiceDraftCalculator) once
+ opened from this payload, and BuildFdsData/BuildInvoiceParams reads them from there:
- new.invoicetitle -> new.title, new.loc -> new.provisionlocation, admin.paymentterms ->
new.paymentterm, admin.CustomerId -> admin.customerid.
Originals are kept alongside; the source objects are not mutated. */
$inv.invcPayload = function (d) {
d = d || {};
- let sms = d.sms || {}, nw = $.extend({}, d.new), adm = $.extend({}, d.admin);
- nw.total_net = sms.ttn || 0;
- nw.total_gross = sms.ttb || 0;
- /* VAT (rate + amount) is taken by the backend straight from the posted sms.vat map
- (FdsInvoiceData.HighestVat), so no per-rate new.vat_* keys are needed here. */
+ let nw = $.extend({}, d.new), adm = $.extend({}, d.admin);
nw.title = (nw.invoicetitle != null ? nw.invoicetitle : (nw.title || ''));
nw.provisionlocation = (nw.loc != null ? nw.loc : (nw.provisionlocation || ''));
nw.paymentterm = (adm.paymentterms != null ? adm.paymentterms : (nw.paymentterm || ''));
adm.customerid = (adm.customerid != null ? adm.customerid : adm.CustomerId);
- return { admin: adm, req: d.bai, sms: d.sms, new: nw };
-};
-$inv.ssave = () => {
- var l = $('div.invoice_layout'), d = l.find('table.invi').data();
- $inv.t_fds_inv();
- l.aC('freeze');
- $ocms.postXT({
- url: $ocms.url('req/save'), data: { invc: JSON.stringify($inv.invcPayload(d)), id: d.invid || '' }, success: (response) => {
- $inv.cntInv({ id: response.id });
- }, error: () => {
- alert($ict.eis);
- }, complete: () => {
- l.rC('freeze');
- }
- });
-};
-$inv.sprev = (change) => {
- var l = $('div.invoice_layout'), d = l.find('table.invi').data();
- change = bool(change, false);
- $inv.t_fds_inv();
- l.aC('freeze');
- //console.debug({ admin: d.admin, req: d.bai, sms: d.sms, new: d.new });
- if ($fis.ValidateEmail(d.new.invoiceemail || '') === false) {
- if (bool(confirm($ict.ivE + $ict.ivEc),false) === false) {
- l.rC('freeze');
- return;
- }
- }
- $ocms.postXT({
- url: $ocms.url('req/' + (change === true ?'sedit':'sprep')), data: { invc: JSON.stringify($inv.invcPayload(d)), id: d.invid ||'' }, success: (response) => {
- let c = $$.dc('imagecollection pdfpreview'), vhr = Math.round(vh() * 0.88), invid = response.id, invtp = response.total;
- if (invtp > 10) {
- $$.dc('note warn', c).text($ict.tpe);
- }
- $.each(response.img || [], function (ii, img) {
- $$.dc('pdfp', c).append($$.img(img).css('max-height', (vhr - rpx(6)).toString() + 'px'));
- });
- for (let ic = (response.img || []).length + 1; ic <= invtp; ic++) {
- $$.dc('pdfp ph', c).append($$.dc('note', $ict.pna));
- }
- $ocms.dlg(c, {
- size: [vhr, Math.round(vw() * 0.88)], zindex: 50, form: false, button: $rct.crI, confirm: function (e) {
- let ct = $(this);
- l.aC('freeze'); /* spinner while the invoice is finalized/emailed on the backend */
- $ocms.postXT({
- url: $ocms.url('req/sconf'), data: { id: invid }, success: (cresp) => {
- ct.trigger('modal_close');
- if (cresp.hasFile === true) {
- window.open($ocms.url('req/idoc') + '?id=' + invid, '_blank'); /* open pdf in new tab, only if a file was actually created */
- }
- $ocms.init('req'); /* go back to request list */
- $inv.rReload();
- }, error: () => {
- alert($t.f1);
- ct.trigger('modal_close');
- }, complete: () => {
- l.rC('freeze');
- }
- });
- }, cancel: function (e) {
- let ct = $(this);
- if (confirm($ict.cdI)) {
- $ocms.postXT({
- url: $ocms.url('req/sdel'), data: {
- id: invid
- }
- });
- }
- $inv.rReload();
- }
- });
- }, error: () => {
- alert($ict.eis);
- }, complete: () => {
- l.rC('freeze');
- }
- });
+ return { admin: adm, req: d.bai, new: nw };
};
+/* Zwischenspeichern and preview now run against the backend-authoritative session
+ (ADR 0006): no full-invoice re-upload — the cached draft is flushed / rendered by
+ token. See $inv.d.save / $inv.d.preview. The finalise + email path (req/sconf) is
+ unchanged and is invoked from the preview modal's confirm handler. */
+$inv.ssave = () => { $inv.d.save(); };
+$inv.sprev = (change) => { $inv.d.preview(); };
$inv.rReload = () => {
try {
let s = $('#listframe ul.rql:first').data();
$inv.cInv2({ id: s.search });
} catch (e) { }
};
-$inv.quantChange = function (i) {
- //console.debug({ t: this, i: i });
- let t = $(this), f = t.closest('form'), fi = {}, pf = (i) => parseFloat(i.toString().replace('%', '').replace(',', '.')), rtp = (num) => num.toFixed(2);
- f.find(':input').each((i, e) => { fi[$(e).attr('name')] = $(e); });
- let qv = parseInt(fi.quantityhours.val() || '0'), nv = pf(fi.net.val() || '0'), vat = pf(fi.vat.val()) * 0.01;
- if (qv > 0 && nv > 0) {
- fi.net_val.val(rtp(qv * nv));
- fi.vat_val.val(rtp(qv * nv * vat));
- if (['Service'].includes(fi.Type.val())) {
- fi.svcnet_val.val(rtp(qv * nv));
- fi.svcvat_val.val(rtp(qv * nv * vat));
- }
- }
-};
+/* No client-side arithmetic (ADR 0006/0008): quantity/price/VAT edits are posted as raw values
+ and the server (InvoiceDraftCalculator.RecomputeLineValues) computes net_val/vat_val/
+ svcnet_val/svcvat_val. The fields are left as entered here; the authoritative values are
+ pushed back onto the row by $inv.d.applyItems once the change reaches the backend. */
+$inv.quantChange = function (i) { };
$inv.storno = function (id, fds) {
let o, fr = $$.dc('choicefrm').append([
$$.dc('btn', 'Storno ohne Details').click({ id: id, mode: 'simple' }, (ev) => { o.c.trigger('modal_close'); $inv.cSt(ev.data); })
@@ -1203,6 +1658,8 @@ $inv.eRowR = function (ev) {
$.extend(tdta.rm, res);
tbl.data(tdta);
$inv.rRemRw.call(row, tdta);
+ /* backend-authoritative: mirror the edited amount / amount-paid to the server session */
+ $inv.rd.syncAmount(tdta.rm.amount, tdta.rm.amount_payed);
}, typedvalues: true
});
};
@@ -1217,7 +1674,10 @@ $inv.ccRem_s2 = function (id, sets) { //reminder creation
//console.debug(response);
let rem = response.rm || {};
let rq = $$.dc('srq', frm);
- $ict.remt[rem.type].forEach(r => $$[0]('p').rwText(r).appendTo(rq));
+ /* Intro/closing notice paragraphs are backend-authoritative (see $inv.rd.notes,
+ populated from FuchsPdf.BuildReminderNotes via rem/dstate after seeding below) —
+ they are appended/prepended into this same .srq container once the draft session
+ is open, so no client-side wording is constructed here. */
let rif = $$.tblset({ class: 'invi' }, rq);
rif.ft = $$[0]('tfoot');
rif.tbl.data($.extend({ invid: rem.invid, new: {} }, response));
@@ -1225,7 +1685,6 @@ $inv.ccRem_s2 = function (id, sets) { //reminder creation
$ict.remHR.forEach(h => $$.th(thr, h));
$inv.rRemRw.call($$.tr(rif.bdy), rif.tbl.data());
rif.ft.appendTo(rif.tbl);
- $ict.remt2[rem.type].forEach(r => $$[0]('p').rwText(r).appendTo(rq));
let fm = (cls, txt, nme, hd, dta) => {
let fr = $$.dc('inpfrm', frm).aC(cls).append(typeof hd === 'string' ? $$.dc('ahd', hd) : (hd > 0 ? $$.dc('ahd', $rct.frm[nme]) : null)), fc = $$.dc('content', fr).rwText(txt);
@@ -1243,57 +1702,26 @@ $inv.ccRem_s2 = function (id, sets) { //reminder creation
rif.tbl.children('tbody').each($inv.bdysort);
rif.tbl.trigger('fds.inv'); /* trigger calculations */
+ /* Seed the authoritative server session (ADR 0006). Amounts join the recipient
+ fields in the 'new' block; the reference invoice data goes into 'rem'. From here
+ the backend owns the open-amount computation and validation; inline edits and the
+ item-row dialog post single deltas (see $inv.rd). */
+ let nw = rif.tbl.data('new');
+ nw.amount = rem.amount; nw.amount_payed = rem.amount_payed;
+ $inv.rd.seed({
+ rem: { invid: rem.invid, type: rem.type, invoiceid: rem.invoiceid, invoicedate: rem.invoicedate },
+ new: nw
+ });
}, complete: () => {
//o.c.trigger('modal_close');
}
});
};
$inv.rprev = () => {
- var l = $('div.invoice_layout'), tbl = l.find('table.invi'), d = tbl.data();
- $.extend(d.new, tbl.find('tbody > tr:first').data());
- l.aC('freeze');
- //console.debug({ rem: d.rm, new: d.new });
- if ($fis.ValidateEmail(d.new.invoiceemail || '') === false) {
- if (bool(confirm($ict.ivE + $ict.ivEc), false) === false) {
- l.rC('freeze');
- return;
- }
- }
- $ocms.postXT({
- url: $ocms.url('rem/prep'), data: { remc: JSON.stringify({ rem: d.rm, new: d.new }), id: d.invid || '' }, success: (response) => {
- l.rC('freeze');
- let c = $$.dc('imagecollection pdfpreview'), vhr = Math.round(vh() * 0.88), remid = response.id;
- $.each(response.img || [], function (ii, img) {
- $$.dc('pdfp', c).append($$.img(img).css('max-height', (vhr - rpx(6)).toString() + 'px'));
- });
- $ocms.dlg(c, {
- size: [vhr, Math.round(vw() * 0.88)], zindex: 50, form: false, button: $ict.remd, confirm: function (e) {
- let ct = $(this);
- $ocms.postXT({
- url: $ocms.url('rem/conf'), data: { id: remid }, success: () => {
- ct.trigger('modal_close');
- window.open($ocms.url('rem/idoc') + '?id=' + remid, '_blank'); /* open pdf in new tab */
- $ocms.init('req'); /* go back to request list */
- $inv.rReload();
- }, error: () => {
- alert($t.f1);
- ct.trigger('modal_close');
- }
- });
- }, cancel: function (e) {
- let ct = $(this);
- if (confirm($ict.cdI)) {
- $ocms.postXT({
- url: $ocms.url('rem/del'), data: {
- id: remid
- }
- });
- }
- $inv.rReload();
- }
- });
- }
- });
+ /* Preview + finalise now run through the backend-authoritative session ($inv.rd):
+ the PDF renders straight from the server cache (no rem/prep DB write), and confirm
+ flushes (rem/dsave) then finalises + emails (rem/conf). */
+ $inv.rd.preview();
};
$inv.sis = (id) => {
if (confirm($ict.sisc)) {
diff --git a/Fuchs/js/intranet/modules/fis.inv_shared.scss b/Fuchs/js/intranet/modules/fis.inv_shared.scss
index 707d506..9809a92 100644
--- a/Fuchs/js/intranet/modules/fis.inv_shared.scss
+++ b/Fuchs/js/intranet/modules/fis.inv_shared.scss
@@ -62,6 +62,18 @@
height: auto;
cursor: pointer;
+ .content {
+ color: #000;
+ }
+
+ .content:empty::before {
+ content: '-';
+ min-width: 5rem;
+ height: 1rem;
+ display: block;
+ position: absolute;
+ }
+
&:hover {
div.axf {
display: block;
@@ -232,6 +244,12 @@
border-color: #FFF;
border-top: 1.5px solid #000;
}
+
+ /* Set-pricing display (see InvoiceSetPricing / $inv.d.applySetDisplay): the set
+ header line is emphasised the same way the PDF renders it (bold title). */
+ &.sethdr td.txt {
+ font-weight: bold;
+ }
}
> tfoot > tr {
@@ -399,6 +417,33 @@
}
}
+/* Backend-authoritative draft editing (ADR 0006): server-side plausibility findings
+ rendered above the editor, and the change-history dialog table. */
+.edit_frm .invoice_layout .dvalidation {
+ margin: 0 0 1rem 0;
+
+ &.hidden { display: none; }
+
+ .dvmsg {
+ padding: 0.4rem 0.7rem;
+ margin: 0.25rem 0;
+ border-radius: 0.2rem;
+ font-size: 0.9rem;
+ border-left: 4px solid #999;
+ background: #f5f5f5;
+
+ &.error { border-left-color: #c0392b; background: #fdecea; color: #922; }
+ &.warning { border-left-color: #e0a800; background: #fff8e1; color: #7a5c00; }
+ &.info { border-left-color: #3498db; background: #eaf4fb; color: #1c5a82; }
+ }
+}
+
+.dhist {
+ .invtbl { width: 100%; }
+ td, th { padding: 0.3rem 0.6rem; text-align: left; vertical-align: top; }
+ tbody tr:nth-child(even) { background: #fafafa; }
+}
+
.modal-body .lstfrm {
display: block;
position: relative;
diff --git a/Fuchs/js/intranet/modules/fis.inv_txt_de.js b/Fuchs/js/intranet/modules/fis.inv_txt_de.js
index 3f34986..583bf94 100644
--- a/Fuchs/js/intranet/modules/fis.inv_txt_de.js
+++ b/Fuchs/js/intranet/modules/fis.inv_txt_de.js
@@ -43,7 +43,6 @@
setm: 'Set-Preisanzeige',
setmo: {
setprice: 'Set mit Preis – Positionen ohne Preis',
- itemprices: 'Positionen mit Preis – Set als Überschrift',
setonly: 'Nur Set mit Preis – Positionen ausgeblendet'
},
ctp: 'Ansprechpartner festlegen',
@@ -63,16 +62,10 @@
rovlh: 'Übersicht der bisherigen Mahnungen',
rovl: ['Betreff', 'Betrag', 'Betrag gezahlt', 'fertiggestellt am'],
remHR: ['Rechnung', 'vom', 'Rechnungsbetrag', 'bereits bezahlt', 'noch offen'],
- remt: {
- f: ['Sehr geehrte Damen und Herren,', 'ein Mahnschreiben sollte kurz, freundlich und erfolgreich sein. Kurz ist es, freundlich sowieso; ob es auch erfolgreich ist, hängt von Ihnen ab.']
- , m: ['Sehr geehrte Damen und Herren,', 'nun müssen wir Sie noch einmal anschreiben.', 'Wahrscheinlich haben Sie triftige Gründe dafür, warum Sie die Zahlung unserer Forderung nicht vornehmen und auch nicht auf unsere Mahnung reagieren. Sollten wir darüber nicht einmal sprechen?', 'Bitte nehmen Sie umgehend in dieser Sache mit uns Kontakt auf.']
- , l: ['Sehr geehrte Damen und Herren,', 'Eine DRITTE MAHNUNG zu erhalten bereitet Ihnen bestimmt ebenso wenig Freude wie uns, sie zu verschicken. Leider haben wir auf unsere zweite Mahnung noch keine Antwort von Ihnen erhalten.", "Wir bitten Sie, den offenen Betrag innerhalb der nächsten 7 Werktage nach Erhalt dieses Schreibens zu begleichen. Nach Ablauf dieser Frist erfolgt keine weitere Mahnung mehr.', 'Sollte die Forderung bis dahin nicht beglichen sein, eröffnen wir das gerichtliche Mahnverfahren. Sollten Sie die Rechnung inzwischen beglichen haben, so betrachten Sie bitte dieses Schreiben als gegenstandslos.']
- },
- remt2: {
- f: ['Wir bitten Sie, den noch offenen Rechnungsbetrag innerhalb einer Woche auf unser Konto zu überweisen.', 'Sollten Sie den Betrag bereits überwiesen haben, so bitten wir Sie, diese Zahlungserinnerung als gegenstandslos zu betrachten.']
- , m: ['Um Ihnen zusätzliche Kosten für weitere Mahnungen zu ersparen, bitten wir Sie nunmehr um die Überweisung des noch zu zahlenden Gesamtbetrages inklusive der ggf. bereits fälligen Mahnzinsen und Mahngebühren innerhalb von einer Woche.']
- , l: []
- }, payi: { account: 'Konto', name: 'Zahler', text: 'Verw.Zweck', InvoiceID: 'Rechnung', amount: 'Betrag', date: 'Datum', manual: 'Typ'}
+ // Reminder intro/closing notice texts are backend-authoritative (see FuchsPdf.BuildReminderNotes /
+ // $inv.rd.notes) — no client-side copies here.
+ translatePaymentTerm: (pt) => (pt || '').replace('wd', ' Werktagen').replace('d', ' Tagen').replace('wk', ' Wochen') || '10 Tagen'
+ , payi: { account: 'Konto', name: 'Zahler', text: 'Verw.Zweck', InvoiceID: 'Rechnung', amount: 'Betrag', date: 'Datum', manual: 'Typ'}
}, $invcol = {
datev: new fields_definition('Rechnung', 'Rechnungen', [
{ name: 'Umsatz (ohne Soll/Haben-Kz)', label: 'Umsatz (ohne Soll/Haben-Kz)', type: 'string' },
diff --git a/Fuchs/js/intranet/modules/fis.req_txt_de.js b/Fuchs/js/intranet/modules/fis.req_txt_de.js
index a207693..f52f98c 100644
--- a/Fuchs/js/intranet/modules/fis.req_txt_de.js
+++ b/Fuchs/js/intranet/modules/fis.req_txt_de.js
@@ -34,6 +34,9 @@
svcPart: 'Service-Anteil',
vat: 'Umsatzsteuer',
combP: 'Positionen zusammenfassen',
+ toSetP: 'Auf Setpreis umstellen (Positionen ohne Preis)',
+ toSetPc: 'Der Set-Preis wird auf die Summe seiner Positionen gesetzt und die Positionen selbst verlieren ihren Preis. Das ist nicht rückgängig zu machen (der Betrag kann danach nur noch manuell geändert werden). Fortfahren?',
+ toSetMc: 'Jeder Leistungsauftrag wird zu einer Set-Position mit der Summe als Preis zusammengefasst. Das ist nicht rückgängig zu machen (die Set-Preise können danach nur noch manuell geändert werden). Fortfahren?',
iSum: 'Zwischensumme',
dtRel: 'Freigegeben am: ',
dtCr: 'Erstellt am: ',
diff --git a/Fuchs/js/intranet/oci_basic.js b/Fuchs/js/intranet/oci_basic.js
index d826cd1..75dc871 100644
--- a/Fuchs/js/intranet/oci_basic.js
+++ b/Fuchs/js/intranet/oci_basic.js
@@ -577,7 +577,7 @@ $ocms.postXT = function (options) {
if ((typeof options.contentType === 'boolean' ? options.contentType === false : false) === true) {
ajo.contentType = false; /* needed for file uploads */
}
- $.ajax(ajo);
+ return $.ajax(ajo);
};
$ocms.cex_timer = function () {
if (!$ocms.cexi) {
@@ -660,16 +660,16 @@ $ocms.vbl_send = function (ev) {
} else {
val = null;
}
- } else if (type === 'number' && typedvalues === true ) {
- let v;
+ } else if ((type === 'number' || dtf[0] === 'float' || dtf[0] === 'integer') && typedvalues === true) {
+ let v, raw = String(val).replace(',', '.');
if (dtf[0] === 'integer') {
- v = parseInt(val);
+ v = parseInt(raw);
} else {
- v = parseFloat(val);
+ v = parseFloat(raw);
}
val = isNaN(v) ? val : v;
}
- if (req === true && ((val || '') === '' || (val.match(pattern) === null))) {
+ if (req === true && ((val === '' || val === null || typeof val === 'undefined') || (typeof val === 'string' && val.match(pattern) === null))) {
if (cat === false && bool(checkvalidity, false) === true) { e.setCustomValidity(t.nza('ocms-nvnote', $ocms.t.inv || 'Invalid field')); }
val = null;
} else if (cat=== false && bool(checkvalidity, false) === true) {
diff --git a/Fuchs/js/intranet/oci_main.js b/Fuchs/js/intranet/oci_main.js
index 25c007a..daf2271 100644
--- a/Fuchs/js/intranet/oci_main.js
+++ b/Fuchs/js/intranet/oci_main.js
@@ -441,6 +441,8 @@
break;
case 'number':
f.pattern = ne(f.pattern, '[-+]?[0-9]*[.,]?[0-9]*');
+ inp.attr('type', 'text');
+ inp.attr('inputmode', 'decimal');
inp.attr('step', f.precision || 'any');
inp.attr('data-format', 'float');
break;
diff --git a/Fuchs/js/intranet/oci_sortable.js b/Fuchs/js/intranet/oci_sortable.js
index 9458116..e870687 100644
--- a/Fuchs/js/intranet/oci_sortable.js
+++ b/Fuchs/js/intranet/oci_sortable.js
@@ -63,7 +63,8 @@ if (!Element.prototype.closest) {
this._dragging = false;
this._dragHandleClass = this._options.dragHandleClass || '';
this._parentident = this._options.parentident || '';
- this._swapdone = typeof this._options.swapdone === "function" ? this._options._swapdone : null;
+ this._swapdone = typeof this._options.swapdone === "function" ? this._options.swapdone : null;
+ this._onend = typeof this._options.onend === "function" ? this._options.onend : null;
this._container.setAttribute("data-is-sortable", 1);
this._container.classList.add("sortable");
@@ -197,7 +198,15 @@ if (!Element.prototype.closest) {
_onPress: function (e) {
if (!e) { return; }
function op(tgt) {
- if (tgt && tgt.parentNode === this._container && (this._dragHandleClass === '' || e.target.className.indexOf(this._dragHandleClass) > -1) && tgt.className.indexOf("nosort") < 0) {
+ // Match the drag handle by real CSS class token, not substring. The old
+ // e.target.className.indexOf('ico') matched every Bootstrap "glyph[ico]n" icon,
+ // so clicking any icon button (edit/delete/set-price…) inside a sortable row
+ // started a zero-distance drag that swallowed the button's own click. Using
+ // closest('.') restricts dragging to the dedicated handle element (e.g.
+ // the ".ico" move button) and its descendants only.
+ var isHandle = this._dragHandleClass === '' ||
+ (e.target.closest && e.target.closest('.' + this._dragHandleClass) != null);
+ if (tgt && tgt.parentNode === this._container && isHandle && tgt.className.indexOf("nosort") < 0) {
e.preventDefault();
this._dragging = true;
this._click = getPoint(e);
@@ -213,10 +222,17 @@ if (!Element.prototype.closest) {
}
},
- // on item release/drop
+ // on item release/drop
_onRelease: function (e) {
+ // Was THIS list mid-drag? (mouseup fires on every instance's window listener.)
+ var wasDragging = this._dragging === true && this._clickItem !== null;
this._dragging = false;
this._trashDragItem();
+ // Fire a single "drag finished" callback so callers can commit the new order once,
+ // reliably, on drop — rather than relying on the per-hover _swapdone during the drag.
+ if (wasDragging && typeof this._onend === 'function') {
+ this._onend();
+ }
},
// on item drag/move
diff --git a/Fuchs/wwwroot/web/fis.admin.css b/Fuchs/wwwroot/web/fis.admin.css
new file mode 100644
index 0000000..f672fe6
--- /dev/null
+++ b/Fuchs/wwwroot/web/fis.admin.css
@@ -0,0 +1,256 @@
+/* basics */
+/* Color SCHEME */
+/* #8396bd */
+/* #e3e6e6 */
+/* #ffffff */
+/* #262626 */
+/* #262626 */
+/* #e3e6e6 */
+/* #FFC801 */
+/* #ffff4a */
+/* media breaks */
+/* other */
+/* mixin */
+/* basics */
+/* Color SCHEME */
+/* #1b4379 #0033b3 */
+/*neu: #56a532 ; alt: rgb(32,144,119);*/
+/* 10% sw */
+.admfrm {
+ padding: 1.5rem;
+}
+.admfrm .adm_sec {
+ font-size: 1.2rem;
+ font-weight: bold;
+ color: rgb(27, 67, 121);
+ margin: 1.5rem 0 0.75rem;
+ border-bottom: 2px solid rgb(27, 67, 121);
+ padding-bottom: 0.25rem;
+}
+.admfrm .adm_sec:first-child {
+ margin-top: 0;
+}
+.admfrm .adm_err {
+ padding: 1rem;
+ color: #b00020;
+ font-weight: bold;
+}
+.admfrm .adm_grid {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(22rem, 1fr));
+ gap: 1rem;
+ align-items: start;
+}
+.admfrm .adm_card {
+ border: 1px solid #d5d5d5;
+ border-radius: 0.4rem;
+ background: #fff;
+ box-shadow: 0 1px 3px rgba(50, 50, 50, 0.12);
+ overflow: hidden;
+}
+.admfrm .adm_card.adm_card_wide {
+ grid-column: 1/-1;
+}
+.admfrm .adm_card_hd {
+ display: flex;
+ align-items: center;
+ gap: 0.5rem;
+ padding: 0.6rem 0.85rem;
+ background: rgb(27, 67, 121);
+ color: #fff;
+ font-weight: bold;
+}
+.admfrm .adm_card_hd > span:first-child {
+ flex: 1 1 auto;
+}
+.admfrm .adm_card_bd {
+ padding: 0.6rem 0.85rem;
+}
+.admfrm .adm_card_ft {
+ padding: 0.5rem 0.85rem 0.75rem;
+ text-align: right;
+}
+.admfrm table.adm_kv {
+ border-collapse: collapse;
+ width: 100%;
+}
+.admfrm table.adm_kv td {
+ padding: 0.25rem 0.35rem;
+ border-bottom: 1px solid #eee;
+ vertical-align: top;
+ font-size: 0.92rem;
+}
+.admfrm table.adm_kv td.k {
+ color: #666;
+ white-space: nowrap;
+ width: 40%;
+}
+.admfrm table.adm_kv td.v {
+ word-break: break-word;
+}
+.admfrm table.adm_kv tr:last-child td {
+ border-bottom: none;
+}
+.admfrm .adm_probe {
+ margin-top: 0.6rem;
+ padding-top: 0.5rem;
+ border-top: 1px dashed #ddd;
+ font-size: 0.88rem;
+}
+.admfrm .adm_probe .adm_probe_msg {
+ font-weight: 600;
+}
+.admfrm .adm_probe .adm_probe_det {
+ color: #555;
+ word-break: break-word;
+ margin-top: 0.15rem;
+}
+.admfrm .adm_probe .adm_probe_dur {
+ color: #999;
+ margin-top: 0.15rem;
+ font-size: 0.8rem;
+}
+.admfrm .adm_probe .adm_probe_metrics {
+ margin-top: 0.35rem;
+}
+.admfrm .adm_probe .adm_probe_metrics .adm_metric {
+ display: flex;
+ justify-content: space-between;
+ gap: 0.5rem;
+ padding: 0.1rem 0;
+ border-bottom: 1px dotted #eee;
+}
+.admfrm .adm_probe .adm_probe_metrics .adm_metric:last-child {
+ border-bottom: none;
+}
+.admfrm .adm_probe .adm_probe_metrics .adm_metric .adm_metric_k {
+ color: #555;
+ word-break: break-word;
+}
+.admfrm .adm_probe .adm_probe_metrics .adm_metric .adm_metric_v {
+ font-weight: 600;
+ white-space: nowrap;
+}
+.admfrm {
+ /* startup checks list */
+}
+.admfrm .adm_checks {
+ margin-top: 0.5rem;
+}
+.admfrm .adm_checks .adm_check {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ gap: 0.5rem;
+ padding: 0.25rem 0;
+ border-bottom: 1px solid #eee;
+}
+.admfrm .adm_checks .adm_check:last-child {
+ border-bottom: none;
+}
+.admfrm .adm_checks .adm_check .adm_check_k {
+ color: #333;
+}
+.admfrm .adm_checks .adm_check .adm_check_v {
+ font-weight: bold;
+ font-size: 0.8rem;
+ padding: 0.05rem 0.5rem;
+ border-radius: 0.25rem;
+ white-space: nowrap;
+}
+.admfrm .adm_checks .adm_check .adm_check_ok {
+ background: #e2f3da;
+ color: #2f6d18;
+}
+.admfrm .adm_checks .adm_check .adm_check_fail {
+ background: #f3ded9;
+ color: #c0341d;
+}
+.admfrm .adm_checks .adm_check .adm_check_skipped {
+ background: #ececec;
+ color: #777;
+}
+.admfrm {
+ /* status pill */
+}
+.admfrm .adm_pill {
+ display: inline-block;
+ padding: 0.1rem 0.55rem;
+ border-radius: 1rem;
+ font-size: 0.78rem;
+ font-weight: bold;
+ color: #fff;
+ background: #999;
+ white-space: nowrap;
+}
+.admfrm .adm_pill_ok {
+ background: rgb(86, 165, 50);
+}
+.admfrm .adm_pill_error {
+ background: #c0341d;
+}
+.admfrm .adm_pill_disabled {
+ background: #888;
+}
+.admfrm .adm_pill_unconfigured {
+ background: #d69100;
+}
+.admfrm .adm_pill_checking {
+ background: #2a72c4;
+}
+.admfrm {
+ /* boolean chips */
+}
+.admfrm .adm_bool {
+ display: inline-block;
+ padding: 0 0.4rem;
+ border-radius: 0.25rem;
+ font-size: 0.8rem;
+ font-weight: bold;
+}
+.admfrm .adm_bool_y {
+ background: #e2f3da;
+ color: #2f6d18;
+}
+.admfrm .adm_bool_n {
+ background: #f3e0dd;
+ color: #9c2a17;
+}
+.admfrm .adm_env {
+ font-size: 0.8rem;
+ font-weight: normal;
+ padding: 0.1rem 0.5rem;
+ border-radius: 0.25rem;
+ background: rgba(255, 255, 255, 0.25);
+}
+.admfrm .adm_env.adm_env_test {
+ background: #13a143;
+}
+.admfrm .adm_btn {
+ cursor: pointer;
+ border-radius: 0.28rem;
+ padding: 0.2rem 0.6rem;
+ font-size: 0.85rem;
+ border: 1px solid #ababab;
+ background-color: #fff;
+ color: #333;
+}
+.admfrm .adm_btn.adm_btn_primary {
+ background-color: rgb(86, 165, 50);
+ border-color: rgb(69.68, 133.688372093, 40.511627907);
+ color: #fff;
+}
+.admfrm .adm_card_hd .adm_btn {
+ background-color: rgba(255, 255, 255, 0.15);
+ color: #fff;
+ border-color: rgba(255, 255, 255, 0.4);
+}
+
+.adm_note {
+ margin-top: 0.75rem;
+ padding: 0.5rem 0.6rem;
+ background: #f3f6fb;
+ border-left: 3px solid rgb(27, 67, 121);
+ font-size: 0.85rem;
+ color: #444;
+}
\ No newline at end of file
diff --git a/Fuchs/wwwroot/web/fis.admin.de.js b/Fuchs/wwwroot/web/fis.admin.de.js
new file mode 100644
index 0000000..03d4c85
--- /dev/null
+++ b/Fuchs/wwwroot/web/fis.admin.de.js
@@ -0,0 +1,330 @@
+let $adt = {
+ mdl: 'Administration'
+ , sub_info: 'System'
+ , sub_status: 'Status & Konnektivität'
+ , sub_tests: 'Tests'
+ // startup checks widget (non-refreshable)
+ , startup: 'Startup-Prüfungen'
+ , startup_notrun: 'Die Startup-Prüfungen sind deaktiviert oder wurden noch nicht ausgeführt (Fuchs:StartupChecks:Enabled).'
+ , startup_on: 'Host'
+ , startup_at: 'Ausgeführt (UTC)'
+ , chk_ok: 'OK'
+ , chk_fail: 'Fehler'
+ , chk_skipped: 'übersprungen'
+ , chk_KeyVault: 'Azure Key Vault'
+ , chk_Database: 'SQL-Datenbank'
+ , chk_MFR: 'MFR (ERP)'
+ , chk_PdfLicense: 'Spire.PDF-Lizenz'
+ , chk_Mailer: 'E-Mail (Startup-Probe)'
+ // system info
+ , host: 'Host / Server'
+ , machine: 'Hostname'
+ , os: 'Betriebssystem'
+ , framework: 'Framework'
+ , env: 'Umgebung'
+ , testdep: 'Test-Deployment'
+ , pid: 'Prozess-ID'
+ , uptime: 'Laufzeit'
+ , since: 'Start (UTC)'
+ , hours: 'Std.'
+ // status cards
+ , db: 'SQL-Datenbank'
+ , mail: 'E-Mail-Dienst'
+ , blob: 'Azure Blob Storage'
+ , mfr: 'MFR (ERP)'
+ , kv: 'Azure Key Vault'
+ // labels
+ , server: 'Server'
+ , catalog: 'Datenbank'
+ , login: 'Login'
+ , mailer: 'Mailer aktiv'
+ , baseurl: 'Base-URL'
+ , account: 'Account'
+ , serverid: 'Server-ID'
+ , token: 'Token hinterlegt'
+ , override: 'OverrideRecipient'
+ , overrideActive: 'Umleitung aktiv'
+ , enabled: 'Aktiviert'
+ , configured: 'Konfiguriert'
+ , invContainer: 'Rechnungs-Container'
+ , remContainer: 'Mahnungs-Container'
+ , host_l: 'Host'
+ , creds: 'Zugangsdaten hinterlegt'
+ , sync: 'Sync aktiv'
+ , vault: 'Vault-URI'
+ , appname: 'App-Präfix'
+ , seccount: 'Verwaltete Secrets'
+ , clientreg: 'Client registriert'
+ , duration: 'Dauer'
+ , checked: 'Geprüft'
+ , detail: 'Detail'
+ // status values
+ , st_ok: 'OK'
+ , st_error: 'Fehler'
+ , st_disabled: 'Deaktiviert'
+ , st_unconfigured: 'Nicht konfiguriert'
+ , st_checking: 'Prüfe…'
+ // actions
+ , refresh: 'Aktualisieren'
+ , refreshAll: 'Alle prüfen'
+ , yes: 'Ja'
+ , no: 'Nein'
+ // test email
+ , testmail: 'Test-E-Mail'
+ , testmail_btn: 'Test-E-Mail senden'
+ , tm_to: 'Empfänger'
+ , tm_subject: 'Betreff'
+ , tm_body: 'Nachricht'
+ , tm_hint: 'Der Versand nutzt die normale E-Mail-Pipeline; bei gesetztem OverrideRecipient wird die Nachricht dorthin umgeleitet.'
+ , tm_sent: 'Test-E-Mail übergeben.'
+ , tm_failed: 'Test-E-Mail konnte nicht gesendet werden.'
+ , tm_default_subject: 'Fuchs Intranet – Test-E-Mail'
+ , tm_default_body: 'Dies ist eine Test-E-Mail aus dem Administrationsbereich des Fuchs Intranet.'
+ , loadfail: 'Der Systemstatus konnte nicht geladen werden.'
+};
+
+let $adm = {
+ init2: function () {
+ // No external libraries needed — go straight to render.
+ $ocms.getScript([], function () { $adm.init3(); });
+ },
+ init3: function () {
+ $fis.cf(true);
+ $fis.lf(true);
+ $('#activemodule').text($adt.mdl);
+ $adm.topbar();
+ let frm = $$.dc('admfrm', $('#contentframe')).ldng(1);
+ $adm.load(frm);
+ },
+ topbar: function () {
+ return $('#topbar').ocmsmenu([
+ { lbl: $adt.refreshAll, id: 'adm_refresh_all', ico: 'glyphicon glyphicon-refresh', fnc: function () { $adm.init3(); } }
+ ]);
+ },
+ load: function (frm) {
+ $ocms.postXT({
+ url: $ocms.url('admin/status'), success: function (r) {
+ frm.empty();
+ $adm.render(frm, r.info || {}, r.probes || []);
+ }, error: function () {
+ frm.empty();
+ $$.dc('adm_err', frm).text($adt.loadfail);
+ }, complete: function () { frm.ldng(0); }
+ });
+ },
+ render: function (frm, info, probes) {
+ let pmap = {};
+ $.each(probes, function (i, p) { pmap[p.component] = p; });
+
+ $$.dc('adm_sec', frm).text($adt.sub_info);
+ $adm.sysCard(frm, info);
+ $adm.startupCard(frm, info.startupChecks);
+
+ $$.dc('adm_sec', frm).text($adt.sub_status);
+ let grid = $$.dc('adm_grid', frm);
+ $adm.dbCard(grid, info.database || {}, pmap.database);
+ $adm.mailCard(grid, info.email || {});
+ $adm.blobCard(grid, info.blob || {}, pmap.blob);
+ $adm.mfrCard(grid, info.mfr || {}, pmap.mfr);
+ $adm.kvCard(grid, info.keyVault || {}, pmap.keyvault);
+ },
+
+ /* ── generic building blocks ─────────────────────────────────────────── */
+ kvTable: function (parent, rows) {
+ let t = $$.tbl().addClass('adm_kv');
+ $.each(rows || [], function (i, r) {
+ if (!r) { return true; }
+ let tr = $$.tr(t);
+ $$.td(tr).addClass('k').text(r[0] == null ? '' : String(r[0]));
+ let v = $$.td(tr).addClass('v');
+ if (r[1] instanceof jQuery) { v.append(r[1]); } else { v.text(r[1] == null ? '' : String(r[1])); }
+ });
+ if (parent instanceof jQuery) { parent.append(t); }
+ return t;
+ },
+ yesNo: function (b) {
+ return $$.sc('adm_bool adm_bool_' + (b ? 'y' : 'n'), b ? $adt.yes : $adt.no);
+ },
+ setPill: function (pill, probe) {
+ probe = probe || {};
+ let st = probe.status || 'unconfigured';
+ let lbl = {
+ ok: $adt.st_ok, error: $adt.st_error, disabled: $adt.st_disabled,
+ unconfigured: $adt.st_unconfigured, checking: $adt.st_checking
+ }[st] || st;
+ pill.attr('class', 'adm_pill adm_pill_' + st).text(lbl);
+ return pill;
+ },
+
+ /* Connectivity card with a live status pill + per-card refresh button. */
+ probeCard: function (grid, title, component, cfgRows, probe) {
+ let card = $$.dc('adm_card', grid);
+ let hd = $$.dc('adm_card_hd', card);
+ $$.s(title).appendTo(hd);
+ let pill = $$.sc('adm_pill').appendTo(hd);
+ let rbtn = $$.bbtn($adt.refresh, 'adm_btn').appendTo(hd);
+ let bd = $$.dc('adm_card_bd', card);
+ $adm.kvTable(bd, cfgRows);
+
+ let pf = $$.dc('adm_probe', bd);
+ let msg = $$.dc('adm_probe_msg', pf);
+ let met = $$.dc('adm_probe_metrics', pf);
+ let det = $$.dc('adm_probe_det', pf);
+ let dur = $$.dc('adm_probe_dur', pf);
+ let apply = function (p) {
+ p = p || {};
+ $adm.setPill(pill, p);
+ msg.text(p.message || '');
+ met.empty();
+ $.each(p.metrics || [], function (i, m) {
+ let row = $$.dc('adm_metric', met);
+ $$.sc('adm_metric_k').text(m.label || '').appendTo(row);
+ $$.sc('adm_metric_v').text(m.value == null ? '' : String(m.value)).appendTo(row);
+ });
+ det.text(p.detail || '');
+ dur.text(p.durationMs != null ? (p.durationMs + ' ms') : '');
+ };
+ apply(probe);
+
+ rbtn.click(function () {
+ $adm.setPill(pill, { status: 'checking' });
+ msg.text(''); met.empty(); det.text(''); dur.text('');
+ $ocms.postXT({
+ url: $ocms.url('admin/probe/' + component), success: function (r) {
+ apply(r.probe);
+ }, error: function () {
+ $adm.setPill(pill, { status: 'error' });
+ msg.text($adt.st_error);
+ }
+ });
+ });
+ return card;
+ },
+
+ /* ── individual cards ────────────────────────────────────────────────── */
+ sysCard: function (frm, info) {
+ let card = $$.dc('adm_card adm_card_wide', frm);
+ let hd = $$.dc('adm_card_hd', card);
+ $$.s($adt.host).appendTo(hd);
+ let env = $$.sc('adm_env').text(info.environment || '');
+ if (info.isTestDeployment === true) { env.aC('adm_env_test'); }
+ env.appendTo(hd);
+ let bd = $$.dc('adm_card_bd', card);
+ $adm.kvTable(bd, [
+ [$adt.machine, info.machineName],
+ [$adt.os, info.osDescription],
+ [$adt.framework, info.frameworkDescription],
+ [$adt.env, info.environment],
+ [$adt.testdep, $adm.yesNo(info.isTestDeployment === true)],
+ [$adt.pid, info.processId],
+ [$adt.since, info.processStartUtc ? fdt(info.processStartUtc) : ''],
+ [$adt.uptime, (info.uptimeHours != null ? (info.uptimeHours + ' ' + $adt.hours) : '')]
+ ]);
+ },
+ /* Non-refreshable widget: the one-shot startup self-test result captured at boot. */
+ startupCard: function (frm, sc) {
+ let card = $$.dc('adm_card adm_card_wide', frm);
+ let hd = $$.dc('adm_card_hd', card);
+ $$.s($adt.startup).appendTo(hd);
+ let bd = $$.dc('adm_card_bd', card);
+
+ if (!sc || sc.ran !== true) {
+ $adm.setPill($$.sc('adm_pill').appendTo(hd), { status: 'disabled' });
+ $$.dc('adm_note', bd).text($adt.startup_notrun);
+ return;
+ }
+
+ let items = sc.items || [];
+ let anyFail = false;
+ $.each(items, function (i, it) { if (it.enabled === true && it.ok !== true) { anyFail = true; } });
+ $adm.setPill($$.sc('adm_pill').appendTo(hd), { status: anyFail ? 'error' : 'ok' });
+
+ $adm.kvTable(bd, [
+ [$adt.startup_on, sc.machineName],
+ [$adt.startup_at, sc.completedUtc ? fdt(sc.completedUtc) : '']
+ ]);
+
+ let list = $$.dc('adm_checks', bd);
+ $.each(items, function (i, it) {
+ let row = $$.dc('adm_check', list);
+ $$.sc('adm_check_k').text($adt['chk_' + it.name] || it.name).appendTo(row);
+ let stt = it.enabled !== true ? 'skipped' : (it.ok === true ? 'ok' : 'fail');
+ let lbl = { ok: $adt.chk_ok, fail: $adt.chk_fail, skipped: $adt.chk_skipped }[stt];
+ $$.sc('adm_check_v adm_check_' + stt).text(lbl).appendTo(row);
+ });
+ },
+ dbCard: function (grid, d, probe) {
+ $adm.probeCard(grid, $adt.db, 'database', [
+ [$adt.configured, $adm.yesNo(d.configured === true)],
+ [$adt.server, d.server],
+ [$adt.catalog, d.catalog],
+ [$adt.login, d.userId]
+ ], probe);
+ },
+ mailCard: function (grid, e) {
+ let card = $$.dc('adm_card', grid);
+ let hd = $$.dc('adm_card_hd', card);
+ $$.s($adt.mail).appendTo(hd);
+ $adm.setPill($$.sc('adm_pill').appendTo(hd), { status: e.mailerEnabled === true ? 'ok' : 'disabled' });
+ let bd = $$.dc('adm_card_bd', card);
+ let rows = [
+ [$adt.mailer, $adm.yesNo(e.mailerEnabled === true)],
+ [$adt.baseurl, e.baseUrl],
+ [$adt.account, e.accountId],
+ [$adt.serverid, e.serverId],
+ [$adt.token, $adm.yesNo(e.tokenConfigured === true)],
+ [$adt.overrideActive, $adm.yesNo(e.overrideActive === true)]
+ ];
+ if (e.overrideActive === true) { rows.push([$adt.override, e.overrideRecipient]); }
+ $adm.kvTable(bd, rows);
+ let ft = $$.dc('adm_card_ft', card);
+ $$.bbtn($adt.testmail_btn, 'adm_btn adm_btn_primary').appendTo(ft).click($adm.testMailDlg);
+ },
+ blobCard: function (grid, b, probe) {
+ $adm.probeCard(grid, $adt.blob, 'blob', [
+ [$adt.enabled, $adm.yesNo(b.enabled === true)],
+ [$adt.configured, $adm.yesNo(b.configured === true)],
+ [$adt.invContainer, b.invoiceContainer],
+ [$adt.remContainer, b.reminderContainer]
+ ], probe);
+ },
+ mfrCard: function (grid, m, probe) {
+ $adm.probeCard(grid, $adt.mfr, 'mfr', [
+ [$adt.host_l, m.host],
+ [$adt.creds, $adm.yesNo(m.credentialsConfigured === true)],
+ [$adt.sync, $adm.yesNo(m.syncEnabled === true)]
+ ], probe);
+ },
+ kvCard: function (grid, k, probe) {
+ $adm.probeCard(grid, $adt.kv, 'keyvault', [
+ [$adt.vault, k.vaultUri],
+ [$adt.appname, k.appName],
+ [$adt.seccount, k.managedSecretCount],
+ [$adt.clientreg, $adm.yesNo(k.clientRegistered === true)]
+ ], probe);
+ },
+
+ /* ── test email ──────────────────────────────────────────────────────── */
+ testMailDlg: function () {
+ $ocms.dlgform([
+ { name: 'to', label: $adt.tm_to, type: 'email', required: true, value: ($ocms.auth.email || '') },
+ { name: 'subject', label: $adt.tm_subject, type: 'string', required: true, value: $adt.tm_default_subject },
+ { name: 'body', label: $adt.tm_body, type: 'text', required: true, value: $adt.tm_default_body }
+ ], {
+ title: $adt.testmail,
+ button: $adt.testmail_btn,
+ size: [420, 560],
+ addcontent: $$.dc('adm_note').text($adt.tm_hint),
+ url: $ocms.url('admin/testmail'),
+ typedvalues: true,
+ /* Runs inside jQuery's success dispatch — it must never throw, or postXT's
+ `complete` (which clears the page loading indicator) is skipped. */
+ success: function (r) {
+ let res = (r && r.result) || {};
+ alert(res.message || (res.sent === true ? $adt.tm_sent : $adt.tm_failed));
+ }
+ });
+ }
+};
+let $$adm = { init2: $adm.init2, auth: {} };
+export default $$adm;
diff --git a/Fuchs/wwwroot/web/fis.admin.de.min.js b/Fuchs/wwwroot/web/fis.admin.de.min.js
new file mode 100644
index 0000000..9219582
--- /dev/null
+++ b/Fuchs/wwwroot/web/fis.admin.de.min.js
@@ -0,0 +1 @@
+let $adt={mdl:"Administration",sub_info:"System",sub_status:"Status & Konnektivität",sub_tests:"Tests",startup:"Startup-Prüfungen",startup_notrun:"Die Startup-Prüfungen sind deaktiviert oder wurden noch nicht ausgeführt (Fuchs:StartupChecks:Enabled).",startup_on:"Host",startup_at:"Ausgeführt (UTC)",chk_ok:"OK",chk_fail:"Fehler",chk_skipped:"übersprungen",chk_KeyVault:"Azure Key Vault",chk_Database:"SQL-Datenbank",chk_MFR:"MFR (ERP)",chk_PdfLicense:"Spire.PDF-Lizenz",chk_Mailer:"E-Mail (Startup-Probe)",host:"Host / Server",machine:"Hostname",os:"Betriebssystem",framework:"Framework",env:"Umgebung",testdep:"Test-Deployment",pid:"Prozess-ID",uptime:"Laufzeit",since:"Start (UTC)",hours:"Std.",db:"SQL-Datenbank",mail:"E-Mail-Dienst",blob:"Azure Blob Storage",mfr:"MFR (ERP)",kv:"Azure Key Vault",server:"Server",catalog:"Datenbank",login:"Login",mailer:"Mailer aktiv",baseurl:"Base-URL",account:"Account",serverid:"Server-ID",token:"Token hinterlegt",override:"OverrideRecipient",overrideActive:"Umleitung aktiv",enabled:"Aktiviert",configured:"Konfiguriert",invContainer:"Rechnungs-Container",remContainer:"Mahnungs-Container",host_l:"Host",creds:"Zugangsdaten hinterlegt",sync:"Sync aktiv",vault:"Vault-URI",appname:"App-Präfix",seccount:"Verwaltete Secrets",clientreg:"Client registriert",duration:"Dauer",checked:"Geprüft",detail:"Detail",st_ok:"OK",st_error:"Fehler",st_disabled:"Deaktiviert",st_unconfigured:"Nicht konfiguriert",st_checking:"Prüfe…",refresh:"Aktualisieren",refreshAll:"Alle prüfen",yes:"Ja",no:"Nein",testmail:"Test-E-Mail",testmail_btn:"Test-E-Mail senden",tm_to:"Empfänger",tm_subject:"Betreff",tm_body:"Nachricht",tm_hint:"Der Versand nutzt die normale E-Mail-Pipeline; bei gesetztem OverrideRecipient wird die Nachricht dorthin umgeleitet.",tm_sent:"Test-E-Mail übergeben.",tm_failed:"Test-E-Mail konnte nicht gesendet werden.",tm_default_subject:"Fuchs Intranet – Test-E-Mail",tm_default_body:"Dies ist eine Test-E-Mail aus dem Administrationsbereich des Fuchs Intranet.",loadfail:"Der Systemstatus konnte nicht geladen werden."},$adm={init2:function(){$ocms.getScript([],(function(){$adm.init3()}))},init3:function(){$fis.cf(!0),$fis.lf(!0),$("#activemodule").text($adt.mdl),$adm.topbar();let e=$$.dc("admfrm",$("#contentframe")).ldng(1);$adm.load(e)},topbar:function(){return $("#topbar").ocmsmenu([{lbl:$adt.refreshAll,id:"adm_refresh_all",ico:"glyphicon glyphicon-refresh",fnc:function(){$adm.init3()}}])},load:function(e){$ocms.postXT({url:$ocms.url("admin/status"),success:function(t){e.empty(),$adm.render(e,t.info||{},t.probes||[])},error:function(){e.empty(),$$.dc("adm_err",e).text($adt.loadfail)},complete:function(){e.ldng(0)}})},render:function(e,t,a){let d={};$.each(a,(function(e,t){d[t.component]=t})),$$.dc("adm_sec",e).text($adt.sub_info),$adm.sysCard(e,t),$adm.startupCard(e,t.startupChecks),$$.dc("adm_sec",e).text($adt.sub_status);let r=$$.dc("adm_grid",e);$adm.dbCard(r,t.database||{},d.database),$adm.mailCard(r,t.email||{}),$adm.blobCard(r,t.blob||{},d.blob),$adm.mfrCard(r,t.mfr||{},d.mfr),$adm.kvCard(r,t.keyVault||{},d.keyvault)},kvTable:function(e,t){let a=$$.tbl().addClass("adm_kv");return $.each(t||[],(function(e,t){if(!t)return!0;let d=$$.tr(a);$$.td(d).addClass("k").text(null==t[0]?"":String(t[0]));let r=$$.td(d).addClass("v");t[1]instanceof jQuery?r.append(t[1]):r.text(null==t[1]?"":String(t[1]))})),e instanceof jQuery&&e.append(a),a},yesNo:function(e){return $$.sc("adm_bool adm_bool_"+(e?"y":"n"),e?$adt.yes:$adt.no)},setPill:function(e,t){let a=(t=t||{}).status||"unconfigured",d={ok:$adt.st_ok,error:$adt.st_error,disabled:$adt.st_disabled,unconfigured:$adt.st_unconfigured,checking:$adt.st_checking}[a]||a;return e.attr("class","adm_pill adm_pill_"+a).text(d),e},probeCard:function(e,t,a,d,r){let n=$$.dc("adm_card",e),i=$$.dc("adm_card_hd",n);$$.s(t).appendTo(i);let s=$$.sc("adm_pill").appendTo(i),o=$$.bbtn($adt.refresh,"adm_btn").appendTo(i),c=$$.dc("adm_card_bd",n);$adm.kvTable(c,d);let l=$$.dc("adm_probe",c),m=$$.dc("adm_probe_msg",l),u=$$.dc("adm_probe_metrics",l),_=$$.dc("adm_probe_det",l),p=$$.dc("adm_probe_dur",l),b=function(e){e=e||{},$adm.setPill(s,e),m.text(e.message||""),u.empty(),$.each(e.metrics||[],(function(e,t){let a=$$.dc("adm_metric",u);$$.sc("adm_metric_k").text(t.label||"").appendTo(a),$$.sc("adm_metric_v").text(null==t.value?"":String(t.value)).appendTo(a)})),_.text(e.detail||""),p.text(null!=e.durationMs?e.durationMs+" ms":"")};return b(r),o.click((function(){$adm.setPill(s,{status:"checking"}),m.text(""),u.empty(),_.text(""),p.text(""),$ocms.postXT({url:$ocms.url("admin/probe/"+a),success:function(e){b(e.probe)},error:function(){$adm.setPill(s,{status:"error"}),m.text($adt.st_error)}})})),n},sysCard:function(e,t){let a=$$.dc("adm_card adm_card_wide",e),d=$$.dc("adm_card_hd",a);$$.s($adt.host).appendTo(d);let r=$$.sc("adm_env").text(t.environment||"");!0===t.isTestDeployment&&r.aC("adm_env_test"),r.appendTo(d);let n=$$.dc("adm_card_bd",a);$adm.kvTable(n,[[$adt.machine,t.machineName],[$adt.os,t.osDescription],[$adt.framework,t.frameworkDescription],[$adt.env,t.environment],[$adt.testdep,$adm.yesNo(!0===t.isTestDeployment)],[$adt.pid,t.processId],[$adt.since,t.processStartUtc?fdt(t.processStartUtc):""],[$adt.uptime,null!=t.uptimeHours?t.uptimeHours+" "+$adt.hours:""]])},startupCard:function(e,t){let a=$$.dc("adm_card adm_card_wide",e),d=$$.dc("adm_card_hd",a);$$.s($adt.startup).appendTo(d);let r=$$.dc("adm_card_bd",a);if(!t||!0!==t.ran)return $adm.setPill($$.sc("adm_pill").appendTo(d),{status:"disabled"}),void $$.dc("adm_note",r).text($adt.startup_notrun);let n=t.items||[],i=!1;$.each(n,(function(e,t){!0===t.enabled&&!0!==t.ok&&(i=!0)})),$adm.setPill($$.sc("adm_pill").appendTo(d),{status:i?"error":"ok"}),$adm.kvTable(r,[[$adt.startup_on,t.machineName],[$adt.startup_at,t.completedUtc?fdt(t.completedUtc):""]]);let s=$$.dc("adm_checks",r);$.each(n,(function(e,t){let a=$$.dc("adm_check",s);$$.sc("adm_check_k").text($adt["chk_"+t.name]||t.name).appendTo(a);let d=!0!==t.enabled?"skipped":!0===t.ok?"ok":"fail",r={ok:$adt.chk_ok,fail:$adt.chk_fail,skipped:$adt.chk_skipped}[d];$$.sc("adm_check_v adm_check_"+d).text(r).appendTo(a)}))},dbCard:function(e,t,a){$adm.probeCard(e,$adt.db,"database",[[$adt.configured,$adm.yesNo(!0===t.configured)],[$adt.server,t.server],[$adt.catalog,t.catalog],[$adt.login,t.userId]],a)},mailCard:function(e,t){let a=$$.dc("adm_card",e),d=$$.dc("adm_card_hd",a);$$.s($adt.mail).appendTo(d),$adm.setPill($$.sc("adm_pill").appendTo(d),{status:!0===t.mailerEnabled?"ok":"disabled"});let r=$$.dc("adm_card_bd",a),n=[[$adt.mailer,$adm.yesNo(!0===t.mailerEnabled)],[$adt.baseurl,t.baseUrl],[$adt.account,t.accountId],[$adt.serverid,t.serverId],[$adt.token,$adm.yesNo(!0===t.tokenConfigured)],[$adt.overrideActive,$adm.yesNo(!0===t.overrideActive)]];!0===t.overrideActive&&n.push([$adt.override,t.overrideRecipient]),$adm.kvTable(r,n);let i=$$.dc("adm_card_ft",a);$$.bbtn($adt.testmail_btn,"adm_btn adm_btn_primary").appendTo(i).click($adm.testMailDlg)},blobCard:function(e,t,a){$adm.probeCard(e,$adt.blob,"blob",[[$adt.enabled,$adm.yesNo(!0===t.enabled)],[$adt.configured,$adm.yesNo(!0===t.configured)],[$adt.invContainer,t.invoiceContainer],[$adt.remContainer,t.reminderContainer]],a)},mfrCard:function(e,t,a){$adm.probeCard(e,$adt.mfr,"mfr",[[$adt.host_l,t.host],[$adt.creds,$adm.yesNo(!0===t.credentialsConfigured)],[$adt.sync,$adm.yesNo(!0===t.syncEnabled)]],a)},kvCard:function(e,t,a){$adm.probeCard(e,$adt.kv,"keyvault",[[$adt.vault,t.vaultUri],[$adt.appname,t.appName],[$adt.seccount,t.managedSecretCount],[$adt.clientreg,$adm.yesNo(!0===t.clientRegistered)]],a)},testMailDlg:function(){$ocms.dlgform([{name:"to",label:$adt.tm_to,type:"email",required:!0,value:$ocms.auth.email||""},{name:"subject",label:$adt.tm_subject,type:"string",required:!0,value:$adt.tm_default_subject},{name:"body",label:$adt.tm_body,type:"text",required:!0,value:$adt.tm_default_body}],{title:$adt.testmail,button:$adt.testmail_btn,size:[420,560],addcontent:$$.dc("adm_note").text($adt.tm_hint),url:$ocms.url("admin/testmail"),typedvalues:!0,success:function(e){let t=e&&e.result||{};alert(t.message||(!0===t.sent?$adt.tm_sent:$adt.tm_failed))}})}},$$adm={init2:$adm.init2,auth:{}};export default $$adm;
\ No newline at end of file
diff --git a/Fuchs/wwwroot/web/fis.admin.min.css b/Fuchs/wwwroot/web/fis.admin.min.css
new file mode 100644
index 0000000..ba7f0c9
--- /dev/null
+++ b/Fuchs/wwwroot/web/fis.admin.min.css
@@ -0,0 +1 @@
+.admfrm{padding:1.5rem}.admfrm .adm_sec{font-size:1.2rem;font-weight:700;color:#1b4379;margin:1.5rem 0 .75rem;border-bottom:2px solid #1b4379;padding-bottom:.25rem}.admfrm .adm_sec:first-child{margin-top:0}.admfrm .adm_err{padding:1rem;color:#b00020;font-weight:700}.admfrm .adm_grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(22rem,1fr));gap:1rem;align-items:start}.admfrm .adm_card{border:1px solid #d5d5d5;border-radius:.4rem;background:#fff;box-shadow:0 1px 3px rgba(50,50,50,.12);overflow:hidden}.admfrm .adm_card.adm_card_wide{grid-column:1/-1}.admfrm .adm_card_hd{display:flex;align-items:center;gap:.5rem;padding:.6rem .85rem;background:#1b4379;color:#fff;font-weight:700}.admfrm .adm_card_hd>span:first-child{flex:1 1 auto}.admfrm .adm_card_bd{padding:.6rem .85rem}.admfrm .adm_card_ft{padding:.5rem .85rem .75rem;text-align:right}.admfrm table.adm_kv{border-collapse:collapse;width:100%}.admfrm table.adm_kv td{padding:.25rem .35rem;border-bottom:1px solid #eee;vertical-align:top;font-size:.92rem}.admfrm table.adm_kv td.k{color:#666;white-space:nowrap;width:40%}.admfrm table.adm_kv td.v{word-break:break-word}.admfrm table.adm_kv tr:last-child td{border-bottom:none}.admfrm .adm_probe{margin-top:.6rem;padding-top:.5rem;border-top:1px dashed #ddd;font-size:.88rem}.admfrm .adm_probe .adm_probe_msg{font-weight:600}.admfrm .adm_probe .adm_probe_det{color:#555;word-break:break-word;margin-top:.15rem}.admfrm .adm_probe .adm_probe_dur{color:#999;margin-top:.15rem;font-size:.8rem}.admfrm .adm_probe .adm_probe_metrics{margin-top:.35rem}.admfrm .adm_probe .adm_probe_metrics .adm_metric{display:flex;justify-content:space-between;gap:.5rem;padding:.1rem 0;border-bottom:1px dotted #eee}.admfrm .adm_probe .adm_probe_metrics .adm_metric:last-child{border-bottom:none}.admfrm .adm_probe .adm_probe_metrics .adm_metric .adm_metric_k{color:#555;word-break:break-word}.admfrm .adm_probe .adm_probe_metrics .adm_metric .adm_metric_v{font-weight:600;white-space:nowrap}.admfrm .adm_checks{margin-top:.5rem}.admfrm .adm_checks .adm_check{display:flex;justify-content:space-between;align-items:center;gap:.5rem;padding:.25rem 0;border-bottom:1px solid #eee}.admfrm .adm_checks .adm_check:last-child{border-bottom:none}.admfrm .adm_checks .adm_check .adm_check_k{color:#333}.admfrm .adm_checks .adm_check .adm_check_v{font-weight:700;font-size:.8rem;padding:.05rem .5rem;border-radius:.25rem;white-space:nowrap}.admfrm .adm_checks .adm_check .adm_check_ok{background:#e2f3da;color:#2f6d18}.admfrm .adm_checks .adm_check .adm_check_fail{background:#f3ded9;color:#c0341d}.admfrm .adm_checks .adm_check .adm_check_skipped{background:#ececec;color:#777}.admfrm .adm_pill{display:inline-block;padding:.1rem .55rem;border-radius:1rem;font-size:.78rem;font-weight:700;color:#fff;background:#999;white-space:nowrap}.admfrm .adm_pill_ok{background:#56a532}.admfrm .adm_pill_error{background:#c0341d}.admfrm .adm_pill_disabled{background:#888}.admfrm .adm_pill_unconfigured{background:#d69100}.admfrm .adm_pill_checking{background:#2a72c4}.admfrm .adm_bool{display:inline-block;padding:0 .4rem;border-radius:.25rem;font-size:.8rem;font-weight:700}.admfrm .adm_bool_y{background:#e2f3da;color:#2f6d18}.admfrm .adm_bool_n{background:#f3e0dd;color:#9c2a17}.admfrm .adm_env{font-size:.8rem;font-weight:400;padding:.1rem .5rem;border-radius:.25rem;background:rgba(255,255,255,.25)}.admfrm .adm_env.adm_env_test{background:#13a143}.admfrm .adm_btn{cursor:pointer;border-radius:.28rem;padding:.2rem .6rem;font-size:.85rem;border:1px solid #ababab;background-color:#fff;color:#333}.admfrm .adm_btn.adm_btn_primary{background-color:#56a532;border-color:rgb(69.68,133.688372093,40.511627907);color:#fff}.admfrm .adm_card_hd .adm_btn{background-color:rgba(255,255,255,.15);color:#fff;border-color:rgba(255,255,255,.4)}.adm_note{margin-top:.75rem;padding:.5rem .6rem;background:#f3f6fb;border-left:3px solid #1b4379;font-size:.85rem;color:#444}
\ No newline at end of file
diff --git a/Fuchs/wwwroot/web/fis.bam.de.js b/Fuchs/wwwroot/web/fis.bam.de.js
index 23b8969..bed80c5 100644
--- a/Fuchs/wwwroot/web/fis.bam.de.js
+++ b/Fuchs/wwwroot/web/fis.bam.de.js
@@ -18,10 +18,21 @@ let $bct = {
},
in: 'Rechnungsnummer',
bt: 'Buchungstexte',
- bv: 'Buchungswert (volle €)'
+ bv: 'Buchungswert (volle €)',
+ mbe: 'Manuelle Buchung erfassen',
+ mbc: 'Manuelle Buchung ändern',
+ mbd: 'Manuelle Buchung löschen',
+ mbdc: 'Manuelle Buchung wirklich löschen?\nDieser Vorgang kann nicht rückgängig gemacht werden.'
};
let $bcol = {
+ man: new fields_definition('Manuelle Buchung', 'Manuelle Buchungen', [
+ { name: 'taID', type: 'hidden' },
+ { name: 'ValueDate', label: 'Valuta', type: 'date', required: true },
+ { name: 'Amount', label: 'Betrag', type: 'number', precision: '0.01', required: true },
+ { name: 'NameOfPayer', label: 'Name', type: 'string' },
+ { name: 'SepaRemittanceInformation', label: 'Verwendungszweck', type: 'string' }
+ ]),
qtl: new fields_definition('Kontobericht', 'Kontoberichte', [
{ name: 'InvoiceId', label: 'RechnungsNr', type: 'string' },
{ name: 'ValueDate', label: 'Valuta', type: 'date' },
@@ -77,11 +88,16 @@ let $bam = {
let fds = bool(ix.fds, false), id = ix.taID, m = [];
m.push({ lbl: $bct.smd, fnc: () => { $bam.smd(id); } });
m.push({ lbl: $bct.ati, fnc: () => { $bam.ati(id); } });
+ if (bool(ix.IsManual, false) === true) {
+ m.push({ lbl: $bct.mbc, fnc: () => { $bam.mbc(id); } });
+ m.push({ lbl: $bct.mbd, fnc: () => { $bam.mbd(id); } });
+ }
return $('#topbar').ocmsmenu(m);
}, eM : (r, re, opt) => {
let m = [];
if ($fis.isAuth('fds_bam', 2) === true) {
m.push({ lbl: $bct.upl, fnc: $bam.ubs});
+ m.push({ lbl: $bct.mbe, fnc: $bam.mbe});
}
if (bool(r, false) === true) {
m.push({ lbl: $bct.rel, fnc: $bam.renderLst });
@@ -353,6 +369,32 @@ let $bam = {
}
}
});
+ }, mbe: () => {
+ $bam.manForm({});
+ }, mbc: (taid) => {
+ $ocms.postXT({
+ url: $ocms.url('bam/mget'), data: { taid: taid }, success: (dta) => {
+ $bam.manForm(dta || {});
+ }
+ });
+ }, mbd: (taid) => {
+ if (confirm($bct.mbdc)) {
+ $ocms.postXT({
+ url: $ocms.url('bam/mdel'), data: { taid: taid }, success: () => {
+ $bam.renderLst();
+ }
+ });
+ }
+ }, manForm: (dta) => {
+ let flds = $bcol.man.clone().applyValues(dta || {});
+ $ocms.dlgform(flds, {
+ title: (ne(dta.taID, '') !== '') ? $bct.mbc : $bct.mbe,
+ url: $ocms.url('bam/man'),
+ typedvalues: true,
+ success: () => {
+ $bam.renderLst();
+ }
+ });
}
}
diff --git a/Fuchs/wwwroot/web/fis.bam.de.min.js b/Fuchs/wwwroot/web/fis.bam.de.min.js
index 7be85c1..d4f518e 100644
--- a/Fuchs/wwwroot/web/fis.bam.de.min.js
+++ b/Fuchs/wwwroot/web/fis.bam.de.min.js
@@ -1 +1 @@
-let $bct={wk:"Woche",nd:"Keine Daten gefunden.",h:"Uhr",mdl:"BankBuchungen",upl:"BuchungsExport hochladen",rel:"Neu Laden",smd:"Buchung als erledigt markieren",smdc:"Buchung wirklich als erledigt markieren?\nDie Buchung wird nicht mehr in den auffälligen Buchungen angezeigt.",ati:"Buchung einer Rechnung zuordnen",ni:"Es wurden keine Rechnungen mit dieser ID gefunden.",ino:"Rechnungsnummer",fi:"Folgende Rechnungen wurden gefunden",atic:"Buchung wirklich der Rechnung {0} zuordnen?",dqb:"Auffällige Zahlungen anzeigen",iov:{all:"Buchungsübersicht (alle)","":"Buchungsübersicht"},in:"Rechnungsnummer",bt:"Buchungstexte",bv:"Buchungswert (volle €)"},$bcol={qtl:new fields_definition("Kontobericht","Kontoberichte",[{name:"InvoiceId",label:"RechnungsNr",type:"string"},{name:"ValueDate",label:"Valuta",type:"date"},{name:"InvoiceBalance",label:"Rechnungsbetrag",type:"string"},{name:"IsCanceled",label:"Storno",type:"bool"},{name:"Amount",label:"Gutschrift",type:"string"},{name:"Skonto",label:"Skonto ?",type:"bool"},{name:"Deviation",label:"Abweichung [%]",type:"bool"},{name:"AccountNumberOfPayer",label:"IBAN",type:"string"},{name:"NameOfPayer",label:"Name",type:"string"},{name:"SepaRemittanceInformation",label:"Verwendungszweck",type:"string"},{name:"EndToEndReference",label:"Referenz",type:"string"}]),bsu:new fields_definition("Kontobericht","Kontoberichte",[{name:"bsu",label:"Export der Buchungen",type:"file",required:!0,prop:{multiple:!0}}])},gi=(e,t)=>$$.sc(`glyphicon glyphicon-${e}`).aC(t),$bam={init2:function(e,t){e=e||"bam",t=t||{},$ocms.getScript([],(function(){$bam.init3(e,t)}))},init3:async function(e,t){$fis.cf(!0);let n=$fis.lf(!0);$bam.eM(),$("#activemodule").text($bct.mdl),await $fis.prepAuth("fds_bam,fds_inv,fds_reminder");let a=[(async()=>{!0===$fis.isAuth("fds_bam",1)&&($bam.prepLst(""),n.aC("fix"))})(),(async()=>{!0===$fis.isAuth("fds_bam",1)&&$bam.renderLst(!1)})(),new Promise(((e,t)=>{}))];await Promise.all(a)},iMn:e=>{bool(e.fds,!1);let t=e.taID,n=[];return n.push({lbl:$bct.smd,fnc:()=>{$bam.smd(t)}}),n.push({lbl:$bct.ati,fnc:()=>{$bam.ati(t)}}),$("#topbar").ocmsmenu(n)},eM:(e,t,n)=>{let a=[];return!0===$fis.isAuth("fds_bam",2)&&a.push({lbl:$bct.upl,fnc:$bam.ubs}),!0===bool(e,!1)&&a.push({lbl:$bct.rel,fnc:$bam.renderLst}),$("#topbar").ocmsmenu(a)},prepLst:function(e){let t=new Date,n=$fis.lf(!0).ldng(1),a=new Date("2021-01-01");$fis.frm_list().IN((function(){}));$$.i({placeholder:$bct.in}).appendTo($$.dc("mth ivn",n)).enterKey((function(e){let t=$(this),n=t.val()||"";e.stopPropagation(),t.parent().siblings().rC("selected"),n.length>3&&(t.parent().aC("selected"),$bam.renderbt("i:"+n,"s"),t.val(""))})),$$.i({placeholder:$bct.bt}).appendTo($$.dc("mth ivn",n)).enterKey((function(e){let t=$(this),n=t.val()||"";e.stopPropagation(),t.parent().siblings().rC("selected"),n.length>3&&(t.parent().aC("selected"),$bam.renderbt("b:"+n,"s"),t.val(""))})),$$.i({placeholder:$bct.bv}).appendTo($$.dc("mth ivn",n)).enterKey((function(e){let t=$(this),n=t.val()||"";e.stopPropagation(),t.parent().siblings().rC("selected"),n.length>3&&(t.parent().aC("selected"),$bam.renderbt(`v:${n}`,"s"),t.val(""))})),$$.dc("mth oreq",n).text($bct.dqb).click((function(e){let t=$(this);e.stopPropagation(),t.siblings().rC("selected"),!0===t.is(".selected")&&(t.tC("selected"),$bam.renderLst(!1)),t.aC("selected")}));n.append("
");let l=$$.dc("mthl",n),i=t.getFullYear(),c=t.getMonth()+1;for(let t=a.getFullYear();t<=i;t++){let n=$$.dc("yr").prependTo(l).text(`${$bct.iov[e]} - ${t.toString()}`).toggleClass("selected",t===i);n.click({yr:t},(function(e){e.stopPropagation(),n.siblings().rC("selected"),n.aC("selected")}));let s=$$.dc("mfrm",n);for(let n=0;n<(t!==i?12:c);n++){a=new Date(t,n,1);let l=$$.dc("mth").prependTo(s).text(`${$bct.iov[e]} - ${fdt(a,"MMM yyyy")}`);l.click({yr:t,mt:n},(function(e){if(e.stopPropagation(),l.siblings().rC("selected"),!0===l.is(".selected")){l.tC("selected");let t=fdt(new Date(e.data.yr,e.data.mt,1),"yy-MM-dd");$bam.renderbt(t,"m")}l.aC("selected")}));let i=getMonday(a),c=new Date(a);c.setMonth(c.getMonth()+1),c.setDate(0),c=getMonday(c);let d=$$.dc("wfrm",l);for(;i<=c;){let e=$$.dc("wk",d).text(`${$bct.wk||"W"} ${fdt(i,"dd.MM.yy")}`);e.click({rd:new Date(i)},(function(t){t.stopPropagation();let n=fdt(t.data.rd,"yy-MM-dd");$bam.renderbt(n,"w"),l.siblings().rC("selected").find(".wk").rC("selected"),l.aC("selected").find(".wk").rC("selected"),e.aC("selected")})),i.setDate(i.getDate()+7)}}}n.ldng(0)},renderbt:function(e,t){let n=$fis.frm_list().ldng(1),a=$$.dc("invfrm",n).aC("md"+t),l=$fis.lf();$ocms.postXT({url:$ocms.url("bam/btl"),data:{mode:t,tgt:e},success:e=>{l.rC("fix").aC("hd"),$$.dc("ovhd",a).append($$.s(e.admin.title)).appendIf($$.sc("note",e.admin.note),""!==ne(e.admin.note,""));let t=$$.tblset({},a),n=$bcol.qtl,i=$$.tr(t.hd);$$.th(i);$.each(n.fields||[],((e,t)=>{$$.th(i).text(t.label),"vat"===t.name&&$$.th(i)}));let c=!1;$.each(e.bank||[],((e,a)=>{let i=$$.tr(t.bdy).tC("alt",c);i.click((function(){l.rC("fix").aC("hd"),i.tC("selected").siblings().rC("selected").find("td.av").rC("av"),i.find("td.av").rC("av")}));$$.td(i,{class:"raux"});$.each(n.fields||[],((e,t)=>{let n=$$.td(i).aC(t.dtype),l=a[t.name];if("function"==typeof t.dfnc)t.dfnc.call(n,l,a);else switch(t.type||""){case"date":n.text(fdt(a[t.name],"dd.MM.yy"));break;case"datetime":n.text(fdt(a[t.name]));break;case"html":n.append($$.dc("ctw").html(l)),n.append($$.dc("ttip").html(l));break;default:n.text(a[t.name])}switch(typeof t.title){case"function":t.title.call(n,a);break;case"string":n.attr("title",cs.title)}}))}))},complete:()=>{n.ldng(0)}})},renderLst:function(){let e=$fis.frm_list(!0,!0).ldng(1),t=$$.dc("bamfrm",e).aC("mdl"),n=$fis.lf();$bam.eM(!0),$ocms.postXT({url:$ocms.url("bam/qtl"),data:{mode:"l"},success:e=>{n.rC("fix").aC("hd"),$$.dc("ovhd",t).append($$.s(e.admin.title)).appendIf($$.sc("note",e.admin.note),""!==ne(e.admin.note,""));let a=$$.tblset({},t),l=$bcol.qtl,i=$$.tr(a.hd);$$.th(i);$.each(l.fields||[],((e,t)=>{$$.th(i).text(t.label)})),$.each(e.bs||[],((e,t)=>{let i=$$.tr(a.bdy,{id:`bt${t.taID}`});i.click((function(){n.rC("fix").aC("hd"),i.toggleClass("selected").siblings().rC("selected").find("td.av").rC("av"),i.find("td.av").rC("av"),!0===i.is(".selected")?$bam.iMn(t):$bam.eM(!0)}));$$.td(i,{class:"raux"});$.each(l.fields||[],((e,n)=>{let a=$$.td(i).aC(n.dtype);"select"===(n.type||"")?a.text((n.url||{})[t[n.name]]||""):a.text(t[n.name])}))}))},complete:()=>{e.ldng(0)}})},ubs:function(){$ocms.dlgform($bcol.bsu,{title:$bcol.bsu.label_sng||"",submit:function(e){var t=$(this).ldng(1),n=new FormData;let a=t.find(':input[name="bsu"]');a.length>0&&a[0].files.length>0?($.each(a[0].files,(function(e,t){n.append("bsu",t)})),$ocms.postXT({url:$ocms.url("bam/up"),data:n,success:function(e){t.trigger("modal_close")},error:function(){alert($t.l17)},complete:function(){t.ldng(0),$bam.renderLst()},timeout:0})):(options.success.call(this,n),t.trigger("modal_close"))},typedvalues:!0})},smd:e=>{confirm($bct.smdc)&&$ocms.postXT({url:$ocms.url("bam/smd"),data:{taid:e},success:t=>{$(`#bt${e}`).aC("mdone")}})},ati:e=>{let t=$$.dc("form"),n=$$.dc("form-body",t),a=$$.dc("form-group",n),l=($$.lbl($bct.ino,{for:"rno"}).appendTo(a),$$.i({id:"rno",placeholder:"Rechnungs-Nummer"}).appendTo(a)),i=$$.dc("rfrm bam",n);l.change((function(e){$ocms.postXT({url:$ocms.url("bam/vfi"),data:{invid:l.val()},success:e=>{i.empty(),e.length>0?($$.dc("nfo",i,$bct.fi),$.each(e,(function(e,t){let n=$$.dc("rinv",i,t.InvoiceId).data("inv",t).click((function(e){$(this).addClass("selected").siblings(".rinv").removeClass("selected")}));$$.dc("invsta",n).rwText(t.SendToAddress)}))):i.text($bct.ni)}})})),$ocms.dlg(t,{title:$bct.ati,size:[500,700],confirm:function(t){let n=$(this),a=n.find(".rinv.selected:first");if(1===a.length){let t=a.data("inv")||{};confirm(string($bct.atic,[t.InvoiceId]))&&$ocms.postXT({url:$ocms.url("bam/ati"),data:{taid:e,iid:t.Id},success:t=>{$(`#bt${e}`).aC("mdone"),n.trigger("modal_close")}})}}})}},$$bam={init2:$bam.init2,auth:{}};export default $$bam;
\ No newline at end of file
+let $bct={wk:"Woche",nd:"Keine Daten gefunden.",h:"Uhr",mdl:"BankBuchungen",upl:"BuchungsExport hochladen",rel:"Neu Laden",smd:"Buchung als erledigt markieren",smdc:"Buchung wirklich als erledigt markieren?\nDie Buchung wird nicht mehr in den auffälligen Buchungen angezeigt.",ati:"Buchung einer Rechnung zuordnen",ni:"Es wurden keine Rechnungen mit dieser ID gefunden.",ino:"Rechnungsnummer",fi:"Folgende Rechnungen wurden gefunden",atic:"Buchung wirklich der Rechnung {0} zuordnen?",dqb:"Auffällige Zahlungen anzeigen",iov:{all:"Buchungsübersicht (alle)","":"Buchungsübersicht"},in:"Rechnungsnummer",bt:"Buchungstexte",bv:"Buchungswert (volle €)",mbe:"Manuelle Buchung erfassen",mbc:"Manuelle Buchung ändern",mbd:"Manuelle Buchung löschen",mbdc:"Manuelle Buchung wirklich löschen?\nDieser Vorgang kann nicht rückgängig gemacht werden."},$bcol={man:new fields_definition("Manuelle Buchung","Manuelle Buchungen",[{name:"taID",type:"hidden"},{name:"ValueDate",label:"Valuta",type:"date",required:!0},{name:"Amount",label:"Betrag",type:"number",precision:"0.01",required:!0},{name:"NameOfPayer",label:"Name",type:"string"},{name:"SepaRemittanceInformation",label:"Verwendungszweck",type:"string"}]),qtl:new fields_definition("Kontobericht","Kontoberichte",[{name:"InvoiceId",label:"RechnungsNr",type:"string"},{name:"ValueDate",label:"Valuta",type:"date"},{name:"InvoiceBalance",label:"Rechnungsbetrag",type:"string"},{name:"IsCanceled",label:"Storno",type:"bool"},{name:"Amount",label:"Gutschrift",type:"string"},{name:"Skonto",label:"Skonto ?",type:"bool"},{name:"Deviation",label:"Abweichung [%]",type:"bool"},{name:"AccountNumberOfPayer",label:"IBAN",type:"string"},{name:"NameOfPayer",label:"Name",type:"string"},{name:"SepaRemittanceInformation",label:"Verwendungszweck",type:"string"},{name:"EndToEndReference",label:"Referenz",type:"string"}]),bsu:new fields_definition("Kontobericht","Kontoberichte",[{name:"bsu",label:"Export der Buchungen",type:"file",required:!0,prop:{multiple:!0}}])},gi=(e,t)=>$$.sc(`glyphicon glyphicon-${e}`).aC(t),$bam={init2:function(e,t){e=e||"bam",t=t||{},$ocms.getScript([],(function(){$bam.init3(e,t)}))},init3:async function(e,t){$fis.cf(!0);let n=$fis.lf(!0);$bam.eM(),$("#activemodule").text($bct.mdl),await $fis.prepAuth("fds_bam,fds_inv,fds_reminder");let a=[(async()=>{!0===$fis.isAuth("fds_bam",1)&&($bam.prepLst(""),n.aC("fix"))})(),(async()=>{!0===$fis.isAuth("fds_bam",1)&&$bam.renderLst(!1)})(),new Promise(((e,t)=>{}))];await Promise.all(a)},iMn:e=>{bool(e.fds,!1);let t=e.taID,n=[];return n.push({lbl:$bct.smd,fnc:()=>{$bam.smd(t)}}),n.push({lbl:$bct.ati,fnc:()=>{$bam.ati(t)}}),!0===bool(e.IsManual,!1)&&(n.push({lbl:$bct.mbc,fnc:()=>{$bam.mbc(t)}}),n.push({lbl:$bct.mbd,fnc:()=>{$bam.mbd(t)}})),$("#topbar").ocmsmenu(n)},eM:(e,t,n)=>{let a=[];return!0===$fis.isAuth("fds_bam",2)&&(a.push({lbl:$bct.upl,fnc:$bam.ubs}),a.push({lbl:$bct.mbe,fnc:$bam.mbe})),!0===bool(e,!1)&&a.push({lbl:$bct.rel,fnc:$bam.renderLst}),$("#topbar").ocmsmenu(a)},prepLst:function(e){let t=new Date,n=$fis.lf(!0).ldng(1),a=new Date("2021-01-01");$fis.frm_list().IN((function(){}));$$.i({placeholder:$bct.in}).appendTo($$.dc("mth ivn",n)).enterKey((function(e){let t=$(this),n=t.val()||"";e.stopPropagation(),t.parent().siblings().rC("selected"),n.length>3&&(t.parent().aC("selected"),$bam.renderbt("i:"+n,"s"),t.val(""))})),$$.i({placeholder:$bct.bt}).appendTo($$.dc("mth ivn",n)).enterKey((function(e){let t=$(this),n=t.val()||"";e.stopPropagation(),t.parent().siblings().rC("selected"),n.length>3&&(t.parent().aC("selected"),$bam.renderbt("b:"+n,"s"),t.val(""))})),$$.i({placeholder:$bct.bv}).appendTo($$.dc("mth ivn",n)).enterKey((function(e){let t=$(this),n=t.val()||"";e.stopPropagation(),t.parent().siblings().rC("selected"),n.length>3&&(t.parent().aC("selected"),$bam.renderbt(`v:${n}`,"s"),t.val(""))})),$$.dc("mth oreq",n).text($bct.dqb).click((function(e){let t=$(this);e.stopPropagation(),t.siblings().rC("selected"),!0===t.is(".selected")&&(t.tC("selected"),$bam.renderLst(!1)),t.aC("selected")}));n.append("
");let l=$$.dc("mthl",n),c=t.getFullYear(),i=t.getMonth()+1;for(let t=a.getFullYear();t<=c;t++){let n=$$.dc("yr").prependTo(l).text(`${$bct.iov[e]} - ${t.toString()}`).toggleClass("selected",t===c);n.click({yr:t},(function(e){e.stopPropagation(),n.siblings().rC("selected"),n.aC("selected")}));let s=$$.dc("mfrm",n);for(let n=0;n<(t!==c?12:i);n++){a=new Date(t,n,1);let l=$$.dc("mth").prependTo(s).text(`${$bct.iov[e]} - ${fdt(a,"MMM yyyy")}`);l.click({yr:t,mt:n},(function(e){if(e.stopPropagation(),l.siblings().rC("selected"),!0===l.is(".selected")){l.tC("selected");let t=fdt(new Date(e.data.yr,e.data.mt,1),"yy-MM-dd");$bam.renderbt(t,"m")}l.aC("selected")}));let c=getMonday(a),i=new Date(a);i.setMonth(i.getMonth()+1),i.setDate(0),i=getMonday(i);let d=$$.dc("wfrm",l);for(;c<=i;){let e=$$.dc("wk",d).text(`${$bct.wk||"W"} ${fdt(c,"dd.MM.yy")}`);e.click({rd:new Date(c)},(function(t){t.stopPropagation();let n=fdt(t.data.rd,"yy-MM-dd");$bam.renderbt(n,"w"),l.siblings().rC("selected").find(".wk").rC("selected"),l.aC("selected").find(".wk").rC("selected"),e.aC("selected")})),c.setDate(c.getDate()+7)}}}n.ldng(0)},renderbt:function(e,t){let n=$fis.frm_list().ldng(1),a=$$.dc("invfrm",n).aC("md"+t),l=$fis.lf();$ocms.postXT({url:$ocms.url("bam/btl"),data:{mode:t,tgt:e},success:e=>{l.rC("fix").aC("hd"),$$.dc("ovhd",a).append($$.s(e.admin.title)).appendIf($$.sc("note",e.admin.note),""!==ne(e.admin.note,""));let t=$$.tblset({},a),n=$bcol.qtl,c=$$.tr(t.hd);$$.th(c);$.each(n.fields||[],((e,t)=>{$$.th(c).text(t.label),"vat"===t.name&&$$.th(c)}));let i=!1;$.each(e.bank||[],((e,a)=>{let c=$$.tr(t.bdy).tC("alt",i);c.click((function(){l.rC("fix").aC("hd"),c.tC("selected").siblings().rC("selected").find("td.av").rC("av"),c.find("td.av").rC("av")}));$$.td(c,{class:"raux"});$.each(n.fields||[],((e,t)=>{let n=$$.td(c).aC(t.dtype),l=a[t.name];if("function"==typeof t.dfnc)t.dfnc.call(n,l,a);else switch(t.type||""){case"date":n.text(fdt(a[t.name],"dd.MM.yy"));break;case"datetime":n.text(fdt(a[t.name]));break;case"html":n.append($$.dc("ctw").html(l)),n.append($$.dc("ttip").html(l));break;default:n.text(a[t.name])}switch(typeof t.title){case"function":t.title.call(n,a);break;case"string":n.attr("title",cs.title)}}))}))},complete:()=>{n.ldng(0)}})},renderLst:function(){let e=$fis.frm_list(!0,!0).ldng(1),t=$$.dc("bamfrm",e).aC("mdl"),n=$fis.lf();$bam.eM(!0),$ocms.postXT({url:$ocms.url("bam/qtl"),data:{mode:"l"},success:e=>{n.rC("fix").aC("hd"),$$.dc("ovhd",t).append($$.s(e.admin.title)).appendIf($$.sc("note",e.admin.note),""!==ne(e.admin.note,""));let a=$$.tblset({},t),l=$bcol.qtl,c=$$.tr(a.hd);$$.th(c);$.each(l.fields||[],((e,t)=>{$$.th(c).text(t.label)})),$.each(e.bs||[],((e,t)=>{let c=$$.tr(a.bdy,{id:`bt${t.taID}`});c.click((function(){n.rC("fix").aC("hd"),c.toggleClass("selected").siblings().rC("selected").find("td.av").rC("av"),c.find("td.av").rC("av"),!0===c.is(".selected")?$bam.iMn(t):$bam.eM(!0)}));$$.td(c,{class:"raux"});$.each(l.fields||[],((e,n)=>{let a=$$.td(c).aC(n.dtype);"select"===(n.type||"")?a.text((n.url||{})[t[n.name]]||""):a.text(t[n.name])}))}))},complete:()=>{e.ldng(0)}})},ubs:function(){$ocms.dlgform($bcol.bsu,{title:$bcol.bsu.label_sng||"",submit:function(e){var t=$(this).ldng(1),n=new FormData;let a=t.find(':input[name="bsu"]');a.length>0&&a[0].files.length>0?($.each(a[0].files,(function(e,t){n.append("bsu",t)})),$ocms.postXT({url:$ocms.url("bam/up"),data:n,success:function(e){t.trigger("modal_close")},error:function(){alert($t.l17)},complete:function(){t.ldng(0),$bam.renderLst()},timeout:0})):(options.success.call(this,n),t.trigger("modal_close"))},typedvalues:!0})},smd:e=>{confirm($bct.smdc)&&$ocms.postXT({url:$ocms.url("bam/smd"),data:{taid:e},success:t=>{$(`#bt${e}`).aC("mdone")}})},ati:e=>{let t=$$.dc("form"),n=$$.dc("form-body",t),a=$$.dc("form-group",n),l=($$.lbl($bct.ino,{for:"rno"}).appendTo(a),$$.i({id:"rno",placeholder:"Rechnungs-Nummer"}).appendTo(a)),c=$$.dc("rfrm bam",n);l.change((function(e){$ocms.postXT({url:$ocms.url("bam/vfi"),data:{invid:l.val()},success:e=>{c.empty(),e.length>0?($$.dc("nfo",c,$bct.fi),$.each(e,(function(e,t){let n=$$.dc("rinv",c,t.InvoiceId).data("inv",t).click((function(e){$(this).addClass("selected").siblings(".rinv").removeClass("selected")}));$$.dc("invsta",n).rwText(t.SendToAddress)}))):c.text($bct.ni)}})})),$ocms.dlg(t,{title:$bct.ati,size:[500,700],confirm:function(t){let n=$(this),a=n.find(".rinv.selected:first");if(1===a.length){let t=a.data("inv")||{};confirm(string($bct.atic,[t.InvoiceId]))&&$ocms.postXT({url:$ocms.url("bam/ati"),data:{taid:e,iid:t.Id},success:t=>{$(`#bt${e}`).aC("mdone"),n.trigger("modal_close")}})}}})},mbe:()=>{$bam.manForm({})},mbc:e=>{$ocms.postXT({url:$ocms.url("bam/mget"),data:{taid:e},success:e=>{$bam.manForm(e||{})}})},mbd:e=>{confirm($bct.mbdc)&&$ocms.postXT({url:$ocms.url("bam/mdel"),data:{taid:e},success:()=>{$bam.renderLst()}})},manForm:e=>{let t=$bcol.man.clone().applyValues(e||{});$ocms.dlgform(t,{title:""!==ne(e.taID,"")?$bct.mbc:$bct.mbe,url:$ocms.url("bam/man"),typedvalues:!0,success:()=>{$bam.renderLst()}})}},$$bam={init2:$bam.init2,auth:{}};export default $$bam;
\ No newline at end of file
diff --git a/Fuchs/wwwroot/web/fis.inv.css b/Fuchs/wwwroot/web/fis.inv.css
index bbd98a4..b31e3cd 100644
--- a/Fuchs/wwwroot/web/fis.inv.css
+++ b/Fuchs/wwwroot/web/fis.inv.css
@@ -156,6 +156,16 @@ table.if td.num {
height: auto;
cursor: pointer;
}
+.edit_frm .invoice_layout .emailfrm .content {
+ color: #000;
+}
+.edit_frm .invoice_layout .emailfrm .content:empty::before {
+ content: "-";
+ min-width: 5rem;
+ height: 1rem;
+ display: block;
+ position: absolute;
+}
.edit_frm .invoice_layout .emailfrm:hover div.axf {
display: block;
}
@@ -285,6 +295,13 @@ table.if td.num {
border-color: #FFF;
border-top: 1.5px solid #000;
}
+.edit_frm .invoice_layout table.invi > tbody > tr {
+ /* Set-pricing display (see InvoiceSetPricing / $inv.d.applySetDisplay): the set
+ header line is emphasised the same way the PDF renders it (bold title). */
+}
+.edit_frm .invoice_layout table.invi > tbody > tr.sethdr td.txt {
+ font-weight: bold;
+}
.edit_frm .invoice_layout table.invi th.currency, .edit_frm .invoice_layout table.invi th.num, .edit_frm .invoice_layout table.invi td.currency, .edit_frm .invoice_layout table.invi td.num {
text-align: right;
white-space: nowrap;
@@ -405,6 +422,50 @@ table.if td.num {
animation: fis_spin 0.8s linear infinite;
}
+/* Backend-authoritative draft editing (ADR 0006): server-side plausibility findings
+ rendered above the editor, and the change-history dialog table. */
+.edit_frm .invoice_layout .dvalidation {
+ margin: 0 0 1rem 0;
+}
+.edit_frm .invoice_layout .dvalidation.hidden {
+ display: none;
+}
+.edit_frm .invoice_layout .dvalidation .dvmsg {
+ padding: 0.4rem 0.7rem;
+ margin: 0.25rem 0;
+ border-radius: 0.2rem;
+ font-size: 0.9rem;
+ border-left: 4px solid #999;
+ background: #f5f5f5;
+}
+.edit_frm .invoice_layout .dvalidation .dvmsg.error {
+ border-left-color: #c0392b;
+ background: #fdecea;
+ color: #922;
+}
+.edit_frm .invoice_layout .dvalidation .dvmsg.warning {
+ border-left-color: #e0a800;
+ background: #fff8e1;
+ color: #7a5c00;
+}
+.edit_frm .invoice_layout .dvalidation .dvmsg.info {
+ border-left-color: #3498db;
+ background: #eaf4fb;
+ color: #1c5a82;
+}
+
+.dhist .invtbl {
+ width: 100%;
+}
+.dhist td, .dhist th {
+ padding: 0.3rem 0.6rem;
+ text-align: left;
+ vertical-align: top;
+}
+.dhist tbody tr:nth-child(even) {
+ background: #fafafa;
+}
+
.modal-body .lstfrm {
display: block;
position: relative;
diff --git a/Fuchs/wwwroot/web/fis.inv.de.js b/Fuchs/wwwroot/web/fis.inv.de.js
index 5067862..4f5ec23 100644
--- a/Fuchs/wwwroot/web/fis.inv.de.js
+++ b/Fuchs/wwwroot/web/fis.inv.de.js
@@ -34,6 +34,9 @@ let $rct = {
svcPart: 'Service-Anteil',
vat: 'Umsatzsteuer',
combP: 'Positionen zusammenfassen',
+ toSetP: 'Auf Setpreis umstellen (Positionen ohne Preis)',
+ toSetPc: 'Der Set-Preis wird auf die Summe seiner Positionen gesetzt und die Positionen selbst verlieren ihren Preis. Das ist nicht rückgängig zu machen (der Betrag kann danach nur noch manuell geändert werden). Fortfahren?',
+ toSetMc: 'Jeder Leistungsauftrag wird zu einer Set-Position mit der Summe als Preis zusammengefasst. Das ist nicht rückgängig zu machen (die Set-Preise können danach nur noch manuell geändert werden). Fortfahren?',
iSum: 'Zwischensumme',
dtRel: 'Freigegeben am: ',
dtCr: 'Erstellt am: ',
@@ -149,7 +152,6 @@ let $ict = {
setm: 'Set-Preisanzeige',
setmo: {
setprice: 'Set mit Preis – Positionen ohne Preis',
- itemprices: 'Positionen mit Preis – Set als Überschrift',
setonly: 'Nur Set mit Preis – Positionen ausgeblendet'
},
ctp: 'Ansprechpartner festlegen',
@@ -169,16 +171,10 @@ let $ict = {
rovlh: 'Übersicht der bisherigen Mahnungen',
rovl: ['Betreff', 'Betrag', 'Betrag gezahlt', 'fertiggestellt am'],
remHR: ['Rechnung', 'vom', 'Rechnungsbetrag', 'bereits bezahlt', 'noch offen'],
- remt: {
- f: ['Sehr geehrte Damen und Herren,', 'ein Mahnschreiben sollte kurz, freundlich und erfolgreich sein. Kurz ist es, freundlich sowieso; ob es auch erfolgreich ist, hängt von Ihnen ab.']
- , m: ['Sehr geehrte Damen und Herren,', 'nun müssen wir Sie noch einmal anschreiben.', 'Wahrscheinlich haben Sie triftige Gründe dafür, warum Sie die Zahlung unserer Forderung nicht vornehmen und auch nicht auf unsere Mahnung reagieren. Sollten wir darüber nicht einmal sprechen?', 'Bitte nehmen Sie umgehend in dieser Sache mit uns Kontakt auf.']
- , l: ['Sehr geehrte Damen und Herren,', 'Eine DRITTE MAHNUNG zu erhalten bereitet Ihnen bestimmt ebenso wenig Freude wie uns, sie zu verschicken. Leider haben wir auf unsere zweite Mahnung noch keine Antwort von Ihnen erhalten.", "Wir bitten Sie, den offenen Betrag innerhalb der nächsten 7 Werktage nach Erhalt dieses Schreibens zu begleichen. Nach Ablauf dieser Frist erfolgt keine weitere Mahnung mehr.', 'Sollte die Forderung bis dahin nicht beglichen sein, eröffnen wir das gerichtliche Mahnverfahren. Sollten Sie die Rechnung inzwischen beglichen haben, so betrachten Sie bitte dieses Schreiben als gegenstandslos.']
- },
- remt2: {
- f: ['Wir bitten Sie, den noch offenen Rechnungsbetrag innerhalb einer Woche auf unser Konto zu überweisen.', 'Sollten Sie den Betrag bereits überwiesen haben, so bitten wir Sie, diese Zahlungserinnerung als gegenstandslos zu betrachten.']
- , m: ['Um Ihnen zusätzliche Kosten für weitere Mahnungen zu ersparen, bitten wir Sie nunmehr um die Überweisung des noch zu zahlenden Gesamtbetrages inklusive der ggf. bereits fälligen Mahnzinsen und Mahngebühren innerhalb von einer Woche.']
- , l: []
- }, payi: { account: 'Konto', name: 'Zahler', text: 'Verw.Zweck', InvoiceID: 'Rechnung', amount: 'Betrag', date: 'Datum', manual: 'Typ'}
+ // Reminder intro/closing notice texts are backend-authoritative (see FuchsPdf.BuildReminderNotes /
+ // $inv.rd.notes) — no client-side copies here.
+ translatePaymentTerm: (pt) => (pt || '').replace('wd', ' Werktagen').replace('d', ' Tagen').replace('wk', ' Wochen') || '10 Tagen'
+ , payi: { account: 'Konto', name: 'Zahler', text: 'Verw.Zweck', InvoiceID: 'Rechnung', amount: 'Betrag', date: 'Datum', manual: 'Typ'}
}, $invcol = {
datev: new fields_definition('Rechnung', 'Rechnungen', [
{ name: 'Umsatz (ohne Soll/Haben-Kz)', label: 'Umsatz (ohne Soll/Haben-Kz)', type: 'string' },
@@ -629,6 +625,11 @@ $inv.iMn = (ix) => {
}
return $('#topbar').ocmsmenu(m);
}
+/* Menu option CSV builder: 'setm' (Set-Preisanzeige) is only offered while the invoice has not
+ yet been explicitly switched to a set-display mode (admin.setmode empty/undefined) — once set,
+ changing it again is not supported (the user edits the line items directly instead); it
+ reappears only if 'Änderungen verwerfen' reverts to a DB state that was never switched. */
+$inv.emOpt = (admin) => 'iss,p13b,ctp' + (((admin || {}).setmode || '') === '' ? ',setm' : '');
$inv.eM = (r, re, opt) => {
let m = [];
if (booln(r, false) === true || booln(re, false) === true) {
@@ -646,11 +647,507 @@ $inv.eM = (r, re, opt) => {
if ((opt || '').split(',').includes('setm') === true) {
m.push({ lbl: $ict.setm, fnc: $inv.ssetmode });
}
+ if ((opt || '').split(',').includes('iss') === true) { /* backend-authoritative draft (ADR 0006) */
+ m.push({ lbl: 'Änderungshistorie', fnc: () => $inv.d.history() });
+ m.push({ lbl: 'Änderungen verwerfen', fnc: () => $inv.d.discard() });
+ }
if (booln(r, false) === true) {
m.push({ lbl: $ict.rel, fnc: $inv.rReload });
}
return $('#topbar').ocmsmenu(m); /* empty Array => empty menu */
};
+/* ── Backend-authoritative draft editing controller (ADR 0006/0007) ───────────
+ The server holds the truth for an invoice draft in an in-memory session; this
+ object seeds it, sends single edits as deltas, and renders the totals footer +
+ validation from the authoritative server state. It is invoice-only: reminders
+ never obtain a token (invSumUpdate, the seed trigger, is only bound for invoices),
+ so they keep the legacy stateless flow untouched. */
+$inv.d = {
+ tbl: () => $('div.invoice_layout table.invi'),
+ layout: () => $('div.invoice_layout'),
+ token: function () { return $inv.d.tbl().data('dtoken') || ''; },
+ /* Hash each assembled block so only genuinely-changed blocks are sent as deltas. */
+ hashes: function () {
+ let bai = $inv.d.tbl().data('bai') || [], h = {};
+ $.each(bai, (i, b) => { h[(b.Id || '').toString()] = JSON.stringify(b); });
+ return h;
+ },
+ /* Seed the authoritative server session from the assembled editor payload. Called
+ once from invSumUpdate on open; thereafter the backend is the source of truth.
+ The in-flight ajax promise is stashed on 'dseedpromise' so a delta sent (e.g. via
+ a context-menu action) before seeding has actually completed can wait for the token
+ instead of silently no-op'ing (see $inv.d.sync). */
+ seed: function (payload) {
+ let l = $inv.d.layout(); l.aC('freeze');
+ let p = $ocms.postXT({
+ url: $ocms.url('inv/dopen'), data: { payload: JSON.stringify(payload) }, success: (r) => {
+ $inv.d.tbl().data('dtoken', r.token).data('dver', r.version).data('dhashes', $inv.d.hashes()).data('dorder', $inv.d.order());
+ $fis.draft.bind(r.token, {
+ onReady: () => $inv.d.refresh(),
+ onExpiring: (s) => $inv.d.warnExpiry(s),
+ onClosed: (reason) => $inv.d.closed(reason)
+ });
+ $inv.d.refresh();
+ }, error: () => { l.rC('freeze'); }, complete: () => { $inv.d.tbl().removeData('dseeding').removeData('dseedpromise'); }
+ });
+ $inv.d.tbl().data('dseedpromise', p);
+ return p;
+ },
+ /* Re-fetch the authoritative state and render the totals footer + validation from it. */
+ refresh: function (cb) {
+ let t = $inv.d.token(); if (t === '') { return; }
+ $ocms.postXT({
+ url: $ocms.url('inv/dstate'), data: { token: t }, success: (state) => {
+ $inv.d.applyState(state); if (typeof cb === 'function') { cb(state); }
+ }, error: (xhr) => { if (xhr && xhr.status === 410) { $inv.d.closed('expired'); } },
+ complete: () => { $inv.d.layout().rC('freeze'); }
+ });
+ },
+ applyState: function (state) {
+ let tbl = $inv.d.tbl(); if (tbl.length < 1) { return; }
+ /* Concurrent refreshes (one per flushed block plus one for a follow-up delta such as
+ item.setprice, and SignalR draftReady on top) can have their dstate responses arrive
+ out of order. Applying a response older than the version already rendered would
+ silently roll back a just-applied server-side mutation (e.g. a set-price conversion
+ reverting to its pre-conversion 0/individually-priced state) — so stale responses are
+ dropped here instead of rendered. */
+ let curVer = tbl.data('dver');
+ if (typeof curVer === 'number' && typeof state.version === 'number' && state.version < curVer) {
+ return;
+ }
+ tbl.data('dver', state.version).data('serverSums', state.sums);
+ $inv.d.footer(tbl, state.sums || {}, state.admin || {});
+ $inv.d.notes(state.notes || []);
+ $inv.d.validation(state.validation || []);
+ $inv.d.applyItems(tbl, state.req || []);
+ $inv.d.applySetDisplay(tbl, state.setDisplay || {});
+ /* Keep the menu's "Set-Preisanzeige" entry in sync with the authoritative admin.setmode:
+ hides it right after a mode switch, and restores it if a discard reverted the draft to
+ a DB state that was never switched (ADR 0006 backend-authoritative refresh). */
+ $inv.eM(false, true, $inv.emOpt(state.admin || {}));
+ },
+ /* Renders the backend-authoritative notice paragraphs (ADR: notice texts are
+ backend-authoritative) exactly as FuchsPdf.BuildInvoiceNotes emits them for the PDF,
+ so the online editor always shows precisely what will be printed. */
+ notes: function (notes) {
+ let frm = $inv.d.layout(); if (frm.length < 1) { return; }
+ let box = frm.children('.dnotes');
+ if (box.length < 1) { box = $$.dc('dnotes'); frm.append(box); }
+ box.empty();
+ (notes || []).forEach((n) => $$.dc('dnote').aC(n.style || 'InvoiceNotes').text(n.text));
+ },
+ /* Push the server's authoritative position numbers back onto the rendered rows so the online
+ editor and the PDF preview always agree (the server numbers priced lines continuously; the
+ browser must not keep its own numbering). Only the position cell is touched — no re-render. */
+ /* Reconciles each block's rendered rows against the authoritative server line list
+ (`req[].itm`, the co shape). The server may not only change a line's values but also
+ ADD lines (the block set row inserted by "Set mit Preis"/block.setprice) and REMOVE lines
+ ("Nur Set mit Preis"/block.setonly), and reorder them — the browser never computes any of
+ that (ADR 0006/0008/0009), it just mirrors the server. For each server line: patch/insert
+ the matching row, preserving null price fields verbatim (ADR 0009: null = empty cell, kept
+ distinct from 0). Rows the server no longer lists are removed; order follows the server.
+ Position numbers, net/VAT and the set-row emphasis all come from rrw off the mirrored data. */
+ applyItems: function (tbl, req) {
+ let val = (x) => (x === undefined ? null : x); // JSON null stays null; absent -> null
+ (req || []).forEach((b) => {
+ if (!b) { return; }
+ let bid = (b.Id || '').toString(); if (bid === '') { return; }
+ let bdy = tbl.children('tbody').filter((i, e) => (($(e).data() || {}).Id || '').toString() === bid).first();
+ if (bdy.length < 1) { return; }
+ let itms = b.itm || [], serverIds = {};
+ let title = bdy.find('tr.title').first();
+ let prev = title.length ? title : null;
+ itms.forEach((co) => {
+ let id = (co.id || '').toString(); if (id === '') { return; }
+ serverIds[id] = true;
+ let rw = bdy.find('#itm' + id).first(), isNew = rw.length < 1;
+ if (isNew) { rw = $$.tr(bdy, { id: 'itm' + id, class: 'itm' }); }
+ let dta = rw.data() || {};
+ let changed = isNew || (dta.Type || '') !== (co.typ || '')
+ || dta.net !== val(co.v) || dta.net_val !== val(co.vt) || dta.vat_val !== val(co.vv)
+ || dta.svcnet_val !== val(co.vs) || dta.svcvat_val !== val(co.vsv)
+ || (dta.position || '') !== (co.p != null ? co.p : '');
+ $.extend(dta, {
+ Id: id, Type: co.typ,
+ net: val(co.v), net_val: val(co.vt), vat_val: val(co.vv),
+ svcnet_val: val(co.vs), svcvat_val: val(co.vsv),
+ vat: co.vat, position: (co.p != null ? co.p : ''),
+ SetItmId: (co.SetItmId != null ? co.SetItmId : null)
+ });
+ if (isNew) { $.extend(dta, { htmltext: co.t, quantity: co.q }); } // text only for server-created rows (e.g. the set row)
+ rw.data(dta);
+ if (prev) { if (rw.prev()[0] !== prev[0]) { rw.insertAfter(prev); } } // keep server order, but don't churn already-ordered rows
+ else if (bdy.children().first()[0] !== rw[0]) { bdy.prepend(rw); }
+ prev = rw;
+ if (changed) { $inv.rrw.call(rw); }
+ });
+ bdy.find('tr.itm').each((i, tr) => {
+ let id = (($(tr).data() || {}).Id || '').toString();
+ if (id !== '' && !serverIds[id]) { $(tr).remove(); } // dropped server-side (block.setonly)
+ });
+ });
+ },
+ /* Applies the backend-authoritative set-pricing display flags (see BuildSetDisplay /
+ InvoiceSetPricing) onto the rendered rows: blanks the price/total cells for lines the
+ server says should show no price (set members in SetPrice/SetOnly mode), and emphasises
+ the set header line — so the online editor always shows exactly what the PDF will print,
+ without duplicating the pricing rules client-side. Rows not present in the map (no set in
+ that block, or standalone items) are left untouched. */
+ applySetDisplay: function (tbl, setDisplay) {
+ tbl.find('tr.itm').each((i, tr) => {
+ let rw = $(tr), dta = rw.data() || {}, id = (dta.Id || '').toString();
+ if (id === '' || !Object.prototype.hasOwnProperty.call(setDisplay, id)) { return; }
+ let flags = setDisplay[id] || {};
+ rw.tC('sethdr', bool(flags.h, false));
+ if (bool(flags.p, true) === false) {
+ rw.find('td.currency').text('');
+ }
+ });
+ },
+ /* Send one change to the server; the draftReady signal and this success both refresh.
+ Returns the underlying ajax promise so callers that must not race a follow-up delta
+ against this one (e.g. $inv.toSetPrice after a flush) can chain on it.
+ If the initial seeding (inv/dopen) is still in flight (no token yet, but a
+ 'dseedpromise' is pending), the delta previously vanished silently — the user saw no
+ network activity at all when clicking a context-menu action right after opening the
+ editor. Now the delta waits for the seed to finish and retries against the freshly
+ issued token instead of being dropped. */
+ sync: function (delta) {
+ let t = $inv.d.token();
+ if (t === '') {
+ let seeding = $inv.d.tbl().data('dseedpromise');
+ if (seeding) { return $.when(seeding).then(() => $inv.d.sync(delta)); }
+ return $.when();
+ }
+ $inv.d.layout().aC('freeze');
+ return $ocms.postXT({
+ url: $ocms.url('inv/dpatch'), data: { token: t, delta: JSON.stringify(delta) },
+ success: () => { $inv.d.refresh(); },
+ error: (xhr) => { $inv.d.layout().rC('freeze'); if (xhr && xhr.status === 410) { $inv.d.closed('expired'); } }
+ });
+ },
+ /* The current section id sequence (used to detect a reorder that changes no block content). */
+ order: function () { return (($inv.d.tbl().data('bai')) || []).map((b) => (b.Id || '').toString()); },
+ /* Diff the freshly-rebuilt blocks against the last-synced state and send only the
+ changed/removed blocks as granular block.replace / block.remove deltas. A pure section
+ reorder (same blocks, new sequence) changes no block hash, so it is sent separately as a
+ block.order delta; the server reorders the cache, renumbers positions and pushes them back.
+ No early return on an empty token here: sync() itself waits for an in-flight seed
+ (dseedpromise) instead of silently dropping the delta, so edits made in the brief window
+ before seeding completes are not lost. */
+ syncChanged: function (tbl) {
+ let bai = tbl.data('bai') || [], prev = tbl.data('dhashes') || {}, next = {}, changed = [], removed = [], pending = [];
+ $.each(bai, (i, b) => { let id = (b.Id || '').toString(), h = JSON.stringify(b); next[id] = h; if (prev[id] !== h) { changed.push(b); } });
+ $.each(prev, (id) => { if (next[id] === undefined) { removed.push(id); } });
+ let order = $inv.d.order(), prevOrder = tbl.data('dorder') || [];
+ tbl.data('dhashes', next).data('dorder', order);
+ changed.forEach((b) => pending.push($inv.d.sync({ Target: 'block.replace', Ref: (b.Id || '').toString(), Value: b })));
+ removed.forEach((id) => pending.push($inv.d.sync({ Target: 'block.remove', Ref: id })));
+ let sameSet = prevOrder.length === order.length && prevOrder.slice().sort().join(',') === order.slice().sort().join(',');
+ if (sameSet && prevOrder.join(',') !== order.join(',')) { pending.push($inv.d.sync({ Target: 'block.order', Value: order })); }
+ /* $.when(...pending) so a caller (e.g. toSetPrice) can wait until every flushed block
+ has actually reached the server before sending a further delta that depends on it —
+ otherwise a delayed block.replace carrying pre-conversion values can land after and
+ silently overwrite a just-applied server-side mutation (e.g. item.setprice). */
+ return $.when.apply($, pending).promise();
+ },
+ /* Map an inline recipient field to its delta target and send it. No token-guard here for the
+ same reason as syncChanged: sync() waits for an in-flight seed instead of dropping the edit. */
+ syncField: function (nme, val) {
+ let map = { invoicetitle: 'title', invoiceaddress: 'address', invoiceemail: 'email', loc: 'provisionlocation', provisionlocation: 'provisionlocation', provisionperiod: 'provisionperiod' };
+ let target = map[nme]; if (!target) { return; }
+ $inv.d.sync({ Target: target, Value: val });
+ },
+ /* Render the totals footer from the server sums (port of invSumUpdate's footer half). */
+ footer: function (tbl, sums, admin) {
+ let ft = tbl.children('tfoot').empty(); tbl.nextAll('.fnote').remove();
+ let p13b = bool(admin.p13b, false);
+ let rwcy = (lbl, val, cls) => $$.tdc('currency', $$.tr(ft, { class: cls || 'tsum' }).append([$$.tdc('aux'), $$.td({ colspan: 4 }).text(lbl)]), fnum(val, $rct.cst));
+ let fn = (t) => $$.dc('fnote').insertAfter(tbl).rwText(t);
+ rwcy('Netto', sums.total_net || 0);
+ if (p13b === false) { $.each(sums.vat || {}, (rate, amt) => rwcy($rct.vat + ' ' + rate + '%', amt, 'tvat')); }
+ rwcy('Summe', sums.total_gross || 0);
+ let itype = (admin.type || '');
+ if (itype === 'i') { fn($rct.note2); fn($rct.note4); }
+ else if (itype === 'c') { fn($rct.note2); }
+ else {
+ fn(string($rct.note3, [fnum(((sums.service_net || 0) + (sums.service_vat || 0)) * (admin.tax_servicerefund || 0), $rct.cst)])).aC('ntax');
+ fn($rct.note2);
+ fn(string($rct.note1, [fnum((sums.service_net || 0) + (sums.service_vat || 0), $rct.cst), fnum(sums.service_net || 0, $rct.cst), fnum(sums.service_vat || 0, $rct.cst)]));
+ }
+ if (p13b === true) { fn($rct.note13b); }
+ },
+ validation: function (msgs) {
+ let frm = $('div.invoice_layout'); if (frm.length < 1) { return; }
+ let box = frm.children('.dvalidation');
+ if (box.length < 1) { box = $$.dc('dvalidation'); frm.prepend(box); }
+ box.empty().tC('hidden', (msgs || []).length < 1);
+ $.each(msgs || [], (i, m) => $$.dc('dvmsg', box).aC(m.severity).text(m.message));
+ },
+ /* PDF preview straight from the cache; confirm = flush + finalise, cancel = discard. */
+ preview: function () {
+ let t = $inv.d.token(); if (t === '') { return; }
+ let l = $inv.d.layout();
+ let email = ($inv.d.tbl().data('new') || {}).invoiceemail || '';
+ if ($fis.ValidateEmail(email) === false) { if (bool(confirm($ict.ivE + $ict.ivEc), false) === false) { return; } }
+ l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('inv/dpreview'), data: { token: t }, success: (response) => {
+ l.rC('freeze');
+ let c = $$.dc('imagecollection pdfpreview'), vhr = Math.round(vh() * 0.88), total = response.total;
+ if (total > 10) { $$.dc('note warn', c).text($ict.tpe); }
+ $.each(response.img || [], (ii, img) => { $$.dc('pdfp', c).append($$.img(img).css('max-height', (vhr - rpx(6)).toString() + 'px')); });
+ for (let ic = (response.img || []).length + 1; ic <= total; ic++) { $$.dc('pdfp ph', c).append($$.dc('note', $ict.pna)); }
+ $ocms.dlg(c, {
+ size: [vhr, Math.round(vw() * 0.88)], zindex: 50, form: false, button: $rct.crI,
+ confirm: function (e) {
+ let ct = $(this); l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('inv/dsave'), data: { token: t }, success: (sv) => {
+ $ocms.postXT({
+ url: $ocms.url('req/sconf'), data: { id: sv.invid }, success: (cresp) => {
+ ct.trigger('modal_close');
+ if (cresp.hasFile === true) { window.open($ocms.url('req/idoc') + '?id=' + sv.invid, '_blank'); }
+ $inv.d.close();
+ $ocms.init('req'); $inv.rReload();
+ }, error: () => { alert($t.f1); ct.trigger('modal_close'); }, complete: () => { l.rC('freeze'); }
+ });
+ }, error: () => { l.rC('freeze'); alert($ict.eis); }
+ });
+ },
+ cancel: function (e) { if (confirm($ict.cdI)) { $inv.d.close(); $inv.rReload(); } }
+ });
+ }, error: () => { l.rC('freeze'); alert($ict.eis); }
+ });
+ },
+ /* Zwischenspeichern: flush the cache to the DB (no re-upload); stay in the editor. */
+ save: function () {
+ let t = $inv.d.token(); if (t === '') { return; }
+ let l = $inv.d.layout(); l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('inv/dsave'), data: { token: t }, success: (r) => { $inv.d.tbl().data('invid', r.invid); },
+ error: () => { alert($ict.eis); }, complete: () => { l.rC('freeze'); }
+ });
+ },
+ history: function () {
+ let t = $inv.d.token(); if (t === '') { return; }
+ $ocms.postXT({
+ url: $ocms.url('inv/dhistory'), data: { token: t }, success: (r) => {
+ let c = $$.dc('dhist');
+ if ((r.history || []).length < 1) { $$.dc('note', c).text('Noch keine Änderungen erfasst.'); }
+ else {
+ let ts = $$.tblset({ class: 'invtbl fullwidth' }, c);
+ $$.tr(ts.hd).append([$$.th().text('Zeit'), $$.th().text('Feld'), $$.th().text('Alt'), $$.th().text('Neu')]);
+ $.each(r.history, (i, h) => $$.tr(ts.bdy).append([$$.tdc('keep', fdt(h.timestamp)), $$.td().text(h.target), $$.td().text(h.oldValue), $$.td().text(h.newValue)]));
+ }
+ $ocms.dlg(c, { width: 800, form: false });
+ }
+ });
+ },
+ discard: function () {
+ let invid = $inv.d.tbl().data('invid') || '';
+ if (invid === '') { alert('Es wurde noch kein Zwischenstand gespeichert, der wiederhergestellt werden könnte.'); return; }
+ if (confirm('Alle Änderungen verwerfen und den zuletzt gespeicherten Stand neu laden?') === false) { return; }
+ $inv.d.close();
+ $inv.cntInv({ id: invid });
+ },
+ warnExpiry: function (secondsLeft) {
+ let mins = Math.max(1, Math.round((secondsLeft || 0) / 60));
+ $fis.notifications.push({ severity: 'info', title: 'Entwurf läuft ab', message: 'Der Rechnungsentwurf läuft in etwa ' + mins + ' Minute(n) ab. Bitte zwischenspeichern, sonst gehen die Änderungen verloren.' });
+ },
+ closed: function (reason) {
+ let t = $inv.d.token();
+ $inv.d.tbl().removeData('dtoken');
+ if (t !== '') { $fis.draft.release(t); }
+ $fis.frm_edit().remove(); $fis.lf(true);
+ $fis.notifications.push({ severity: 'error', title: 'Entwurf geschlossen', message: reason === 'expired' ? 'Der Rechnungsentwurf ist wegen Inaktivität abgelaufen. Nicht gespeicherte Änderungen sind verloren.' : 'Der Rechnungsentwurf wurde geschlossen.' });
+ try { $inv.rReload(); } catch (e) { }
+ },
+ close: function () {
+ let t = $inv.d.token();
+ if (t !== '') { $ocms.postXT({ url: $ocms.url('inv/dclose'), data: { token: t } }); $fis.draft.release(t); }
+ $inv.d.tbl().removeData('dtoken');
+ }
+};
+/* ── Backend-authoritative reminder draft editing (ADR 0006/0007) ─────────────
+ The reminder mirror of $inv.d: the server holds the truth for a reminder draft in
+ an in-memory session; this object seeds it (rem/dopen), sends single edits as deltas
+ (rem/dpatch), and renders the open-amount footer + validation from the authoritative
+ server state (rem/dstate). Preview renders straight from the cache (rem/dpreview);
+ confirm flushes (rem/dsave) then finalises + emails (rem/conf). It coexists with $inv.d
+ on the same DOM: each keys off its own token (rdtoken vs dtoken), so the shared inline
+ editor safely no-ops for the mode that is not active. */
+$inv.rd = {
+ tbl: () => $('div.invoice_layout table.invi'),
+ layout: () => $('div.invoice_layout'),
+ token: function () { return $inv.rd.tbl().data('rdtoken') || ''; },
+ /* Seed the authoritative server session from the assembled reminder editor payload. */
+ seed: function (payload) {
+ let l = $inv.rd.layout(); l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('rem/dopen'), data: { payload: JSON.stringify(payload) }, success: (r) => {
+ $inv.rd.tbl().data('rdtoken', r.token).data('rdver', r.version);
+ $fis.draft.bind(r.token, {
+ onReady: () => $inv.rd.refresh(),
+ onExpiring: (s) => $inv.rd.warnExpiry(s),
+ onClosed: (reason) => $inv.rd.closed(reason)
+ });
+ $inv.rd.refresh();
+ }, error: () => { l.rC('freeze'); }
+ });
+ },
+ /* Re-fetch the authoritative state and render the open-amount footer + validation from it. */
+ refresh: function (cb) {
+ let t = $inv.rd.token(); if (t === '') { return; }
+ $ocms.postXT({
+ url: $ocms.url('rem/dstate'), data: { token: t }, success: (state) => {
+ $inv.rd.applyState(state); if (typeof cb === 'function') { cb(state); }
+ }, error: (xhr) => { if (xhr && xhr.status === 410) { $inv.rd.closed('expired'); } },
+ complete: () => { $inv.rd.layout().rC('freeze'); }
+ });
+ },
+ applyState: function (state) {
+ let tbl = $inv.rd.tbl(); if (tbl.length < 1) { return; }
+ /* See $inv.d.applyState — drop stale/out-of-order dstate responses so an older refresh
+ can never roll back a newer one's totals/validation. */
+ let curVer = tbl.data('rdver');
+ if (typeof curVer === 'number' && typeof state.version === 'number' && state.version < curVer) {
+ return;
+ }
+ tbl.data('rdver', state.version).data('serverSums', state.sums).data('remid', state.remid || '');
+ $inv.rd.footer(tbl, state.sums || {});
+ $inv.rd.notes(state.notes || {});
+ $inv.rd.validation(state.validation || []);
+ },
+ /* Renders the backend-authoritative intro/closing notice paragraphs (ADR: notice texts
+ are backend-authoritative) exactly as FuchsPdf.BuildReminderNotes emits them for the
+ PDF, so the online editor always shows precisely what will be printed. */
+ notes: function (notes) {
+ let frm = $inv.rd.layout(); if (frm.length < 1) { return; }
+ let rq = frm.find('.srq'); if (rq.length < 1) { return; }
+ rq.children('.dnote').remove();
+ let intro = (notes || {}).intro || [], first = rq.children().first();
+ intro.slice().reverse().forEach((t) => {
+ let p = $$[0]('p').aC('dnote intro').rwText(t);
+ if (first.length) { p.insertBefore(first); } else { p.appendTo(rq); }
+ });
+ ((notes || {}).closing || []).forEach((t) => $$[0]('p').aC('dnote closing').rwText(t).appendTo(rq));
+ },
+ /* Send one change to the server; the draftReady signal and this success both refresh. */
+ sync: function (delta) {
+ let t = $inv.rd.token(); if (t === '') { return; }
+ $inv.rd.layout().aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('rem/dpatch'), data: { token: t, delta: JSON.stringify(delta) },
+ success: () => { $inv.rd.refresh(); },
+ error: (xhr) => { $inv.rd.layout().rC('freeze'); if (xhr && xhr.status === 410) { $inv.rd.closed('expired'); } }
+ });
+ },
+ /* Map an inline recipient field to its delta target and send it. */
+ syncField: function (nme, val) {
+ if ($inv.rd.token() === '') { return; }
+ let map = { subject: 'subject', invoiceaddress: 'address', invoiceemail: 'email', text: 'text' };
+ let target = map[nme]; if (!target) { return; }
+ $inv.rd.sync({ Target: target, Value: val });
+ },
+ /* Amount / amount-paid come from the item-row dialog; send both as their own deltas. */
+ syncAmount: function (amount, amount_payed) {
+ if ($inv.rd.token() === '') { return; }
+ $inv.rd.sync({ Target: 'amount', Value: (amount != null ? amount : 0).toString() });
+ $inv.rd.sync({ Target: 'amount_payed', Value: (amount_payed != null ? amount_payed : 0).toString() });
+ },
+ /* Render the open-amount footer from the server sums. Detail rows ($inv.rRemRw) have
+ 6 columns (aux, invoiceid, date, amount, amount_payed, open); span the label over the
+ 4 columns between aux and the open-amount column so the total lands in the same last
+ column as the per-invoice open amounts. */
+ footer: function (tbl, sums) {
+ let ft = tbl.children('tfoot').empty();
+ let tr = $$.tr(ft, { class: 'tsum' }).append([$$.tdc('aux'), $$.td({ colspan: 4 }).text('Offener Betrag')]);
+ $$.tdc('currency', tr, fnum(sums.amount_open || 0, $rct.cst));
+ },
+ validation: function (msgs) {
+ let frm = $inv.rd.layout(); if (frm.length < 1) { return; }
+ let box = frm.children('.dvalidation');
+ if (box.length < 1) { box = $$.dc('dvalidation'); frm.prepend(box); }
+ box.empty().tC('hidden', (msgs || []).length < 1);
+ $.each(msgs || [], (i, m) => $$.dc('dvmsg', box).aC(m.severity).text(m.message));
+ },
+ /* PDF preview straight from the cache; confirm = flush + finalise + email, cancel = discard. */
+ preview: function () {
+ let t = $inv.rd.token(); if (t === '') { return; }
+ let l = $inv.rd.layout();
+ let email = (($inv.rd.tbl().data('new') || {}).invoiceemail) || '';
+ if ($fis.ValidateEmail(email) === false) { if (bool(confirm($ict.ivE + $ict.ivEc), false) === false) { return; } }
+ l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('rem/dpreview'), data: { token: t }, success: (response) => {
+ l.rC('freeze');
+ let c = $$.dc('imagecollection pdfpreview'), vhr = Math.round(vh() * 0.88);
+ $.each(response.img || [], (ii, img) => { $$.dc('pdfp', c).append($$.img(img).css('max-height', (vhr - rpx(6)).toString() + 'px')); });
+ $ocms.dlg(c, {
+ size: [vhr, Math.round(vw() * 0.88)], zindex: 50, form: false, button: $ict.remd,
+ confirm: function (e) {
+ let ct = $(this); l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('rem/dsave'), data: { token: t }, success: (sv) => {
+ $ocms.postXT({
+ url: $ocms.url('rem/conf'), data: { id: sv.remid }, success: () => {
+ ct.trigger('modal_close');
+ window.open($ocms.url('rem/idoc') + '?id=' + sv.remid, '_blank');
+ $inv.rd.close();
+ $ocms.init('req'); $inv.rReload();
+ }, error: () => { alert($t.f1); ct.trigger('modal_close'); }, complete: () => { l.rC('freeze'); }
+ });
+ }, error: () => { l.rC('freeze'); alert($t.f1); }
+ });
+ },
+ cancel: function (e) { if (confirm($ict.cdI)) { $inv.rd.close(); $inv.rReload(); } }
+ });
+ }, error: () => { l.rC('freeze'); alert($t.f1); }
+ });
+ },
+ /* Zwischenspeichern: flush the cache to the DB (no re-upload); stay in the editor. */
+ save: function () {
+ let t = $inv.rd.token(); if (t === '') { return; }
+ let l = $inv.rd.layout(); l.aC('freeze');
+ $ocms.postXT({
+ url: $ocms.url('rem/dsave'), data: { token: t }, success: (r) => { $inv.rd.tbl().data('remid', r.remid); },
+ error: () => { alert($t.f1); }, complete: () => { l.rC('freeze'); }
+ });
+ },
+ history: function () {
+ let t = $inv.rd.token(); if (t === '') { return; }
+ $ocms.postXT({
+ url: $ocms.url('rem/dhistory'), data: { token: t }, success: (r) => {
+ let c = $$.dc('dhist');
+ if ((r.history || []).length < 1) { $$.dc('note', c).text('Noch keine Änderungen erfasst.'); }
+ else {
+ let ts = $$.tblset({ class: 'invtbl fullwidth' }, c);
+ $$.tr(ts.hd).append([$$.th().text('Zeit'), $$.th().text('Feld'), $$.th().text('Alt'), $$.th().text('Neu')]);
+ $.each(r.history, (i, h) => $$.tr(ts.bdy).append([$$.tdc('keep', fdt(h.timestamp)), $$.td().text(h.target), $$.td().text(h.oldValue), $$.td().text(h.newValue)]));
+ }
+ $ocms.dlg(c, { width: 800, form: false });
+ }
+ });
+ },
+ warnExpiry: function (secondsLeft) {
+ let mins = Math.max(1, Math.round((secondsLeft || 0) / 60));
+ $fis.notifications.push({ severity: 'info', title: 'Entwurf läuft ab', message: 'Der Mahnentwurf läuft in etwa ' + mins + ' Minute(n) ab. Bitte zwischenspeichern, sonst gehen die Änderungen verloren.' });
+ },
+ closed: function (reason) {
+ let t = $inv.rd.token();
+ $inv.rd.tbl().removeData('rdtoken');
+ if (t !== '') { $fis.draft.release(t); }
+ $fis.frm_edit().remove(); $fis.lf(true);
+ $fis.notifications.push({ severity: 'error', title: 'Entwurf geschlossen', message: reason === 'expired' ? 'Der Mahnentwurf ist wegen Inaktivität abgelaufen. Nicht gespeicherte Änderungen sind verloren.' : 'Der Mahnentwurf wurde geschlossen.' });
+ try { $inv.rReload(); } catch (e) { }
+ },
+ close: function () {
+ let t = $inv.rd.token();
+ if (t !== '') { $ocms.postXT({ url: $ocms.url('rem/dclose'), data: { token: t } }); $fis.draft.release(t); }
+ $inv.rd.tbl().removeData('rdtoken');
+ }
+};
$inv.cInv2 = function (data) {
let fr = $$.dc('rfrm').ldng(1);
let o = $ocms.dlg(fr, { width: 1000 });
@@ -808,7 +1305,7 @@ $inv.ccInv = function (ev) { //normale rechnung
rif.tbl.children('tbody').each($inv.bdysort);
rif.tbl.trigger('fds.inv'); /* trigger calculations */
- $inv.eM(false, true, 'iss,p13b,setm,ctp');
+ $inv.eM(false, true, $inv.emOpt(admin));
}, complete: () => {
o.c.trigger('modal_close');
}
@@ -953,7 +1450,7 @@ $inv.cntInv = function (data) { //invoice continuation
rif.tbl.children('tbody').each($inv.bdysort);
rif.tbl.trigger('fds.inv'); /* trigger calculations */
- $inv.eM(false, true, 'iss,p13b,setm,ctp');
+ $inv.eM(false, true, $inv.emOpt(response.admin));
}, complete: () => {
o.c.trigger('modal_close');
}
@@ -1028,9 +1525,12 @@ $inv.cSt = function (data) {
};
$inv.eHtml = function (ev) {
let t = $(this), frmct = ev.data instanceof jQuery ? ev.data : ev.data.t;
- /* invoiceemail must stay plain text — using the TinyMCE/html editor here used to wrap the
- address in tags, which then got posted and persisted verbatim into SendToEmail. */
- let isPlainText = ev.data.nme === 'invoiceemail';
+ /* Single-line fields must stay plain text — the TinyMCE/html editor wraps the value in
+ tags, which used to get posted and persisted verbatim (e.g.
18.06.2026
in the
+ Leistungsdatum). The backend sanitises HTML too (single source of truth, ADR 0006), but
+ keeping these plain here avoids the UI briefly holding the wrapped value. Multi-line fields
+ (invoiceaddress, loc) stay HTML-capable and are normalised to newlines server-side. */
+ let isPlainText = ['invoiceemail', 'provisionperiod', 'invoicetitle'].includes(ev.data.nme);
let flds = isPlainText
? [{ name: 'txt', label: 'Text', type: 'text', value: frmct.text() }]
: [{ name: 'txt', label: 'Text', type: 'html', value: frmct.html(), tinymce: true, attr: { style: 'height: 300px' } }];
@@ -1046,6 +1546,11 @@ $inv.eHtml = function (ev) {
if (typeof change === 'function') {
change(response.txt);
}
+ /* backend-authoritative: mirror the inline recipient-field edit to the server session.
+ Invoice and reminder editors share this DOM; each syncField no-ops unless its own
+ draft token is present, so only the active mode's session receives the delta. */
+ $inv.d.syncField(ev.data.nme, isPlainText ? (response.txt || '') : response.txt);
+ $inv.rd.syncField(ev.data.nme, isPlainText ? (response.txt || '') : response.txt);
},
tinymce: { valid_elements: 'br', hidemenu: true, hidetoolbar: true }
}
@@ -1068,6 +1573,8 @@ $inv.eHtml = function (ev) {
}
$ocms.dlgform(flds, sets);
};
+/* No client-side arithmetic (ADR 0006/0008): only the chosen VAT rate is stored on each row;
+ the server (InvoiceDraftCalculator.RecomputeLineValues) recomputes vat_val/svcvat_val from it. */
$inv.setVat = function (ev) {
let t = $(this), thisrow = ev.data;
let vat = prompt($rct.rqV);
@@ -1080,12 +1587,6 @@ $inv.setVat = function (ev) {
thisrow.siblings('.itm').each(function () {
let rwi = $(this), dta = rwi.data();
dta.vat = fnum(vat, { style: 'percent' }).replace(' ', '');
- if ((dta.net_val || 0) > 0) {
- dta.vat_val = dta.net_val * vat;
- }
- if ((dta.svcnet_val || 0) > 0) {
- dta.svcvat_val = dta.svcnet_val * vat;
- }
});
$inv.t_fds_inv();
}
@@ -1131,7 +1632,11 @@ $inv.eRw = function(row, dta, flds) {
}, typedvalues: true
});
};
-$inv.bdysort = (i, e) => { $(e).Sortable({ dragItem: false, dragHandleClass: 'ico', parentident: 'tr', swapdone: (p1, p2, i1, i2) => { $inv.t_fds_inv(); } }) }
+/* Reorder items via drag. The DOM swap happens inside the Sortable during the drag; we commit
+ the new order once, reliably, on drop (onend) — that recomputes positions/totals and pushes the
+ changed block(s) to the backend session (t_fds_inv -> syncChanged). Committing on drop (rather
+ than on every mid-drag hover-swap) avoids rebuilding the row that is currently being dragged. */
+$inv.bdysort = (i, e) => { $(e).Sortable({ dragItem: false, dragHandleClass: 'ico', parentident: 'tr', onend: () => { $inv.t_fds_inv(); } }) }
$inv.rrw = function () {
let rw = $(this), dta = rw.data(), co = {}, ph = rw.is('.placeholder'), hn = rw.is('.hidenote');
let oHtml = (e) => $$.d().append(e).html();
@@ -1141,6 +1646,16 @@ $inv.rrw = function () {
if (ph === false) {
bc.unshift($$.dc('ibtn edit', { title: $rct.cP }).append(gi('pencil')).click(rw, $inv.eRow));
bc.push($$.dc('ibtn del', { title: $rct.dR }).append(gi('trash')).click(function (e) { if (confirm($rct.cD)) { rw.remove(); $inv.t_fds_inv(); } }));
+ /* "Auf Setpreis umstellen": offered on a Set header item that does not yet carry a
+ price. fds__prepInvoice's [SetItmId] now anchors on the still-unconverted (price 0)
+ header, so the header row's own SetItmId self-references its own id rather than being
+ null — the real signal for showing this button is still the header's own price/net_val
+ being 0 (once converted it carries a nonzero price and the button disappears).
+ Irreversible: the actual sum/clear mutation happens server-side (backend-authoritative,
+ see InvoiceDraftEditService.ApplyItemSetPrice) via the "item.setprice" patch target. */
+ if ((dta.Type || '').toLowerCase() === 'set' && (dta.net_val || 0) === 0) {
+ bc.push($$.dc('ibtn tosetp', { title: $rct.toSetP }).append(gi('scale')).click(rw, $inv.toSetPrice));
+ }
}
let axf = $$.dc('axf').append(bc);
if (ph === true) {
@@ -1148,7 +1663,7 @@ $inv.rrw = function () {
} else if (rw.is('.itm.osum') === true) {
co = { invrqid: dta.InvRqId, id: 'osum' + rw.index(), typ: 'osum', p: '', q: null, t: oHtml(dta.tbl.tbl), tt: null, v: null, vt: dta.net_val, vs: dta.svcnet_val, vat: dta.vat, vv: dta.vat_val, vsv: dta.svcvat_val, det: false };
} else {
- co = { invrqid: dta.InvRqId, id: dta.Id || '', typ: dta.Type || 'other', p: '', q: null, t: '', tt: null, v: null, vt: dta.net_val, vs: dta.svcnet_val, vat: dta.vat, vv: dta.vat_val, vsv: dta.svcvat_val, det: (dta.Note || '') !== '' && hn === false };
+ co = { invrqid: dta.InvRqId, id: dta.Id || '', typ: dta.Type || 'other', p: '', q: null, t: '', tt: null, v: null, vt: dta.net_val, vs: dta.svcnet_val, vat: dta.vat, vv: dta.vat_val, vsv: dta.svcvat_val, det: (dta.Note || '') !== '' && hn === false, SetItmId: dta.SetItmId || null };
$$.dc('ibtn ico move', axf, { title: $rct.mR }); /* should be the last added */
co.p = dta.position || (dta.SortOrder || '');
@@ -1158,7 +1673,7 @@ $inv.rrw = function () {
co.t = dta.htmltext || (((dta.NameOrNumber || '').substr(0, 1) !== '#' ? oHtml($$[0]('p').text(dta.NameOrNumber)) : '') + (dta.Note || ''));
} else {
co.tt = co.det ? '' : $$.s(dta.Note || '').text();
- co.q = dta.quantity || (fnum(dta.quantityhours) + ' ' + (dta.UnitString || ''));
+ co.q = dta.quantity || ((dta.quantityhours || 0) !== 0 ? (fnum(dta.quantityhours) + ' ' + (dta.UnitString || '')) : ''); /* guard: no quantityhours -> blank, not fnum(undefined)="NaN" (e.g. the block set row) */
co.t = dta.htmltext ||(co.det ? (oHtml($$.s(dta.NameOrNumber || '')) + oHtml($$.dc('desc').html(dta.Note))) : oHtml($$.s(dta.NameOrNumber || '')));
co.v = dta.net
co.vt = dta.net_val
@@ -1177,45 +1692,62 @@ $inv.rrw = function () {
tda.push($$.td(rw, { colspan: 4 }).append(co.t));
} else {
Array.prototype.push.apply(tda, co.q ? [$$.tdc('keep').text(co.q)] : []);
+ /* ADR 0009: a null/undefined price renders an EMPTY cell (block-mode "Set mit Preis"
+ members, and the set row's own unit-price), distinct from a real 0,00 €. */
+ let cur = (x) => (x == null ? '' : fnum(x, $rct.cst));
Array.prototype.push.apply(tda, [
$$.tdc('txt', { colspan: !co.q ? 2 : 1, title: co.tt }).append(co.t),
- $$.tdc('currency').text(fnum(co.v, $rct.cst)),
- $$.tdc('currency inetval').text(fnum(co.vt, $rct.cst)).attr('title', $rct.svcPart + ': ' + fnum(co.vs, $rct.cst))
+ $$.tdc('currency').text(cur(co.v)),
+ $$.tdc('currency inetval').text(cur(co.vt)).attr('title', $rct.svcPart + ': ' + cur(co.vs))
]);
}
- rw.empty().attr('class', ph ? 'placeholder' : 'itm').aC(co.Typ).tC('hidenote', hn).append(tda);
+ rw.empty().attr('class', ph ? 'placeholder' : 'itm').aC(co.Typ)
+ .tC('sethdr', (co.typ || '').toString().toLowerCase() === 'set') /* emphasise set rows (fn1 header + block set row) */
+ .tC('hidenote', hn).append(tda);
dta.co = co;
};
+/* "Auf Setpreis umstellen" (see $inv.rrw): backend-authoritative (ADR 0006) — the browser only
+ posts the target set-header item id; the server (InvoiceDraftEditService.ApplyItemSetPrice)
+ sums the member rows (same block, [SetItmId] equal to this row's id), writes that sum onto
+ the set header and clears each member's price, then the normal draftReady refresh re-renders
+ both the header and its members from the authoritative session state. This mirrors the PDF's
+ read of the same cached session, so the online editor and PDF can never drift apart. */
+$inv.toSetPrice = function (ev) {
+ let rw = ev.data, dta = rw.data(), id = (dta.Id || '').toString();
+ if (id === '') { return; }
+ if (confirm($rct.toSetPc) === false) { return; }
+ /* Wait for the flush of any pending local edits to actually reach the server before sending
+ the conversion delta — sending both in parallel let a delayed block.replace (still carrying
+ the pre-conversion, zero member/header values) land after item.setprice and silently
+ overwrite the just-converted totals back to 0. */
+ $.when($inv.t_fds_inv()).done(() => { $inv.d.sync({ Target: 'item.setprice', Ref: id }); });
+};
+/* No client-side totals/footer/tax computation (ADR 0006/0008): this only re-assembles each
+ block's row contract array (needed to post the "req" shape to the server) and, on the very
+ first pass, seeds the authoritative backend session. Footer, VAT breakdown, service-refund
+ note figures and the per-block sum cell are never computed here — they are rendered exclusively
+ from the server's `dstate` response by $inv.d.footer / $inv.d.applyState once the draft has a
+ token. Before a token exists the footer/notes/isum cells are simply left empty; there is no
+ local approximation to display. */
$inv.invSumUpdate = function () {
- let tbl = $(this), ft = tbl.children('tfoot').empty(), p13b = bool((tbl.data().admin || {}).p13b || '', false);
- tbl.nextAll('.fnote').remove();
- let sms = { ttn: 0, ttb: 0, ttvat: 0, tscn: 0, tscvat: 0, vat: {}, itmnet: {} }, ba = [];
- let rwcy = (lbl, val, cls) => $$.tdc('currency', $$.tr(ft, { class: cls || 'tsum' }).append([$$.tdc('aux'), $$.td({ colspan: 4 }).text(lbl)]), fnum(val, $rct.cst)), fn = (t) => $$.dc('fnote').insertAfter(tbl).rwText(t);
- let csms = function (rrx, sms, sid) {
- sms.tscn += (rrx.svcnet_val || 0);
- sms.tscvat += (rrx.svcvat_val || 0);
- sms.ttn += (rrx.net_val || 0);
- sms.ttvat += (rrx.vat_val || 0);
- sms.ttb += ((rrx.net_val || 0) + (rrx.vat_val || 0));
- if ((rrx.vat || '') !== '') {
- sms.vat[rrx.vat] = (sms.vat[rrx.vat] || 0) + (rrx.vat_val || 0);
- }
- //sms.itmnet[sid] = (sms.itmnet[sid] || 0) + (rrx.net_val || 0);
- };
+ let tbl = $(this);
+ let ba = [];
let bds = tbl.children('tbody');
bds.each((bi, bdy) => {
- let b = $(bdy), rx = b.data() || {}, i = [], citems = [], cset = null, bnet = 0, itm = b.find('tr.itm'), iso = 0, ipos = 0;
+ let b = $(bdy), rx = b.data() || {}, i = [], citems = [], itm = b.find('tr.itm'), iso = 0, ipos = 0;
b.tC('empty', itm.length < 1);
itm.each((ti, tx) => {
-
- let rrx = $(tx).data() || {}; csms(rrx, sms, rx.Id); bnet += (rrx.net_val || 0); i.push(rrx.co);
- //console.debug('rrx %o', rrx);
+ let rrx = $(tx).data() || {};
+ i.push(rrx.co);
/* backend item contract (title/desc/qty/price_net/total_net + set flags), see InvoiceSetPricing.
- Set grouping: an item of Type 'set' is a header that claims the following items in this
- block as its members until the next set header (mfr__items has no explicit member link). */
+ Set grouping: fds__prepInvoice computes [SetItmId] per item, anchored on the still-unconverted
+ (price 0) Set header that owns it — this is the authoritative membership signal (not row order),
+ so items not tagged with a SetItmId by the server are never swept into a preceding set. The
+ header row's own SetItmId self-references its own id, but it is never its own member (excluded
+ by the id !== '' && !== citem.id check below). */
let citem = $inv.itemToContract(rrx);
- if (citem.type === 'set' && citem.id !== '') { cset = citem.id; }
- else if (cset !== null && (citem.id || '') !== '') { citem.setId = cset; }
+ let sid = (rrx.SetItmId || '').toString();
+ if (citem.type !== 'set' && sid !== '' && sid !== citem.id) { citem.setId = sid; }
citems.push(citem);
if (((typeof rrx.SortOrder === 'undefined' || rrx.SortOrder === null) ? -1 : rrx.SortOrder) > -1) {
if (['text', 'title'].includes((rrx.Type || 'other').toLowerCase()) === false) { ipos++; }
@@ -1224,42 +1756,18 @@ $inv.invSumUpdate = function () {
$inv.rrw.call(tx);
}
});
- //console.debug('%o', {
- // f: b.find('tr.isum > td.isumval'), t: fnum(bnet, $rct.cst), n: bnet
- //});
- b.find('tr.isum > td.isumval').text(fnum(bnet, $rct.cst));
- ba.push({ Id: rx.Id, nme: rx.Name, text: rx.text, itm: i, items: citems, netval: bnet });
+ ba.push({ Id: rx.Id, nme: rx.Name, text: rx.text, itm: i, items: citems });
});
let nonempty = tbl.find('tbody:not(.empty)').length;
bds.find('tr.isum').tC('hidden', nonempty < 2);
- //let fnet = $$.tdc('currency', $$.tr(ft, { class: 'tsum' }).append([$$.tdc('aux'), $$.td({ colspan: 4 }).text('Netto')]), fnum(sms.ttn, $rct.cst));
- rwcy('Netto', sms.ttn);
- if (p13b === false) {
- $.each(sms.vat, (vi, vx) => {
- //$$.tdc('currency vat', $$.tr(ft, { class: 'tvat' }).append([$$.tdc('aux'), $$.td({ colspan: 4 }).text('Umsatzsteuer ' + vi)]), fnum(vx, $rct.cst));
- rwcy($rct.vat + ' ' + vi, vx, 'tvat');
- });
- } else {
- sms.ttb = sms.ttn;
- }
- //let fsum = $$.tdc('currency', $$.tr(ft, { class: 'tsum' }).append([$$.tdc('aux'), $$.td({ colspan: 4 }).text('Summe')]), fnum(sms.ttb, $rct.cst));
- rwcy('Summe', sms.ttb);
- let itype = tbl.data().admin.type;
- if (itype === 'i') {
- fn($rct.note2);
- fn($rct.note4);
- } else if (itype === 'c') {
- fn($rct.note2);
- } else {
- fn(string($rct.note3, [fnum((sms.tscn + sms.tscvat) * (tbl.data().admin.tax_servicerefund || 0), $rct.cst)])).aC('ntax');
- fn($rct.note2);
- fn(string($rct.note1, [fnum(sms.tscn + sms.tscvat, $rct.cst), fnum(sms.tscn, $rct.cst), fnum(sms.tscvat, $rct.cst)]));
- }
- if (p13b === true) {
- fn($rct.note13b);
- }
- tbl.data('sms', sms);
tbl.data('bai', ba);
+ /* Backend-authoritative seeding (ADR 0006): on the first calculation of an invoice
+ draft (invSumUpdate is only bound for invoices, never reminders), hand the assembled
+ model to the server session and switch to server-driven totals from then on. */
+ if ((tbl.data('dtoken') || '') === '' && bool(tbl.data('dseeding'), false) === false && ((tbl.data('admin') || {}).type != null)) {
+ tbl.data('dseeding', true);
+ $inv.d.seed($.extend($inv.invcPayload(tbl.data()), { invid: tbl.data('invid') || '' }));
+ }
};
$inv.worknotes = function (rx) {
let wn = '';
@@ -1347,7 +1855,21 @@ $inv.rendersrq = function () {
$$.tdc('currency isumval', istr);
}
};
-$inv.t_fds_inv = () => { $('div.invoice_layout table.invi').trigger('fds.inv'); };
+$inv.t_fds_inv = () => {
+ let tbl = $('div.invoice_layout table.invi');
+ tbl.trigger('fds.inv');
+ /* After any local item mutation, push the changed block(s) to the authoritative
+ server session as granular deltas (invoice drafts only — reminders have no token,
+ nor a 'dseedpromise', so they correctly fall through to the no-op). While the initial
+ seed (inv/dopen) is still in flight there is no token yet either, but a 'dseedpromise'
+ is pending — wait for it instead of skipping the flush, otherwise an edit made in that
+ brief window is silently never sent. Returns the flush promise so callers that must
+ sequence a follow-up server delta after this flush (e.g. $inv.toSetPrice) can wait for
+ it instead of racing it. */
+ if ((tbl.data('dtoken') || '') !== '') { return $inv.d.syncChanged(tbl); }
+ let seeding = tbl.data('dseedpromise');
+ return seeding ? $.when(seeding).then(() => $inv.d.syncChanged(tbl)) : $.when();
+};
$inv.sedit = () => {
$inv.sprev(true);
};
@@ -1402,6 +1924,7 @@ $inv.sp13b = () => {
} else {
}
tbl.trigger('fds.inv');
+ $inv.d.sync({ Target: 'p13b', Value: d.admin.p13b });
};
/* Maps an item row's data to the backend item contract consumed by InvoiceSetPricing
/ FuchsPdf.ApplyInvoice: { id, type, title (plain), desc (html), qty, price_net,
@@ -1412,7 +1935,10 @@ $inv.itemToContract = function (rrx) {
rrx = rrx || {};
let oHtml = (e) => $$.d().append(e).html();
let type = (rrx.Type || '').toString().toLowerCase();
- let ci = { id: (rrx.Id || '').toString(), type: type, title: '', desc: '', qty: '', price_net: '', total_net: (rrx.net_val || 0), vat: rrx.vat || '' };
+ /* ADR 0009: preserve null prices verbatim (null = empty cell, kept distinct from a real 0) so
+ block-mode nulled members and the set row round-trip unchanged when the block is re-posted. */
+ let nz = (x) => (x == null ? null : x);
+ let ci = { id: (rrx.Id || '').toString(), type: type, title: '', desc: '', qty: '', price_net: '', total_net: nz(rrx.net_val), vat: rrx.vat || '' };
if (rrx.co && rrx.co.typ === 'osum') {
/* combined single-sum line — the on-screen "title" is an HTML sub-table; render it as desc */
ci.desc = rrx.co.t || '';
@@ -1433,29 +1959,35 @@ $inv.itemToContract = function (rrx) {
ci.desc = rrx.Note || '';
}
ci.qty = rrx.quantity || ((rrx.quantityhours || 0) !== 0 ? (fnum(rrx.quantityhours) + (rrx.UnitString ? ' ' + rrx.UnitString : '')) : '');
- ci.price_net = (rrx.net || 0);
- ci.total_net = (rrx.net_val || 0);
+ ci.price_net = nz(rrx.net);
+ ci.total_net = nz(rrx.net_val);
}
return ci;
};
-/* 3-way set-pricing display switch. Mirrors §13b: writes the choice onto admin.setmode,
- which BuildInvoiceParams turns into the "setmode:" InvoiceOptions token the PDF reads. */
+/* 2-way set-pricing display switch (SetPrice / SetOnly). Mirrors §13b: writes the choice onto
+ admin.setmode, which BuildInvoiceParams turns into the "setmode:" InvoiceOptions token
+ the PDF reads. ItemPrices ("Positionen mit Preis – Set als Überschrift") was removed: it was
+ always just the implicit pre-conversion default and is not a state the user can switch back to
+ once a set has been converted via the "Auf Setpreis umstellen" item switch (see $inv.toSetPrice /
+ InvoiceDraftEditService.ApplyItemSetPrice) — that conversion is one-way. */
$inv.ssetmode = () => {
let l = $('div.invoice_layout'), tbl = l.find('table.invi'), d = tbl.data();
d.admin = d.admin || {};
let cur = (d.admin.setmode || 'setprice'), o;
let btn = (mode) => $$.dc('btn', $ict.setmo[mode]).tC('selected', cur === mode).click(() => { o.c.trigger('modal_close'); $inv.setSetmode(mode); });
- let fr = $$.dc('choicefrm').append([btn('setprice'), btn('itemprices'), btn('setonly')]);
+ let fr = $$.dc('choicefrm').append([btn('setprice'), btn('setonly')]);
o = $ocms.dlg(fr, { width: 800 });
};
+/* "Set mit Preis" / "Nur Set mit Preis" (ADR 0009): NOT a display toggle — an irreversible,
+ backend-authoritative mutation grouped by service-request block. The server inserts a dedicated
+ set row per block (block sum) and either nulls each member's price (setprice) or removes the
+ members (setonly); the normal draftReady refresh re-renders both via $inv.d.applyItems. The
+ browser only posts the chosen mode. Flush pending local edits first so a delayed block.replace
+ can't land after the conversion and overwrite it (same race guard as $inv.toSetPrice). */
$inv.setSetmode = (mode) => {
- let l = $('div.invoice_layout'), tbl = l.find('table.invi'), d = tbl.data();
- d.admin = d.admin || {};
- d.admin.setmode = mode; /* posted in admin -> BuildInvoiceParams writes setmode: into InvoiceOptions */
- d.inv = d.inv || {}; /* keep a local InvoiceOptions reflection in sync (cosmetic) */
- let opts = (d.inv.InvoiceOptions || '').split(',').filter(x => x !== '' && x.indexOf('setmode:') !== 0);
- if (mode && mode !== 'setprice') { opts.push('setmode:' + mode); }
- d.inv.InvoiceOptions = opts.join(',');
+ if (confirm($rct.toSetMc || $rct.toSetPc) === false) { return; }
+ let target = (mode === 'setonly') ? 'block.setonly' : 'block.setprice';
+ $.when($inv.t_fds_inv()).done(() => { $inv.d.sync({ Target: target }); });
};
$inv.sctp = () => {
let flds = $invcol.ctp;
@@ -1472,126 +2004,45 @@ $inv.sctp = () => {
cvo.contactEmail = response.email;
d.new.CustomValues = JSON.stringify(cvo); //Assign it to new Values so that this is submitted also
l.find('.ctpfrm').text(ne(response.name, response.email));
+ $inv.d.sync({ Target: 'contact', Value: { name: response.name, email: response.email } });
}, typedvalues: true
});
};
/* Normalises the editor's working model into the exact field names the C# backend
- (FdsInvoiceData.BuildInvoiceParams) reads, then returns the `invc` payload:
- - balances/service sums come from `sms` (ttn/ttb), exposed on `new` as total_net/total_gross;
- - every VAT rate's net amount is exposed as new.vat__net (the backend reads the highest);
+ (FdsInvoiceData.BuildInvoiceParams) reads, then returns the `invc` payload. No totals/VAT
+ are computed here (ADR 0006/0008: the online editor performs no arithmetic at all) — the
+ backend session computes total_net/total_gross/vat itself (InvoiceDraftCalculator) once
+ opened from this payload, and BuildFdsData/BuildInvoiceParams reads them from there:
- new.invoicetitle -> new.title, new.loc -> new.provisionlocation, admin.paymentterms ->
new.paymentterm, admin.CustomerId -> admin.customerid.
Originals are kept alongside; the source objects are not mutated. */
$inv.invcPayload = function (d) {
d = d || {};
- let sms = d.sms || {}, nw = $.extend({}, d.new), adm = $.extend({}, d.admin);
- nw.total_net = sms.ttn || 0;
- nw.total_gross = sms.ttb || 0;
- /* VAT (rate + amount) is taken by the backend straight from the posted sms.vat map
- (FdsInvoiceData.HighestVat), so no per-rate new.vat_* keys are needed here. */
+ let nw = $.extend({}, d.new), adm = $.extend({}, d.admin);
nw.title = (nw.invoicetitle != null ? nw.invoicetitle : (nw.title || ''));
nw.provisionlocation = (nw.loc != null ? nw.loc : (nw.provisionlocation || ''));
nw.paymentterm = (adm.paymentterms != null ? adm.paymentterms : (nw.paymentterm || ''));
adm.customerid = (adm.customerid != null ? adm.customerid : adm.CustomerId);
- return { admin: adm, req: d.bai, sms: d.sms, new: nw };
-};
-$inv.ssave = () => {
- var l = $('div.invoice_layout'), d = l.find('table.invi').data();
- $inv.t_fds_inv();
- l.aC('freeze');
- $ocms.postXT({
- url: $ocms.url('req/save'), data: { invc: JSON.stringify($inv.invcPayload(d)), id: d.invid || '' }, success: (response) => {
- $inv.cntInv({ id: response.id });
- }, error: () => {
- alert($ict.eis);
- }, complete: () => {
- l.rC('freeze');
- }
- });
-};
-$inv.sprev = (change) => {
- var l = $('div.invoice_layout'), d = l.find('table.invi').data();
- change = bool(change, false);
- $inv.t_fds_inv();
- l.aC('freeze');
- //console.debug({ admin: d.admin, req: d.bai, sms: d.sms, new: d.new });
- if ($fis.ValidateEmail(d.new.invoiceemail || '') === false) {
- if (bool(confirm($ict.ivE + $ict.ivEc),false) === false) {
- l.rC('freeze');
- return;
- }
- }
- $ocms.postXT({
- url: $ocms.url('req/' + (change === true ?'sedit':'sprep')), data: { invc: JSON.stringify($inv.invcPayload(d)), id: d.invid ||'' }, success: (response) => {
- let c = $$.dc('imagecollection pdfpreview'), vhr = Math.round(vh() * 0.88), invid = response.id, invtp = response.total;
- if (invtp > 10) {
- $$.dc('note warn', c).text($ict.tpe);
- }
- $.each(response.img || [], function (ii, img) {
- $$.dc('pdfp', c).append($$.img(img).css('max-height', (vhr - rpx(6)).toString() + 'px'));
- });
- for (let ic = (response.img || []).length + 1; ic <= invtp; ic++) {
- $$.dc('pdfp ph', c).append($$.dc('note', $ict.pna));
- }
- $ocms.dlg(c, {
- size: [vhr, Math.round(vw() * 0.88)], zindex: 50, form: false, button: $rct.crI, confirm: function (e) {
- let ct = $(this);
- l.aC('freeze'); /* spinner while the invoice is finalized/emailed on the backend */
- $ocms.postXT({
- url: $ocms.url('req/sconf'), data: { id: invid }, success: (cresp) => {
- ct.trigger('modal_close');
- if (cresp.hasFile === true) {
- window.open($ocms.url('req/idoc') + '?id=' + invid, '_blank'); /* open pdf in new tab, only if a file was actually created */
- }
- $ocms.init('req'); /* go back to request list */
- $inv.rReload();
- }, error: () => {
- alert($t.f1);
- ct.trigger('modal_close');
- }, complete: () => {
- l.rC('freeze');
- }
- });
- }, cancel: function (e) {
- let ct = $(this);
- if (confirm($ict.cdI)) {
- $ocms.postXT({
- url: $ocms.url('req/sdel'), data: {
- id: invid
- }
- });
- }
- $inv.rReload();
- }
- });
- }, error: () => {
- alert($ict.eis);
- }, complete: () => {
- l.rC('freeze');
- }
- });
+ return { admin: adm, req: d.bai, new: nw };
};
+/* Zwischenspeichern and preview now run against the backend-authoritative session
+ (ADR 0006): no full-invoice re-upload — the cached draft is flushed / rendered by
+ token. See $inv.d.save / $inv.d.preview. The finalise + email path (req/sconf) is
+ unchanged and is invoked from the preview modal's confirm handler. */
+$inv.ssave = () => { $inv.d.save(); };
+$inv.sprev = (change) => { $inv.d.preview(); };
$inv.rReload = () => {
try {
let s = $('#listframe ul.rql:first').data();
$inv.cInv2({ id: s.search });
} catch (e) { }
};
-$inv.quantChange = function (i) {
- //console.debug({ t: this, i: i });
- let t = $(this), f = t.closest('form'), fi = {}, pf = (i) => parseFloat(i.toString().replace('%', '').replace(',', '.')), rtp = (num) => num.toFixed(2);
- f.find(':input').each((i, e) => { fi[$(e).attr('name')] = $(e); });
- let qv = parseInt(fi.quantityhours.val() || '0'), nv = pf(fi.net.val() || '0'), vat = pf(fi.vat.val()) * 0.01;
- if (qv > 0 && nv > 0) {
- fi.net_val.val(rtp(qv * nv));
- fi.vat_val.val(rtp(qv * nv * vat));
- if (['Service'].includes(fi.Type.val())) {
- fi.svcnet_val.val(rtp(qv * nv));
- fi.svcvat_val.val(rtp(qv * nv * vat));
- }
- }
-};
+/* No client-side arithmetic (ADR 0006/0008): quantity/price/VAT edits are posted as raw values
+ and the server (InvoiceDraftCalculator.RecomputeLineValues) computes net_val/vat_val/
+ svcnet_val/svcvat_val. The fields are left as entered here; the authoritative values are
+ pushed back onto the row by $inv.d.applyItems once the change reaches the backend. */
+$inv.quantChange = function (i) { };
$inv.storno = function (id, fds) {
let o, fr = $$.dc('choicefrm').append([
$$.dc('btn', 'Storno ohne Details').click({ id: id, mode: 'simple' }, (ev) => { o.c.trigger('modal_close'); $inv.cSt(ev.data); })
@@ -1750,6 +2201,8 @@ $inv.eRowR = function (ev) {
$.extend(tdta.rm, res);
tbl.data(tdta);
$inv.rRemRw.call(row, tdta);
+ /* backend-authoritative: mirror the edited amount / amount-paid to the server session */
+ $inv.rd.syncAmount(tdta.rm.amount, tdta.rm.amount_payed);
}, typedvalues: true
});
};
@@ -1764,7 +2217,10 @@ $inv.ccRem_s2 = function (id, sets) { //reminder creation
//console.debug(response);
let rem = response.rm || {};
let rq = $$.dc('srq', frm);
- $ict.remt[rem.type].forEach(r => $$[0]('p').rwText(r).appendTo(rq));
+ /* Intro/closing notice paragraphs are backend-authoritative (see $inv.rd.notes,
+ populated from FuchsPdf.BuildReminderNotes via rem/dstate after seeding below) —
+ they are appended/prepended into this same .srq container once the draft session
+ is open, so no client-side wording is constructed here. */
let rif = $$.tblset({ class: 'invi' }, rq);
rif.ft = $$[0]('tfoot');
rif.tbl.data($.extend({ invid: rem.invid, new: {} }, response));
@@ -1772,7 +2228,6 @@ $inv.ccRem_s2 = function (id, sets) { //reminder creation
$ict.remHR.forEach(h => $$.th(thr, h));
$inv.rRemRw.call($$.tr(rif.bdy), rif.tbl.data());
rif.ft.appendTo(rif.tbl);
- $ict.remt2[rem.type].forEach(r => $$[0]('p').rwText(r).appendTo(rq));
let fm = (cls, txt, nme, hd, dta) => {
let fr = $$.dc('inpfrm', frm).aC(cls).append(typeof hd === 'string' ? $$.dc('ahd', hd) : (hd > 0 ? $$.dc('ahd', $rct.frm[nme]) : null)), fc = $$.dc('content', fr).rwText(txt);
@@ -1790,57 +2245,26 @@ $inv.ccRem_s2 = function (id, sets) { //reminder creation
rif.tbl.children('tbody').each($inv.bdysort);
rif.tbl.trigger('fds.inv'); /* trigger calculations */
+ /* Seed the authoritative server session (ADR 0006). Amounts join the recipient
+ fields in the 'new' block; the reference invoice data goes into 'rem'. From here
+ the backend owns the open-amount computation and validation; inline edits and the
+ item-row dialog post single deltas (see $inv.rd). */
+ let nw = rif.tbl.data('new');
+ nw.amount = rem.amount; nw.amount_payed = rem.amount_payed;
+ $inv.rd.seed({
+ rem: { invid: rem.invid, type: rem.type, invoiceid: rem.invoiceid, invoicedate: rem.invoicedate },
+ new: nw
+ });
}, complete: () => {
//o.c.trigger('modal_close');
}
});
};
$inv.rprev = () => {
- var l = $('div.invoice_layout'), tbl = l.find('table.invi'), d = tbl.data();
- $.extend(d.new, tbl.find('tbody > tr:first').data());
- l.aC('freeze');
- //console.debug({ rem: d.rm, new: d.new });
- if ($fis.ValidateEmail(d.new.invoiceemail || '') === false) {
- if (bool(confirm($ict.ivE + $ict.ivEc), false) === false) {
- l.rC('freeze');
- return;
- }
- }
- $ocms.postXT({
- url: $ocms.url('rem/prep'), data: { remc: JSON.stringify({ rem: d.rm, new: d.new }), id: d.invid || '' }, success: (response) => {
- l.rC('freeze');
- let c = $$.dc('imagecollection pdfpreview'), vhr = Math.round(vh() * 0.88), remid = response.id;
- $.each(response.img || [], function (ii, img) {
- $$.dc('pdfp', c).append($$.img(img).css('max-height', (vhr - rpx(6)).toString() + 'px'));
- });
- $ocms.dlg(c, {
- size: [vhr, Math.round(vw() * 0.88)], zindex: 50, form: false, button: $ict.remd, confirm: function (e) {
- let ct = $(this);
- $ocms.postXT({
- url: $ocms.url('rem/conf'), data: { id: remid }, success: () => {
- ct.trigger('modal_close');
- window.open($ocms.url('rem/idoc') + '?id=' + remid, '_blank'); /* open pdf in new tab */
- $ocms.init('req'); /* go back to request list */
- $inv.rReload();
- }, error: () => {
- alert($t.f1);
- ct.trigger('modal_close');
- }
- });
- }, cancel: function (e) {
- let ct = $(this);
- if (confirm($ict.cdI)) {
- $ocms.postXT({
- url: $ocms.url('rem/del'), data: {
- id: remid
- }
- });
- }
- $inv.rReload();
- }
- });
- }
- });
+ /* Preview + finalise now run through the backend-authoritative session ($inv.rd):
+ the PDF renders straight from the server cache (no rem/prep DB write), and confirm
+ flushes (rem/dsave) then finalises + emails (rem/conf). */
+ $inv.rd.preview();
};
$inv.sis = (id) => {
if (confirm($ict.sisc)) {
diff --git a/Fuchs/wwwroot/web/fis.inv.de.min.js b/Fuchs/wwwroot/web/fis.inv.de.min.js
index 1d38dbc..ad06eed 100644
--- a/Fuchs/wwwroot/web/fis.inv.de.min.js
+++ b/Fuchs/wwwroot/web/fis.inv.de.min.js
@@ -1 +1 @@
-let $rct={mdl:"Aufträge",or:"offene Aufträge",orr:"offene Aufträge (4 W)",rn:"Auftragsnummer",iov:{all:"Auftragsübersicht (alle)","":"Auftragsübersicht"},wk:"Woche",nd:"Keine Daten gefunden.",h:"Uhr",rq1:"Auftragsdaten werden von MFR abgerufen.\nDer Vorgang kann bis zu 90Sek dauern.",rq2:"Auftragsdaten werden geladen",rq1f:"Die Auftragsdaten von MFR konnten nicht oder nicht schnell genug abgerufen werde.\nMöchten Sie mit den bestehenden Daten trotzdem weitermachen?",note1:"Im Bruttobetrag sind {0} Lohnkosten enthalten (netto {1}). Die darin enthaltene Umsatzsteuer beträgt {2}.",note2:"Bitte beachten Sie, nach §14 Abs. 1 Umsatzsteuergesetz ist diese Rechnung ein Zahlungsbeleg oder eine andere beweiskräftige Unterlage für 2 Jahre nach Ablauf des Kalenderjahres der Ausstellung dieser Rechnung aufzubewahren, soweit nicht aufgrund anderer gesetzlicher Regelungen andere ggf.längere Aufbewahrungsfristen gelten.",note3:"Privathaushalten erstattet das Finanzamt bis zu {0} des Arbeitslohns mit der nächsten Steuererklärung.",note4:"Für bereits erbrachte Arbeiten, Dienstleistungen, Materiallieferungen und getätigte Bestellvorgänge zum oben genannten Bauvorhaben, die sich aus dem mit Ihnen geschlossenen Vertrag ergeben, stellen wir Ihnen vertragsgemäß unsere Akontozahlung in Rechnung. Eine Endabrechnung erhalten Sie als Schlussrechnung nach Abschluss des gesamten Bauvorhabens. Das Ausführungsdatum entnehmen Sie bitte dem Schlusstext dieser Rechnung. Wir danken Ihnen herzlich für das entgegengebrachte Vertrauen und bitten Sie um kurzfristigen Ausgleich der Akontorechnung.",note13b:"Gem. §13b Umsatzsteuergesetz unterliegen Sie der Steuerschuldnerschaft des Leistungsempfängers zur Umsatzsteuer aus dieser Rechnung mit einem Steuersatz von 19%.",crI:"Rechnung erstellen",crII:"Abschlagsrechnung erstellen",dII:"Für eine Abschlagsrechnung darf nur ein Auftrag gewählt werden.",dnS:"Für eine Rechnung muss mindestens ein Auftrag gewählt werden.",inv:"Rechnung",invs:"Rechnungen",req:"Auftrag",provP:"Leistungszeitraum",provD:"Leistungsdatum",cP:"Position ändern",iRb:"Zeile darunter einfügen",dR:"Zeile löschen",sV:"USt festlegen",cD:"Löschen?",mR:"Zeile verschieben",svcPart:"Service-Anteil",vat:"Umsatzsteuer",combP:"Positionen zusammenfassen",iSum:"Zwischensumme",dtRel:"Freigegeben am: ",dtCr:"Erstellt am: ",rqV:"USt des Auftrags?",cthd:"wirklich aus-/einblenden ?",cst:{style:"currency",currency:"EUR"},sts:{IsWorkDone:"Arbeiten erledigt",Closed:"Auftrag geschlossen",SubcontractorPendingConfirmation:"Warten auf Bestätigung (Unterauftrag)",Scheduled:"Geplant",OfferIsRejected:"Angebot abgelehnt",OfferIsSend:"Offen (Angebot versandt)",CollaborationWaitingConfirmation:"Warten auf Bestätigung (Zusammenarbeit)",Released:"Freigegeben",OfferIsConfirmed:"Bestätigt",InProgress:"In Bearbeitung",ReadyForScheduling:"Zur Planung",Created:"Erstellt",Rejected:"Abgebrochen",Invoiced:"Rechnung gestellt","-":"-"},invHR:["Pos.","Menge","Artikelbezeichnung","VK","Summe"],frm:{invoiceaddress:"Adresse",loc:"Leistungsort / Lieferadresse",invoiceemail:"Email"}},$rcol={req:new fields_definition("Auftrag","Aufträge",[{name:"tags",label:"",type:"string",dfnc:function(e,t){""!==(e||"")&&($(this).aC("tags"),e.split(",").forEach((e=>{""!==e&&$(this).append($$.sc("tag "+e.replace(" ","_").replace("/","_").toLowerCase(),e))})))}},{name:"DateOfCreation",label:"Datum",type:"date",title:function(e){$(this).attr("title",$rct.dtCr+fdt(e.DateOfCreation).ne("-")+" \n"+$rct.dtRel+fdt(e.DateReleased).ne("-"))}},{name:"CustomerName",label:"Kunde (Firma)",type:"string"},{name:"Name",label:"Auftragsname",type:"string"},{name:"ExternalId",label:"Auftragsnummer",type:"string"},{name:"ParentExtenalId",label:"PAuftrag",type:"string"},{name:"InvoiceId",label:"RNummer",type:"string",dfnc:function(e,t){$(this).rwText(e," ").find("span").each((function(){$(this).aC("cla").click({id:$(this).text()},$inv.jdbn)}))}},{name:"State",label:"Status",type:"string"},{name:"WorkDoneAt",label:"Erledigt am",type:"date"},{name:"Description",label:"Beschreibung",type:"html"}]),itm:new fields_definition("Auftragsposition","Auftragspositionen",[{name:"NameOrNumber",label:"Bezeichnung",type:"string"},{name:"Type",label:"Typ",type:"select",required:!0,value:"Text",url:[{value:"Text",label:"Text"},{value:"Equipment",label:"Ausrüstung"},{value:"Material",label:"Material"},{value:"Service",label:"Arbeitsleistung"}],change:function(e){$req.quantChange.call(this,e)}},{name:"quantityhours",label:"Anzahl / Menge",type:"number",precision:"0.01",value:1,change:function(e){$inv.quantChange.call(this,e)}},{name:"UnitString",label:"Einheit",type:"select",url:["LFDM","Stck","Std.","QM","AW","Pauschal"],change:function(e){$inv.quantChange.call(this,e)}},{name:"net",label:"EinzelPreis netto",type:"number",precision:"0.01",value:0,change:function(e){$inv.quantChange.call(this,e)}},{name:"net_val",label:"GesamtPreis netto",type:"number",precision:"0.01",value:0},{name:"vat_val",label:"GesamtPreis USt",type:"number",precision:"0.01",value:0},{name:"svcnet_val",label:"Arbeitslohn netto",type:"number",precision:"0.01",value:0},{name:"svcvat_val",label:"Arbeitslohn USt",type:"number",precision:"0.01",value:0},{name:"net_pos",label:"Netto",type:"string"},{name:"bo_pos",label:"Brutto",type:"string"},{name:"vat",label:"USt",type:"string",value:"19,0%",change:function(e){$inv.quantChange.call(this,e)}},{name:"Note",label:"Details",type:"html",tinymce:!0}])},$ict={mdl:"Rechnungen",iov:{all:"Rechnungen (alle)","":"Rechnungen (nur fertige)","#d":"Rechnungen (nur Entwürfe)","#u":"Rechnungen (nur unbezahlt)","#r":"Rechnungen (nur angemahnt)","#a":"Rechnungen (nur Akonto)","#c":"Rechnungen (nur Storno)","#ru":"Rechnungen (nur angemahnt + unbez.)"},uba:", gesamter Zeitraum)",req:"Auftrag",inv:"Rechnung",rem:"Mahnung",in:"Rechnungsnummer",cc:"Kunde",wk:"Woche",nd:"Keine Daten gefunden.",dl:"Herunterladen",ed:"Bearbeiten",ced:"Bearbeitung fortsetzen",sItm:"Einzelheiten anzeigen",sPay:"Zahlungen anzeigen",cdI:"Entwurf der Rechnung löschen?",rel:"Neu Laden",relm:"Bitte laden Sie Liste manuell neu, um die Änderungen zu sehen.",dsp:"Rechnung anzeigen",storno:"Storno-Rechnung erstellen",credit:"Gutschrift erstellen",remd:"Mahnung erstellen",remdt:"Mahnung erstellen zur Rechnung {0}",remlst:"Mahnungen anzeigen",remdsp:"Mahnung anzeigen",remres:"Mahnung erneut senden",remresc:"Mahnung {0} wirklich erneut senden?",remresr:"Mahnung {0} wurde erfolgreich versandt.",setpyd:"Bezahlt markieren",cpyd:"Rechnung wirklich als bezahlt markieren?",setupd:"Bezahlt-Markierung aufheben",cupd:"Bezahlt-Markierung wirklich aufheben?",ivE:"Die Email-Adresse ist vermutlich nicht gültig.",ivEc:"\nMöchten Sie fortfahren?",pna:"Diese Seite ist in der Vorschau nicht verfügbar",tpe:"Die Anzahl von {0} Seiten wird aktuell nicht unterstützt",eis:"Der Rechnungsentwurf konnte nicht gespeichert werden.",iss:"Zwischenstand speichern.",p13b:"USt -> §13b",setm:"Set-Preisanzeige",setmo:{setprice:"Set mit Preis – Positionen ohne Preis",itemprices:"Positionen mit Preis – Set als Überschrift",setonly:"Nur Set mit Preis – Positionen ausgeblendet"},ctp:"Ansprechpartner festlegen",mfr:"Von MFR neu abrufen",rq1:"Auftragsdaten werden von MFR abgerufen.\nDer Vorgang kann bis zu 90Sek dauern.",rq2:"Auftragsdaten werden geladen",iq1:"Rechnungsdaten werden von MFR abgerufen.\nDer Vorgang kann bis zu 90Sek dauern.",iq2:"Rechnungsdaten werden geladen",sis:"Rechnung als versandt markieren",srs:"Mahnung als versandt markieren",sisc:"Rechnung wirklich als versandt markieren?",srsc:"Mahnung wirklich als versandt markieren?",iSt:{dft:"Entwurf",uns:"nicht versandt",pyd:"bezahlt",cc:"storniert",op:"offen",due:"fällig",ovd:"überfällig",rem:"angemahnt"},rSt:["","Überfällig","2. Mahnung","3. Stufe"],pSt:{a:"Vollst.",p:"Teilz."},ivT:{i:"AbschlagsR.",f:"SchlussR",r:"Rechnung",c:"StornoR."},rovlh:"Übersicht der bisherigen Mahnungen",rovl:["Betreff","Betrag","Betrag gezahlt","fertiggestellt am"],remHR:["Rechnung","vom","Rechnungsbetrag","bereits bezahlt","noch offen"],remt:{f:["Sehr geehrte Damen und Herren,","ein Mahnschreiben sollte kurz, freundlich und erfolgreich sein. Kurz ist es, freundlich sowieso; ob es auch erfolgreich ist, hängt von Ihnen ab."],m:["Sehr geehrte Damen und Herren,","nun müssen wir Sie noch einmal anschreiben.","Wahrscheinlich haben Sie triftige Gründe dafür, warum Sie die Zahlung unserer Forderung nicht vornehmen und auch nicht auf unsere Mahnung reagieren. Sollten wir darüber nicht einmal sprechen?","Bitte nehmen Sie umgehend in dieser Sache mit uns Kontakt auf."],l:["Sehr geehrte Damen und Herren,",'Eine DRITTE MAHNUNG zu erhalten bereitet Ihnen bestimmt ebenso wenig Freude wie uns, sie zu verschicken. Leider haben wir auf unsere zweite Mahnung noch keine Antwort von Ihnen erhalten.", "Wir bitten Sie, den offenen Betrag innerhalb der nächsten 7 Werktage nach Erhalt dieses Schreibens zu begleichen. Nach Ablauf dieser Frist erfolgt keine weitere Mahnung mehr.',"Sollte die Forderung bis dahin nicht beglichen sein, eröffnen wir das gerichtliche Mahnverfahren. Sollten Sie die Rechnung inzwischen beglichen haben, so betrachten Sie bitte dieses Schreiben als gegenstandslos."]},remt2:{f:["Wir bitten Sie, den noch offenen Rechnungsbetrag innerhalb einer Woche auf unser Konto zu überweisen.","Sollten Sie den Betrag bereits überwiesen haben, so bitten wir Sie, diese Zahlungserinnerung als gegenstandslos zu betrachten."],m:["Um Ihnen zusätzliche Kosten für weitere Mahnungen zu ersparen, bitten wir Sie nunmehr um die Überweisung des noch zu zahlenden Gesamtbetrages inklusive der ggf. bereits fälligen Mahnzinsen und Mahngebühren innerhalb von einer Woche."],l:[]},payi:{account:"Konto",name:"Zahler",text:"Verw.Zweck",InvoiceID:"Rechnung",amount:"Betrag",date:"Datum",manual:"Typ"}},$invcol={datev:new fields_definition("Rechnung","Rechnungen",[{name:"Umsatz (ohne Soll/Haben-Kz)",label:"Umsatz (ohne Soll/Haben-Kz)",type:"string"},{name:"vf",label:"vf",type:"string"},{name:"Soll/Haben-Kennzeichen",label:"Soll/Haben-Kennzeichen",type:"string"},{name:"Konto",label:"Konto",type:"string"},{name:"Gegenkonto",label:"Gegenkonto",type:"string"},{name:"BU-Schlüssel",label:"BU-Schlüssel",type:"string"},{name:"Belegdatum",label:"Belegdatum",type:"string"},{name:"Belegfeld 1",label:"Belegfeld 1",type:"string"},{name:"Belegfeld 2",label:"Belegfeld 2",type:"string"},{name:"Buchungstext",label:"Buchungstext",type:"string"}]),inv:new fields_definition("Rechnung","Rechnungen",[{name:"invstatus",label:"Status",type:"select",url:$ict.iSt},{name:"balance",label:"Umsatz",type:"string",dtype:"currency"},{name:"CustomerName",label:"Kunde",type:"string"},{name:"InvoiceId",label:"RNummer",type:"string"},{name:"InvoiceType",label:"Typ",type:"select",url:$ict.ivT},{name:"request",label:"Auftrag",type:"string",dtype:"num"},{name:"vat",label:"MwSt",type:"string",dtype:"num"},{name:"deb_cred",label:"Soll/Haben",type:"string"},{name:"customer",label:"Konto",type:"string",dtype:"num"},{name:"contra_account",label:"Gegenkonto",type:"string",dtype:"num"},{name:"Belegdatum",label:"Belegdatum",type:"date"},{name:"reminderstatus",label:"MahnStatus",type:"select",url:$ict.rSt},{name:"reminder",label:"# Mahnungen",type:"integer"},{name:"Buchungstext",label:"Buchungstext",type:"string"},{name:"Payment",label:"Zahlung",type:"string"}]),rem:new fields_definition("Zahlungserinnerung","Zahlungserinnerung",[{name:"amount",label:"Rechnungsbetrag",type:"number",precision:"0.01",value:1},{name:"amount_payed",label:"bereits bezahlt",type:"number",precision:"0.01",value:1}]),rem2:new fields_definition("Zahlungserinnerung","Zahlungserinnerung",[{name:"DocumentName",label:"Name",type:"string"},{name:"subject",label:"Betreff",type:"string"},{name:"DateSent",label:"Versanddatum",type:"date"},{name:"status",label:"Status",type:"string"},{name:"amount_open",label:"offener Betrag",type:"number",precision:"0.01"},{name:"InvoiceId",label:"RNummer",type:"string"}]),rid:new fields_definition("Zahlungserinnerung","Zahlungserinnerung",[{name:"type",label:"Typ",type:"select",url:[["f","einfache Zahlungserinnerung"],["m","Mahnung"],["l","letzte Mahnung"]],required:!0},{name:"level",label:"Stufe",type:"select",url:[["1","Stufe 1"],["2","Stufe 2"],["3","Stufe 3"],["4","Stufe 4"],["5","Stufe 5"],["6","Stufe 6"]],required:!0}]),ctp:new fields_definition("Ansprechpartner","Ansprechpartner",[{name:"name",label:"Name",type:"string"},{name:"email",label:"Email",type:"string"}])},gi=(e,t)=>$$.sc("glyphicon glyphicon-"+e).aC(t),$inv={init2:function(e,t){e=e||"inv",t=t||{},$ocms.getScript([],(function(){$inv.init3(e,t)}))},init3:async function(e,t){$fis.cf(!0);let n=$fis.lf(!0);$("#topbar").ocmsmenu([]),$("#activemodule").text($ict.mdl);let i=[(async()=>{await $fis.getAuth("fds_inv")>0&&($inv.prepLst(""),n.aC("fix"))})(),new Promise(((e,t)=>{$fis.prepAuth(["fds_reminder"])}))];await Promise.all(i)},prepLst:function(e){let t=new Date,n=$fis.lf(!0).ldng(1),i=new Date("2021-01-01");$fis.frm_list().IN((function(){}));let a=[];$.each($ict.iov,((e,t)=>{a.push({lbl:t,fnc:()=>{$inv.prepLst(e),n.aC("fix")}})})),$fis.lfm().ocmsmenu([{lbl:"Filter",itm:a}]);$$.i({placeholder:$ict.in}).appendTo($$.dc("mth ivn",n)).enterKey((function(e){let t=$(this),n=t.val()||"";e.stopPropagation(),t.parent().siblings().rC("selected"),n.length>3&&(t.parent().aC("selected"),$inv.renderinv("i:"+n,"s","all"),t.val(""))})),$$.i({placeholder:$ict.cc}).appendTo($$.dc("mth ivc",n)).enterKey((function(e){let t=$(this),n=t.val()||"";e.stopPropagation(),t.parent().siblings().rC("selected"),n.length>=3&&(t.parent().aC("selected"),$inv.renderinv("c:"+n,"s","all"),t.val(""))}));"#"===e.substr(0,1)&&$$.dc("mth extra",n).text($ict.iov[e].replace(")",$ict.uba)).click((function(t){let n=$(this);if(t.stopPropagation(),n.siblings().rC("selected"),!0===n.is(".selected")){n.toggleClass("selected");let t=fdt(new Date,"yy-MM-dd");$inv.renderinv(t,"a",e)}n.aC("selected")})),n.append("