taxtank-core 2.0.14 → 2.0.16

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);
         }
@@ -20555,7 +20558,8 @@ class PdfFromHtmlTableService extends PdfFromTableService {
         tables.forEach((table) => {
             table.querySelectorAll('tbody .mat-mdc-row')
                 .forEach(row => row.classList.contains('expandable-row') ? row.remove() : '');
-            this.addCaption(pdf, table.caption?.innerText || '', pageBreak);
+            const captionText = this.getCaptionText(table.caption);
+            this.addCaption(pdf, captionText, pageBreak);
             pdf.autoTable({
                 html: table,
                 ...customOptions,
@@ -20566,6 +20570,17 @@ class PdfFromHtmlTableService extends PdfFromTableService {
         });
         return pdf;
     }
+    /**
+     * extracts formatted text from caption's html
+     */
+    getCaptionText(caption) {
+        if (!caption) {
+            return '';
+        }
+        return caption.children.length ?
+            Array.from(caption.children).map((node) => node.textContent).join('\n') :
+            caption.innerText;
+    }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: PdfFromHtmlTableService, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.6", ngImport: i0, type: PdfFromHtmlTableService, providedIn: 'root' }); }
 }
@@ -20923,6 +20938,8 @@ class XlsxService {
             SheetNames: [],
             Sheets: {}
         };
+        // sets the starting cell coordinate for writing data
+        xlsx.utils.sheet_add_aoa(worksheet, [['']], { origin: 'A1' });
         tables.forEach((data) => {
             // add caption for the current table
             xlsx.utils.sheet_add_aoa(worksheet, [[data.caption?.innerText]], { origin: -1 });