shareneus 1.4.71 → 1.4.73
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.
|
@@ -245,7 +245,7 @@ class InvoiceprintService {
|
|
|
245
245
|
if (column.Field === 'Disc') {
|
|
246
246
|
if (column.type === 'percentage') {
|
|
247
247
|
if (!tr_utils_1.TrUtils.IsEmpty(part[column.Field])) {
|
|
248
|
-
dataRow.push({ text: part[column.Field].toString(), noWrap: true });
|
|
248
|
+
dataRow.push({ text: part[column.Field].toString(), noWrap: true, alignment: 'center' });
|
|
249
249
|
}
|
|
250
250
|
else {
|
|
251
251
|
dataRow.push({ text: '', noWrap: true });
|
|
@@ -253,7 +253,7 @@ class InvoiceprintService {
|
|
|
253
253
|
}
|
|
254
254
|
else {
|
|
255
255
|
if (!tr_utils_1.TrUtils.IsNull(part[column.Field])) {
|
|
256
|
-
dataRow.push({ text: part[column.Field].toString(), noWrap: true });
|
|
256
|
+
dataRow.push({ text: part[column.Field].toString(), noWrap: true, alignment: 'right' });
|
|
257
257
|
}
|
|
258
258
|
else {
|
|
259
259
|
dataRow.push({ text: '', noWrap: true });
|
|
@@ -368,7 +368,7 @@ class InvoiceprintService {
|
|
|
368
368
|
if (column.Field === 'Disc') {
|
|
369
369
|
if (column.type === 'percentage') {
|
|
370
370
|
if (!tr_utils_1.TrUtils.IsEmpty(Ops[column.Field])) {
|
|
371
|
-
dataRow.push({ text: Ops[column.Field].toString(), noWrap: true });
|
|
371
|
+
dataRow.push({ text: Ops[column.Field].toString(), noWrap: true, alignment: 'center' });
|
|
372
372
|
}
|
|
373
373
|
else {
|
|
374
374
|
dataRow.push({ text: '', noWrap: true });
|
|
@@ -376,7 +376,7 @@ class InvoiceprintService {
|
|
|
376
376
|
}
|
|
377
377
|
else {
|
|
378
378
|
if (!tr_utils_1.TrUtils.IsNull(Ops[column.Field])) {
|
|
379
|
-
dataRow.push({ text: Ops[column.Field].toString(), noWrap: true });
|
|
379
|
+
dataRow.push({ text: Ops[column.Field].toString(), noWrap: true, alignment: 'right' });
|
|
380
380
|
}
|
|
381
381
|
else {
|
|
382
382
|
dataRow.push({ text: '', noWrap: true });
|
|
@@ -688,7 +688,7 @@ class InvoiceprintService {
|
|
|
688
688
|
// ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn,
|
|
689
689
|
// TrUtils.isTaxable(ROPrintData.Settings.Tax), ROPrintData.CustLaborITax,
|
|
690
690
|
// ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, ROPrintData.Adj,ROPrintData.STotal),
|
|
691
|
-
shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails1(ROPrintData, ROPrintData.CustLaborTotalAfterDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalAfterDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.
|
|
691
|
+
shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails1(ROPrintData, ROPrintData.CustLaborTotalAfterDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalAfterDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.TaxSummary, ROPrintData.ShowAccParts, ROPrintData.CustLaborAfterTax, ROPrintData.CustPartAfterTax, ROPrintData.FixedDisc, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn, tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax), ROPrintData.CustLaborITax, ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, ROPrintData.Adj, ROPrintData.TaxSummary, ROPrintData.STotal, isAuto, moreDiscDetails),
|
|
692
692
|
this.GetNumberInWords(ROPrintData.CustRoundedTotal),
|
|
693
693
|
shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale, ROPrintData.Entity.DecimalsNumber),
|
|
694
694
|
shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
|
|
@@ -2121,13 +2121,12 @@ class SharedPDFService {
|
|
|
2121
2121
|
return {
|
|
2122
2122
|
// lineHeight: 0.7,
|
|
2123
2123
|
fontSize: this.TableHeaders,
|
|
2124
|
-
marginTop:
|
|
2124
|
+
marginTop: 3,
|
|
2125
2125
|
marginBottom: 5,
|
|
2126
2126
|
table: {
|
|
2127
|
-
widths: [
|
|
2127
|
+
widths: ['*', 'auto'],
|
|
2128
2128
|
body: [[{ text: 'Paid : ' + tr_utils_1.TrUtils.FixPriceValue(Paid, DecimalsNumber) },
|
|
2129
|
-
{ text: 'Due : ' + tr_utils_1.TrUtils.FixPriceValue(Due, DecimalsNumber) }
|
|
2130
|
-
{ text: 'Status : ' + Status }]]
|
|
2129
|
+
{ text: 'Due : ' + tr_utils_1.TrUtils.FixPriceValue(Due, DecimalsNumber) }]]
|
|
2131
2130
|
},
|
|
2132
2131
|
layout: this.LayOutStyle(),
|
|
2133
2132
|
};
|
|
@@ -2144,10 +2143,9 @@ class SharedPDFService {
|
|
|
2144
2143
|
marginTop: 10,
|
|
2145
2144
|
marginBottom: 5,
|
|
2146
2145
|
table: {
|
|
2147
|
-
widths: [
|
|
2146
|
+
widths: ['*', 'auto'],
|
|
2148
2147
|
body: [[{ text: 'Paid : ' + Paid },
|
|
2149
|
-
{ text: 'Due : ' + Due }
|
|
2150
|
-
{ text: 'Status : ' + Status }]]
|
|
2148
|
+
{ text: 'Due : ' + Due }]]
|
|
2151
2149
|
},
|
|
2152
2150
|
layout: this.LayOutStyle(),
|
|
2153
2151
|
};
|