@tomei/finance 0.6.56 → 0.6.58

package/package.json

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

package/src/document/document.ts

@@ -497,13 +497,11 @@ export default class Document extends AccountSystemEntity {
         <td class="tm_width_4">
           ${documentItem.Description}
         </td>
-        <td class="tm_width_2">${documentItem.Currency} ${
-        documentItem.UnitPrice
-      }</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>
+        <td class="tm_width_2 tm_text_right">${documentItem.Currency} ${+documentItem.UnitPrice * +documentItem.Quantity
+        }</td>
       </tr>
       `;
     });
@@ -718,13 +716,11 @@ export default class Document extends AccountSystemEntity {
       <td class="tm_width_4">
         ${documentItem.Description}
       </td>
-      <td class="tm_width_2">${documentItem.Currency} ${
-        documentItem.UnitPrice
-      }</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>
+      <td class="tm_width_2 tm_text_right">${documentItem.Currency} ${+documentItem.UnitPrice * +documentItem.Quantity
+        }</td>
     </tr>
     `;
     });
@@ -827,7 +823,7 @@ export default class Document extends AccountSystemEntity {
     /* insert FileStream on htmlPayload  */
     const htmlPayload: InternalMediaDto = {
       ObjectId: this.DocNo,
-      ObjectType: this.DocType,
+      ObjectType: 'Document',
       Type: MediaType.Document,
       FileName: `${this.DocType}-${this.DocNo}`,
       FileStream: await Document.DEFAULT_INVOICE_TEMPLATE_HTML(),
@@ -849,7 +845,7 @@ export default class Document extends AccountSystemEntity {
     /* insert FileStream on pdfPayload  */
     const pdfPayload: InternalMediaDto = {
       ObjectId: this.DocNo,
-      ObjectType: this.DocType,
+      ObjectType: 'Document',
       Type: MediaType.Document,
       FileName: `${this.DocType}-${this.DocNo}`,
       FileStream: await this.DEFAULT_INVOICE_TEMPLATE_PDF(customer),
@@ -916,7 +912,7 @@ export default class Document extends AccountSystemEntity {
     /* insert FileStream on htmlPayload  */
     const htmlPayload: InternalMediaDto = {
       ObjectId: this.DocNo,
-      ObjectType: this.DocType,
+      ObjectType: 'Document',
       Type: MediaType.Document,
       FileName: `${this.DocType}-${this.DocNo}`,
       FileStream: await Document.DEFAULT_INVOICE_TEMPLATE_HTML(),
@@ -937,7 +933,7 @@ export default class Document extends AccountSystemEntity {
     /* insert FileStream on pdfPayload  */
     const pdfPayload: InternalMediaDto = {
       ObjectId: this.DocNo,
-      ObjectType: this.DocType,
+      ObjectType: 'Document',
       Type: MediaType.Document,
       FileName: `${this.DocType}-${this.DocNo}`,
       FileStream: await this.DEFAULT_RECEIPT_TEMPLATE_PDF(customer),

package/src/enum/collect-payment-type.ts

@@ -0,0 +1,4 @@
+export enum CollectPaymentType {
+    MANUAL = 'MANUAL',
+    AUTOMATIC = 'AUTOMATIC'
+}

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

@@ -40,6 +40,7 @@ import { ActionEnum, Activity } from '@tomei/activity-history';
 import { ApplicationConfig } from '@tomei/config';
 import { TaxRepository } from '../tax/tax.repository';
 import { Tax } from '../tax/tax';
+import { CollectPaymentType } from '../enum/collect-payment-type';
 
 export default class FinanceCompany extends ObjectBase {
   private _CompanyId = 'New';
@@ -1183,6 +1184,7 @@ export default class FinanceCompany extends ObjectBase {
     dbTransaction: any,
     loginUser: LoginUserBase,
     payment: Payment,
+    collectPaymentType: CollectPaymentType = CollectPaymentType.AUTOMATIC,
   ): Promise<Payment> {
     try {
       /*validation 1: Make sure that the payment has at least 1 payment item*/
@@ -1215,7 +1217,7 @@ export default class FinanceCompany extends ObjectBase {
           Description: payment.Description,
           Currency: payment.Currency,
           Amount: payment.Amount,
-          Status: PaymentStatus.PENDING,
+          Status: collectPaymentType === CollectPaymentType.AUTOMATIC ? PaymentStatus.CONFIRMED : PaymentStatus.PENDING,
           PostedToAccSystemYN: 'N',
           ReceivedBy: payment.ReceivedBy,
           IssuedBy: payment.IssuedBy,
@@ -1731,6 +1733,7 @@ export default class FinanceCompany extends ObjectBase {
       Amount: number;
     }[],
     receiptNo?: string,
+    collectPaymentType: CollectPaymentType = CollectPaymentType.AUTOMATIC,
   ): Promise<Payment> {
     //Method to collect payment for multiple customer.
     try {
@@ -1809,7 +1812,7 @@ export default class FinanceCompany extends ObjectBase {
           Description: payment.Description,
           Currency: payment.Currency,
           Amount: payment.Amount,
-          Status: PaymentStatus.PENDING,
+          Status: collectPaymentType === CollectPaymentType.MANUAL ? PaymentStatus.PENDING : PaymentStatus.CONFIRMED,
           PostedToAccSystemYN: 'N',
           ReceivedBy: payment.ReceivedBy,
           IssuedBy: payment.IssuedBy,