@design.estate/dees-document 5.1.0 → 5.3.0

package/ts_web/elements/contentinvoice.ts

@@ -143,6 +143,9 @@ const positionColumns: IColumnLayout = {
   flexibleMinWidth: 120,
 };
 
+/** The positions of a document without VAT (`withoutVat`): the same, without the VAT rate's 50 px. */
+const positionColumnsWithoutVat: IColumnLayout = { ...positionColumns, fixedWidth: 40 };
+
 /**
  * A reminder's claims, and its charges and sums, which share the last column;
  * the document label is flexible with at least 150 px (as the grid in the
@@ -354,6 +357,11 @@ export class DeContentInvoice extends DeesElement {
         grid-template-columns: 40px minmax(120px, 1fr) var(--quantity-column-width, 50px) var(--unit-column-width, 50px) var(--unit-price-column-width, 100px) 50px var(--amount-column-width, 100px);
       }
 
+      /* a document without VAT (\`withoutVat\`) has no VAT column */
+      .grid.withoutVat {
+        grid-template-columns: 40px minmax(120px, 1fr) var(--quantity-column-width, 50px) var(--unit-column-width, 50px) var(--unit-price-column-width, 100px) var(--amount-column-width, 100px);
+      }
+
       .topLine {
         margin-top: 5px;
         background: #e7e7e7;
@@ -899,7 +907,11 @@ export class DeContentInvoice extends DeesElement {
   /**
    * The QR pay box. It is printed only when the payment has a valid EPC QR
    * code: a euro amount to the sender's IBAN, which a document in another
-   * currency or without the sender's IBAN does not have.
+   * currency or without the sender's IBAN does not have. The code carries the
+   * reference the document states (`paymentOptions.paymentReference`): an ISO
+   * 11649 creditor reference in line 10, any other as free text, and where it
+   * states none, the letter's number (`epcRemittanceOf`). A stated reference
+   * is printed beside the code, so a payer who types the transfer quotes it.
    */
   private renderPaymentInfo(optionsArg: {
     /** the sender, who is paid */
@@ -907,15 +919,17 @@ export class DeContentInvoice extends DeesElement {
     currency: string;
     /** the amount to pay */
     amount: number;
-    /** the number of the letter, the remittance information */
-    reference: string;
+    /** the number of the letter, the remittance information where the document states no reference */
+    number: string;
+    /** the reference the document states for its payment (EN 16931 BT-83) */
+    statedReference?: string;
   }): TemplateResult | null {
     const bic = optionsArg.from.sepaConnection?.bic;
     const name = optionsArg.from.name;
     const iban = optionsArg.from.sepaConnection?.iban;
     const currency = optionsArg.currency;
     const totalGross = optionsArg.amount;
-    const reference = optionsArg.reference;
+    const remittance = plugins.shared.epcRemittanceOf(optionsArg.statedReference, optionsArg.number);
     if (
       typeof iban !== "string" ||
       plugins.shared.buildEpcQrPayload({
@@ -924,7 +938,8 @@ export class DeContentInvoice extends DeesElement {
         iban,
         currency,
         amount: totalGross,
-        remittanceInformation: reference,
+        remittanceInformation: remittance.remittanceInformation,
+        ...(remittance.creditorReference ? { creditorReference: remittance.creditorReference } : {}),
       }) === null
     ) {
       return null;
@@ -935,6 +950,9 @@ export class DeContentInvoice extends DeesElement {
         <div>
           <div class="label">${this.translateKey("invoice@@payment.qr")}</div>
           <span> ${this.translateKey("invoice@@payment.qr.description")} </span>
+          ${remittance.printedReference
+            ? html`<div>${this.translateKey("invoice@@payment.reference")}: ${remittance.printedReference}</div>`
+            : ""}
         </div>
         <dedocument-paymentcode
           bic="${bic}"
@@ -942,7 +960,8 @@ export class DeContentInvoice extends DeesElement {
           iban="${iban}"
           currency="${currency}"
           totalGross="${totalGross}"
-          reference="${reference}"
+          reference="${remittance.remittanceInformation}"
+          creditorReference="${remittance.creditorReference ?? ""}"
         />
       </div>
     </div>`;
@@ -1052,7 +1071,8 @@ export class DeContentInvoice extends DeesElement {
         from: accountingDocArg.from,
         currency: accountingDocArg.currency,
         amount: summaryArg ? summaryArg.amountDue : this.getTotalGross(),
-        reference: accountingDocArg.id,
+        number: accountingDocArg.id,
+        statedReference: accountingDocArg.paymentOptions?.paymentReference,
       })}
     `;
   }
@@ -1397,7 +1417,8 @@ export class DeContentInvoice extends DeesElement {
         from: reminderArg.from,
         currency: reminderArg.currency,
         amount: totals.payable,
-        reference: reminderArg.id,
+        number: reminderArg.id,
+        statedReference: reminderArg.paymentOptions?.paymentReference,
       })}
     `;
   }
@@ -1435,6 +1456,11 @@ export class DeContentInvoice extends DeesElement {
       return;
     }
     const accountingDoc = this.accountingDoc;
+    // a document without VAT prints no VAT column, no VAT line and one total; one that states tax is refused
+    if (accountingDoc) {
+      plugins.shared.assertWithoutVatStatesNoTax(accountingDoc, this.documentSettings);
+    }
+    const withoutVat = this.documentSettings.withoutVat === true;
     // throws when the advance payments do not add up to the paid amount
     const paidAmountSummary = accountingDoc
       ? plugins.shared.getPaidAmountSummary(accountingDoc, this.getTotalGross())
@@ -1444,7 +1470,7 @@ export class DeContentInvoice extends DeesElement {
         ${this.renderCorrection()}
         <div>${this.translateKey(this.docContent.introStatement)}</div>
         ${this.renderRelatedDocuments()}
-        <div class="grid topLine dataHeader">
+        <div class="grid topLine dataHeader ${withoutVat ? "withoutVat" : ""}">
           <div class="lineItem rightAlign">
             ${this.translateKey("invoice@@item.position")}
           </div>
@@ -1458,18 +1484,20 @@ export class DeContentInvoice extends DeesElement {
             ${this.translateKey("invoice@@unit.type")}
           </div>
           <div class="lineItem rightAlign unitPriceCell">
-            ${this.translateKey("invoice@@price.unit.net")}
-          </div>
-          <div class="lineItem rightAlign">
-            ${this.translateKey("invoice@@vat.short")}
+            ${this.translateKey(withoutVat ? "invoice@@price.unit.withoutVat" : "invoice@@price.unit.net")}
           </div>
+          ${withoutVat
+            ? html``
+            : html`<div class="lineItem rightAlign">
+                ${this.translateKey("invoice@@vat.short")}
+              </div>`}
           <div class="lineItem rightAlign amountCell">
-            ${this.translateKey("invoice@@price.total.net")}
+            ${this.translateKey(withoutVat ? "invoice@@price.total.withoutVat" : "invoice@@price.total.net")}
           </div>
         </div>
         ${accountingDoc?.items?.map(
           (invoiceItem, index) => html`
-            <div class="grid needsDataHeader">
+            <div class="grid needsDataHeader ${withoutVat ? "withoutVat" : ""}">
               <div class="lineItem rightAlign">${index + 1}</div>
               <div class="lineItem descriptionCell">${invoiceItem.name}</div>
               <div class="lineItem rightAlign quantityCell">
@@ -1485,9 +1513,11 @@ export class DeContentInvoice extends DeesElement {
               <div class="lineItem rightAlign unitPriceCell">
                 ${this.formatPrice(invoiceItem.unitNetPrice)}
               </div>
-              <div class="lineItem rightAlign">
-                ${invoiceItem.vatPercentage}%
-              </div>
+              ${withoutVat
+                ? html``
+                : html`<div class="lineItem rightAlign">
+                    ${invoiceItem.vatPercentage}%
+                  </div>`}
               <div class="lineItem rightAlign amountCell">
                 ${this.formatPrice(
                   invoiceItem.unitQuantity * invoiceItem.unitNetPrice
@@ -1497,15 +1527,17 @@ export class DeContentInvoice extends DeesElement {
           `
         )}
         <div class="sums">
-          <div class="sumline">
-            <div class="label">
-              ${this.translateKey("invoice@@sum.total.net")}
-            </div>
-            <div class="value value--total rightAlign amountCell">
-              ${this.formatPrice(this.getTotalNet())}
-            </div>
-          </div>
-          ${this.getVatGroups().map((vatGroupArg) => {
+          ${withoutVat
+            ? html``
+            : html`<div class="sumline">
+                <div class="label">
+                  ${this.translateKey("invoice@@sum.total.net")}
+                </div>
+                <div class="value value--total rightAlign amountCell">
+                  ${this.formatPrice(this.getTotalNet())}
+                </div>
+              </div>`}
+          ${(withoutVat ? [] : this.getVatGroups()).map((vatGroupArg) => {
             let itemNumbers = vatGroupArg.items
               .map((item) => (accountingDoc?.items.indexOf(item) ?? -1) + 1)
               .join(", ");
@@ -1529,7 +1561,7 @@ export class DeContentInvoice extends DeesElement {
             `;
           })}
           <div class="sumline">
-            <div class="label">${this.translateKey("invoice@@totalGross")}</div>
+            <div class="label">${this.translateKey(withoutVat ? "invoice@@totalWithoutVat" : "invoice@@totalGross")}</div>
             <div class="value value--total rightAlign amountCell">
               ${this.formatPrice(this.getTotalGross())}
             </div>
@@ -1558,7 +1590,7 @@ export class DeContentInvoice extends DeesElement {
     this.fitColumns(
       contentNodes.currentContent,
       ".grid.dataHeader",
-      positionColumns
+      withoutVat ? positionColumnsWithoutVat : positionColumns
     );
   }
 

package/ts_web/elements/paymentcode.ts

@@ -53,6 +53,10 @@ export class DedocumentPaymentCode extends DeesElement {
   @property()
   accessor reference!: string;
 
+  /** an ISO 11649 creditor reference for line 10; the reference (line 11) is empty beside it */
+  @property()
+  accessor creditorReference: string | undefined;
+
   /** The EPC QR code content, or null when the payment has no valid code (see buildEpcQrPayload). */
   private get payload(): string | null {
     if (
@@ -71,6 +75,9 @@ export class DedocumentPaymentCode extends DeesElement {
       currency: this.currency,
       amount: this.totalGross,
       remittanceInformation: this.reference,
+      ...(typeof this.creditorReference === "string" && this.creditorReference.length > 0
+        ? { creditorReference: this.creditorReference }
+        : {}),
     });
   }