shareneus 1.1.3 → 1.1.5
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,23 @@ 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 },
|
|
332
|
-
{ text: '', Field: '
|
|
336
|
+
{ text: '', Field: 'Batch', lineHeight: 0.5 },
|
|
337
|
+
{ text: 'Expiry', Field: 'ExDate', lineHeight: 0.5 },
|
|
338
|
+
{ text: '', Field: 'QtyAndUoM', lineHeight: 0.5 },
|
|
339
|
+
{ text: '', Field: 'OfQty', lineHeight: 0.5 },
|
|
340
|
+
{ text: '', Field: 'MRP', lineHeight: 0.5 },
|
|
341
|
+
{ text: '', Field: 'UnPr', lineHeight: 0.5 },
|
|
333
342
|
{ text: 'Line Total', Field: 'LineTotal', lineHeight: 0.5 }
|
|
334
343
|
]];
|
|
335
344
|
if (permission) {
|
|
@@ -340,10 +349,10 @@ class InvoiceLandscapePdfService {
|
|
|
340
349
|
headersNames[0].unshift(sno, MPN);
|
|
341
350
|
headersNames[1].unshift(sno1, MPN1);
|
|
342
351
|
if (ShowDiscountColumn) {
|
|
343
|
-
headersNames[0].splice(
|
|
344
|
-
headersNames[0].splice(
|
|
345
|
-
headersNames[1].splice(
|
|
346
|
-
headersNames[1].splice(
|
|
352
|
+
headersNames[0].splice(9, 0, { text: 'Discount', style: 'tableheader', colSpan: 2, alignment: 'center', lineHeight: 0.5 });
|
|
353
|
+
headersNames[0].splice(10, 0, {});
|
|
354
|
+
headersNames[1].splice(9, 0, { text: '%', alignment: 'center', style: 'tableheader', Field: 'Perc', type: 'percentage', lineHeight: 0.5 });
|
|
355
|
+
headersNames[1].splice(10, 0, { text: 'Rs', alignment: 'center', style: 'tableheader', Field: 'Disc', type: 'amount', lineHeight: 0.5 });
|
|
347
356
|
}
|
|
348
357
|
}
|
|
349
358
|
else {
|
|
@@ -352,10 +361,10 @@ class InvoiceLandscapePdfService {
|
|
|
352
361
|
headersNames[0].unshift(sno);
|
|
353
362
|
headersNames[1].unshift(sno1);
|
|
354
363
|
if (ShowDiscountColumn) {
|
|
355
|
-
headersNames[0].splice(
|
|
356
|
-
headersNames[0].splice(
|
|
357
|
-
headersNames[1].splice(
|
|
358
|
-
headersNames[1].splice(
|
|
364
|
+
headersNames[0].splice(8, 0, { text: 'Discount', style: 'tableheader', colSpan: 2, alignment: 'center', lineHeight: 0.5 });
|
|
365
|
+
headersNames[0].splice(9, 0, {});
|
|
366
|
+
headersNames[1].splice(8, 0, { text: '%', alignment: 'center', style: 'tableheader', Field: 'Perc', type: 'percentage', lineHeight: 0.5 });
|
|
367
|
+
headersNames[1].splice(9, 0, { text: 'Rs', alignment: 'center', style: 'tableheader', Field: 'Disc', type: 'amount', lineHeight: 0.5 });
|
|
359
368
|
}
|
|
360
369
|
}
|
|
361
370
|
return headersNames;
|
|
@@ -767,18 +776,18 @@ class InvoiceLandscapePdfService {
|
|
|
767
776
|
// console.log('ShowDiscountColumn', ShowDiscountColumn);
|
|
768
777
|
if (PrintPartNo) {
|
|
769
778
|
if (ShowDiscountColumn) {
|
|
770
|
-
return [24, 70, '*', 25, 60, 45, 45, 50];
|
|
779
|
+
return [24, 70, '*', 45, 45, 25, 25, 60, 60, 45, 45, 50];
|
|
771
780
|
}
|
|
772
781
|
else {
|
|
773
|
-
return [25, 70, '*', 35, 60, 80];
|
|
782
|
+
return [25, 70, '*', 45, 45, 35, 35, 60, 60, 80];
|
|
774
783
|
}
|
|
775
784
|
}
|
|
776
785
|
else {
|
|
777
786
|
if (ShowDiscountColumn) {
|
|
778
|
-
return [25, '*', 70, 70, 70, 70, 70];
|
|
787
|
+
return [25, '*', 50, 50, 50, 50, 70, 70, 70, 70, 70];
|
|
779
788
|
}
|
|
780
789
|
else {
|
|
781
|
-
return [25, '*', 40, 60, 80];
|
|
790
|
+
return [25, '*', 45, 45, 40, 40, 60, 60, 80];
|
|
782
791
|
}
|
|
783
792
|
}
|
|
784
793
|
}
|