shareneus 1.0.8 → 1.1.0
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.
|
@@ -240,6 +240,7 @@ class InvPrintService {
|
|
|
240
240
|
// Item['Desc'].lastIndexOf('}#'));
|
|
241
241
|
// }
|
|
242
242
|
// Item.Desc = Item['Desc'].split(' #{')[0];
|
|
243
|
+
Item.MRP = tr_utils_1.TrUtils.FixPriceValue(Item.MRP);
|
|
243
244
|
Item.CGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.CGST);
|
|
244
245
|
Item.SGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.SGST);
|
|
245
246
|
Item.IGSTAmt = tr_utils_1.TrUtils.FixPriceValue(Item.IGST);
|
|
@@ -237,23 +237,25 @@ class InvoiceLandscapePdfService {
|
|
|
237
237
|
{ text: 'Expiry', rowSpan: 2, style: 'tableheader', lineHeight: 1 },
|
|
238
238
|
{ text: 'Qty', style: 'tableheader', rowSpan: 2, lineHeight: 0.5 },
|
|
239
239
|
{ text: 'Offer Qty', style: 'tableheader', rowSpan: 2, lineHeight: 1 },
|
|
240
|
+
{ text: 'M.R.P', style: 'tableheader', rowSpan: 2, lineHeight: 0.5, alignment: 'center', },
|
|
240
241
|
{ text: 'Unit Price', style: 'tableheader', rowSpan: 2, lineHeight: 0.5, alignment: 'center', },
|
|
241
242
|
{ text: 'Line Total', rowSpan: 2, lineHeight: 0.5, style: 'tabFleheader' }
|
|
242
243
|
],
|
|
243
244
|
[{ text: '', Field: 'SNo', lineHeight: 0.5 }, { text: '', Field: 'MPN', lineHeight: 0.5 },
|
|
244
245
|
{ text: '', Field: 'Desc', lineHeight: 0.5 }, { text: 'HSN/SAC', Field: 'HSN', lineHeight: 0.5 },
|
|
245
246
|
{ text: '', Field: 'Batch', lineHeight: 0.5 }, { text: 'Expiry', Field: 'ExDate', lineHeight: 0.5 },
|
|
246
|
-
{ text: '', Field: 'QtyAndUoM', lineHeight: 0.5 }, { text: '', Field: 'OfQty', lineHeight: 0.5 },
|
|
247
|
+
{ text: '', Field: 'QtyAndUoM', lineHeight: 0.5 }, { text: '', Field: 'OfQty', lineHeight: 0.5 },
|
|
248
|
+
{ text: '', Field: 'MRP', lineHeight: 0.5 }, { text: '', Field: 'UnPr', lineHeight: 0.5 },
|
|
247
249
|
{ text: 'Line Total', Field: 'LineTotal', lineHeight: 0.5 }
|
|
248
250
|
]
|
|
249
251
|
];
|
|
250
|
-
let Count =
|
|
252
|
+
let Count = 10;
|
|
251
253
|
if (ShowDiscountColumn) {
|
|
252
254
|
headersNames[0].splice(Count, 0, { text: 'Discount', style: 'tableheader', colSpan: 2, alignment: 'center', lineHeight: 0.8 });
|
|
253
255
|
headersNames[0].splice(Count + 1, 0, {});
|
|
254
256
|
headersNames[1].splice(Count, 0, { text: '%', alignment: 'center', style: 'tableheader', Field: 'Perc', type: 'percentage', lineHeight: 0.5 });
|
|
255
257
|
headersNames[1].splice(Count + 1, 0, { text: 'Rs', alignment: 'center', style: 'tableheader', Field: 'Disc', type: 'amount', lineHeight: 0.5 });
|
|
256
|
-
Count =
|
|
258
|
+
Count = 12;
|
|
257
259
|
}
|
|
258
260
|
if (ShowIGST) {
|
|
259
261
|
headersNames[0].splice(Count, 0, { text: 'IGST', style: 'tableheader', colSpan: 2, alignment: 'center', lineHeight: 0.8 });
|
|
@@ -280,22 +282,24 @@ class InvoiceLandscapePdfService {
|
|
|
280
282
|
{ text: 'Expiry', rowSpan: 2, style: 'tableheader', lineHeight: 1 },
|
|
281
283
|
{ text: 'Qty', style: 'tableheader', rowSpan: 2, lineHeight: 0.6 },
|
|
282
284
|
{ text: 'Offer Qty', style: 'tableheader', rowSpan: 2, lineHeight: 1 },
|
|
285
|
+
{ text: 'M.R.P', style: 'tableheader', rowSpan: 2, lineHeight: 0.5, alignment: 'center', },
|
|
283
286
|
{ text: 'Unit Price', style: 'tableheader', rowSpan: 2, alignment: 'center', lineHeight: 0.6 },
|
|
284
287
|
{ text: 'Line Total', rowSpan: 2, style: 'tableheader', lineHeight: 0.6 }
|
|
285
288
|
],
|
|
286
289
|
[{ text: '', Field: 'SNo', lineHeight: 0.5 },
|
|
287
290
|
{ text: '', Field: 'Desc', lineHeight: 0.5 }, { text: 'HSN/SAC', Field: 'HSN', lineHeight: 0.5 },
|
|
288
291
|
{ text: '', Field: 'Batch', lineHeight: 0.5 }, { text: 'Expiry', Field: 'ExDate', lineHeight: 0.5 },
|
|
289
|
-
{ text: '', Field: 'QtyAndUoM', lineHeight: 0.5 }, { text: '', Field: 'OfQty', lineHeight: 0.5 }, { text: '', Field: '
|
|
292
|
+
{ text: '', Field: 'QtyAndUoM', lineHeight: 0.5 }, { text: '', Field: 'OfQty', lineHeight: 0.5 }, { text: '', Field: 'MRP', lineHeight: 0.5 },
|
|
293
|
+
{ text: '', Field: 'UnPr', lineHeight: 0.5 },
|
|
290
294
|
{ text: 'Line Total', Field: 'LineTotal', lineHeight: 0.5 }
|
|
291
295
|
]];
|
|
292
|
-
let Count =
|
|
296
|
+
let Count = 9;
|
|
293
297
|
if (ShowDiscountColumn) {
|
|
294
298
|
headersNames[0].splice(Count, 0, { text: 'Discount', style: 'tableheader', colSpan: 2, alignment: 'center', lineHeight: 0.8 });
|
|
295
299
|
headersNames[0].splice(Count + 1, 0, {});
|
|
296
300
|
headersNames[1].splice(Count, 0, { text: '%', alignment: 'center', style: 'tableheader', Field: 'Perc', type: 'percentage', lineHeight: 0.5 });
|
|
297
301
|
headersNames[1].splice(Count + 1, 0, { text: 'Rs', alignment: 'center', style: 'tableheader', Field: 'Disc', type: 'amount', lineHeight: 0.5 });
|
|
298
|
-
Count =
|
|
302
|
+
Count = 11;
|
|
299
303
|
}
|
|
300
304
|
if (ShowIGST) {
|
|
301
305
|
headersNames[0].splice(Count, 0, { text: 'IGST', style: 'tableheader', colSpan: 2, alignment: 'center', lineHeight: 0.8 });
|
|
@@ -610,36 +614,36 @@ class InvoiceLandscapePdfService {
|
|
|
610
614
|
if (PrintPartNo) {
|
|
611
615
|
if (ShowIGST) {
|
|
612
616
|
if (ShowDiscountColumn) {
|
|
613
|
-
return [24, 50, '*', 35, 35, 35, 30, 25, 40, 20, 35, 20, 35, 45];
|
|
617
|
+
return [24, 50, '*', 35, 35, 35, 30, 25, 40, 20, 35, 35, 20, 35, 45];
|
|
614
618
|
}
|
|
615
619
|
else {
|
|
616
|
-
return [24, 50, '*', 35, 35, 35, 30, 25, 40, 20, 35, 51];
|
|
620
|
+
return [24, 50, '*', 35, 35, 35, 30, 25, 40, 40, 20, 35, 51];
|
|
617
621
|
}
|
|
618
622
|
}
|
|
619
623
|
else {
|
|
620
624
|
if (ShowDiscountColumn) {
|
|
621
|
-
return [24, 45, '*', 35, 35, 35, 30, 22, 40, 20, 34, 20, 32, 20, 32, 48];
|
|
625
|
+
return [24, 45, '*', 35, 35, 35, 30, 22, 40, 20, 34, 20, 32, 32, 20, 32, 48];
|
|
622
626
|
}
|
|
623
627
|
else {
|
|
624
|
-
return [24, 45, '*', 35, 35, 35, 30, 22, 40, 20, 32, 20, 32, 54];
|
|
628
|
+
return [24, 45, '*', 35, 35, 35, 30, 22, 40, 20, 32, 32, 20, 32, 54];
|
|
625
629
|
}
|
|
626
630
|
}
|
|
627
631
|
}
|
|
628
632
|
else {
|
|
629
633
|
if (ShowIGST) {
|
|
630
634
|
if (ShowDiscountColumn) {
|
|
631
|
-
return [24, '*', 35, 41, 35, 30, 25, 40, 20, 35, 20, 35, 41];
|
|
635
|
+
return [24, '*', 35, 41, 35, 30, 25, 40, 20, 35, 35, 20, 35, 41];
|
|
632
636
|
}
|
|
633
637
|
else {
|
|
634
|
-
return [24, '*', 35, 50, 35, 30, 25, 40, 20, 40, 50];
|
|
638
|
+
return [24, '*', 35, 50, 35, 30, 25, 40, 40, 20, 40, 50];
|
|
635
639
|
}
|
|
636
640
|
}
|
|
637
641
|
else {
|
|
638
642
|
if (ShowDiscountColumn) {
|
|
639
|
-
return [24, '*', 35, 45, 35, 30, 22, 40, 20, 34, 20, 35, 20, 35, 45];
|
|
643
|
+
return [24, '*', 35, 45, 35, 30, 22, 40, 20, 34, 20, 35, 35, 20, 35, 45];
|
|
640
644
|
}
|
|
641
645
|
else {
|
|
642
|
-
return [24, '*', 35, 50, 35, 30, 22, 40, 20, 35, 20, 35, 50];
|
|
646
|
+
return [24, '*', 35, 50, 35, 30, 22, 40, 20, 35, 35, 20, 35, 50];
|
|
643
647
|
}
|
|
644
648
|
}
|
|
645
649
|
}
|