@tomei/finance 0.4.21 → 0.4.23

package/migrations/finance-payment-migration.js

@@ -61,6 +61,16 @@ module.exports = {
         type: Sequelize.STRING(200),
         allowNull: true,
       },
+      ReceiptDocNo: {
+        type: Sequelize.STRING(30),
+        allowNull: true,
+        references: {
+          model: 'finance_Document',
+          key: 'DocNo',
+        },
+        onUpdate: 'CASCADE',
+        onDelete: 'CASCADE',
+      },
       AccSystemRefId: {
         type: Sequelize.STRING(30),
         allowNull: true,

package/package.json

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

package/src/customer/customer.ts

@@ -11,7 +11,7 @@ import { FinanceCustomerRepository } from './finance-customer.repository';
 import * as cuid from 'cuid';
 import Account from '../account/account';
 import { AccountRepository } from '../account/account.repository';
-import type from '../helpers/typeof';
+import { type } from '../helpers/typeof';
 import * as FinanceDb from '../database';
 
 // const AccountSystemEntity = import('../account-system-entity').then(({AccountSystemEntity}) => AccountSystemEntity);

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

@@ -32,6 +32,8 @@ import PaymentMethod from '../payment-method/payment-method';
 import { AccountRepository } from '../account/account.repository';
 import { PaymentPaidWithRepository } from '../payment-paid-with/payment-paid-with.repository';
 import { MediasModel } from '@tomei/media';
+import DocumentItem from '../document/document-item';
+import { type } from 'src/helpers/typeof';
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const getConfig = require('../config');
@@ -1135,6 +1137,7 @@ export default class FinanceCompany extends ObjectBase {
    * @param payment - The payment object containing payment details
    * @param customer - The customer making the payment
    * @param ctAccountNo - The account number of the customer's Account Receivable account to transact, else the default customer account payable receivable will be used
+   * @param receiptNo - The document receipt number
    *
    * @returns {Payment} - Payment object representing the full detals of the payment collection recorded
    */
@@ -1144,6 +1147,7 @@ export default class FinanceCompany extends ObjectBase {
     payment: Payment,
     customer: FinanceCustomerBase,
     ctAccountNo?: string,
+    receiptNo?: string,
   ): Promise<Payment> {
     try {
       /*validation 1: Make sure that the payment has at least 1 payment item*/
@@ -1167,6 +1171,20 @@ export default class FinanceCompany extends ObjectBase {
       payment.ReceivedBy = loginUser.ObjectId;
       payment.IssuedBy = loginUser.ObjectId;
 
+      const receiptDocuments: any =
+        await FinanceCompany._DocumentRepository.findAll({
+          where: {
+            DocType: DocType.RECEIPT,
+            CompanyId: config.financeCompanies['TXG-FS'].companyId,
+          },
+        });
+
+      if (receiptNo) {
+        payment.ReceiptDocNo = receiptNo;
+      } else {
+        payment.ReceiptDocNo = `EZC-RCT-${receiptDocuments.length + 1}`;
+      }
+
       await FinanceCompany._PaymentRepository.create(
         {
           PaymentId: payment.PaymentId,
@@ -1182,6 +1200,7 @@ export default class FinanceCompany extends ObjectBase {
           Remarks: payment.Remarks,
           RelatedObjectId: payment.RelatedObjectId,
           RelatedObjectType: payment.RelatedObjectType,
+          ReceiptDocNo: payment.ReceiptDocNo,
           UpdatedAt: new Date(),
           UpdatedBy: loginUser.ObjectId,
           CreatedAt: new Date(),
@@ -1231,6 +1250,33 @@ export default class FinanceCompany extends ObjectBase {
         );
       }
 
+      /*Generating the receipt*/
+      const receipt = new Document(dbTransaction);
+
+      receipt.DocNo = payment.ReceiptDocNo;
+      receipt.DocType = DocType.RECEIPT;
+      receipt.DocDate = new Date();
+      receipt.CompanyId = config.financeCompanies['TXG-FS'].companyId;
+      receipt.Currency = payment.Currency;
+      receipt.Description = 'Payment Received';
+      receipt.IssuedById = loginUser.ObjectId;
+      receipt.IssuedToId = customer.CustomerId;
+      receipt.IssuedToType = type(customer);
+      receipt.RelatedObjectId = payment.RelatedObjectId;
+      receipt.RelatedObjectType = payment.RelatedObjectType;
+      receipt.UseAccSystemDocYN = 'N';
+
+      for (const paymentItem of paymentItems) {
+        const receiptItem = new DocumentItem(dbTransaction, receipt);
+        receiptItem.Name = `Payment for ${paymentItem.PayForObjectType} No. ${paymentItem.PayForObjectId}`;
+        receiptItem.NameBM = `Bayaran untuk ${paymentItem.PayForObjectType} No. ${paymentItem.PayForObjectId}`;
+        receiptItem.Amount = paymentItem.Amount;
+        receiptItem.Currency = paymentItem.Currency;
+        await receipt.newDocumentItem(receiptItem);
+      }
+
+      await receipt.generateReceipt(receipt.IssuedById, customer);
+
       /*Registering the Journal Entries for the transaction*/
       const transactionDate = new Date();
 
@@ -1263,10 +1309,11 @@ export default class FinanceCompany extends ObjectBase {
         debitLT.Currency = paymentPaidWith.Currency;
         debitLT.DebitAmount = paymentPaidWith.Amount;
         debitLT.Date = transactionDate;
-        debitLT.Description = customer.FullName;
+        debitLT.Description = 'Payment Received'; //customer.FullName;
         debitLT.Name = customer.FullName;
-        debitLT.RelatedObjectId = payment.RelatedObjectId;
+        debitLT.RelatedObjectId = receipt.RelatedObjectId;
         debitLT.RelatedObjectType = payment.RelatedObjectType;
+        debitLT.RelatedPaymentId = payment.PaymentId;
 
         const creditLT = await journalEntry.newLedgerTransaction(
           TransactionTypeOptions.CREDIT,
@@ -1280,10 +1327,11 @@ export default class FinanceCompany extends ObjectBase {
         creditLT.Currency = paymentPaidWith.Currency;
         creditLT.CreditAmount = paymentPaidWith.Amount;
         creditLT.Date = transactionDate;
-        creditLT.Description = paymentMethodType.Name;
+        creditLT.Description = 'Payment Received'; //paymentMethodType.Name;
         creditLT.Name = paymentMethodType.Name;
-        creditLT.RelatedObjectId = payment.RelatedObjectId;
+        creditLT.RelatedObjectId = receipt.RelatedObjectId;
         creditLT.RelatedObjectType = payment.RelatedObjectType;
+        creditLT.RelatedPaymentId = payment.PaymentId;
 
         await this.postJournal(dbTransaction, journalEntry, loginUser);
       }

package/src/helpers/typeof.ts

@@ -1,4 +1,4 @@
-export default function type(value: any): string {
+export function type(value: any): string {
   if (value === null) {
     return 'null';
   }

package/src/models/document.entity.ts

@@ -13,6 +13,8 @@ import {
 import { DocType, DocumentStatus } from '../enum';
 import FinanceCompanyModel from './finance-company.entity';
 import DocumentItemModel from './document-item.entity';
+import LedgerTransactionModel from './ledger-transaction.entity';
+import PaymentModel from './payment.entity';
 
 @Table({
   tableName: 'finance_Document',
@@ -198,6 +200,12 @@ export default class DocumentModel extends Model {
   @HasMany(() => DocumentItemModel)
   DocumentItems: DocumentItemModel[];
 
+  @HasMany(() => LedgerTransactionModel)
+  LedgerTransactions: LedgerTransactionModel[];
+
+  @HasMany(() => PaymentModel)
+  Payments: PaymentModel[];
+
   @BelongsTo(() => FinanceCompanyModel)
   FinanceCompany: FinanceCompanyModel;
 }

package/src/models/payment.entity.ts

@@ -6,8 +6,11 @@ import {
   Model,
   Table,
   UpdatedAt,
+  BelongsTo,
 } from 'sequelize-typescript';
+import { ForeignKey } from 'sequelize-typescript/dist/associations/foreign-key/foreign-key';
 import { PaymentType, PaymentStatus } from '../enum';
+import DocumentModel from './document.entity';
 import PaymentItemModel from './payment-item.entity';
 
 @Table({
@@ -102,6 +105,14 @@ export default class PaymentModel extends Model {
   })
   RelatedObjectType: string;
 
+  @ApiProperty({ type: String, description: 'DocNo' })
+  @ForeignKey(() => DocumentModel)
+  @Column({
+    allowNull: true,
+    type: DataType.STRING(30),
+  })
+  ReceiptDocNo: string;
+
   @ApiProperty({
     type: String,
     description: 'Account Customer Id in API',
@@ -144,4 +155,7 @@ export default class PaymentModel extends Model {
 
   @HasMany(() => PaymentItemModel)
   PaymentItems: PaymentItemModel[];
+
+  @BelongsTo(() => DocumentModel)
+  Document: DocumentModel;
 }

package/src/payment/interfaces/payment-attr.interface.ts

@@ -12,6 +12,7 @@ export class IPaymentAttr {
   IssuedBy?: string;
   RelatedObjectId?: string;
   RelatedObjectType?: string;
+  ReceiptDocNo?: string;
   Remarks?: string;
   UpdatedAt: Date;
   UpdatedBy: string;

package/src/payment/payment.ts

@@ -30,6 +30,7 @@ export default class Payment extends AccountSystemEntity {
   Remarks = '';
   RelatedObjectId = '';
   RelatedObjectType = '';
+  ReceiptDocNo = '';
 
   private static _RepositoryBase = new PaymentRepository();
   private static _PaymentItemRepository = new PaymentItemRepository();
@@ -103,6 +104,7 @@ export default class Payment extends AccountSystemEntity {
         payment.Remarks = paymentData.Remarks;
         payment.RelatedObjectId = paymentData.RelatedObjectId;
         payment.RelatedObjectType = paymentData.RelatedObjectType;
+        payment.ReceiptDocNo = paymentData.ReceiptDocNo;
         payment.AccSystemRefId = paymentData.AccSystemRefId;
         payment.PostedToAccSystemYN = paymentData.PostedToAccSystemYN;
         payment.PostedById = paymentData.PostedById;

package/src/payment-item/payment-item.ts

@@ -1,6 +1,6 @@
 import { ObjectBase } from '@tomei/general';
 import Payment from '../payment/payment';
-import type from '../helpers/typeof';
+import { type } from '../helpers/typeof';
 import { QueryTypes } from 'sequelize';
 import { FinanceDb } from '../';
 import { Next } from '@nestjs/common/decorators';