shareneus 1.1.2 → 1.1.4
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.
|
@@ -322,14 +322,22 @@ class InvoiceLandscapePdfService {
|
|
|
322
322
|
}
|
|
323
323
|
static GetWithOutDiscountFieldHeader2(permission, Body, ShowDiscountColumn) {
|
|
324
324
|
let headersNames = [[
|
|
325
|
-
{ text: 'Description', rowSpan: 2, style: 'tableheader', alignment: '
|
|
325
|
+
{ text: 'Description', rowSpan: 2, style: 'tableheader', alignment: 'left', lineHeight: 0.5 },
|
|
326
|
+
{ text: 'Batch No', rowSpan: 2, style: 'tableheader', lineHeight: 1 },
|
|
327
|
+
{ text: 'Expiry', rowSpan: 2, style: 'tableheader', lineHeight: 1 },
|
|
326
328
|
{ text: 'Qty', style: 'tableheader', rowSpan: 2, lineHeight: 0.5 },
|
|
329
|
+
{ text: 'Offer Qty', style: 'tableheader', rowSpan: 2, lineHeight: 1 },
|
|
330
|
+
{ text: 'M.R.P', style: 'tableheader', rowSpan: 2, lineHeight: 0.5, alignment: 'center', },
|
|
327
331
|
{ text: 'Unit Price', style: 'tableheader', rowSpan: 2, lineHeight: 0.5, alignment: 'right', },
|
|
328
332
|
{ text: 'Line Total', rowSpan: 2, lineHeight: 0.5, style: 'tableheader' }
|
|
329
333
|
],
|
|
330
334
|
[
|
|
331
335
|
{ text: '', Field: 'Desc', lineHeight: 0.5 },
|
|
336
|
+
{ text: '', Field: 'Batch', lineHeight: 0.5 },
|
|
337
|
+
{ text: 'Expiry', Field: 'ExDate', lineHeight: 0.5 },
|
|
332
338
|
{ text: '', Field: 'QtyAndUoM', lineHeight: 0.5 }, { text: '', Field: 'UnPr', lineHeight: 0.5 },
|
|
339
|
+
{ text: '', Field: 'OfQty', lineHeight: 0.5 },
|
|
340
|
+
{ text: '', Field: 'MRP', lineHeight: 0.5 },
|
|
333
341
|
{ text: 'Line Total', Field: 'LineTotal', lineHeight: 0.5 }
|
|
334
342
|
]];
|
|
335
343
|
if (permission) {
|
|
@@ -340,10 +348,10 @@ class InvoiceLandscapePdfService {
|
|
|
340
348
|
headersNames[0].unshift(sno, MPN);
|
|
341
349
|
headersNames[1].unshift(sno1, MPN1);
|
|
342
350
|
if (ShowDiscountColumn) {
|
|
343
|
-
headersNames[0].splice(
|
|
344
|
-
headersNames[0].splice(
|
|
345
|
-
headersNames[1].splice(
|
|
346
|
-
headersNames[1].splice(
|
|
351
|
+
headersNames[0].splice(9, 0, { text: 'Discount', style: 'tableheader', colSpan: 2, alignment: 'center', lineHeight: 0.5 });
|
|
352
|
+
headersNames[0].splice(10, 0, {});
|
|
353
|
+
headersNames[1].splice(9, 0, { text: '%', alignment: 'center', style: 'tableheader', Field: 'Perc', type: 'percentage', lineHeight: 0.5 });
|
|
354
|
+
headersNames[1].splice(10, 0, { text: 'Rs', alignment: 'center', style: 'tableheader', Field: 'Disc', type: 'amount', lineHeight: 0.5 });
|
|
347
355
|
}
|
|
348
356
|
}
|
|
349
357
|
else {
|
|
@@ -352,10 +360,10 @@ class InvoiceLandscapePdfService {
|
|
|
352
360
|
headersNames[0].unshift(sno);
|
|
353
361
|
headersNames[1].unshift(sno1);
|
|
354
362
|
if (ShowDiscountColumn) {
|
|
355
|
-
headersNames[0].splice(
|
|
356
|
-
headersNames[0].splice(
|
|
357
|
-
headersNames[1].splice(
|
|
358
|
-
headersNames[1].splice(
|
|
363
|
+
headersNames[0].splice(8, 0, { text: 'Discount', style: 'tableheader', colSpan: 2, alignment: 'center', lineHeight: 0.5 });
|
|
364
|
+
headersNames[0].splice(9, 0, {});
|
|
365
|
+
headersNames[1].splice(8, 0, { text: '%', alignment: 'center', style: 'tableheader', Field: 'Perc', type: 'percentage', lineHeight: 0.5 });
|
|
366
|
+
headersNames[1].splice(9, 0, { text: 'Rs', alignment: 'center', style: 'tableheader', Field: 'Disc', type: 'amount', lineHeight: 0.5 });
|
|
359
367
|
}
|
|
360
368
|
}
|
|
361
369
|
return headersNames;
|
|
@@ -439,7 +447,7 @@ class InvoiceLandscapePdfService {
|
|
|
439
447
|
dataRow.push({ text: part[column.Field].toString(), alignment: 'center' });
|
|
440
448
|
}
|
|
441
449
|
else {
|
|
442
|
-
if (column.text === 'Line Total' || column.Field === 'UnPr' || column.Field === 'Batch' || column.Field === 'ExDate' || column.Field === 'QtyAndUoM'
|
|
450
|
+
if (column.text === 'Line Total' || column.Field === 'UnPr' || column.Field === 'MRP' || column.Field === 'Batch' || column.Field === 'ExDate' || column.Field === 'QtyAndUoM'
|
|
443
451
|
|| column.text === 'Tax' || column.Field === 'Disc' || column.Field === 'CGSTAmt' || column.Field === 'SGSTAmt'
|
|
444
452
|
|| column.Field === 'CGSTPerc' || column.Field === 'SGSTPerc' || column.Field === 'IGSTAmt' || column.Field === 'IGSTPerc') {
|
|
445
453
|
if (column.Field === 'Disc') {
|
|
@@ -767,18 +775,18 @@ class InvoiceLandscapePdfService {
|
|
|
767
775
|
// console.log('ShowDiscountColumn', ShowDiscountColumn);
|
|
768
776
|
if (PrintPartNo) {
|
|
769
777
|
if (ShowDiscountColumn) {
|
|
770
|
-
return [24, 70, '*', 25, 60, 45, 45, 50];
|
|
778
|
+
return [24, 70, '*', 45, 45, 25, 25, 60, 60, 45, 45, 50];
|
|
771
779
|
}
|
|
772
780
|
else {
|
|
773
|
-
return [25, 70, '*', 35, 60, 80];
|
|
781
|
+
return [25, 70, '*', 45, 45, 35, 35, 60, 60, 80];
|
|
774
782
|
}
|
|
775
783
|
}
|
|
776
784
|
else {
|
|
777
785
|
if (ShowDiscountColumn) {
|
|
778
|
-
return [25, '*', 70, 70, 70, 70, 70];
|
|
786
|
+
return [25, '*', 50, 50, 50, 50, 70, 70, 70, 70, 70];
|
|
779
787
|
}
|
|
780
788
|
else {
|
|
781
|
-
return [25, '*', 40, 60, 80];
|
|
789
|
+
return [25, '*', 45, 45, 40, 40, 60, 60, 80];
|
|
782
790
|
}
|
|
783
791
|
}
|
|
784
792
|
}
|