shareneus 1.5.31 → 1.5.33
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.
|
@@ -243,7 +243,6 @@ function GetServicePriceForPriceList(service, priceList, equipment = null, quant
|
|
|
243
243
|
if (!service || !priceList) {
|
|
244
244
|
return service;
|
|
245
245
|
}
|
|
246
|
-
console.log(service, priceList, equipment, quantity);
|
|
247
246
|
const resolvedQty = Math.max(1, Number(quantity) || 1);
|
|
248
247
|
const warnings = [];
|
|
249
248
|
const priceListId = (_b = (_a = priceList === null || priceList === void 0 ? void 0 : priceList._id) === null || _a === void 0 ? void 0 : _a.toString) === null || _b === void 0 ? void 0 : _b.call(_a);
|
|
@@ -255,7 +254,6 @@ function GetServicePriceForPriceList(service, priceList, equipment = null, quant
|
|
|
255
254
|
// Check if equipment-based service (FitPriceCosts) or simple service (Price)
|
|
256
255
|
if (service.FitPriceCosts && service.FitPriceCosts.length > 0) {
|
|
257
256
|
// Equipment-based service - need equipment information
|
|
258
|
-
console.log('Equipment-based service pricing detected.', !equipment);
|
|
259
257
|
if (!equipment) {
|
|
260
258
|
warnings.push("Equipment information required for equipment-based service pricing.");
|
|
261
259
|
service.PriceListWarnings = warnings;
|
|
@@ -376,7 +374,6 @@ function GetServicePriceForPriceList(service, priceList, equipment = null, quant
|
|
|
376
374
|
let baseCostSource = "BASE";
|
|
377
375
|
if (service.FitPriceCosts && service.FitPriceCosts.length > 0) {
|
|
378
376
|
// Equipment-based service - need equipment information
|
|
379
|
-
console.log('Equipment-based service pricing detected.', !equipment);
|
|
380
377
|
if (!equipment) {
|
|
381
378
|
warnings.push("Equipment information required for equipment-based service costing.");
|
|
382
379
|
service.PriceListWarnings = warnings;
|
|
@@ -497,9 +497,44 @@ export declare class SharedPDFService {
|
|
|
497
497
|
hLineColor: (i: any, node: any) => string;
|
|
498
498
|
};
|
|
499
499
|
}[];
|
|
500
|
+
} | {
|
|
501
|
+
stack: ({
|
|
502
|
+
text: string;
|
|
503
|
+
bold: boolean;
|
|
504
|
+
fontSize: number;
|
|
505
|
+
margin: number[];
|
|
506
|
+
italics?: undefined;
|
|
507
|
+
opacity?: undefined;
|
|
508
|
+
} | {
|
|
509
|
+
text: any;
|
|
510
|
+
fontSize: number;
|
|
511
|
+
margin: number[];
|
|
512
|
+
italics: boolean;
|
|
513
|
+
opacity: number;
|
|
514
|
+
bold?: undefined;
|
|
515
|
+
})[];
|
|
516
|
+
margin: number[];
|
|
500
517
|
})[];
|
|
501
518
|
})[];
|
|
502
519
|
};
|
|
520
|
+
static GetNotes(RecordData: any): "" | {
|
|
521
|
+
stack: ({
|
|
522
|
+
text: string;
|
|
523
|
+
bold: boolean;
|
|
524
|
+
fontSize: number;
|
|
525
|
+
margin: number[];
|
|
526
|
+
italics?: undefined;
|
|
527
|
+
opacity?: undefined;
|
|
528
|
+
} | {
|
|
529
|
+
text: any;
|
|
530
|
+
fontSize: number;
|
|
531
|
+
margin: number[];
|
|
532
|
+
italics: boolean;
|
|
533
|
+
opacity: number;
|
|
534
|
+
bold?: undefined;
|
|
535
|
+
})[];
|
|
536
|
+
margin: number[];
|
|
537
|
+
};
|
|
503
538
|
static GrandTotal1(RecordData: any, LaborAfterGST: any, PartsAfterGST: any, OverAllRecordDiscount: any, totalTax: any, For: any, OverAllRecordTotal: any, Rounded: any, GrandTotal: any, Adj: any, Consolidate: any, STotal: any, moreDiscDetails: boolean): {
|
|
504
539
|
style: string[];
|
|
505
540
|
lineHeight: number;
|
|
@@ -1643,6 +1643,7 @@ class SharedPDFService {
|
|
|
1643
1643
|
// { text: (istaxable && PartsTaxInfo.length !== 0) ? itemName : '', fontSize: 7, opacity: 0.8 },
|
|
1644
1644
|
// this.PartsTaxAmounts1(PartsTaxInfo, ShowAccParts, ShowIGST,
|
|
1645
1645
|
// ShowTaxColumn)
|
|
1646
|
+
this.GetNotes(RecordData)
|
|
1646
1647
|
]
|
|
1647
1648
|
},
|
|
1648
1649
|
// { text: '', width: 60 },
|
|
@@ -1653,6 +1654,26 @@ class SharedPDFService {
|
|
|
1653
1654
|
// , marginLeft: 10
|
|
1654
1655
|
};
|
|
1655
1656
|
}
|
|
1657
|
+
static GetNotes(RecordData) {
|
|
1658
|
+
if (!tr_utils_1.TrUtils.IsNull(RecordData.Notes)) {
|
|
1659
|
+
return {
|
|
1660
|
+
stack: [
|
|
1661
|
+
{ text: 'Notes:', bold: true, fontSize: 9, margin: [0, 5, 0, 0] },
|
|
1662
|
+
{
|
|
1663
|
+
text: RecordData.Notes,
|
|
1664
|
+
fontSize: 7,
|
|
1665
|
+
margin: [0, 2, 0, 5],
|
|
1666
|
+
italics: true,
|
|
1667
|
+
opacity: 0.7
|
|
1668
|
+
}
|
|
1669
|
+
],
|
|
1670
|
+
margin: [0, 5, 0, 0]
|
|
1671
|
+
};
|
|
1672
|
+
}
|
|
1673
|
+
else {
|
|
1674
|
+
return '';
|
|
1675
|
+
}
|
|
1676
|
+
}
|
|
1656
1677
|
static GrandTotal1(RecordData, LaborAfterGST, PartsAfterGST, OverAllRecordDiscount, totalTax, For, OverAllRecordTotal, Rounded, GrandTotal, Adj, Consolidate, STotal, moreDiscDetails) {
|
|
1657
1678
|
let AccountFields = [
|
|
1658
1679
|
// { name: 'Labor Total', value: LaborAfterGST },
|