shareneus 1.7.4 → 1.7.6

package/dist/services/reports/excel/repair-orders-excel.service.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RepairOrdersXlsxFileService = void 0;
 const XLSX = __importStar(require("xlsx"));

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

@@ -1,3 +1,3 @@
-export declare function GetTableHeader(itemsHeader: any[]): any[];
+export declare function GetTableHeader(itemsHeader: any[], taxMode?: string): any[];
 export declare function getRenderableColumns(headerConfig: any[], sType?: string): any[];
 export declare function buildHeaderRows(headerConfig: any[], sType?: string): any[][];

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

@@ -4,8 +4,11 @@ exports.GetTableHeader = GetTableHeader;
 exports.getRenderableColumns = getRenderableColumns;
 exports.buildHeaderRows = buildHeaderRows;
 const pdf_table_config_1 = require("./pdf-table.config");
-function GetTableHeader(itemsHeader) {
+function GetTableHeader(itemsHeader, taxMode = '') {
     const orderedHeaders = getHeadersBySequence(itemsHeader);
+    const filteredHeaders = shouldHideTaxHeaders(taxMode)
+        ? orderedHeaders.filter((item) => !isTaxHeaderConfig(item))
+        : orderedHeaders;
     const toHeaderObject = (item) => {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         const itemTitle = (_c = (_b = (_a = item === null || item === void 0 ? void 0 : item.title) !== null && _a !== void 0 ? _a : item === null || item === void 0 ? void 0 : item.CustTitle) !== null && _b !== void 0 ? _b : item === null || item === void 0 ? void 0 : item.Tital) !== null && _c !== void 0 ? _c : '';
@@ -25,7 +28,7 @@ function GetTableHeader(itemsHeader) {
             stackSeq: typeof stackSeq === 'number' ? stackSeq : Number.MAX_SAFE_INTEGER
         };
     };
-    const visibleHeaders = orderedHeaders.filter((item) => { var _a; return ((_a = item === null || item === void 0 ? void 0 : item.show) !== null && _a !== void 0 ? _a : item === null || item === void 0 ? void 0 : item.Show) !== false; });
+    const visibleHeaders = filteredHeaders.filter((item) => { var _a; return ((_a = item === null || item === void 0 ? void 0 : item.show) !== null && _a !== void 0 ? _a : item === null || item === void 0 ? void 0 : item.Show) !== false; });
     const headerRow = visibleHeaders
         .filter((item) => { var _a; return !((_a = item === null || item === void 0 ? void 0 : item.stackFields) !== null && _a !== void 0 ? _a : item === null || item === void 0 ? void 0 : item.Stacked); })
         .map((item) => {
@@ -268,6 +271,15 @@ function isTaxPercentHeader(header) {
 function isTaxAmountHeader(header) {
     return normalizeHeaderText(header === null || header === void 0 ? void 0 : header.text) === 'TAXAMOUNT';
 }
+function isTaxHeaderConfig(header) {
+    var _a, _b, _c;
+    const title = (_c = (_b = (_a = header === null || header === void 0 ? void 0 : header.title) !== null && _a !== void 0 ? _a : header === null || header === void 0 ? void 0 : header.CustTitle) !== null && _b !== void 0 ? _b : header === null || header === void 0 ? void 0 : header.Tital) !== null && _c !== void 0 ? _c : header === null || header === void 0 ? void 0 : header.text;
+    const normalizedTitle = normalizeHeaderText(title);
+    return normalizedTitle === 'TAX%' || normalizedTitle === 'TAXAMOUNT';
+}
+function shouldHideTaxHeaders(taxMode) {
+    return taxMode === 'BS' || taxMode === 'NO';
+}
 function normalizeHeaderText(value) {
     return String(value !== null && value !== void 0 ? value : '')
         .replace(/\s+/g, '')

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

@@ -17,8 +17,9 @@ function buildInvoiceTableData(PDFInvoiceData, PrintConfig, availableWidth) {
     const items = Array.isArray(PDFInvoiceData === null || PDFInvoiceData === void 0 ? void 0 : PDFInvoiceData.Items) ? PDFInvoiceData.Items : [];
     const services = Array.isArray(PDFInvoiceData === null || PDFInvoiceData === void 0 ? void 0 : PDFInvoiceData.Ops) ? PDFInvoiceData.Ops : [];
     const sType = (_a = PDFInvoiceData === null || PDFInvoiceData === void 0 ? void 0 : PDFInvoiceData.SType) !== null && _a !== void 0 ? _a : '';
+    const taxMode = resolveInvoiceTaxMode(PDFInvoiceData);
     const showSectionSummaryRows = !resolveIsPoSPrint(PrintConfig);
-    const headerConfig = (0, pdf_table_header_1.GetTableHeader)(PrintConfig.TableConfig)[0];
+    const headerConfig = (0, pdf_table_header_1.GetTableHeader)(PrintConfig.TableConfig, taxMode)[0];
     const renderColumns = (0, pdf_table_header_1.getRenderableColumns)(headerConfig, sType);
     const headerRows = (0, pdf_table_header_1.buildHeaderRows)(headerConfig, sType);
     const fixedTo = resolveFixedTo(PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.fixedTo);
@@ -35,9 +36,6 @@ function buildInvoiceTableData(PDFInvoiceData, PrintConfig, availableWidth) {
                 columnsOrHeaders: fallbackHeaderRow,
                 descriptionColumnIndex,
                 label: 'Items',
-                totalLabel: 'Items Total',
-                totals: itemTotals,
-                fixedTo,
                 buildRow: (item, index) => buildFallbackDataRow(item, index, fallbackHeaderRow, fixedTo),
                 buildTotalRow: () => buildFallbackSectionTotalRow(fallbackHeaderRow, 'Items Total', itemTotals, fixedTo),
                 showSectionSummaryRows
@@ -49,9 +47,6 @@ function buildInvoiceTableData(PDFInvoiceData, PrintConfig, availableWidth) {
                 columnsOrHeaders: fallbackHeaderRow,
                 descriptionColumnIndex,
                 label: 'Services',
-                totalLabel: 'Services Total',
-                totals: serviceTotals,
-                fixedTo,
                 buildRow: (service, index) => buildFallbackDataRow(service, index, fallbackHeaderRow, fixedTo),
                 buildTotalRow: () => buildFallbackSectionTotalRow(fallbackHeaderRow, 'Services Total', serviceTotals, fixedTo),
                 showSectionSummaryRows
@@ -74,9 +69,6 @@ function buildInvoiceTableData(PDFInvoiceData, PrintConfig, availableWidth) {
                 columnsOrHeaders: renderColumns,
                 descriptionColumnIndex,
                 label: 'Items',
-                totalLabel: 'Items Total',
-                totals: itemTotals,
-                fixedTo,
                 buildRow: (item, index) => (0, pdf_table_row_1.buildDataRow)(item, index, renderColumns, fixedTo),
                 buildTotalRow: () => buildSectionTotalRow(renderColumns, 'Items Total', itemTotals, fixedTo),
                 showSectionSummaryRows
@@ -88,9 +80,6 @@ function buildInvoiceTableData(PDFInvoiceData, PrintConfig, availableWidth) {
                 columnsOrHeaders: renderColumns,
                 descriptionColumnIndex,
                 label: 'Services',
-                totalLabel: 'Services Total',
-                totals: serviceTotals,
-                fixedTo,
                 buildRow: (service, index) => (0, pdf_table_row_1.buildDataRow)(service, index, renderColumns, fixedTo),
                 buildTotalRow: () => buildSectionTotalRow(renderColumns, 'Services Total', serviceTotals, fixedTo),
                 showSectionSummaryRows
@@ -362,6 +351,10 @@ function resolveIsPoSPrint(printConfig) {
     var _a;
     return Boolean((_a = printConfig === null || printConfig === void 0 ? void 0 : printConfig.IsPoSPrint) !== null && _a !== void 0 ? _a : printConfig === null || printConfig === void 0 ? void 0 : printConfig.isPoSPrint);
 }
+function resolveInvoiceTaxMode(pdfInvoiceData) {
+    var _a, _b;
+    return String((_b = (_a = pdfInvoiceData === null || pdfInvoiceData === void 0 ? void 0 : pdfInvoiceData.Settings) === null || _a === void 0 ? void 0 : _a.Tax) !== null && _b !== void 0 ? _b : '').trim().toUpperCase();
+}
 function buildSectionRows({ rows, columnsOrHeaders, descriptionColumnIndex, label, buildRow, buildTotalRow, showSectionSummaryRows }) {
     const sectionRows = rows.map((row, index) => buildRow(row, index));
     if (!showSectionSummaryRows) {

package/dist/{accounting/invoice/invoice-pdf.service.js → shared/transactions-pdf.service.js}

@@ -6,20 +6,20 @@ exports.GetDeliveryChallanPDF = GetDeliveryChallanPDF;
 exports.GetCreditNotePDF = GetCreditNotePDF;
 exports.GetSalesReceiptPDF = GetSalesReceiptPDF;
 exports.GetBillPDF = GetBillPDF;
-const purchase_order_print_service_1 = require("../../purchases/purchase-order/purchase-order-print.service");
-const delivery_challan_pdf_service_1 = require("../../sales/delivery-challan/delivery-challan-pdf.service");
-const delivery_challan_print_service_1 = require("../../sales/delivery-challan/delivery-challan-print.service");
-const sales_pdf_service_1 = require("../../sales/sales/sales-pdf.service");
-const sales_print_service_1 = require("../../sales/sales/sales-print.service");
-const math_operations_1 = require("../../shared/math-operations");
-const tr_utils_1 = require("../../utils/tr-utils");
-const pos_receipt_pdf_1 = require("../counter-sales/pos-receipt-pdf");
-const sales_receipt_print_service_1 = require("../counter-sales/sales-receipt-print.service");
-const cn_print_service_1 = require("../credit-note/cn-print.service");
-const credit_note_pdf_service_1 = require("../credit-note/credit-note-pdf.service");
-const inv_print_service_1 = require("./inv-print.service");
-const invoice_pdf_service_1 = require("./invoice-pdf/invoice-pdf.service");
-const unified_invoice_pdf_service_1 = require("./unified-invoice-pdf.service");
+const purchase_order_print_service_1 = require("../purchases/purchase-order/purchase-order-print.service");
+const delivery_challan_pdf_service_1 = require("../sales/delivery-challan/delivery-challan-pdf.service");
+const delivery_challan_print_service_1 = require("../sales/delivery-challan/delivery-challan-print.service");
+const sales_pdf_service_1 = require("../sales/sales/sales-pdf.service");
+const sales_print_service_1 = require("../sales/sales/sales-print.service");
+const math_operations_1 = require("./math-operations");
+const tr_utils_1 = require("../utils/tr-utils");
+const pos_receipt_pdf_1 = require("../accounting/counter-sales/pos-receipt-pdf");
+const sales_receipt_print_service_1 = require("../accounting/counter-sales/sales-receipt-print.service");
+const cn_print_service_1 = require("../accounting/credit-note/cn-print.service");
+const credit_note_pdf_service_1 = require("../accounting/credit-note/credit-note-pdf.service");
+const inv_print_service_1 = require("../accounting/invoice/inv-print.service");
+const invoice_pdf_service_1 = require("../accounting/invoice/invoice-pdf/invoice-pdf.service");
+const unified_invoice_pdf_service_1 = require("../accounting/invoice/unified-invoice-pdf.service");
 function GetInvoicePDF(invoiceData, entityData, headerConfig, printConfig, taxCodes, image = null, numberofCopies = ['Original'], withPass = false, options = null) {
     var _a;
     if (!options) {
@@ -38,7 +38,7 @@ function GetInvoicePDF(invoiceData, entityData, headerConfig, printConfig, taxCo
     printConfigData.withPass = withPass;
     const invoicePrintData = (0, inv_print_service_1.GetInvoicePrintInfo)(invoiceData, entityData, image, options.ShowGST, options.ConsolidateGST, taxCodes, options.IsProforma, options.PartInvoice, options.LaborInvoice);
     let invPrint;
-    if (options.ConsolidateGST || !options.ShowGST) {
+    if (options.ConsolidateGST) {
         invPrint = (0, unified_invoice_pdf_service_1.GetInvoicePrint)(invoicePrintData, numberofCopies, withPass, options.Size, options.MoreDiscDetails, options.Orientation);
     }
     else {

package/package.json

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