@tomei/finance 0.4.8 → 0.4.10

package/invoice-template/index.html

@@ -40,7 +40,7 @@
               </div>
             </div>
             <div class="tm_invoice_head tm_mb10">
-              <div class="tm_invoice_left">
+              <div class="tm_invoice_left tm_customer_detail">
                 <p class="tm_mb2">
                   <b class="tm_primary_color">Invoice To:</b>
                 </p>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tomei/finance",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "description": "NestJS package for finance module",
   "main": "dist/index.js",
   "scripts": {

package/src/document/document.ts

@@ -281,7 +281,7 @@ export default class Document extends AccountSystemEntity {
       size: htmlBuffer.length,
       encoding: '8bit',
       filename: 'sample-invoice.html',
-      destination: '',
+      destination: path.dirname(templateLocation),
       path: '',
       stream: null,
     };
@@ -334,7 +334,7 @@ export default class Document extends AccountSystemEntity {
     }, imgTag);
 
     // Get the current date and invoice number from customer
-    const currentDate = new Date().toLocaleDateString();
+    const currentDate = new Date().toLocaleDateString('en-GB');
     const invoiceNo = 'EZC-2202-2020';
 
     // Update the invoice number and date in the HTML content
@@ -342,7 +342,7 @@ export default class Document extends AccountSystemEntity {
     <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>
+        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>
@@ -354,6 +354,23 @@ export default class Document extends AccountSystemEntity {
       invoice.innerHTML = invoiceContent;
     }, invoiceContent);
 
+    // Update the invoice customer detail in the HTML content
+    const invoiceCustomerContent = `
+    <p class="tm_mb2">
+      <b class="tm_primary_color">Invoice To:</b>
+    </p>
+    <p>
+      ${customer.FullName} <br />
+      ${customer.DefaultAddress.Address}, ${customer.DefaultAddress.City} <br />
+      ${customer.DefaultAddress.Country} <br />
+      ${customer.Email}
+    </p>
+    `;
+    const invoiceCustomerHandle = await page.$('.tm_customer_detail');
+    await invoiceCustomerHandle.evaluate((invoice, invoiceCustomerContent) => {
+      invoice.innerHTML = invoiceCustomerContent;
+    }, invoiceCustomerContent);
+
     const pdfBuffer = await page.pdf({
       format: 'a4',
       printBackground: true,
@@ -500,23 +517,23 @@ export default class Document extends AccountSystemEntity {
       userId ?? 'System',
     );
 
-    try {
-      const document = await this.RepositoryBase.findOne({
-        where: {
-          DocNo: this.DocNo,
-        },
-        // transaction: this._DbTransaction,
-      });
-
-      /* storing HTML & PDF MediaId to finance_Document */
-      document.DocHTMLFileMediaId = HTMLInvoiceMedia.MediaId;
-      document.DocPDFFileMediaId = PDFInvoiceMedia.MediaId;
-      await document.save();
-      // await document.save({ transaction: this._DbTransaction });
-    } catch (err) {
-      // tslint:disable-next-line:no-console
-      console.log(err);
-    }
+    // try {
+    //   const document = await this.RepositoryBase.findOne({
+    //     where: {
+    //       DocNo: this.DocNo,
+    //     },
+    //     transaction: this._DbTransaction,
+    //   });
+
+    //   /* storing HTML & PDF MediaId to finance_Document */
+    //   document.DocHTMLFileMediaId = HTMLInvoiceMedia.MediaId;
+    //   document.DocPDFFileMediaId = PDFInvoiceMedia.MediaId;
+
+    //   await document.save({ transaction: this._DbTransaction });
+    // } catch (err) {
+    //   // tslint:disable-next-line:no-console
+    //   console.log(err);
+    // }
 
     return {
       HTMLMedia: HTMLInvoiceMedia,

package/src/finance-company/finance-company.ts

@@ -31,6 +31,7 @@ import { PaymentMethodTypeRepository } from '../payment-method-type/payment-meth
 import PaymentMethod from '../payment-method/payment-method';
 import { AccountRepository } from '../account/account.repository';
 import { PaymentPaidWithRepository } from '../payment-paid-with/payment-paid-with.repository';
+import { Medias, MediasModel } from '@tomei/media';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const getConfig = require('../config');
@@ -539,7 +540,25 @@ export default class FinanceCompany extends ObjectBase {
 
       /*Set up the document type*/
       invoice.DocType = DocType.INVOICE;
-      // invoice.DocNo = cuid();
+
+      /*Generating the invoice*/
+      let invoiceMedia: {
+        HTMLMedia: MediasModel;
+        PDFMedia: MediasModel;
+      };
+
+      if (invoice.UseAccSystemDocYN === 'Y') {
+        /*todo: Posting to accounting system to generate invoice*/
+        await this.AccountingSystem.createInvoice(invoice);
+      } else {
+        /*todo: check config file to see which invoice template is to be used for specific project*/
+
+        /*Generating invoice based on template*/
+        invoiceMedia = await invoice.generateInvoice(
+          invoice.IssuedById,
+          customer,
+        );
+      }
 
       /*Saving the document and document items to the database*/
       await FinanceCompany._DocumentRepository.create(
@@ -561,8 +580,8 @@ export default class FinanceCompany extends ObjectBase {
           CreatedAt: new Date(),
           UpdatedById: invoice.UpdatedById,
           UpdatedAt: new Date(),
-          DocPDFFileMediaId: invoice.DocPDFFileMediaId,
-          DocHTMLFileMediaId: invoice.DocHTMLFileMediaId,
+          DocPDFFileMediaId: invoiceMedia.PDFMedia,
+          DocHTMLFileMediaId: invoiceMedia.HTMLMedia,
           AccSystemRefId: invoice.AccSystemRefId,
           PostedToAccSystemYN: invoice.PostedToAccSystemYN,
           PostedById: invoice.PostedById,
@@ -608,17 +627,6 @@ export default class FinanceCompany extends ObjectBase {
         );
       }
 
-      /*Generating the invoice*/
-      if (invoice.UseAccSystemDocYN === 'Y') {
-        /*todo: Posting to accounting system to generate invoice*/
-        await this.AccountingSystem.createInvoice(invoice);
-      } else {
-        /*todo: check config file to see which invoice template is to be used for specific project*/
-
-        /*Generating invoice based on template*/
-        invoice.generateInvoice(invoice.IssuedById, customer);
-      }
-
       const transactionDate = new Date();
       const htCreditAccountAmount = new HashTable();
       const htCreditAccountCurrency = new HashTable();