shareneus 1.4.16 → 1.4.18
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.
- package/dist/services/delivery-challan-print.service.js +2 -2
- package/dist/services/inv-print.service.js +2 -2
- package/dist/services/invoice-portrait-pdf.js +1 -1
- package/dist/services/sales-pdf.service.js +1 -1
- package/dist/services/sales-print.service.js +2 -2
- package/dist/services/sales-receipt-print.service.js +2 -2
- package/dist/services/shared-pdf.service.js +2 -3
- package/package.json +1 -1
|
@@ -19,8 +19,8 @@ class DeliveryChallanPrintService {
|
|
|
19
19
|
InvoicePrintData.IsProforma = IsProforma;
|
|
20
20
|
InvoicePrintData.Settings = tr_utils_1.TrUtils.Stringify(argInvoiceData.Settings);
|
|
21
21
|
let SType;
|
|
22
|
-
if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.
|
|
23
|
-
SType = argInvoiceData.
|
|
22
|
+
if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.SType)) {
|
|
23
|
+
SType = argInvoiceData.SType;
|
|
24
24
|
}
|
|
25
25
|
InvoicePrintData = this.GetPrintConditionsBasedOnInput(InvoicePrintData, IncludeGST, ConsolidateGST, SType, argInvoiceData, IsProforma);
|
|
26
26
|
InvoicePrintData.Entity = shared_print_service_1.PrintSharedService.GetFormattedEntityDataForPrint(OriginalEntityData, "Delivery Challan", OriginalInvoiceData);
|
|
@@ -22,8 +22,8 @@ class InvPrintService {
|
|
|
22
22
|
InvoicePrintData.IsProforma = IsProforma;
|
|
23
23
|
InvoicePrintData.Settings = tr_utils_1.TrUtils.Stringify(argInvoiceData.Settings);
|
|
24
24
|
let SType;
|
|
25
|
-
if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.
|
|
26
|
-
SType = argInvoiceData.
|
|
25
|
+
if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.SType)) {
|
|
26
|
+
SType = argInvoiceData.SType;
|
|
27
27
|
}
|
|
28
28
|
InvoicePrintData = this.GetPrintConditionsBasedOnInput(InvoicePrintData, IncludeGST, ConsolidateGST, ForInsurance, SType, argInvoiceData, IsProforma, PartsPrint, LaborPrint);
|
|
29
29
|
InvoicePrintData.Entity = shared_print_service_1.PrintSharedService.GetFormattedEntityDataForPrint(OriginalEntityData, "Invoice", OriginalInvoiceData);
|
|
@@ -36,7 +36,7 @@ class InvoicePortraitPrintService {
|
|
|
36
36
|
},
|
|
37
37
|
layout: this.HeaderLayOut()
|
|
38
38
|
},
|
|
39
|
-
this.GetItemsTable(InvoicePDFData.Ops, InvoicePDFData.Items, InvoicePDFData.ShowTaxColumn, InvoicePDFData.
|
|
39
|
+
this.GetItemsTable(InvoicePDFData.Ops, InvoicePDFData.Items, InvoicePDFData.ShowTaxColumn, InvoicePDFData.SType, printOptions, size),
|
|
40
40
|
[this.TotalDetails(InvoicePDFData)],
|
|
41
41
|
{
|
|
42
42
|
style: 'tableExample',
|
|
@@ -50,7 +50,7 @@ class SalesPdfService {
|
|
|
50
50
|
static CommonHeaderDetails(ROPrintData, text) {
|
|
51
51
|
return [
|
|
52
52
|
this.GetMainHeaderDetails(ROPrintData.Entity, ROPrintData.HeaderName, ROPrintData.Image, ROPrintData.HColor, ROPrintData.AColor, text),
|
|
53
|
-
shared_pdf_service_1.SharedPDFService.GetSOCustomerAndOthDetails(ROPrintData._id, ROPrintData.CrDate, ROPrintData.PrDate, ROPrintData.PrintType, ROPrintData.For, ROPrintData.SurName, ROPrintData.SurPhone, ROPrintData.Type, ROPrintData.SurEmail, ROPrintData.ShippmentTo, ROPrintData.PolNo, ROPrintData.PolType, ROPrintData.Customer, ROPrintData.
|
|
53
|
+
shared_pdf_service_1.SharedPDFService.GetSOCustomerAndOthDetails(ROPrintData._id, ROPrintData.CrDate, ROPrintData.PrDate, ROPrintData.PrintType, ROPrintData.For, ROPrintData.SurName, ROPrintData.SurPhone, ROPrintData.Type, ROPrintData.SurEmail, ROPrintData.ShippmentTo, ROPrintData.PolNo, ROPrintData.PolType, ROPrintData.Customer, ROPrintData.DoS, ROPrintData.RefNo, null, null, null, null, null),
|
|
54
54
|
shared_pdf_service_1.SharedPDFService.GetOwnerDetails(ROPrintData.Cust, ROPrintData.Type, ROPrintData.For),
|
|
55
55
|
shared_pdf_service_1.SharedPDFService.CustomerAndVehicleDetailsAfterLine(),
|
|
56
56
|
shared_pdf_service_1.SharedPDFService.GetDisplayTable(),
|
|
@@ -20,8 +20,8 @@ class SalesPrintService {
|
|
|
20
20
|
InvoicePrintData.IsProforma = IsProforma;
|
|
21
21
|
InvoicePrintData.Settings = tr_utils_1.TrUtils.Stringify(argInvoiceData.Settings);
|
|
22
22
|
let SType;
|
|
23
|
-
if (!tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.
|
|
24
|
-
SType = OriginalInvoiceData.
|
|
23
|
+
if (!tr_utils_1.TrUtils.IsNull(OriginalInvoiceData.SType)) {
|
|
24
|
+
SType = OriginalInvoiceData.SType;
|
|
25
25
|
}
|
|
26
26
|
InvoicePrintData = this.GetPrintConditionsBasedOnInput(InvoicePrintData, IncludeGST, ConsolidateGST, ForInsurance, SType, argInvoiceData, IsProforma);
|
|
27
27
|
InvoicePrintData.Entity = shared_print_service_1.PrintSharedService.GetFormattedEntityDataForPrint(OriginalEntityData, OriginalInvoiceData.Type, OriginalInvoiceData);
|
|
@@ -22,8 +22,8 @@ class SaleReceiptPrintService {
|
|
|
22
22
|
InvoicePrintData.IsProforma = IsProforma;
|
|
23
23
|
InvoicePrintData.Settings = tr_utils_1.TrUtils.Stringify(argInvoiceData.Settings);
|
|
24
24
|
let SType;
|
|
25
|
-
if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.
|
|
26
|
-
SType = argInvoiceData.
|
|
25
|
+
if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.SType)) {
|
|
26
|
+
SType = argInvoiceData.SType;
|
|
27
27
|
}
|
|
28
28
|
InvoicePrintData = this.GetPrintConditionsBasedOnInput(InvoicePrintData, IncludeGST, ConsolidateGST, ForInsurance, SType, argInvoiceData, IsProforma);
|
|
29
29
|
InvoicePrintData.Entity = shared_print_service_1.PrintSharedService.GetFormattedEntityDataForPrint(OriginalEntityData, "Invoice", OriginalInvoiceData);
|
|
@@ -131,7 +131,6 @@ class SharedPDFService {
|
|
|
131
131
|
return Details;
|
|
132
132
|
}
|
|
133
133
|
static GetWatermarkImage(Image, pageSize, Wmark) {
|
|
134
|
-
console.log(Image, Wmark);
|
|
135
134
|
if (!tr_utils_1.TrUtils.IsNull(Image) && Wmark) {
|
|
136
135
|
return {
|
|
137
136
|
margun: [10, 15, 10, 15],
|
|
@@ -751,14 +750,14 @@ class SharedPDFService {
|
|
|
751
750
|
],
|
|
752
751
|
};
|
|
753
752
|
}
|
|
754
|
-
static GetSOCustomerAndOthDetails(Id, CrDate, PrDate, PrintType, For, SurName, SurPhone, Type, SurEmail, Shipment, PolNo, PolType, Customer,
|
|
753
|
+
static GetSOCustomerAndOthDetails(Id, CrDate, PrDate, PrintType, For, SurName, SurPhone, Type, SurEmail, Shipment, PolNo, PolType, Customer, DoS, RefNo, IsPackage, PackId, PackedDate, ShipId, ShippedDate) {
|
|
755
754
|
return {
|
|
756
755
|
style: 'textcust',
|
|
757
756
|
marginLeft: 5,
|
|
758
757
|
stack: [{
|
|
759
758
|
columns: [{ text: 'SO# : ' + this.CheckAndSetString(Id) },
|
|
760
759
|
{ text: 'Date : ' + this.CheckAndSetString(CrDate) },
|
|
761
|
-
{ text: 'Place Of Supply : ' + this.GetStateName(
|
|
760
|
+
{ text: 'Place Of Supply : ' + this.GetStateName(DoS) }]
|
|
762
761
|
},
|
|
763
762
|
this.CustomerDetails(Customer, Type, For, null, null, Shipment)],
|
|
764
763
|
};
|