shareneus 1.6.73 → 1.6.75

package/dist/accounting/invoice/invoice-pdf/invoice-pdf.service.js

@@ -8,6 +8,7 @@ const pdf_table_section_1 = require("../../../shared/table-section/pdf-table.sec
 const pdf_totals_section_1 = require("../../../shared/totals-section/pdf-totals.section");
 const pdf_shared_utils_1 = require("../../../shared/header-footer-section/pdf-shared.utils");
 const pdf_header_footer_section_1 = require("../../../shared/header-footer-section/pdf-header-footer.section");
+const shared_pdf_service_1 = require("../../../shared/shared-pdf.service");
 const PAGE_MARGINS = [20, 20, 20, 20];
 const CELL_PADDING_LEFT = 4;
 const CELL_PADDING_RIGHT = 4;
@@ -61,40 +62,43 @@ function GetInvoicePdfDataUrl(PDFInvoiceData = {}, PrintConfigData = {}, printCo
     //     }
     // });
 }
+function SalesReceiptHeaderData(Entity, Image, AColor, HColor, text) {
+    return [
+        shared_pdf_service_1.SharedPDFService.GetMainHeader(Entity, Image, AColor, HColor, text),
+        shared_pdf_service_1.SharedPDFService.GetPrintType('Sales Receipt'),
+        shared_pdf_service_1.SharedPDFService.HeaderAfterLine()
+    ];
+}
 function buildPdfDocDefinition(PDFInvoiceData = {}, PrintConfigData = {}, printCopies = []) {
+    var _a;
     const PrintConfig = normalizePrintConfig(PDFInvoiceData, PrintConfigData);
-    const compactLayout = (0, pdf_header_footer_section_1.isHalfA4PageSize)(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.PSize);
     const requestedPageOrientation = (0, pdf_header_footer_section_1.resolvePageOrientation)((PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.Orientation) || (PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.PageOrientation));
     const pageSize = (0, pdf_header_footer_section_1.resolvePageSize)(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.PSize, requestedPageOrientation);
     const basePageMargins = (0, pdf_header_footer_section_1.resolvePageMargins)(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.pageMargins);
-    const resolvedPrintConfig = compactLayout ? Object.assign(Object.assign({}, PrintConfig), { compactLayout: true }) : PrintConfig;
     const copyLabels = normalizeCopyLabels(printCopies);
-    const watermark = (0, pdf_header_footer_section_1.buildWatermark)(resolvedPrintConfig, PDFInvoiceData);
-    const background = (0, pdf_header_footer_section_1.buildLogoWatermarkBackground)(resolvedPrintConfig, PDFInvoiceData);
-    const pageHeader = (0, pdf_header_footer_section_1.buildPageNumberHeader)(resolvedPrintConfig);
-    const pageFooter = (0, pdf_header_footer_section_1.buildFooter)(resolvedPrintConfig);
-    const pageMargins = pageHeader !== null
-        ? [
-            compactLayout ? Math.min(basePageMargins[0], 12) : basePageMargins[0],
-            compactLayout ? Math.max(Math.min(basePageMargins[1], 12), 12) : Math.max(basePageMargins[1], 18),
-            compactLayout ? Math.min(basePageMargins[2], 12) : basePageMargins[2],
-            compactLayout ? Math.min(basePageMargins[3], 12) : basePageMargins[3]
-        ]
-        : [
-            compactLayout ? Math.min(basePageMargins[0], 12) : basePageMargins[0],
-            compactLayout ? Math.min(basePageMargins[1], 12) : basePageMargins[1],
-            compactLayout ? Math.min(basePageMargins[2], 12) : basePageMargins[2],
-            compactLayout ? Math.min(basePageMargins[3], 12) : basePageMargins[3]
-        ];
+    const watermark = (0, pdf_header_footer_section_1.buildWatermark)(PrintConfig, PDFInvoiceData);
+    const background = (0, pdf_header_footer_section_1.buildLogoWatermarkBackground)(PrintConfig, PDFInvoiceData);
+    const pageHeader = (0, pdf_header_footer_section_1.buildPageNumberHeader)(PrintConfig);
+    const pageFooter = (0, pdf_header_footer_section_1.buildFooter)(PrintConfig);
+    let pageMargins = pageHeader !== null
+        ? [basePageMargins[0], Math.max(basePageMargins[1], 18), basePageMargins[2], basePageMargins[3]]
+        : basePageMargins;
+    const raw = String((_a = PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.PSize) !== null && _a !== void 0 ? _a : '').trim().toLowerCase();
+    const normalized = raw.replace(/[\s_-]/g, '');
+    if (normalized === 'halfa4') {
+        pageMargins = [25, 15, 25, 435.945];
+    }
     const availableWidth = (0, pdf_table_section_1.getAvailablePageWidth)(pageSize, requestedPageOrientation, pageMargins);
     const content = [];
     copyLabels.forEach((copyLabel, index) => {
-        const invoiceHeaderContent = (0, pdf_header_footer_section_1.buildDocumentHeaderSection)(resolvedPrintConfig, PDFInvoiceData);
-        const invoiceHeadingContent = (0, pdf_header_footer_section_1.buildDocumentHeadingSection)(PDFInvoiceData, resolvedPrintConfig, availableWidth);
-        const invoicePartyDetailsContent = (0, pdf_party_details_section_1.buildInvoicePartyDetailsSection)(PDFInvoiceData, resolvedPrintConfig === null || resolvedPrintConfig === void 0 ? void 0 : resolvedPrintConfig.Customer, resolvedPrintConfig);
-        const invoiceTotalsAndNotesContent = (0, pdf_totals_section_1.buildInvoiceTotalsAndNotesSection)(PDFInvoiceData, availableWidth, resolvedPrintConfig);
-        const signatureContent = (0, pdf_totals_section_1.buildSignatureSection)(resolvedPrintConfig, PDFInvoiceData, availableWidth);
-        const tableData = (0, pdf_table_section_1.buildInvoiceTableData)(PDFInvoiceData, resolvedPrintConfig, availableWidth);
+        var _a, _b, _c;
+        // const invoiceHeaderContent = buildDocumentHeaderSection(PrintConfig, PDFInvoiceData);
+        const invoiceHeaderContent = SalesReceiptHeaderData(PDFInvoiceData === null || PDFInvoiceData === void 0 ? void 0 : PDFInvoiceData.Entity, PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.Image, (_a = PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.headerStyles) === null || _a === void 0 ? void 0 : _a.OrgNameClr, (_b = PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.headerStyles) === null || _b === void 0 ? void 0 : _b.AdrsClr, (_c = PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.headerData) === null || _c === void 0 ? void 0 : _c.OrgName);
+        const invoiceHeadingContent = (0, pdf_header_footer_section_1.buildDocumentHeadingSection)(PDFInvoiceData, PrintConfig, availableWidth);
+        const invoicePartyDetailsContent = (0, pdf_party_details_section_1.buildInvoicePartyDetailsSection)(PDFInvoiceData, PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.Customer, PrintConfig);
+        const invoiceTotalsAndNotesContent = (0, pdf_totals_section_1.buildInvoiceTotalsAndNotesSection)(PDFInvoiceData, availableWidth, PrintConfigData);
+        const signatureContent = (0, pdf_totals_section_1.buildSignatureSection)(PrintConfig, PDFInvoiceData, availableWidth);
+        const tableData = (0, pdf_table_section_1.buildInvoiceTableData)(PDFInvoiceData, PrintConfig, availableWidth);
         if (index > 0) {
             content.push({ text: '', pageBreak: 'before' });
         }

package/dist/shared/header-footer-section/pdf-header-footer.section.d.ts

@@ -3,7 +3,6 @@ export declare function resolvePageSize(value: any, orientation?: 'portrait' | '
     width: number;
     height: number;
 };
-export declare function isHalfA4PageSize(value: any): boolean;
 export declare function deriveHeaderDataFromInvoice(PDFInvoiceData: any): {
     invoiceHeading: string;
     organization: {

package/dist/shared/header-footer-section/pdf-header-footer.section.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolvePageOrientation = resolvePageOrientation;
 exports.resolvePageSize = resolvePageSize;
-exports.isHalfA4PageSize = isHalfA4PageSize;
 exports.deriveHeaderDataFromInvoice = deriveHeaderDataFromInvoice;
 exports.normalizeHeaderData = normalizeHeaderData;
 exports.normalizeHeaderStyle = normalizeHeaderStyle;
@@ -32,7 +31,8 @@ function resolvePageSize(value, orientation = DEFAULT_PAGE_ORIENTATION) {
     const raw = String(value !== null && value !== void 0 ? value : '').trim().toLowerCase();
     const normalized = raw.replace(/[\s_-]/g, '');
     if (normalized === 'halfa4') {
-        return { width: A4_WIDTH, height: HALF_A4_HEIGHT };
+        // return { width: A4_WIDTH, height: HALF_A4_HEIGHT };
+        return 'A4';
     }
     if (normalized === 'letter') {
         return 'LETTER';
@@ -42,11 +42,6 @@ function resolvePageSize(value, orientation = DEFAULT_PAGE_ORIENTATION) {
     }
     return 'A4';
 }
-function isHalfA4PageSize(value) {
-    const raw = String(value !== null && value !== void 0 ? value : '').trim().toLowerCase();
-    const normalized = raw.replace(/[\s_-]/g, '');
-    return normalized === 'halfa4';
-}
 function deriveHeaderDataFromInvoice(PDFInvoiceData) {
     const entity = (PDFInvoiceData === null || PDFInvoiceData === void 0 ? void 0 : PDFInvoiceData.Entity) || {};
     return {

package/dist/shared/shared-pdf.service.js

@@ -289,7 +289,7 @@ class SharedPDFService {
     }
     static GetEntityDetails(Entity) {
         let SetData = [];
-        if (Entity.PrUPI && !Entity.IsProforma) {
+        if (Entity.PrUPI && !Entity.IsProforma && !tr_utils_1.TrUtils.IsEmpty(Entity.UPI)) {
             SetData.push({ qr: Entity.UPI, fit: '125', marginLeft: 150 });
             SetData.push({ text: 'Scan To Pay', fontSize: this.TermsandCond, marginLeft: 151, bold: true, marginTop: 2 });
             // SetData.push({ text: 'UPI Number: ' + Entity.UPIPhone, fontSize: 9, marginLeft: 151, bold: true, marginTop: 5 });

package/dist/shared/totals-section/pdf-totals.section.js

@@ -23,7 +23,6 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
     const terms = (0, pdf_shared_utils_1.firstValue)(normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.TermsAndConditions, normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.TermsCondition, normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Terms, normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.TC);
     const dueInfo = resolveDueInfo(normalizedInvoice, totals);
     const qrPayload = resolveQrPayload(normalizedInvoice, PrintConfigData);
-    const compactLayout = !!(PrintConfigData === null || PrintConfigData === void 0 ? void 0 : PrintConfigData.compactLayout) || (0, pdf_header_footer_section_1.isHalfA4PageSize)(PrintConfigData === null || PrintConfigData === void 0 ? void 0 : PrintConfigData.PSize);
     const hasTopSection = !hideTopSection && (taxSummary.hasData || bankDetails.hasData || totals.hasData);
     const hasBottomSection = !!(notes || terms || totalInWords || (showDueSection && dueInfo.hasData) || qrPayload);
     if (!hasTopSection && !hasBottomSection) {
@@ -33,12 +32,12 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
         canvas: [
             { type: 'line', x1: 0, y1: 0, x2: Math.max(1, availableWidth), y2: 0, lineWidth: 1, lineColor: '#1f2937' }
         ],
-        margin: compactLayout ? [0, 6, 0, 6] : [0, 10, 0, 10]
+        margin: [0, 10, 0, 10]
     };
     const topColumns = {
         columns: buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails, totals),
         columnGap: 20,
-        margin: compactLayout ? [0, 0, 0, 4] : [0, 0, 0, 8]
+        margin: [0, 0, 0, 8]
     };
     const bottomColumns = buildPostTotalsInfoSection({
         totalInWords,
@@ -160,18 +159,17 @@ function buildSignatureSection(PrintConfig, invoiceData, availableWidth) {
     const headerData = (0, pdf_header_footer_section_1.normalizeHeaderData)((_a = PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.headerData) !== null && _a !== void 0 ? _a : {});
     const companyName = (0, pdf_shared_utils_1.firstValue)((_b = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _b === void 0 ? void 0 : _b.cName, (_c = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Entity) === null || _c === void 0 ? void 0 : _c.CName, (_d = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Entity) === null || _d === void 0 ? void 0 : _d.Name, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.CName);
     const withPass = !!((PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.withPass) || (invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.withPass) || (invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.WithPass));
-    const compactLayout = !!(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.compactLayout) || (0, pdf_header_footer_section_1.isHalfA4PageSize)(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.PSize);
     const signatureRows = [
         {
             columns: [
                 { width: '*', text: '' },
                 { width: '*', text: `For ${companyName || ''}`.trim(), fontSize: 9, bold: true, color: '#111827', alignment: 'right' }
             ],
-            margin: compactLayout ? [0, 6, 0, 0] : [0, 12, 0, 0]
+            margin: [0, 12, 0, 0]
         },
         {
             text: '',
-            margin: compactLayout ? [0, 10, 0, 0] : [0, 18, 0, 0]
+            margin: [0, 18, 0, 0]
         },
         {
             columns: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shareneus",
-  "version": "1.6.73",
+  "version": "1.6.75",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",