shareneus 1.7.319 → 1.7.320
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.
|
@@ -398,7 +398,7 @@ function GetBillNameForInvoicePrint(argInvoiceData, InvoicePrintData) {
|
|
|
398
398
|
Customer.Adrs.push(city);
|
|
399
399
|
}
|
|
400
400
|
}
|
|
401
|
-
Customer.GSTIN = (_b = argInvoiceData.BillTo.TaxId) === null || _b === void 0 ? void 0 : _b.
|
|
401
|
+
Customer.GSTIN = (_b = argInvoiceData.BillTo.TaxId) === null || _b === void 0 ? void 0 : _b.Value;
|
|
402
402
|
if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.BillTo.DLNo)) {
|
|
403
403
|
Customer.DLNo = argInvoiceData.BillTo.DLNo;
|
|
404
404
|
}
|
|
@@ -86,7 +86,7 @@ function buildPartyDetailsSectionLayout(config) {
|
|
|
86
86
|
}];
|
|
87
87
|
}
|
|
88
88
|
function resolveSalesBillToDetails(transactionData) {
|
|
89
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j;
|
|
89
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
|
|
90
90
|
const billTo = (transactionData === null || transactionData === void 0 ? void 0 : transactionData.BillTo) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Customer) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Cust) || {};
|
|
91
91
|
const address = normalizeAddress((billTo === null || billTo === void 0 ? void 0 : billTo.Adrs)
|
|
92
92
|
|| ((_a = transactionData === null || transactionData === void 0 ? void 0 : transactionData.BillTo) === null || _a === void 0 ? void 0 : _a.Adrs)
|
|
@@ -95,10 +95,10 @@ function resolveSalesBillToDetails(transactionData) {
|
|
|
95
95
|
|| ((_b = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Customer) === null || _b === void 0 ? void 0 : _b.Adrs)
|
|
96
96
|
|| ((_c = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Cust) === null || _c === void 0 ? void 0 : _c.Adrs));
|
|
97
97
|
const name = (0, pdf_shared_utils_1.firstValue)(billTo === null || billTo === void 0 ? void 0 : billTo.Name, billTo === null || billTo === void 0 ? void 0 : billTo.CName, (_d = transactionData === null || transactionData === void 0 ? void 0 : transactionData.BillTo) === null || _d === void 0 ? void 0 : _d.Name, (_e = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Customer) === null || _e === void 0 ? void 0 : _e.Name, (_f = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Cust) === null || _f === void 0 ? void 0 : _f.Name, transactionData === null || transactionData === void 0 ? void 0 : transactionData.CustomerName);
|
|
98
|
-
const gstin = (0, pdf_shared_utils_1.firstValue)((_g = billTo === null || billTo === void 0 ? void 0 : billTo.TaxId) === null || _g === void 0 ? void 0 : _g.
|
|
98
|
+
const gstin = (0, pdf_shared_utils_1.firstValue)((_g = billTo === null || billTo === void 0 ? void 0 : billTo.TaxId) === null || _g === void 0 ? void 0 : _g.Value, (_h = billTo === null || billTo === void 0 ? void 0 : billTo.TaxId) === null || _h === void 0 ? void 0 : _h.GSTIN, (_j = billTo === null || billTo === void 0 ? void 0 : billTo.TaxId) === null || _j === void 0 ? void 0 : _j.GSTNo);
|
|
99
99
|
const contactInfo = resolvePhoneFromContacts(billTo === null || billTo === void 0 ? void 0 : billTo.Cons);
|
|
100
100
|
const directPhone = (0, pdf_shared_utils_1.firstValue)(billTo === null || billTo === void 0 ? void 0 : billTo.Ph, billTo === null || billTo === void 0 ? void 0 : billTo.Phone, billTo === null || billTo === void 0 ? void 0 : billTo.Mobile);
|
|
101
|
-
const ownerName = (0, pdf_shared_utils_1.firstValue)((
|
|
101
|
+
const ownerName = (0, pdf_shared_utils_1.firstValue)((_k = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Cust) === null || _k === void 0 ? void 0 : _k.Name);
|
|
102
102
|
return {
|
|
103
103
|
name,
|
|
104
104
|
addressLines: buildAddressLines(address),
|
|
@@ -110,13 +110,13 @@ function resolveSalesBillToDetails(transactionData) {
|
|
|
110
110
|
};
|
|
111
111
|
}
|
|
112
112
|
function resolveSalesShipToDetails(transactionData) {
|
|
113
|
-
var _a, _b;
|
|
113
|
+
var _a, _b, _c;
|
|
114
114
|
const shipTo = (transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShipTo) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShippmentTo) || {};
|
|
115
115
|
const address = normalizeAddress((shipTo === null || shipTo === void 0 ? void 0 : shipTo.Adrs)
|
|
116
116
|
|| (transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShipAddress)
|
|
117
117
|
|| (transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShipToAddress));
|
|
118
118
|
const name = (0, pdf_shared_utils_1.firstValue)(shipTo === null || shipTo === void 0 ? void 0 : shipTo.Name, shipTo === null || shipTo === void 0 ? void 0 : shipTo.CName);
|
|
119
|
-
const gstin = (0, pdf_shared_utils_1.firstValue)((_a = shipTo === null || shipTo === void 0 ? void 0 : shipTo.TaxId) === null || _a === void 0 ? void 0 : _a.
|
|
119
|
+
const gstin = (0, pdf_shared_utils_1.firstValue)((_a = shipTo === null || shipTo === void 0 ? void 0 : shipTo.TaxId) === null || _a === void 0 ? void 0 : _a.Value, (_b = shipTo === null || shipTo === void 0 ? void 0 : shipTo.TaxId) === null || _b === void 0 ? void 0 : _b.GSTIN, (_c = shipTo === null || shipTo === void 0 ? void 0 : shipTo.TaxId) === null || _c === void 0 ? void 0 : _c.GSTNo);
|
|
120
120
|
return {
|
|
121
121
|
name,
|
|
122
122
|
addressLines: buildAddressLines(address),
|
|
@@ -125,7 +125,7 @@ function resolveSalesShipToDetails(transactionData) {
|
|
|
125
125
|
};
|
|
126
126
|
}
|
|
127
127
|
function resolvePurchaseBFromDetails(transactionData) {
|
|
128
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
|
|
128
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
|
|
129
129
|
const billTo = (transactionData === null || transactionData === void 0 ? void 0 : transactionData.BFrom) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.BillTo) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Vendor) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Vnd) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Supplier) || {};
|
|
130
130
|
const address = normalizeAddress((billTo === null || billTo === void 0 ? void 0 : billTo.Adrs)
|
|
131
131
|
|| ((_a = transactionData === null || transactionData === void 0 ? void 0 : transactionData.BFrom) === null || _a === void 0 ? void 0 : _a.Adrs)
|
|
@@ -137,7 +137,7 @@ function resolvePurchaseBFromDetails(transactionData) {
|
|
|
137
137
|
|| ((_d = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Vnd) === null || _d === void 0 ? void 0 : _d.Adrs)
|
|
138
138
|
|| ((_e = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Supplier) === null || _e === void 0 ? void 0 : _e.Adrs));
|
|
139
139
|
const name = (0, pdf_shared_utils_1.firstValue)(billTo === null || billTo === void 0 ? void 0 : billTo.Name, billTo === null || billTo === void 0 ? void 0 : billTo.CName, (_f = transactionData === null || transactionData === void 0 ? void 0 : transactionData.BFrom) === null || _f === void 0 ? void 0 : _f.Name, (_g = transactionData === null || transactionData === void 0 ? void 0 : transactionData.BillTo) === null || _g === void 0 ? void 0 : _g.Name, (_h = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Vendor) === null || _h === void 0 ? void 0 : _h.Name, (_j = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Vnd) === null || _j === void 0 ? void 0 : _j.Name, (_k = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Supplier) === null || _k === void 0 ? void 0 : _k.Name, transactionData === null || transactionData === void 0 ? void 0 : transactionData.BFromName, transactionData === null || transactionData === void 0 ? void 0 : transactionData.VendorName);
|
|
140
|
-
const gstin = (0, pdf_shared_utils_1.firstValue)((_l = billTo === null || billTo === void 0 ? void 0 : billTo.TaxId) === null || _l === void 0 ? void 0 : _l.
|
|
140
|
+
const gstin = (0, pdf_shared_utils_1.firstValue)((_l = billTo === null || billTo === void 0 ? void 0 : billTo.TaxId) === null || _l === void 0 ? void 0 : _l.Value, (_m = billTo === null || billTo === void 0 ? void 0 : billTo.TaxId) === null || _m === void 0 ? void 0 : _m.GSTIN, (_o = billTo === null || billTo === void 0 ? void 0 : billTo.TaxId) === null || _o === void 0 ? void 0 : _o.GSTNo);
|
|
141
141
|
const contactInfo = resolvePhoneFromContacts(billTo === null || billTo === void 0 ? void 0 : billTo.Contact);
|
|
142
142
|
const directPhone = (0, pdf_shared_utils_1.firstValue)(billTo === null || billTo === void 0 ? void 0 : billTo.Ph, billTo === null || billTo === void 0 ? void 0 : billTo.Phone, billTo === null || billTo === void 0 ? void 0 : billTo.Mobile);
|
|
143
143
|
return {
|
|
@@ -190,14 +190,14 @@ function resolvePurchaseOtherDetails(transactionData, printConfig = {}) {
|
|
|
190
190
|
};
|
|
191
191
|
}
|
|
192
192
|
function resolvePurchaseShipFromDetails(transactionData) {
|
|
193
|
-
var _a, _b;
|
|
193
|
+
var _a, _b, _c;
|
|
194
194
|
const shipFrom = (transactionData === null || transactionData === void 0 ? void 0 : transactionData.SFrom) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShipFrom) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.From) || {};
|
|
195
195
|
const address = normalizeAddress((shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.Adrs)
|
|
196
196
|
|| (transactionData === null || transactionData === void 0 ? void 0 : transactionData.SFromAddress)
|
|
197
197
|
|| (transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShipFromAddress)
|
|
198
198
|
|| (transactionData === null || transactionData === void 0 ? void 0 : transactionData.FromAddress));
|
|
199
199
|
const name = (0, pdf_shared_utils_1.firstValue)(shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.Name, shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.CName, shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.WhName, transactionData === null || transactionData === void 0 ? void 0 : transactionData.SFromName, transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShipFromName);
|
|
200
|
-
const gstin = (0, pdf_shared_utils_1.firstValue)((_a = shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.TaxId) === null || _a === void 0 ? void 0 : _a.
|
|
200
|
+
const gstin = (0, pdf_shared_utils_1.firstValue)((_a = shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.TaxId) === null || _a === void 0 ? void 0 : _a.Value, (_b = shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.TaxId) === null || _b === void 0 ? void 0 : _b.GSTIN, (_c = shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.TaxId) === null || _c === void 0 ? void 0 : _c.GSTNo);
|
|
201
201
|
return {
|
|
202
202
|
name,
|
|
203
203
|
addressLines: buildAddressLines(address),
|
|
@@ -206,11 +206,11 @@ function resolvePurchaseShipFromDetails(transactionData) {
|
|
|
206
206
|
};
|
|
207
207
|
}
|
|
208
208
|
function resolveInsuranceDetails(transactionData) {
|
|
209
|
-
var _a, _b;
|
|
209
|
+
var _a, _b, _c;
|
|
210
210
|
const insurance = (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Insurance) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Ins) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Insurer) || {};
|
|
211
211
|
const address = normalizeAddress((insurance === null || insurance === void 0 ? void 0 : insurance.Adrs) || (insurance === null || insurance === void 0 ? void 0 : insurance.Address));
|
|
212
212
|
const name = (0, pdf_shared_utils_1.firstValue)(insurance === null || insurance === void 0 ? void 0 : insurance.Name, insurance === null || insurance === void 0 ? void 0 : insurance.Company, insurance === null || insurance === void 0 ? void 0 : insurance.Provider, insurance === null || insurance === void 0 ? void 0 : insurance.InsName);
|
|
213
|
-
const gstin = (0, pdf_shared_utils_1.firstValue)((_a = insurance === null || insurance === void 0 ? void 0 : insurance.TaxId) === null || _a === void 0 ? void 0 : _a.
|
|
213
|
+
const gstin = (0, pdf_shared_utils_1.firstValue)((_a = insurance === null || insurance === void 0 ? void 0 : insurance.TaxId) === null || _a === void 0 ? void 0 : _a.Value, (_b = insurance === null || insurance === void 0 ? void 0 : insurance.TaxId) === null || _b === void 0 ? void 0 : _b.GSTIN, (_c = insurance === null || insurance === void 0 ? void 0 : insurance.TaxId) === null || _c === void 0 ? void 0 : _c.GSTNo);
|
|
214
214
|
return {
|
|
215
215
|
name,
|
|
216
216
|
addressLines: buildAddressLines(address),
|
package/package.json
CHANGED
|
@@ -415,7 +415,7 @@ export function GetBillNameForInvoicePrint(argInvoiceData: any, InvoicePrintData
|
|
|
415
415
|
Customer.Adrs.push(city);
|
|
416
416
|
}
|
|
417
417
|
}
|
|
418
|
-
Customer.GSTIN = argInvoiceData.BillTo.TaxId?.
|
|
418
|
+
Customer.GSTIN = argInvoiceData.BillTo.TaxId?.Value;
|
|
419
419
|
if (!TrUtils.IsNull(argInvoiceData.BillTo.DLNo)) {
|
|
420
420
|
Customer.DLNo = argInvoiceData.BillTo.DLNo;
|
|
421
421
|
}
|
|
@@ -105,6 +105,7 @@ function resolveSalesBillToDetails(transactionData: any) {
|
|
|
105
105
|
transactionData?.CustomerName
|
|
106
106
|
);
|
|
107
107
|
const gstin = firstValue(
|
|
108
|
+
billTo?.TaxId?.Value,
|
|
108
109
|
billTo?.TaxId?.GSTIN,
|
|
109
110
|
billTo?.TaxId?.GSTNo
|
|
110
111
|
);
|
|
@@ -130,7 +131,7 @@ function resolveSalesShipToDetails(transactionData: any) {
|
|
|
130
131
|
|| transactionData?.ShipToAddress
|
|
131
132
|
);
|
|
132
133
|
const name = firstValue(shipTo?.Name, shipTo?.CName);
|
|
133
|
-
const gstin = firstValue(shipTo?.TaxId?.GSTIN, shipTo?.TaxId?.GSTNo);
|
|
134
|
+
const gstin = firstValue(shipTo?.TaxId?.Value, shipTo?.TaxId?.GSTIN, shipTo?.TaxId?.GSTNo);
|
|
134
135
|
return {
|
|
135
136
|
name,
|
|
136
137
|
addressLines: buildAddressLines(address),
|
|
@@ -164,6 +165,7 @@ function resolvePurchaseBFromDetails(transactionData: any) {
|
|
|
164
165
|
transactionData?.VendorName
|
|
165
166
|
);
|
|
166
167
|
const gstin = firstValue(
|
|
168
|
+
billTo?.TaxId?.Value,
|
|
167
169
|
billTo?.TaxId?.GSTIN,
|
|
168
170
|
billTo?.TaxId?.GSTNo
|
|
169
171
|
);
|
|
@@ -238,7 +240,7 @@ function resolvePurchaseShipFromDetails(transactionData: any) {
|
|
|
238
240
|
transactionData?.SFromName,
|
|
239
241
|
transactionData?.ShipFromName
|
|
240
242
|
);
|
|
241
|
-
const gstin = firstValue(shipFrom?.TaxId?.GSTIN, shipFrom?.TaxId?.GSTNo);
|
|
243
|
+
const gstin = firstValue(shipFrom?.TaxId?.Value, shipFrom?.TaxId?.GSTIN, shipFrom?.TaxId?.GSTNo);
|
|
242
244
|
|
|
243
245
|
return {
|
|
244
246
|
name,
|
|
@@ -257,7 +259,7 @@ function resolveInsuranceDetails(transactionData: any) {
|
|
|
257
259
|
insurance?.Provider,
|
|
258
260
|
insurance?.InsName
|
|
259
261
|
);
|
|
260
|
-
const gstin = firstValue(insurance?.TaxId?.GSTIN, insurance?.TaxId?.GSTNo);
|
|
262
|
+
const gstin = firstValue(insurance?.TaxId?.Value, insurance?.TaxId?.GSTIN, insurance?.TaxId?.GSTNo);
|
|
261
263
|
return {
|
|
262
264
|
name,
|
|
263
265
|
addressLines: buildAddressLines(address),
|