@tomei/finance 0.11.8 → 0.12.0

package/dist/document/document-item.d.ts

@@ -1,7 +1,8 @@
 import Document from './document';
 import { ObjectBase } from '@tomei/general';
 import { IDocumentItemAttr } from './interfaces/document-item-attr.interface';
-export default class DocumentItem extends ObjectBase {
+import { DiscountType } from '../enum/discount-type.enum';
+export default class DocumentItem extends ObjectBase implements IDocumentItemAttr {
     DocumentItemId: string;
     DocNo: string;
     Name: string;
@@ -16,6 +17,9 @@ export default class DocumentItem extends ObjectBase {
     Quantity: number;
     QuantityUOM: string;
     private _Amount;
+    AmountBeforeDiscount: number;
+    DiscountType: DiscountType;
+    DiscountValue: number;
     TaxCode: string;
     TaxAmount: number;
     TaxRate: number;
@@ -42,6 +46,7 @@ export default class DocumentItem extends ObjectBase {
     set Amount(amount: number);
     constructor(dbTransaction: any, document: Document);
     init(params: IDocumentItemAttr): void;
+    calculateAmount(): void;
     static initDocumentItems(dbTransaction: any, document: Document): Promise<DocumentItem[]>;
 }
 //# sourceMappingURL=document-item.d.ts.map

package/dist/document/document-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"document-item.d.ts","sourceRoot":"","sources":["../../src/document/document-item.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAG5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAE9E,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,UAAU;IAClD,cAAc,SAAS;IACvB,KAAK,SAAM;IACX,IAAI,SAAM;IACV,MAAM,SAAM;IACZ,WAAW,CAAC,SAAM;IAClB,MAAM,SAAM;IACZ,QAAQ,SAAM;IACd,OAAO,SAAM;IACb,YAAY,SAAM;IAClB,QAAQ,SAAS;IACjB,SAAS,SAAK;IACd,QAAQ,SAAK;IACb,WAAW,SAAY;IACvB,OAAO,CAAC,OAAO,CAAK;IACpB,OAAO,SAAM;IACb,SAAS,SAAK;IACd,OAAO,SAAK;IACZ,cAAc,SAAO;IACrB,WAAW,SAAM;IACjB,WAAW,SAAM;IACjB,cAAc,SAAS;IACvB,mBAAmB,SAAO;IAC1B,UAAU,EAAE,MAAM,CAAQ;IAC1B,cAAc,EAAE,IAAI,CAAQ;IAC5B,OAAO,CAAC,WAAW,CAAkB;IACrC,IAAI,UAAU,WAEb;IAED,OAAO,CAAC,MAAM,CAAC,eAAe,CAAgC;IAE9D,OAAO,CAAC,cAAc,CAAM;IAC5B,OAAO,CAAC,SAAS,CAAW;IAG5B,IAAI,QAAQ,WAEX;IACD,IAAI,UAAU,WAEb;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,QAAQ,IAIW,QAAQ,CAF9B;IAED,IAAI,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAE9B;IAED,IAAI,aAAa,IAIgB,GAAG,CAFnC;IAED,IAAI,aAAa,CAAC,aAAa,EAAE,GAAG,EAEnC;IAED,IAAI,MAAM,IAIS,MAAM,CAFxB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAGxB;gBAEW,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ;IAMlD,IAAI,CAAC,MAAM,EAAE,iBAAiB;WA4BV,iBAAiB,CACnC,aAAa,EAAE,GAAG,EAClB,QAAQ,EAAE,QAAQ;CA+BrB"}
+{"version":3,"file":"document-item.d.ts","sourceRoot":"","sources":["../../src/document/document-item.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAG5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2CAA2C,CAAC;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAE1D,MAAM,CAAC,OAAO,OAAO,YACnB,SAAQ,UACR,YAAW,iBAAiB;IAE5B,cAAc,SAAS;IACvB,KAAK,SAAM;IACX,IAAI,SAAM;IACV,MAAM,SAAM;IACZ,WAAW,CAAC,SAAM;IAClB,MAAM,SAAM;IACZ,QAAQ,SAAM;IACd,OAAO,SAAM;IACb,YAAY,SAAM;IAClB,QAAQ,SAAS;IACjB,SAAS,SAAK;IACd,QAAQ,SAAK;IACb,WAAW,SAAY;IACvB,OAAO,CAAC,OAAO,CAAK;IACpB,oBAAoB,SAAK;IACzB,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,SAAK;IAClB,OAAO,SAAM;IACb,SAAS,SAAK;IACd,OAAO,SAAK;IACZ,cAAc,SAAO;IACrB,WAAW,SAAM;IACjB,WAAW,SAAM;IACjB,cAAc,SAAS;IACvB,mBAAmB,SAAO;IAC1B,UAAU,EAAE,MAAM,CAAQ;IAC1B,cAAc,EAAE,IAAI,CAAQ;IAC5B,OAAO,CAAC,WAAW,CAAkB;IACrC,IAAI,UAAU,WAEb;IAED,OAAO,CAAC,MAAM,CAAC,eAAe,CAAgC;IAE9D,OAAO,CAAC,cAAc,CAAM;IAC5B,OAAO,CAAC,SAAS,CAAW;IAG5B,IAAI,QAAQ,WAEX;IACD,IAAI,UAAU,WAEb;IAED,IAAI,SAAS,WAEZ;IAED,IAAI,QAAQ,IAIW,QAAQ,CAF9B;IAED,IAAI,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAE9B;IAED,IAAI,aAAa,IAIgB,GAAG,CAFnC;IAED,IAAI,aAAa,CAAC,aAAa,EAAE,GAAG,EAEnC;IAED,IAAI,MAAM,IAIS,MAAM,CAFxB;IAED,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAGxB;gBAEW,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ;IAMlD,IAAI,CAAC,MAAM,EAAE,iBAAiB;IAgC9B,eAAe,IAAI,IAAI;WAgCH,iBAAiB,CACnC,aAAa,EAAE,GAAG,EAClB,QAAQ,EAAE,QAAQ;CA+BrB"}

package/dist/document/document-item.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const general_1 = require("@tomei/general");
 const document_item_repository_1 = require("./document-item.repository");
 const general_2 = require("@tomei/general");
+const discount_type_enum_1 = require("../enum/discount-type.enum");
 class DocumentItem extends general_1.ObjectBase {
     get ObjectType() {
         return this._ObjectType;
@@ -51,6 +52,8 @@ class DocumentItem extends general_1.ObjectBase {
         this.Quantity = 0;
         this.QuantityUOM = 'Pieces';
         this._Amount = 0;
+        this.AmountBeforeDiscount = 0;
+        this.DiscountValue = 0;
         this.TaxCode = '';
         this.TaxAmount = 0;
         this.TaxRate = 0;
@@ -80,6 +83,10 @@ class DocumentItem extends general_1.ObjectBase {
         this.Quantity = params.Quantity || this.Quantity;
         this.QuantityUOM = params.QuantityUOM || this.QuantityUOM;
         this._Amount = params.Amount || this._Amount;
+        this.AmountBeforeDiscount =
+            params.AmountBeforeDiscount || this.AmountBeforeDiscount;
+        this.DiscountType = params.DiscountType || this.DiscountType;
+        this.DiscountValue = params.DiscountValue || this.DiscountValue;
         this.TaxCode = params.TaxCode || this.TaxCode;
         this.TaxAmount = params.TaxAmount || this.TaxAmount;
         this.TaxRate = params.TaxRate || this.TaxRate;
@@ -92,6 +99,22 @@ class DocumentItem extends general_1.ObjectBase {
         this.PostedById = params.PostedById || this.PostedById;
         this.PostedDateTime = params.PostedDateTime || this.PostedDateTime;
     }
+    calculateAmount() {
+        const baseAmount = this.UnitPrice * this.Quantity;
+        this.AmountBeforeDiscount = baseAmount;
+        this._Amount = baseAmount;
+        if (this.DiscountType === discount_type_enum_1.DiscountType.Percentage) {
+            const discountValue = baseAmount * (this.DiscountValue / 100);
+            this._Amount = baseAmount - discountValue;
+        }
+        else if (this.DiscountType === discount_type_enum_1.DiscountType.Fixed) {
+            this._Amount = baseAmount - this.DiscountValue;
+        }
+        this._Amount = Math.round(this._Amount * 100) / 100;
+        if (this._Amount < 0) {
+            this._Amount = 0;
+        }
+    }
     static async initDocumentItems(dbTransaction, document) {
         try {
             const documentItems = await this._RepositoryBase.findAll({

package/dist/document/document-item.js.map

@@ -1 +1 @@
-{"version":3,"file":"document-item.js","sourceRoot":"","sources":["../../src/document/document-item.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"document-item.js","sourceRoot":"","sources":["../../src/document/document-item.ts"],"names":[],"mappings":"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"}

package/dist/document/document.d.ts

@@ -1,5 +1,5 @@
 import { CommonService as MediaCommonService, MediasModel } from '@tomei/media';
-import { DocumentStatus, DocType } from '../enum';
+import { DocumentStatus, DocType, DiscountType } from '../enum';
 import { IDocumentAttr } from './interfaces/document-attr.interface';
 import { IDocumentFindAll } from './interfaces/document-find-all.interface';
 import DocumentItem from './document-item';
@@ -27,6 +27,9 @@ export default class Document extends AccountSystemEntity {
     UpdatedById: string;
     UpdatedAt: Date;
     UseAccSystemDocYN: string;
+    AmountBeforeDiscount: number;
+    DiscountType: DiscountType;
+    DiscountValue: number;
     protected _ObjectType: string;
     get ObjectType(): string;
     private _DocHTMLFileMediaId;

package/dist/document/document.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../../src/document/document.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"document.d.ts","sourceRoot":"","sources":["../../src/document/document.ts"],"names":[],"mappings":"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"}

package/dist/document/document.js

@@ -125,6 +125,8 @@ class Document extends account_system_entity_1.AccountSystemEntity {
         this.CreatedById = '';
         this.UpdatedById = '';
         this.UseAccSystemDocYN = 'N';
+        this.AmountBeforeDiscount = 0;
+        this.DiscountValue = 0;
         this._ObjectType = 'Document';
         this._DocHTMLFileMediaId = '';
         this._DocPDFFileMediaId = '';
@@ -240,9 +242,28 @@ class Document extends account_system_entity_1.AccountSystemEntity {
     }
     async reCalculateAmount() {
         const roundToTwoDecimals = (value) => Math.round(value * 100) / 100;
-        this.Amount = 0;
+        let totalBeforeDiscount = 0;
+        let totalAfterItemDiscount = 0;
         for (const documentItem of this._DocumentItems) {
-            this.Amount = roundToTwoDecimals(this.Amount + documentItem.Amount);
+            documentItem.calculateAmount();
+            totalBeforeDiscount += documentItem.AmountBeforeDiscount;
+            totalAfterItemDiscount += documentItem.Amount;
+        }
+        let finalAfterDiscount = totalAfterItemDiscount;
+        if (this.DiscountType === enum_1.DiscountType.Percentage) {
+            finalAfterDiscount =
+                totalAfterItemDiscount -
+                    totalAfterItemDiscount * (this.DiscountValue / 100);
+        }
+        else if (this.DiscountType === enum_1.DiscountType.Fixed) {
+            finalAfterDiscount = totalAfterItemDiscount - this.DiscountValue;
+        }
+        totalBeforeDiscount = roundToTwoDecimals(totalBeforeDiscount);
+        finalAfterDiscount = roundToTwoDecimals(finalAfterDiscount);
+        this.AmountBeforeDiscount = totalBeforeDiscount;
+        this.Amount = finalAfterDiscount;
+        if (this.Amount < 0) {
+            this.Amount = 0;
         }
     }
     get DocumentItems() {
@@ -405,31 +426,31 @@ class Document extends account_system_entity_1.AccountSystemEntity {
         }, imgTag);
         const currentDate = date.toLocaleDateString('en-GB');
         const invoiceNo = this.DocNo;
-        const invoiceTitleInfo = `
-    <div class="tm_invoice_seperator tm_gray_bg"></div>
-    <div class="tm_invoice_info_list">
-      <p class="tm_invoice_number tm_m0">
-        Invoice No: <b class="tm_primary_color">${invoiceNo}</b>
-      </p>
-      <p class="tm_invoice_date tm_m0">
-        Date: <b class="tm_primary_color">${currentDate}</b>
-      </p>
-    </div>
+        const invoiceTitleInfo = `
+    <div class="tm_invoice_seperator tm_gray_bg"></div>
+    <div class="tm_invoice_info_list">
+      <p class="tm_invoice_number tm_m0">
+        Invoice No: <b class="tm_primary_color">${invoiceNo}</b>
+      </p>
+      <p class="tm_invoice_date tm_m0">
+        Date: <b class="tm_primary_color">${currentDate}</b>
+      </p>
+    </div>
   `;
         const invoiceTitleInfoHandle = await page.$('.tm_invoice_info');
         await invoiceTitleInfoHandle.evaluate((invoice, invoiceTitleInfo) => {
             invoice.innerHTML = invoiceTitleInfo;
         }, invoiceTitleInfo);
-        const invoiceCustomerContent = `
-    <p class="tm_mb2">
-      <b class="tm_primary_color">Invoice To:</b>
-    </p>
-    <p>
-      ${customer.FullName} <br />
-      ${customer.DefaultAddress.AddressLine1}, ${customer.DefaultAddress.City} <br />
-      ${customer.DefaultAddress.Country} <br />
-      ${customer.Email}
-    </p>
+        const invoiceCustomerContent = `
+    <p class="tm_mb2">
+      <b class="tm_primary_color">Invoice To:</b>
+    </p>
+    <p>
+      ${customer.FullName} <br />
+      ${customer.DefaultAddress.AddressLine1}, ${customer.DefaultAddress.City} <br />
+      ${customer.DefaultAddress.Country} <br />
+      ${customer.Email}
+    </p>
     `;
         const invoiceCustomerHandle = await page.$('.tm_customer_detail');
         await invoiceCustomerHandle.evaluate((invoice, invoiceCustomerContent) => {
@@ -447,64 +468,64 @@ class Document extends account_system_entity_1.AccountSystemEntity {
         }, invoicePaymentInfoContent);
         const invoiceSubtotal = +this.Amount;
         const invoiceTax = 0;
-        const invoiceRightFooterContent = `
-    <table>
-      <tbody>
-        <tr>
-          <td
-            class="tm_width_3 tm_primary_color tm_border_none tm_bold"
-          >
-            Subtotal
-          </td>
-          <td
-            class="tm_width_3 tm_primary_color tm_text_right tm_border_none tm_bold"
-          >
-            ${this.Currency} ${invoiceSubtotal.toFixed(2)}
-          </td>
-        </tr>
-        <tr>
-          <td
-            class="tm_width_3 tm_primary_color tm_border_none tm_pt0"
-          >
-            Tax <span class="tm_ternary_color">(0%)</span>
-          </td>
-          <td
-            class="tm_width_3 tm_primary_color tm_text_right tm_border_none tm_pt0"
-          >
-            ${this.Currency} ${invoiceTax.toFixed(2)}
-          </td>
-        </tr>
-        <tr class="tm_border_top tm_border_bottom">
-          <td
-            class="tm_width_3 tm_border_top_0 tm_bold tm_f16 tm_primary_color"
-          >
-            Grand Total
-          </td>
-          <td
-            class="tm_width_3 tm_border_top_0 tm_bold tm_f16 tm_primary_color tm_text_right"
-          >
-            ${this.Currency} ${(invoiceSubtotal + invoiceTax).toFixed(2)}
-          </td>
-        </tr>
-      </tbody>
-    </table>
+        const invoiceRightFooterContent = `
+    <table>
+      <tbody>
+        <tr>
+          <td
+            class="tm_width_3 tm_primary_color tm_border_none tm_bold"
+          >
+            Subtotal
+          </td>
+          <td
+            class="tm_width_3 tm_primary_color tm_text_right tm_border_none tm_bold"
+          >
+            ${this.Currency} ${invoiceSubtotal.toFixed(2)}
+          </td>
+        </tr>
+        <tr>
+          <td
+            class="tm_width_3 tm_primary_color tm_border_none tm_pt0"
+          >
+            Tax <span class="tm_ternary_color">(0%)</span>
+          </td>
+          <td
+            class="tm_width_3 tm_primary_color tm_text_right tm_border_none tm_pt0"
+          >
+            ${this.Currency} ${invoiceTax.toFixed(2)}
+          </td>
+        </tr>
+        <tr class="tm_border_top tm_border_bottom">
+          <td
+            class="tm_width_3 tm_border_top_0 tm_bold tm_f16 tm_primary_color"
+          >
+            Grand Total
+          </td>
+          <td
+            class="tm_width_3 tm_border_top_0 tm_bold tm_f16 tm_primary_color tm_text_right"
+          >
+            ${this.Currency} ${(invoiceSubtotal + invoiceTax).toFixed(2)}
+          </td>
+        </tr>
+      </tbody>
+    </table>
     `;
         const invoiceRightFooterHandle = await page.$('.tm_item_total_section');
         await invoiceRightFooterHandle.evaluate((invoice, invoiceRightFooterContent) => {
             invoice.innerHTML = invoiceRightFooterContent;
         }, invoiceRightFooterContent);
-        const invoiceTNCContent = `
-    <li>
-      All payment must be made to:
-      <ul>
-        <li>Bank: <b>RHB BANK BHD</b></li>
-        <li>Account Name: <b>TXG Financial Solutions Sdn Bhd</b></li>
-        <li>Account No.: <b>2142 13000 17954</b></li>
-      </ul>
-    </li>
-    <li>
-      Once payment has been made, please email your transaction confirmation slip to <i>payment@ezcash.com.my</i>
-    </li>
+        const invoiceTNCContent = `
+    <li>
+      All payment must be made to:
+      <ul>
+        <li>Bank: <b>RHB BANK BHD</b></li>
+        <li>Account Name: <b>TXG Financial Solutions Sdn Bhd</b></li>
+        <li>Account No.: <b>2142 13000 17954</b></li>
+      </ul>
+    </li>
+    <li>
+      Once payment has been made, please email your transaction confirmation slip to <i>payment@ezcash.com.my</i>
+    </li>
     `;
         const invoiceTNCHandle = await page.$('.tm_tnc_content');
         await invoiceTNCHandle.evaluate((invoice, invoiceTNCContent) => {
@@ -513,16 +534,16 @@ class Document extends account_system_entity_1.AccountSystemEntity {
         const invoiceDocumentItems = await this.DocumentItems;
         let invoiceItemContent = ``;
         invoiceDocumentItems.forEach((documentItem, i) => {
-            invoiceItemContent += `
-      <tr>
-        <td class="tm_width_3">${i + 1}. ${documentItem.Name}</td>
-        <td class="tm_width_4">
-          ${documentItem.Description}
-        </td>
-        <td class="tm_width_2">${documentItem.Currency} ${documentItem.UnitPrice}</td>
-        <td class="tm_width_1">${documentItem.Quantity}</td>
-        <td class="tm_width_2 tm_text_right">${documentItem.Currency} ${(+documentItem.UnitPrice * +documentItem.Quantity).toFixed(2)}</td>
-      </tr>
+            invoiceItemContent += `
+      <tr>
+        <td class="tm_width_3">${i + 1}. ${documentItem.Name}</td>
+        <td class="tm_width_4">
+          ${documentItem.Description}
+        </td>
+        <td class="tm_width_2">${documentItem.Currency} ${documentItem.UnitPrice}</td>
+        <td class="tm_width_1">${documentItem.Quantity}</td>
+        <td class="tm_width_2 tm_text_right">${documentItem.Currency} ${(+documentItem.UnitPrice * +documentItem.Quantity).toFixed(2)}</td>
+      </tr>
       `;
         });
         const invoiceDocumentItemHandle = await page.$('.tm_items_content');
@@ -578,40 +599,40 @@ class Document extends account_system_entity_1.AccountSystemEntity {
         }, imgTag);
         const currentDate = date.toLocaleDateString('en-GB');
         const receiptNo = this.DocNo;
-        const receiptTitle = `
-    <div class="tm_primary_color tm_f50 tm_text_uppercase">
-      Receipt
-    </div>
+        const receiptTitle = `
+    <div class="tm_primary_color tm_f50 tm_text_uppercase">
+      Receipt
+    </div>
     `;
         const receiptTitleHandle = await page.$('.tm_invoice_title');
         await receiptTitleHandle.evaluate((receipt, receiptTitle) => {
             receipt.innerHTML = receiptTitle;
         }, receiptTitle);
-        const receiptTitleInfo = `
-  <div class="tm_invoice_seperator tm_gray_bg"></div>
-  <div class="tm_invoice_info_list">
-    <p class="tm_invoice_number tm_m0">
-      Receipt No: <b class="tm_primary_color">${receiptNo}</b>
-    </p>
-    <p class="tm_invoice_date tm_m0">
-      Date: <b class="tm_primary_color">${currentDate}</b>
-    </p>
-  </div>
+        const receiptTitleInfo = `
+  <div class="tm_invoice_seperator tm_gray_bg"></div>
+  <div class="tm_invoice_info_list">
+    <p class="tm_invoice_number tm_m0">
+      Receipt No: <b class="tm_primary_color">${receiptNo}</b>
+    </p>
+    <p class="tm_invoice_date tm_m0">
+      Date: <b class="tm_primary_color">${currentDate}</b>
+    </p>
+  </div>
 `;
         const receiptTitleInfoHandle = await page.$('.tm_invoice_info');
         await receiptTitleInfoHandle.evaluate((receipt, receiptTitleInfo) => {
             receipt.innerHTML = receiptTitleInfo;
         }, receiptTitleInfo);
-        const receiptCustomerContent = `
-  <p class="tm_mb2">
-    <b class="tm_primary_color">Issued To:</b>
-  </p>
-  <p>
-    ${customer.FullName} <br />
-    ${customer.DefaultAddress.AddressLine1}, ${customer.DefaultAddress.City} <br />
-    ${customer.DefaultAddress.Country} <br />
-    ${customer.Email}
-  </p>
+        const receiptCustomerContent = `
+  <p class="tm_mb2">
+    <b class="tm_primary_color">Issued To:</b>
+  </p>
+  <p>
+    ${customer.FullName} <br />
+    ${customer.DefaultAddress.AddressLine1}, ${customer.DefaultAddress.City} <br />
+    ${customer.DefaultAddress.Country} <br />
+    ${customer.Email}
+  </p>
   `;
         const receiptCustomerHandle = await page.$('.tm_customer_detail');
         await receiptCustomerHandle.evaluate((receipt, receiptCustomerContent) => {
@@ -629,47 +650,47 @@ class Document extends account_system_entity_1.AccountSystemEntity {
         }, receiptPaymentInfoContent);
         const receiptSubtotal = +this.Amount;
         const receiptTax = 0;
-        const receiptRightFooterContent = `
-  <table>
-    <tbody>
-      <tr>
-        <td
-          class="tm_width_3 tm_primary_color tm_border_none tm_bold"
-        >
-          Subtotal
-        </td>
-        <td
-          class="tm_width_3 tm_primary_color tm_text_right tm_border_none tm_bold"
-        >
-          ${this.Currency} ${receiptSubtotal}
-        </td>
-      </tr>
-      <tr>
-        <td
-          class="tm_width_3 tm_primary_color tm_border_none tm_pt0"
-        >
-          Tax <span class="tm_ternary_color">(0%)</span>
-        </td>
-        <td
-          class="tm_width_3 tm_primary_color tm_text_right tm_border_none tm_pt0"
-        >
-          ${this.Currency} ${receiptTax}
-        </td>
-      </tr>
-      <tr class="tm_border_top tm_border_bottom">
-        <td
-          class="tm_width_3 tm_border_top_0 tm_bold tm_f16 tm_primary_color"
-        >
-          Grand Total
-        </td>
-        <td
-          class="tm_width_3 tm_border_top_0 tm_bold tm_f16 tm_primary_color tm_text_right"
-        >
-          ${this.Currency} ${receiptSubtotal + receiptTax}
-        </td>
-      </tr>
-    </tbody>
-  </table>
+        const receiptRightFooterContent = `
+  <table>
+    <tbody>
+      <tr>
+        <td
+          class="tm_width_3 tm_primary_color tm_border_none tm_bold"
+        >
+          Subtotal
+        </td>
+        <td
+          class="tm_width_3 tm_primary_color tm_text_right tm_border_none tm_bold"
+        >
+          ${this.Currency} ${receiptSubtotal}
+        </td>
+      </tr>
+      <tr>
+        <td
+          class="tm_width_3 tm_primary_color tm_border_none tm_pt0"
+        >
+          Tax <span class="tm_ternary_color">(0%)</span>
+        </td>
+        <td
+          class="tm_width_3 tm_primary_color tm_text_right tm_border_none tm_pt0"
+        >
+          ${this.Currency} ${receiptTax}
+        </td>
+      </tr>
+      <tr class="tm_border_top tm_border_bottom">
+        <td
+          class="tm_width_3 tm_border_top_0 tm_bold tm_f16 tm_primary_color"
+        >
+          Grand Total
+        </td>
+        <td
+          class="tm_width_3 tm_border_top_0 tm_bold tm_f16 tm_primary_color tm_text_right"
+        >
+          ${this.Currency} ${receiptSubtotal + receiptTax}
+        </td>
+      </tr>
+    </tbody>
+  </table>
   `;
         const receiptRightFooterHandle = await page.$('.tm_item_total_section');
         await receiptRightFooterHandle.evaluate((receipt, receiptRightFooterContent) => {
@@ -678,29 +699,29 @@ class Document extends account_system_entity_1.AccountSystemEntity {
         const receiptDocumentItems = await this.DocumentItems;
         let receiptItemContent = ``;
         receiptDocumentItems.forEach((documentItem, i) => {
-            receiptItemContent += `
-    <tr>
-      <td class="tm_width_3">${i + 1}. ${documentItem.Name}</td>
-      <td class="tm_width_4">
-        ${documentItem.Description}
-      </td>
-      <td class="tm_width_2">${documentItem.Currency} ${documentItem.UnitPrice}</td>
-      <td class="tm_width_1">${documentItem.Quantity}</td>
-      <td class="tm_width_2 tm_text_right">${documentItem.Currency} ${+documentItem.UnitPrice * +documentItem.Quantity}</td>
-    </tr>
+            receiptItemContent += `
+    <tr>
+      <td class="tm_width_3">${i + 1}. ${documentItem.Name}</td>
+      <td class="tm_width_4">
+        ${documentItem.Description}
+      </td>
+      <td class="tm_width_2">${documentItem.Currency} ${documentItem.UnitPrice}</td>
+      <td class="tm_width_1">${documentItem.Quantity}</td>
+      <td class="tm_width_2 tm_text_right">${documentItem.Currency} ${+documentItem.UnitPrice * +documentItem.Quantity}</td>
+    </tr>
     `;
         });
         const receiptDocumentItemHandle = await page.$('.tm_items_content');
         await receiptDocumentItemHandle.evaluate((receipt, receiptItemContent) => {
             receipt.innerHTML = receiptItemContent;
         }, receiptItemContent);
-        const receiptFooterContent = `
-    <p class="tm_mb5 tm_text_center tm_f11">
-      <i>
-       Thank you for your payment. This is computer generated receipt
-       - no signature is required.
-     </i>
-   </p>
+        const receiptFooterContent = `
+    <p class="tm_mb5 tm_text_center tm_f11">
+      <i>
+       Thank you for your payment. This is computer generated receipt
+       - no signature is required.
+     </i>
+   </p>
     `;
         const receiptFooterHandle = await page.$('.tm_footer_section');
         await receiptFooterHandle.evaluate((receipt, receiptFooterContent) => {