shareneus 1.7.22 → 1.7.23
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -7,6 +7,7 @@ export declare function deriveHeaderDataFromInvoice(PDFInvoiceData: any): {
|
|
|
7
7
|
invoiceHeading: string;
|
|
8
8
|
organization: {
|
|
9
9
|
cName: any;
|
|
10
|
+
tLine: any;
|
|
10
11
|
address1: any;
|
|
11
12
|
address2: any;
|
|
12
13
|
city: any;
|
|
@@ -28,6 +29,7 @@ export declare function normalizeHeaderData(headerData: any): {
|
|
|
28
29
|
invoiceHeading: string;
|
|
29
30
|
organization: {
|
|
30
31
|
cName: string;
|
|
32
|
+
tLine: string;
|
|
31
33
|
address1: string;
|
|
32
34
|
address2: string;
|
|
33
35
|
city: string;
|
|
@@ -48,6 +48,7 @@ function deriveHeaderDataFromInvoice(PDFInvoiceData) {
|
|
|
48
48
|
invoiceHeading: (PDFInvoiceData === null || PDFInvoiceData === void 0 ? void 0 : PDFInvoiceData.Type) ? `${PDFInvoiceData.Type} Invoice` : 'INVOICE',
|
|
49
49
|
organization: {
|
|
50
50
|
cName: (entity === null || entity === void 0 ? void 0 : entity.CName) || '',
|
|
51
|
+
tLine: (entity === null || entity === void 0 ? void 0 : entity.TLine) || '',
|
|
51
52
|
address1: (entity === null || entity === void 0 ? void 0 : entity.Adrs1) || (entity === null || entity === void 0 ? void 0 : entity.Addr1) || '',
|
|
52
53
|
address2: (entity === null || entity === void 0 ? void 0 : entity.Adrs2) || (entity === null || entity === void 0 ? void 0 : entity.Addr2) || '',
|
|
53
54
|
city: (entity === null || entity === void 0 ? void 0 : entity.City) || '',
|
|
@@ -73,6 +74,7 @@ function normalizeHeaderData(headerData) {
|
|
|
73
74
|
invoiceHeading: (headerData === null || headerData === void 0 ? void 0 : headerData.invoiceHeading) ? String(headerData.invoiceHeading) : 'INVOICE',
|
|
74
75
|
organization: {
|
|
75
76
|
cName: (0, pdf_shared_utils_1.toStr)(organization === null || organization === void 0 ? void 0 : organization.cName),
|
|
77
|
+
tLine: (0, pdf_shared_utils_1.toStr)(organization === null || organization === void 0 ? void 0 : organization.tLine),
|
|
76
78
|
address1: (0, pdf_shared_utils_1.toStr)(organization === null || organization === void 0 ? void 0 : organization.address1),
|
|
77
79
|
address2: (0, pdf_shared_utils_1.toStr)(organization === null || organization === void 0 ? void 0 : organization.address2),
|
|
78
80
|
city: (0, pdf_shared_utils_1.toStr)(organization === null || organization === void 0 ? void 0 : organization.city),
|
|
@@ -120,27 +122,27 @@ function resolvePageMargins(value) {
|
|
|
120
122
|
return DEFAULT_PAGE_MARGINS;
|
|
121
123
|
}
|
|
122
124
|
function buildDocumentHeaderSection(PrintConfig, DocumentData = {}) {
|
|
123
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8;
|
|
125
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9;
|
|
124
126
|
const entity = (_a = DocumentData === null || DocumentData === void 0 ? void 0 : DocumentData.Entity) !== null && _a !== void 0 ? _a : {};
|
|
125
127
|
const documentLogoDataUrl = resolveDocumentLogoDataUrl(DocumentData);
|
|
126
128
|
const headerData = normalizeHeaderData((_b = PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.headerData) !== null && _b !== void 0 ? _b : {});
|
|
127
|
-
const mergedHeaderData = normalizeHeaderData(Object.assign(Object.assign({}, headerData), { logoDataUrl: (0, pdf_shared_utils_1.firstValue)(documentLogoDataUrl, headerData === null || headerData === void 0 ? void 0 : headerData.logoDataUrl), organization: Object.assign(Object.assign({}, ((_c = headerData === null || headerData === void 0 ? void 0 : headerData.organization) !== null && _c !== void 0 ? _c : {})), { cName: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.CName, (_d = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _d === void 0 ? void 0 : _d.cName),
|
|
128
|
-
const headerStyles = normalizeHeaderStyle((
|
|
129
|
+
const mergedHeaderData = normalizeHeaderData(Object.assign(Object.assign({}, headerData), { logoDataUrl: (0, pdf_shared_utils_1.firstValue)(documentLogoDataUrl, headerData === null || headerData === void 0 ? void 0 : headerData.logoDataUrl), organization: Object.assign(Object.assign({}, ((_c = headerData === null || headerData === void 0 ? void 0 : headerData.organization) !== null && _c !== void 0 ? _c : {})), { cName: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.CName, (_d = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _d === void 0 ? void 0 : _d.cName), tLine: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.TLine, (_e = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _e === void 0 ? void 0 : _e.tLine), address1: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.Adrs1, (_f = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _f === void 0 ? void 0 : _f.address1), address2: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.Adrs2, (_g = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _g === void 0 ? void 0 : _g.address2), dlNo: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.DLNo, entity === null || entity === void 0 ? void 0 : entity.DLNO, (_h = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _h === void 0 ? void 0 : _h.dlNo), gstin: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.GSTIN, (_j = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _j === void 0 ? void 0 : _j.gstin), pan: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.PAN, (_k = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _k === void 0 ? void 0 : _k.pan), taxIds: Array.isArray(entity === null || entity === void 0 ? void 0 : entity.TaxIds) ? entity.TaxIds : (_l = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _l === void 0 ? void 0 : _l.taxIds, city: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.City, (_m = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _m === void 0 ? void 0 : _m.city), state: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.State, (_o = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _o === void 0 ? void 0 : _o.state), pin: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.PIN, entity === null || entity === void 0 ? void 0 : entity.Pin, (_p = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _p === void 0 ? void 0 : _p.pin), email: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.Email, entity === null || entity === void 0 ? void 0 : entity.EMail, (_q = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _q === void 0 ? void 0 : _q.email), phone: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.Phone, entity === null || entity === void 0 ? void 0 : entity.Ph, (_r = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _r === void 0 ? void 0 : _r.phone), phone2: (0, pdf_shared_utils_1.firstValue)(entity === null || entity === void 0 ? void 0 : entity.Phone2, entity === null || entity === void 0 ? void 0 : entity.Ph2, (_s = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _s === void 0 ? void 0 : _s.phone2) }) }));
|
|
130
|
+
const headerStyles = normalizeHeaderStyle((_t = PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.headerStyles) !== null && _t !== void 0 ? _t : {
|
|
129
131
|
OrgNameFsize: PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.OrgNameFsize,
|
|
130
132
|
OrgNameClr: PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.OrgNameClr,
|
|
131
133
|
AdrsFsize: PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.AdrsFsize,
|
|
132
134
|
AdrsClr: PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.AdrsClr
|
|
133
135
|
});
|
|
134
|
-
const headerSettings = normalizeHeaderSettings((
|
|
136
|
+
const headerSettings = normalizeHeaderSettings((_v = (_u = PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.Header) !== null && _u !== void 0 ? _u : PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.Header) !== null && _v !== void 0 ? _v : {});
|
|
135
137
|
if (!headerSettings.Show) {
|
|
136
138
|
return [];
|
|
137
139
|
}
|
|
138
|
-
const hasPrintedTaxIds = !!buildPrintedTaxIdsText((
|
|
139
|
-
const hasOrganizationData = !!(((
|
|
140
|
-
|| ((
|
|
141
|
-
|| ((
|
|
142
|
-
|| ((
|
|
143
|
-
|| ((
|
|
140
|
+
const hasPrintedTaxIds = !!buildPrintedTaxIdsText((_w = mergedHeaderData.organization) === null || _w === void 0 ? void 0 : _w.taxIds);
|
|
141
|
+
const hasOrganizationData = !!(((_x = mergedHeaderData.organization) === null || _x === void 0 ? void 0 : _x.cName) || ((_y = mergedHeaderData.organization) === null || _y === void 0 ? void 0 : _y.address1)
|
|
142
|
+
|| ((_z = mergedHeaderData.organization) === null || _z === void 0 ? void 0 : _z.address2) || ((_0 = mergedHeaderData.organization) === null || _0 === void 0 ? void 0 : _0.city) || ((_1 = mergedHeaderData.organization) === null || _1 === void 0 ? void 0 : _1.state)
|
|
143
|
+
|| ((_2 = mergedHeaderData.organization) === null || _2 === void 0 ? void 0 : _2.pin) || ((_3 = mergedHeaderData.organization) === null || _3 === void 0 ? void 0 : _3.gstin) || ((_4 = mergedHeaderData.organization) === null || _4 === void 0 ? void 0 : _4.email)
|
|
144
|
+
|| ((_5 = mergedHeaderData.organization) === null || _5 === void 0 ? void 0 : _5.phone) || ((_6 = mergedHeaderData.organization) === null || _6 === void 0 ? void 0 : _6.phone2) || ((_7 = mergedHeaderData.organization) === null || _7 === void 0 ? void 0 : _7.dlNo)
|
|
145
|
+
|| ((_8 = mergedHeaderData.organization) === null || _8 === void 0 ? void 0 : _8.cin) || ((_9 = mergedHeaderData.organization) === null || _9 === void 0 ? void 0 : _9.pan) || hasPrintedTaxIds);
|
|
144
146
|
const hasLogo = !!mergedHeaderData.logoDataUrl && headerSettings.ShowLogo;
|
|
145
147
|
if (!hasOrganizationData && !hasLogo) {
|
|
146
148
|
return [];
|
|
@@ -270,6 +272,9 @@ function buildOrganizationStack(organization, headerStyles, alignment) {
|
|
|
270
272
|
if (organization === null || organization === void 0 ? void 0 : organization.cName) {
|
|
271
273
|
stack.push({ text: organization.cName, bold: true, fontSize: orgNameFontSize, color: orgNameFontColor, lineHeight: 1.1, alignment });
|
|
272
274
|
}
|
|
275
|
+
if (organization === null || organization === void 0 ? void 0 : organization.tLine) {
|
|
276
|
+
stack.push({ text: organization.tLine, bold: true, fontSize: 10, color: orgNameFontColor, lineHeight: 1.1, alignment });
|
|
277
|
+
}
|
|
273
278
|
if (organization === null || organization === void 0 ? void 0 : organization.address1) {
|
|
274
279
|
stack.push({ text: organization.address1, fontSize: orgAddressFontSize, color: orgAddressFontColor, lineHeight: 1.05, alignment });
|
|
275
280
|
}
|
|
@@ -447,7 +452,7 @@ function buildHeaderContentWithLogo(logoDataUrl, hasLogo, organizationStack, log
|
|
|
447
452
|
logoBlock,
|
|
448
453
|
{
|
|
449
454
|
width: '*',
|
|
450
|
-
marginLeft: -
|
|
455
|
+
marginLeft: -90,
|
|
451
456
|
stack: safeOrganizationStack
|
|
452
457
|
}
|
|
453
458
|
],
|
package/package.json
CHANGED
|
@@ -41,6 +41,7 @@ export function deriveHeaderDataFromInvoice(PDFInvoiceData: any) {
|
|
|
41
41
|
invoiceHeading: PDFInvoiceData?.Type ? `${PDFInvoiceData.Type} Invoice` : 'INVOICE',
|
|
42
42
|
organization: {
|
|
43
43
|
cName: entity?.CName || '',
|
|
44
|
+
tLine: entity?.TLine || '',
|
|
44
45
|
address1: entity?.Adrs1 || entity?.Addr1 || '',
|
|
45
46
|
address2: entity?.Adrs2 || entity?.Addr2 || '',
|
|
46
47
|
city: entity?.City || '',
|
|
@@ -66,6 +67,7 @@ export function normalizeHeaderData(headerData: any) {
|
|
|
66
67
|
invoiceHeading: headerData?.invoiceHeading ? String(headerData.invoiceHeading) : 'INVOICE',
|
|
67
68
|
organization: {
|
|
68
69
|
cName: toStr(organization?.cName),
|
|
70
|
+
tLine: toStr(organization?.tLine),
|
|
69
71
|
address1: toStr(organization?.address1),
|
|
70
72
|
address2: toStr(organization?.address2),
|
|
71
73
|
city: toStr(organization?.city),
|
|
@@ -125,6 +127,7 @@ export function buildDocumentHeaderSection(PrintConfig: any, DocumentData: any =
|
|
|
125
127
|
organization: {
|
|
126
128
|
...(headerData?.organization ?? {}),
|
|
127
129
|
cName: firstValue(entity?.CName, headerData?.organization?.cName),
|
|
130
|
+
tLine: firstValue(entity?.TLine, headerData?.organization?.tLine),
|
|
128
131
|
address1: firstValue(entity?.Adrs1, headerData?.organization?.address1),
|
|
129
132
|
address2: firstValue(entity?.Adrs2, headerData?.organization?.address2),
|
|
130
133
|
dlNo: firstValue(entity?.DLNo, entity?.DLNO, headerData?.organization?.dlNo),
|
|
@@ -145,7 +148,7 @@ export function buildDocumentHeaderSection(PrintConfig: any, DocumentData: any =
|
|
|
145
148
|
AdrsFsize: PrintConfig?.AdrsFsize,
|
|
146
149
|
AdrsClr: PrintConfig?.AdrsClr
|
|
147
150
|
});
|
|
148
|
-
const headerSettings:any = normalizeHeaderSettings(PrintConfig?.Header ?? PrintConfig?.Header ?? {});
|
|
151
|
+
const headerSettings: any = normalizeHeaderSettings(PrintConfig?.Header ?? PrintConfig?.Header ?? {});
|
|
149
152
|
|
|
150
153
|
if (!headerSettings.Show) {
|
|
151
154
|
return [];
|
|
@@ -312,6 +315,10 @@ function buildOrganizationStack(organization: any, headerStyles: any, alignment:
|
|
|
312
315
|
if (organization?.cName) {
|
|
313
316
|
stack.push({ text: organization.cName, bold: true, fontSize: orgNameFontSize, color: orgNameFontColor, lineHeight: 1.1, alignment });
|
|
314
317
|
}
|
|
318
|
+
|
|
319
|
+
if (organization?.tLine) {
|
|
320
|
+
stack.push({ text: organization.tLine, bold: true, fontSize: 10, color: orgNameFontColor, lineHeight: 1.1, alignment });
|
|
321
|
+
}
|
|
315
322
|
if (organization?.address1) {
|
|
316
323
|
stack.push({ text: organization.address1, fontSize: orgAddressFontSize, color: orgAddressFontColor, lineHeight: 1.05, alignment });
|
|
317
324
|
}
|
|
@@ -511,7 +518,7 @@ function buildHeaderContentWithLogo(
|
|
|
511
518
|
logoBlock,
|
|
512
519
|
{
|
|
513
520
|
width: '*',
|
|
514
|
-
marginLeft: -
|
|
521
|
+
marginLeft: -90,
|
|
515
522
|
stack: safeOrganizationStack
|
|
516
523
|
}
|
|
517
524
|
],
|