taxtank-core 2.0.13 → 2.0.15

package/fesm2022/taxtank-core.mjs

@@ -4715,10 +4715,13 @@ class ServiceSubscription extends ServiceSubscription$1 {
         if (!this.promoCode) {
             return 0;
         }
-        const discountApplicable = this.items
-            .map(item => item.price)
-            .filter(price => this.promoCode.getProductsIds().includes(price.product.id))
-            .reduce((sum, price) => sum + price.amount, 0) || this.initialPrice;
+        let discountApplicable = this.initialPrice;
+        if (this.promoCode.products.length) {
+            discountApplicable = this.items
+                .map(item => item.price)
+                .filter(price => this.promoCode.getProductsIds().includes(price.product.id))
+                .reduce((sum, price) => sum + price.amount, 0);
+        }
         if (this.promoCode.amountOff) {
             return Math.min(discountApplicable, this.promoCode.amountOff);
         }
@@ -20220,7 +20223,7 @@ class ExportFormatterService {
         return rows.map((row) => row.map((column) => {
             switch (column.type) {
                 case ExportCellTypeEnum.DATE:
-                    return this.datePipe.transform(column.value, 'dd/MM/YYYY').toString();
+                    return this.datePipe.transform(column.value, 'dd/MM/yyyy').toString();
                 case ExportCellTypeEnum.CURRENCY:
                     return this.currencyPipe.transform(column.value).toString();
                 case ExportCellTypeEnum.PERCENT:
@@ -20416,11 +20419,8 @@ class PdfFromTableService {
     /**
      * Set basic options for PDF table
      */
-    setTableOptions(pdf, tableCaption = '') {
+    setTableOptions(pdf) {
         const lastTableCoords = pdf['lastAutoTable'].finalY || FILE_SETTINGS.contentCoords.top;
-        // get caption height based on caption content height
-        const captionHeight = pdf.getTextDimensions(pdf.splitTextToSize(tableCaption, pdf.internal.pageSize.width)).h;
-        pdf.text(tableCaption, FILE_SETTINGS.contentCoords.left, lastTableCoords + FILE_SETTINGS.contentCoords.top);
         return {
             headStyles: {
                 fillColor: FILE_SETTINGS.text.colorPrimary,
@@ -20429,7 +20429,7 @@ class PdfFromTableService {
                 fillColor: FILE_SETTINGS.text.colorWhite,
                 textColor: FILE_SETTINGS.text.colorBlack
             },
-            startY: lastTableCoords + captionHeight + FILE_SETTINGS.titleCoords.top,
+            startY: lastTableCoords,
             didParseCell: (data) => {
                 // Align last column content to right
                 if (data.table.columns.length > 1 && (data.column.index === data.table.columns.length - 1)) {
@@ -20458,6 +20458,32 @@ class PdfFromTableService {
             .text(description, FILE_SETTINGS.text.positionDescriptionX, FILE_SETTINGS.text.positionDescriptionY)
             .setTextColor(FILE_SETTINGS.text.colorPrimary);
     }
+    /**
+     * Renders a caption before a table.
+     * - Implemented via autoTable (not plain text) so that:
+     *   • line wrapping and text height are calculated automatically,
+     *   • the vertical position (finalY) updates consistently,
+     *   • page breaks keep caption and table together.
+     * - If `pageBreak` is true, caption (and table) start on a new page.
+     */
+    addCaption(pdf, text, pageBreak) {
+        const lastTableCoords = pdf['lastAutoTable'].finalY || FILE_SETTINGS.contentCoords.top;
+        pdf.autoTable({
+            body: [[text]],
+            theme: 'plain',
+            margin: {
+                bottom: 0,
+                left: FILE_SETTINGS.titleCoords.left,
+            },
+            styles: {
+                minCellHeight: 4,
+                fontSize: 12,
+                fontStyle: 'bold',
+            },
+            pageBreak: pageBreak ? 'always' : 'auto',
+            startY: lastTableCoords + FILE_SETTINGS.titleCoords.top / 2,
+        });
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: PdfFromTableService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: PdfFromTableService, providedIn: 'root' }); }
 }
@@ -20489,13 +20515,17 @@ class PdfFromDataTableService extends PdfFromTableService {
         this.setDocumentLogo(pdf);
         this.setDocumentSubtitle(pdf, fileSettings.subtitle);
         this.setDocumentDescription(pdf, fileSettings.description);
+        let pageBreak;
         dataTables.forEach((dataTable) => {
+            this.addCaption(pdf, dataTable.caption || '', pageBreak);
             pdf.autoTable({
                 head: [dataTable.header],
                 body: this.formatter.format(dataTable.body),
                 foot: this.formatter.format(dataTable.footer),
-                ...this.setTableOptions(pdf, dataTable.caption)
+                ...this.setTableOptions(pdf)
             });
+            // pageBreak affects the next caption, so we set it at loop end.
+            pageBreak = dataTable.pageBreak;
         });
         return pdf;
     }
@@ -20524,19 +20554,18 @@ class PdfFromHtmlTableService extends PdfFromTableService {
         const pdf = new JsPdf(fileSettings.orientation);
         this.setDocumentTitle(pdf, fileSettings.title);
         this.setDocumentLogo(pdf);
+        let pageBreak;
         tables.forEach((table) => {
             table.querySelectorAll('tbody .mat-mdc-row')
                 .forEach(row => row.classList.contains('expandable-row') ? row.remove() : '');
-            // Add table caption if not provided
-            if (!table.caption) {
-                table.createCaption();
-                table.caption.innerText = '';
-            }
+            this.addCaption(pdf, table.caption?.innerText || '', pageBreak);
             pdf.autoTable({
                 html: table,
                 ...customOptions,
-                ...this.setTableOptions(pdf, table.caption.innerText)
+                ...this.setTableOptions(pdf),
             });
+            // pageBreak affects the next caption, so we set it at loop end.
+            pageBreak = table.hasAttribute('pageBreak');
         });
         return pdf;
     }