@tomei/finance 0.3.33 → 0.3.35

package/migrations/finance-ledger-transaction-migration.js

@@ -36,13 +36,9 @@ module.exports = {
         type: Sequelize.DATE,
         allowNull: false,
       },
-      Name: {
-        type: Sequelize.STRING(200),
-        allowNull: false,
-      },
       Description: {
         type: Sequelize.STRING(1000),
-        allowNull: true,
+        allowNull: false,
       },
       Currency: {
         type: Sequelize.CHAR(3),
@@ -58,11 +54,31 @@ module.exports = {
       },
       RelatedObjectId: {
         type: Sequelize.STRING(30),
-        allowNull: false,
+        allowNull: true,
       },
       RelatedObjectType: {
         type: Sequelize.STRING(200),
-        allowNull: false,
+        allowNull: true,
+      },
+      RelatedDocNo: {
+        type: Sequelize.STRING(30),
+        allowNull: true,
+        references: {
+          model: 'finance_Document',
+          key: 'DocNo',
+        },
+        onUpdate: 'CASCADE',
+        onDelete: 'CASCADE',
+      },
+      RelatedPaymentId: {
+        type: Sequelize.STRING(30),
+        allowNull: true,
+        references: {
+          model: 'finance_Payment',
+          key: 'PaymentId',
+        },
+        onUpdate: 'CASCADE',
+        onDelete: 'CASCADE',
       },
     });
   },

package/migrations/finance-payment-item-migration.js

@@ -30,8 +30,16 @@ module.exports = {
         type: Sequelize.DECIMAL(10, 2),
         allowNull: false,
       },
-      TaxCode: {
-        type: Sequelize.STRING(10),
+      Name: {
+        type: Sequelize.STRING(200),
+        allowNull: true,
+      },
+      Description: {
+        type: Sequelize.STRING(1000),
+        allowNull: false,
+      },
+      Remarks: {
+        type: Sequelize.STRING(5000),
         allowNull: true,
       },
     });

package/migrations/finance-payment-migration.js

@@ -17,25 +17,9 @@ module.exports = {
         type: Sequelize.DATE,
         allowNull: false,
       },
-      CompanyId: {
-        type: Sequelize.STRING(30),
-        allowNull: false,
-        references: {
-          model: 'finance_Company',
-          key: 'CompanyId',
-        },
-        onUpdate: 'CASCADE',
-        onDelete: 'CASCADE',
-      },
-      MethodTypeId: {
-        type: Sequelize.STRING(30),
+      Description: {
+        type: Sequelize.STRING(1000),
         allowNull: false,
-        references: {
-          model: 'finance_PaymentMethodType',
-          key: 'MethodTypeId',
-        },
-        onUpdate: 'CASCADE',
-        onDelete: 'CASCADE',
       },
       Currency: {
         type: Sequelize.CHAR(3),
@@ -49,22 +33,6 @@ module.exports = {
         type: Sequelize.STRING(20),
         allowNull: false,
       },
-      TransactionId: {
-        type: Sequelize.STRING(100),
-        allowNull: true,
-      },
-      TransactionApprovalCode: {
-        type: Sequelize.STRING(100),
-        allowNull: true,
-      },
-      TransactionAccountName: {
-        type: Sequelize.STRING(100),
-        allowNull: true,
-      },
-      TransactionAccountNo: {
-        type: Sequelize.STRING(100),
-        allowNull: true,
-      },
       ReceivedBy: {
         type: Sequelize.STRING(30),
         allowNull: false,

package/migrations/finance-paymentpaidwith-migration.js

@@ -0,0 +1,66 @@
+'use strict';
+
+module.exports = {
+  async up(queryInterface, Sequelize) {
+    await queryInterface.createTable('finance_PaymentPaidWith', {
+      PaymentId: {
+        type: Sequelize.STRING(30),
+        primaryKey: true,
+        allowNull: false,
+        references: {
+          model: 'finance_Payment',
+          key: 'PaymentId',
+        },
+        onUpdate: 'CASCADE',
+        onDelete: 'CASCADE',
+      },
+      MethodTypeId: {
+        type: Sequelize.STRING(30),
+        allowNull: false,
+        primaryKey: true,
+        references: {
+          model: 'finance_PaymentMethodType',
+          key: 'MethodTypeId',
+        },
+        onUpdate: 'CASCADE',
+        onDelete: 'CASCADE',
+      },
+      Currency: {
+        type: Sequelize.CHAR(3),
+        allowNull: false,
+      },
+      Amount: {
+        type: Sequelize.DECIMAL(10, 2),
+        allowNull: false,
+      },
+      Status: {
+        type: Sequelize.STRING(20),
+        allowNull: false,
+      },
+      TransactionId: {
+        type: Sequelize.STRING(100),
+        allowNull: true,
+      },
+      TransactionApprovalCode: {
+        type: Sequelize.STRING(100),
+        allowNull: true,
+      },
+      TransactionApprovalName: {
+        type: Sequelize.STRING(100),
+        allowNull: true,
+      },
+      TransactionAccountNo: {
+        type: Sequelize.STRING(100),
+        allowNull: true,
+      },
+      Remarks: {
+        type: Sequelize.TEXT,
+        allowNull: true,
+      },
+    });
+  },
+
+  async down(queryInterface) {
+    await queryInterface.dropTable('finance_PaymentPaidWith');
+  },
+};

package/package.json

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

package/src/document/document.ts

@@ -20,6 +20,7 @@ import { DocumentRepository } from './document.repository';
 import FinanceCompany from '../finance-company/finance-company';
 import FinanceCustomerBase from '../customer/customer';
 import DocumentModel from '../models/document.entity';
+import { threadId } from 'worker_threads';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const getConfig = require('../config');
@@ -132,7 +133,6 @@ export default class Document extends AccountSystemEntity {
 
   constructor(dbTransaction?: any, docNo?: string) {
     super();
-    console.log(config, '<<< test config from finance');
     if (dbTransaction) {
       this._DbTransaction = dbTransaction;
     }
@@ -167,6 +167,7 @@ export default class Document extends AccountSystemEntity {
             this.PostedById = documentData.PostedById;
             this.PostedDateTime = documentData.PostedDateTime;
             this.UseAccSystemDocYN = documentData.UseAccSystemDocYN;
+            this.IsNewRecord = false;
           } else {
             const notFoundError = new RecordNotFoundError('No Record Found.');
             throw notFoundError;
@@ -205,8 +206,9 @@ export default class Document extends AccountSystemEntity {
           .catch((err) => {
             reject(err);
           });
+      } else {
+        resolve(this._DocumentItems);
       }
-      resolve(this._DocumentItems);
     });
   }
 
@@ -467,14 +469,22 @@ export default class Document extends AccountSystemEntity {
    *
    * @returns {DocumentItem}
    */
-  async newDocumentItem(documentItem): Promise<DocumentItem[]> {
-    await Document._DocumentItemRepository.create({
-      ...documentItem,
-      DocumentItemId: cuid(),
-      DocNo: this.DocNo,
-    });
-
-    return await this.DocumentItems;
+  async newDocumentItem(
+    dbTransaction?: any,
+    documentItem?: any,
+  ): Promise<DocumentItem> {
+    // await Document._DocumentItemRepository.create({
+    //   ...documentItem,
+    //   DocumentItemId: cuid(),
+    //   DocNo: this.DocNo,
+    // });
+
+    // return await this.DocumentItems;
+
+    const di = new DocumentItem();
+    di.DocNo = this.DocNo;
+    this._DocumentItems.push(documentItem);
+    return documentItem;
   }
 
   /**