Book a portal's commission and payment fee, and show them on the invoice

assets/controllers/invoices_controller.js

@@ -8,6 +8,8 @@ import {
     getLocalStorageItem,
     updatePDFExportLinks,
     enableDeletePopover,
+    enableTooltips,
+    disposeTooltips,
     setModalTitle
 } from '../js/utils.js';
 
@@ -23,6 +25,10 @@ const debounce = (fn, delay = 300) => {
 
 export default class extends Controller {
     connect() {
+        // Every form loaded into the modal connects anew, while the bootstrapping
+        // below runs once per page - so tooltips are set up before that guard.
+        this.initTooltips();
+
         this.modalContent = document.getElementById('modal-content-ajax');
         const invoicesBootstrapped = this.modalContent.hasAttribute('data-invoices-bootstrapped');
         if (invoicesBootstrapped) {
@@ -40,6 +46,14 @@ export default class extends Controller {
         }
     }
 
+    async initTooltips() {
+        await enableTooltips(this.element);
+    }
+
+    disconnect() {
+        disposeTooltips(this.element);
+    }
+
     // Actions
     openModalAction(event) {
         event.preventDefault();
@@ -249,6 +263,10 @@ export default class extends Controller {
         if (includesVat) includesVat.checked = values[3] === '1';
         if (isFlatPrice) isFlatPrice.checked = values[4] === '1';
         if (isPerRoom) isPerRoom.checked = values[5] === '1';
+        // Carried over from the price like the switches above; a package passes
+        // its answer on to the components it is broken into.
+        const brokered = document.getElementById('invoice_misc_position_brokered');
+        if (brokered && selected) brokered.checked = selected.dataset.brokered !== '0';
         if (isFlatPrice && !isPackage) {
             this.applyFlatPriceState(isFlatPrice, isPerRoom);
         }

assets/controllers/prices_controller.js

@@ -189,6 +189,16 @@ export default class extends Controller {
         if (defaultActiveCheckbox) {
             defaultActiveCheckbox.disabled = !isMisc;
         }
+        // A night is what the portal brokered, so the question is only put for
+        // miscellaneous prices; PriceService keeps apartment prices on "yes".
+        const brokeredWrapper = this.element.querySelector(`#brokered-wrap-${priceId}`);
+        const brokeredCheckbox = this.element.querySelector(`#brokered-${priceId}`);
+        if (brokeredWrapper) {
+            brokeredWrapper.classList.toggle('d-none', !isMisc);
+        }
+        if (brokeredCheckbox) {
+            brokeredCheckbox.disabled = !isMisc;
+        }
         const bookableOnlineWrapper = this.element.querySelector(`#bookable-online-wrap-${priceId}`);
         const bookableOnlineCheckbox = this.element.querySelector(`#isBookableOnline-${priceId}`);
         if (bookableOnlineWrapper) {

assets/controllers/settings_controller.js

@@ -77,6 +77,15 @@ export default class extends Controller {
         }
     }
 
+    // Show or hide a container based on a checkbox, e.g. the portal-fee fields
+    // that only apply once an origin is marked as charging them.
+    toggleFieldsAction(event) {
+        const targetSelector = event.currentTarget.dataset.targetSelector;
+        if (!targetSelector) return;
+        const target = document.querySelector(targetSelector);
+        if (target) target.classList.toggle('d-none', !event.currentTarget.checked);
+    }
+
     submitFormAction(event) {
         event.preventDefault();
         const form = event.target.closest('form');

docs/release-notes/4.12.0.de.md

@@ -11,6 +11,16 @@
 * **Zeitgesteuerte Automatisierungen** können täglich, Montag–Freitag oder Montag–Samstag ab einer gewählten vollen Stunde laufen. Ausgeschlossene Tage werden am nächsten erlaubten Tag nachgeholt. Bestehende Regeln bleiben bei täglich ab 00:00 Uhr; der Cronjob prüft weiterhin viertelstündlich und führt sie beim ersten passenden Durchlauf aus.
 * Beim Versand oder Anhängen einer Rechnung kannst du eine **PDF-Rechnungsvorlage** auswählen – auch für Anhänge an Vorlagen-E-Mails. Ohne Auswahl gilt die Standardvorlage.
 
+## 🏷️ Portalgebühren je Buchungsherkunft
+
+* Bei einer Buchungsherkunft hinterlegst du **Kommission und Zahlungsgebühr in Prozent** sowie, wer die Zahlung und wer die Kurtaxe einzieht. Beim Anlegen einer Reservierung werden diese Angaben mitgeschrieben, damit ein später geänderter Vertrag nicht rückwirkend ändert, was für ältere Buchungen gilt. Beitrag von @MeisterAdebar ([#293](https://github.com/developeregrem/fewohbee/pull/293)).
+* Die neue Automatisierung **„Prozentualen Buchungseintrag erstellen“** bucht den Abzug ins Buchungsjournal – wahlweise mit dem Satz aus der Herkunft oder einem selbst eingetragenen. Soll- und Habenkonto, Steuersatz und Bemerkung legst du an der Automatisierung fest; `%number%` wird durch die Rechnungsnummer ersetzt.
+* Für Rechnungsvorlagen stehen die Bausteine **Buchungsherkunft, OTA-Kommission und OTA-Zahlungsgebühr** bereit. Dieselbe Berechnung liefert die Beträge für Rechnung und Buchung, damit beides zusammenpasst.
+* Worauf die Gebühren entfallen, steht an den Rechnungspositionen. Am Preis gibt der Schalter **„Teil einer Portalbuchung“** vor, was an der Rezeption verkauft wird und damit keine Gebühren trägt; an einer von Hand hinzugefügten Position lässt sich das ändern. Eine separat ausgewiesene Kurtaxe bleibt kommissionsfrei, sofern sie auch beim Portal getrennt eingerichtet ist.
+* Sind auf einer Rechnung unterschiedliche Sätze im Spiel oder wurden die Aufenthalte teils über das Portal und teils direkt bezahlt, bucht die Automatisierung nichts und schreibt den Grund ins Protokoll; die Rechnung lässt die Beträge dann weg. So steht auf der Rechnung nie eine Zahl, die im Journal fehlt.
+* Eine Buchung kann als **„wartet auf Belegnummer“** markiert werden. Solange sie fehlt, lässt sich der Monat nicht abschließen. Konten und Steuersätze, mit denen eine Automatisierung bucht, lassen sich nicht mehr löschen.
+* ⚠️ **Beim Update:** Bestehende Buchungsherkünfte tragen keine Gebühren, es ändert sich also zunächst nichts. Herkünfte mit Zahlungsgebühr gelten künftig als „Zahlung zieht das Portal ein“. Kurtaxe-Positionen auf bereits geschriebenen Rechnungen gelten als vom Haus kassiert und kommissionsfrei.
+
 ## 💳 Zahlungs-QR-Code und Rechnungsvorlagen
 
 * Der neue Baustein **„Zahlungs-QR-Code (GiroCode)“** übernimmt Empfänger, IBAN, Betrag und Rechnungsnummer für eine SEPA-Überweisung in die Banking-App. Größe und Position sind anpassbar. Er erscheint nur mit hinterlegter Bankverbindung, übertragbarem Betrag und Euro als Währung. [Anleitung und Beispiel](https://github.com/developeregrem/fewohbee/wiki/Templates-Invoice) · Beitrag von @MeisterAdebar ([#280](https://github.com/developeregrem/fewohbee/pull/280)).

migrations/Version20260719160000.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260719160000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add requires_document_number to booking_entries (marks entries whose document reference is still to be supplied)';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE booking_entries ADD requires_document_number TINYINT(1) DEFAULT 0 NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE booking_entries DROP requires_document_number');
+    }
+
+    public function isTransactional(): bool
+    {
+        return false;
+    }
+}

migrations/Version20260720170000.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260720170000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add commission_percent and payment_fee_percent to reservation_origins (the portal fees a guest carries on top of the direct price)';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE reservation_origins ADD commission_percent NUMERIC(5, 2) DEFAULT NULL, ADD payment_fee_percent NUMERIC(5, 2) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE reservation_origins DROP commission_percent, DROP payment_fee_percent');
+    }
+
+    public function isTransactional(): bool
+    {
+        return false;
+    }
+}

migrations/Version20260730120000.php

@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260730120000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add commission_percent and payment_fee_percent to reservations (the portal rates as they stood when the reservation was booked)';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // Left null for existing reservations: those were booked before the rates
+        // were pinned, and the origin's current rate is the only figure available
+        // for them - which is what the deduction falls back to.
+        $this->addSql('ALTER TABLE reservations ADD commission_percent NUMERIC(5, 2) DEFAULT NULL, ADD payment_fee_percent NUMERIC(5, 2) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE reservations DROP commission_percent, DROP payment_fee_percent');
+    }
+
+    public function isTransactional(): bool
+    {
+        return false;
+    }
+}

migrations/Version20260804120000.php

@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260804120000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Record on the data what a portal charges its fees on: brokered/commissionable per invoice position, brokered per price, and who collects the payment on origin and reservation';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // What a portal brokered, and what it charges commission on, becomes a
+        // property of the position rather than a setting in a workflow: the
+        // invoice's own figures and the journal's deduction both read it, and
+        // neither can reach a workflow's config.
+        $this->addSql('ALTER TABLE invoice_positions ADD brokered TINYINT(1) DEFAULT 1 NOT NULL, ADD commissionable TINYINT(1) DEFAULT 1 NOT NULL');
+
+        // A tourist tax billed as its own position carries no commission, which
+        // existing invoices are set to. It rests on the tax being set up
+        // separately at the portal - see InvoicePosition::$commissionable.
+        $this->addSql("UPDATE invoice_positions SET commissionable = 0 WHERE position_group = 'tourist_tax'");
+
+        // Whether the portal also collected that tax cannot be told from an
+        // invoice already written, so it is assumed to have been paid at the
+        // property - the common case, and the one that charges no payment fee on
+        // it. Going forward the origin's tourist_tax_collection decides.
+        $this->addSql("UPDATE invoice_positions SET brokered = 0 WHERE position_group = 'tourist_tax'");
+
+        // The default for the positions made from a price. True for everything
+        // booked along with the stay; false is for what the house sells on site.
+        $this->addSql('ALTER TABLE prices ADD brokered TINYINT(1) DEFAULT 1 NOT NULL');
+
+        // Who takes the money. Defaults to the property on both counts, which is
+        // what a direct booking does and what an origin that merely passes
+        // bookings on does - no payment handled, no payment fee charged. A portal
+        // that settles payments itself is configured as such once, per origin.
+        $this->addSql("ALTER TABLE reservation_origins ADD payment_collection VARCHAR(16) DEFAULT 'property' NOT NULL, ADD tourist_tax_collection VARCHAR(16) DEFAULT 'property' NOT NULL");
+
+        // Pinned per reservation like the two rates, and left null here for the
+        // same reason they were: nothing was recorded for bookings that predate
+        // the column, and null falls back to the origin rather than asserting an
+        // answer nobody gave.
+        $this->addSql('ALTER TABLE reservations ADD payment_collection VARCHAR(16) DEFAULT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE invoice_positions DROP brokered, DROP commissionable');
+        $this->addSql('ALTER TABLE prices DROP brokered');
+        $this->addSql('ALTER TABLE reservation_origins DROP payment_collection, DROP tourist_tax_collection');
+        $this->addSql('ALTER TABLE reservations DROP payment_collection');
+    }
+
+    public function isTransactional(): bool
+    {
+        return false;
+    }
+}

migrations/Version20260804140000.php

@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260804140000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Mark origins that charge a payment fee as collecting the payment, now that the fee is charged on what the portal processed';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // The payment fee is now taken on what the portal actually processed
+        // (see OriginFeeCalculator), and the column added for that defaults to
+        // the property - which for an origin that charges a payment fee would
+        // quietly book nothing at all from here on.
+        //
+        // An origin charging a percentage for processing payments does process
+        // them; that is what the fee is. So the ones that have such a fee are
+        // marked accordingly, and every other origin keeps the default. The
+        // tourist tax is left alone: portals differ on it and the setting is
+        // there to be answered per origin.
+        $this->addSql("UPDATE reservation_origins SET payment_collection = 'portal' WHERE payment_fee_percent IS NOT NULL AND payment_fee_percent > 0");
+
+        // Reservations booked before this keep NULL and fall back to the origin,
+        // which now answers for them. Deliberately not stamped: pinning today's
+        // answer onto old bookings is exactly what the column exists to prevent.
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql("UPDATE reservation_origins SET payment_collection = 'property' WHERE payment_fee_percent IS NOT NULL AND payment_fee_percent > 0");
+    }
+
+    public function isTransactional(): bool
+    {
+        return false;
+    }
+}

migrations/Version20260915120000.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20260915120000 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Pin who collects the tourist tax onto the reservation, as the payment collection and the rates already are';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // The tourist tax was the one answer still read live off the origin
+        // while the invoice was written. An origin that changes who collects it
+        // would therefore have changed what older, not yet invoiced bookings
+        // are charged - the very thing the pinned columns next to this one
+        // exist to prevent.
+        $this->addSql('ALTER TABLE reservations ADD tourist_tax_collection VARCHAR(16) DEFAULT NULL');
+
+        // Left NULL for everything booked so far, which falls back to the
+        // origin. Stamping today's answer onto old bookings would assert
+        // something about them that nobody recorded.
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE reservations DROP tourist_tax_collection');
+    }
+
+    public function isTransactional(): bool
+    {
+        return false;
+    }
+}

src/Controller/BookingJournalController.php

@@ -28,6 +28,7 @@
 use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Http\Attribute\IsGranted;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 #[Route('/journal')]
 #[IsGranted('ROLE_CASHJOURNAL')]
@@ -184,6 +185,8 @@ public function toggleBatchStatus(
         Request $request,
         EntityManagerInterface $em,
         AuthorizationCheckerInterface $authChecker,
+        BookingEntryRepository $entryRepo,
+        TranslatorInterface $translator,
     ): Response {
         if (!$this->isCsrfTokenValid('batch_toggle_'.$batch->getId(), $request->request->get('_token'))) {
             $this->addFlash('warning', 'flash.access.denied');
@@ -197,6 +200,21 @@ public function toggleBatchStatus(
             return $this->redirectToRoute('journal.batch.entries', ['id' => $batch->getId()]);
         }
 
+        // Closing is what makes a month final, so it is also the last chance to
+        // notice an entry still waiting for the document reference it was
+        // booked ahead of. Reopening stays unguarded - the point is to let
+        // those entries be completed.
+        if (!$batch->isClosed()) {
+            $missing = $entryRepo->countMissingDocumentNumber($batch);
+            if ($missing > 0) {
+                $this->addFlash('warning', $translator->trans('accounting.journal.flash.batch_missing_document_numbers', [
+                    '%count%' => $missing,
+                ]));
+
+                return $this->redirectToRoute('journal.batch.entries', ['id' => $batch->getId()]);
+            }
+        }
+
         $batch->setIsClosed(!$batch->isClosed());
 
         $em->flush();
@@ -258,6 +276,10 @@ public function duplicateEntry(
         $copy->setCreditAccount($entry->getCreditAccount());
         $copy->setTaxRate($entry->getTaxRate());
         $copy->setInvoiceNumber($entry->getInvoiceNumber());
+        // Carried over like everything else: a copy of an entry booked ahead of
+        // its document is waiting for one just as much as the original, and
+        // losing the flag would let the month close on it.
+        $copy->setRequiresDocumentNumber($entry->requiresDocumentNumber());
         $copy->setRemark($entry->getRemark());
 
         $formOptions = [