shareneus 1.4.53 → 1.4.54

package/dist/accounting/counter-sales/auto-sales-receipt-pdf.service.js

@@ -454,7 +454,7 @@ class SalesReceiptprintService {
             shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails(ROPrintData, ROPrintData.CustLaborTotalAfterDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalAfterDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.CustTaxGroupData, ROPrintData.ShowAccParts, ROPrintData.CustLaborAfterTax, ROPrintData.CustPartAfterTax, ROPrintData.FixedDisc, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn, tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax), ROPrintData.CustLaborITax, ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, ROPrintData.Adj, null, moreDiscDetails),
             shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale, ROPrintData.Entity.DecimalsNumber),
             shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
-            shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank),
+            shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank, ROPrintData.Entity.UPIPhone),
             shared_pdf_service_1.SharedPDFService.GetUnderLine(),
             shared_pdf_service_1.SharedPDFService.GetInvSignatures(ROPrintData.Entity.CName, ROPrintData.isCountersale),
             // this.PageBrake(ROPrintData, withPass),

package/dist/accounting/invoice/hc-inv-pdf.service.js

@@ -769,7 +769,7 @@ class HCInvoiceprintService {
             this.GetNumberInWords(ROPrintData.CustRoundedTotal),
             this.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale, ROPrintData.Entity.DecimalsNumber),
             shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
-            shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank),
+            shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank, ROPrintData.Entity.UPIPhone),
             // SharedPDFService.GetUnderLine(),
             shared_pdf_service_1.SharedPDFService.GetHCInvSignatures(ROPrintData.Entity.CName, ROPrintData.isCountersale),
             // this.PageBrake(ROPrintData, withPass),

package/dist/accounting/invoice/inv-pdf.service.js

@@ -708,7 +708,7 @@ class InvoiceprintService {
         return CommonDetails;
     }
     static GetBanckdetailswithQRCode(ROPrintData) {
-        return { columns: [shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank),
+        return { columns: [shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank, ROPrintData.Entity.UPIPhone),
                 shared_pdf_service_1.SharedPDFService.GetEntityDetails(ROPrintData.Entity)] };
     }
     static GetNumberInWords(TotalAmount) {

package/dist/accounting/invoice/invoice-landscape-pdf.service.js

@@ -901,7 +901,7 @@ class InvoiceLandscapePdfService {
                             // SharedPDFService.GetTaxOnParts(ROPrintData.CustPartsTotalBeforeDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST,
                             //     ROPrintData.CustPartSGST, ROPrintData.ShowAccParts, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn,
                             //     ROPrintData.ShowTaxColumn, ROPrintData.From),
-                            shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank),
+                            shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank, ROPrintData.Entity.UPIPhone),
                             {
                                 columns: [{ text: '', width: moreDiscDetails ? 153 : 175 }, shared_pdf_service_1.SharedPDFService.GrandTotal(ROPrintData, '0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate, null, moreDiscDetails, ROPrintData.Entity.DecimalsNumber)]
                             }

package/dist/accounting/invoice/invoice-letterhead-pdf.service.js

@@ -708,7 +708,7 @@ class InvoiceLetterheadPdfService {
         return CommonDetails;
     }
     static GetBanckdetailswithQRCode(ROPrintData) {
-        return { columns: [shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank),
+        return { columns: [shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank, ROPrintData.Entity.UPIPhone),
                 shared_pdf_service_1.SharedPDFService.GetEntityDetails(ROPrintData.Entity)] };
     }
     static GetNumberInWords(TotalAmount) {

package/dist/accounting/invoice/shared-inv-pdf.service.js

@@ -673,7 +673,7 @@ class SharedInvoiceprintService {
             this.GetNumberInWords(ROPrintData.CustRoundedTotal),
             shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale, ROPrintData.Entity.DecimalsNumber),
             shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
-            shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank),
+            shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank, ROPrintData.Entity.UPIPhone),
             shared_pdf_service_1.SharedPDFService.GetUnderLine(),
             shared_pdf_service_1.SharedPDFService.GetInvSignatures(ROPrintData.Entity.CName, ROPrintData.isCountersale),
             // this.PageBrake(ROPrintData, withPass),

package/dist/inventory/items/issue-parts-pdf.service.js

@@ -673,7 +673,7 @@ class IssuePartsprintService {
             this.GetNumberInWords(ROPrintData.CustRoundedTotal),
             shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale, ROPrintData.Entity.DecimalsNumber),
             shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
-            shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank),
+            shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank, ROPrintData.Entity.UPIPhone),
             shared_pdf_service_1.SharedPDFService.GetUnderLine(),
             shared_pdf_service_1.SharedPDFService.GetInvSignatures(ROPrintData.Entity.CName, ROPrintData.isCountersale),
             // this.PageBrake(ROPrintData, withPass),

package/dist/sales/delivery-challan/dc-landscape-pdf.service.js

@@ -877,7 +877,7 @@ class DCLandscapePdfService {
                             // SharedPDFService.GetTaxOnParts(ROPrintData.CustPartsTotalBeforeDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST,
                             //     ROPrintData.CustPartSGST, ROPrintData.ShowAccParts, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn,
                             //     ROPrintData.ShowTaxColumn, ROPrintData.From),
-                            shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank),
+                            shared_pdf_service_1.SharedPDFService.GetBankDetials(ROPrintData.Entity.Bank, ROPrintData.Entity.PrBank, ROPrintData.Entity.UPIPhone),
                             {
                                 columns: [{ text: '', width: moreDiscDetails ? 140 : 175 }, shared_pdf_service_1.SharedPDFService.GrandTotal(ROPrintData, '0.00', ROPrintData.CustPartsTotalBeforeDisc, totalDisc, totalTax, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, null, ROPrintData.Consolidate, null, moreDiscDetails, ROPrintData.Entity.DecimalsNumber)],
                             }

package/dist/shared/math-operations.js

@@ -182,46 +182,3 @@ function GetMarginValue(price, cost) {
     // Return the calculated margin
     return margin;
 }
-// /* Returns age as a human-readable string in years, months, weeks and days.
-// * E.g. "10 years, 5 months, 1 week, 2 days"
-// */
-// export function GetAgeString(dateOfBirth: Date): string {
-//   const now = new Date();
-//   // 1) Calculate full years
-//   let years = now.getFullYear() - dateOfBirth.getFullYear();
-//   const anniversary = new Date(dateOfBirth);
-//   anniversary.setFullYear(dateOfBirth.getFullYear() + years);
-//   if (anniversary > now) {
-//     years--;
-//     anniversary.setFullYear(dateOfBirth.getFullYear() + years);
-//   }
-//   // 2) Calculate full months since last "anniversary"
-//   let temp = new Date(anniversary);
-//   let months = 0;
-//   while (true) {
-//     const next = new Date(temp);
-//     next.setMonth(next.getMonth() + 1);
-//     if (next <= now) {
-//       months++;
-//       temp = next;
-//     } else {
-//       break;
-//     }
-//   }
-//   // 3) Calculate remaining days → weeks + days
-//   const msPerDay = 24 * 60 * 60 * 1000;
-//   const daysTotal = Math.floor((now.getTime() - temp.getTime()) / msPerDay);
-//   const weeks = Math.floor(daysTotal / 7);
-//   const days = daysTotal % 7;
-//   // 4) Build the output, skipping zero-values
-//   const parts: string[] = [];
-//   if (years)  parts.push(`${years} year${years > 1 ? 's' : ''}`);
-//   if (months) parts.push(`${months} month${months > 1 ? 's' : ''}`);
-//   if (weeks)  parts.push(`${weeks} week${weeks > 1 ? 's' : ''}`);
-//   if (days)   parts.push(`${days} day${days > 1 ? 's' : ''}`);
-//   // Fallback for same-day birth (unlikely in practice)
-//   if (parts.length === 0) {
-//     return '0 days';
-//   }
-//   return parts.join(', ');
-// }

package/dist/shared/shared-pdf.service.d.ts

@@ -140,7 +140,7 @@ export declare class SharedPDFService {
         };
         layout: string;
     };
-    static GetBankDetials(Bankinfo: any, isPrint: boolean): any;
+    static GetBankDetials(Bankinfo: any, isPrint: boolean, UPIPhone: string): any;
     static GetBankDataTable(data: any, isBank: boolean): any;
     static LaborTotalTable(ROPrintData: any): {
         style: string[];

package/dist/shared/shared-pdf.service.js

@@ -286,7 +286,7 @@ class SharedPDFService {
     static GetEntityDetails(Entity) {
         let SetData = [];
         if (Entity.PrUPI && !Entity.IsProforma) {
-            SetData.push({ qr: Entity.UPI, fit: '100', marginLeft: 150 });
+            SetData.push({ qr: Entity.UPI, fit: '120', marginLeft: 150 });
             SetData.push({ text: 'Scan To Pay', fontSize: this.TermsandCond, marginLeft: 151, bold: true, marginTop: 2 });
         }
         // SetData.push({ columns: [this.GetEntityTax(Entity)] })
@@ -563,7 +563,7 @@ class SharedPDFService {
             layout: 'noBorders',
         };
     }
-    static GetBankDetials(Bankinfo, isPrint) {
+    static GetBankDetials(Bankinfo, isPrint, UPIPhone) {
         if (isPrint && !tr_utils_1.TrUtils.IsNull(Bankinfo)) {
             let AccountFields = [];
             let BANK = { name: 'BANK', value: Bankinfo.Name };
@@ -571,6 +571,7 @@ class SharedPDFService {
             let AccHolderName = { name: 'Account Holder Name', value: Bankinfo.ACName };
             let Branch = { name: 'Branch', value: tr_utils_1.TrUtils.IsNull(Bankinfo.Bran) ? '' : Bankinfo.Bran };
             let IFSC = { name: 'IFSC NO', value: Bankinfo.IFSC };
+            let UPIPh = { name: 'Phone Pay / Google Pay', value: UPIPhone };
             // let TotalPartsAmount = { name: 'Final Labor Amount', value: this.LabourtotalAmount(ROPrintData.LaborInsTotal) };
             AccountFields.push(BANK);
             // if (!TrUtils.IsNull(ROPrintData.OverAllLaborDiscount) && ROPrintData.OverAllLaborDiscount !== 0) {
@@ -579,7 +580,9 @@ class SharedPDFService {
             // }
             AccountFields.push(Branch);
             AccountFields.push(IFSC);
-            // AccountFields.push(TotalPartsAmount);
+            if (!tr_utils_1.TrUtils.IsNull(UPIPhone)) {
+                AccountFields.push(UPIPh);
+            } // AccountFields.push(TotalPartsAmount);
             return {
                 style: ['columnheader', 'TotalsStyles'],
                 lineHeight: 1,

package/dist/shared/shared-print.service.js

@@ -40,6 +40,7 @@ class PrintSharedService {
             Entity.PrBank = tempEntity.Settings.Acc.PrBnk;
             Entity.PrUPI = tempEntity.Settings.Acc.PrUPI;
             Entity.UPI = tempEntity.Settings.Acc.UPI;
+            Entity.UPIPhone = tempEntity.Settings.Acc.UPIPhone;
         }
         if (tr_utils_1.TrUtils.IsNull(tempEntity.Settings.Common.Tax.GSTIN)) {
             Entity.GSTIN = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shareneus",
-  "version": "1.4.53",
+  "version": "1.4.54",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",