@tomei/finance 0.6.51 → 0.6.53

package/dist/enum/payment-status.enum.d.ts

@@ -1,4 +1,6 @@
 export declare enum PaymentStatus {
-    SUCCESSFUL = "Successful",
+    PENDING = "Pending",
+    CONFIRMED = "Confirmed",
+    REJECTED = "Rejected",
     FAILED = "Failed"
 }

package/dist/enum/payment-status.enum.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaymentStatus = void 0;
 var PaymentStatus;
 (function (PaymentStatus) {
-    PaymentStatus["SUCCESSFUL"] = "Successful";
+    PaymentStatus["PENDING"] = "Pending";
+    PaymentStatus["CONFIRMED"] = "Confirmed";
+    PaymentStatus["REJECTED"] = "Rejected";
     PaymentStatus["FAILED"] = "Failed";
 })(PaymentStatus = exports.PaymentStatus || (exports.PaymentStatus = {}));
 //# sourceMappingURL=payment-status.enum.js.map

package/dist/enum/payment-status.enum.js.map

@@ -1 +1 @@
-{"version":3,"file":"payment-status.enum.js","sourceRoot":"","sources":["../../src/enum/payment-status.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,0CAAyB,CAAA;IACzB,kCAAiB,CAAA;AACnB,CAAC,EAHW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAGxB"}
+{"version":3,"file":"payment-status.enum.js","sourceRoot":"","sources":["../../src/enum/payment-status.enum.ts"],"names":[],"mappings":";;;AAAA,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,oCAAmB,CAAA;IACnB,wCAAuB,CAAA;IACvB,sCAAqB,CAAA;IACrB,kCAAiB,CAAA;AACnB,CAAC,EALW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAKxB"}

package/dist/finance-company/finance-company.d.ts

@@ -4,6 +4,7 @@ import JournalEntry from '../journal-entry/journal-entry';
 import FinanceCustomerBase from '../customer/customer';
 import Document from '../document/document';
 import { IAccountSystem } from '../interfaces';
+import { PaymentStatus } from '../enum';
 import Payment from '../payment/payment';
 import PaymentMethod from '../payment-method/payment-method';
 import { LoginUser } from '@tomei/sso';
@@ -56,7 +57,7 @@ export default class FinanceCompany extends ObjectBase {
     issueInvoice(dbTransaction: any, invoice: Document, loginUser?: LoginUserBase, customer?: FinanceCustomerBase, dtAccountNo?: string): Promise<Document>;
     issueDebitNote(dbTransaction: any, loginUser: LoginUserBase, invoice: Document, customer: FinanceCustomerBase, dtAccountNo?: string): Promise<Document>;
     issueCreditNote(dbTransaction: any, loginUser: LoginUserBase, creditNote: Document, customer: FinanceCustomerBase, ctAccountNo?: string): Promise<Document>;
-    collectPayment(dbTransaction: any, loginUser: LoginUserBase, payment: Payment, customer: FinanceCustomerBase, ctAccountNo?: string, receiptNo?: string): Promise<Payment>;
+    collectPayment(dbTransaction: any, loginUser: LoginUserBase, payment: Payment): Promise<Payment>;
     makePayment(dbTransaction: any, loginUser: LoginUserBase, payment: Payment, customer: FinanceCustomerBase, dtAccountNo?: string): Promise<Payment>;
     get PaymentMethods(): Promise<PaymentMethod[]>;
     get TaxCodes(): Promise<Tax[]>;
@@ -67,4 +68,5 @@ export default class FinanceCompany extends ObjectBase {
         Currency: string;
         Amount: number;
     }[], receiptNo?: string): Promise<Payment>;
+    confirmPayment(dbTransaction: any, loginUser: LoginUserBase, customer: FinanceCustomerBase, payment: Payment, status: PaymentStatus.CONFIRMED | PaymentStatus.REJECTED | PaymentStatus.FAILED, remarks: string, ctAccountNo?: string, receiptNo?: string): Promise<void>;
 }

package/dist/finance-company/finance-company.js

@@ -209,9 +209,17 @@ class FinanceCompany extends general_1.ObjectBase {
                 if (creditTransactions.length < 1 || (debitTransactions === null || debitTransactions === void 0 ? void 0 : debitTransactions.length) < 1) {
                     throw new Error('There should be at least 1 debit ledger transaction and 1 credit ledger transaction in the journal entry');
                 }
-                const totalCreditAmount = creditTransactions.reduce((accumulator, currentValue) => accumulator + currentValue.CreditAmount, 0);
-                const totalDebitAmount = debitTransactions.reduce((accumulator, currentValue) => accumulator + currentValue.DebitAmount, 0);
-                if (totalCreditAmount !== totalDebitAmount) {
+                let totalCreditAmount = creditTransactions.reduce((accumulator, currentValue) => accumulator + currentValue.CreditAmount, 0);
+                let totalDebitAmount = debitTransactions.reduce((accumulator, currentValue) => accumulator + currentValue.DebitAmount, 0);
+                console.log('totalCreditAmount: ', totalCreditAmount);
+                console.log('totalDebitAmount: ', totalDebitAmount);
+                if (typeof totalCreditAmount === 'string') {
+                    totalCreditAmount = parseFloat(totalCreditAmount);
+                }
+                if (typeof totalDebitAmount === 'string') {
+                    totalDebitAmount = parseFloat(totalDebitAmount);
+                }
+                if (totalCreditAmount.toFixed(2) !== totalDebitAmount.toFixed(2)) {
                     throw new Error('Credit ledger transaction and debit ledger transaction should the same amount');
                 }
                 const newJournalEntry = yield journalEntry.save(loginUser.ObjectId, dbTransaction);
@@ -723,7 +731,7 @@ class FinanceCompany extends general_1.ObjectBase {
             }
         });
     }
-    collectPayment(dbTransaction, loginUser, payment, customer, ctAccountNo, receiptNo) {
+    collectPayment(dbTransaction, loginUser, payment) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const paymentItems = yield payment.getPaymentItems();
@@ -734,111 +742,10 @@ class FinanceCompany extends general_1.ObjectBase {
                 if (paymentPaidWithItems.length < 1) {
                     throw new Error('Atleast one payment paid with item is required to identify how the payment was made.');
                 }
-                const receiptDocuments = yield FinanceCompany._DocumentRepository.findAll({
-                    where: {
-                        DocType: enum_1.DocType.RECEIPT,
-                        CompanyId: this.ObjectId,
-                    },
-                });
-                const receipt = new document_1.default(dbTransaction);
-                if (receiptNo) {
-                    receipt.DocNo = receiptNo;
-                }
-                else {
-                    receipt.DocNo = `EZC-RCT-${receiptDocuments.length + 1}`;
-                }
-                receipt.DocType = enum_1.DocType.RECEIPT;
-                receipt.DocDate = new Date();
-                receipt.CompanyId = this.ObjectId;
-                receipt.Currency = payment.Currency;
-                receipt.Description = 'Payment Received';
-                receipt.IssuedById = loginUser.ObjectId;
-                receipt.IssuedToId = customer.CustomerId;
-                receipt.IssuedToType = (0, typeof_1.type)(customer);
-                receipt.RelatedObjectId = payment.RelatedObjectId;
-                receipt.RelatedObjectType = payment.RelatedObjectType;
-                receipt.UseAccSystemDocYN = 'N';
-                receipt.CreatedById = loginUser.ObjectId;
-                receipt.UpdatedById = loginUser.ObjectId;
-                for (const paymentItem of paymentItems) {
-                    const receiptItem = new document_item_1.default(dbTransaction, receipt);
-                    receiptItem.Name = `Payment for ${paymentItem.PayForObjectType} No. ${paymentItem.PayForObjectId}`;
-                    receiptItem.NameBM = `Bayaran untuk ${paymentItem.PayForObjectType} No. ${paymentItem.PayForObjectId}`;
-                    receiptItem.Description = '-';
-                    receiptItem.Currency = paymentItem.Currency;
-                    receiptItem.UnitPrice = paymentItem.Amount;
-                    receiptItem.Quantity = 1;
-                    receiptItem.Amount = receiptItem.UnitPrice * receiptItem.Quantity;
-                    receiptItem.ItemId = receipt.DocNo;
-                    receiptItem.ItemType = (0, typeof_1.type)(payment);
-                    receiptItem.CtAccountNo = ctAccountNo;
-                    yield receipt.newDocumentItem(receiptItem);
-                }
-                const receiptMedia = yield receipt.generateReceipt(receipt.IssuedById, customer, dbTransaction);
-                yield FinanceCompany._DocumentRepository.create({
-                    DocNo: receipt.DocNo,
-                    DocType: receipt.DocType,
-                    DocDate: receipt.DocDate,
-                    CompanyId: receipt.CompanyId,
-                    Currency: receipt.Currency,
-                    Amount: receipt.Amount,
-                    Description: receipt.Description,
-                    Status: receipt.Status,
-                    IssuedById: receipt.IssuedById,
-                    IssuedToId: receipt.IssuedToId,
-                    IssuedToType: receipt.IssuedToType,
-                    RelatedObjectId: receipt.RelatedObjectId,
-                    RelatedObjectType: receipt.RelatedObjectType,
-                    CreatedById: receipt.CreatedById,
-                    CreatedAt: new Date(),
-                    UpdatedById: receipt.UpdatedById,
-                    UpdatedAt: new Date(),
-                    DocPDFFileMediaId: receiptMedia.PDFMedia.MediaId,
-                    DocHTMLFileMediaId: receiptMedia.HTMLMedia.MediaId,
-                    AccSystemRefId: receipt.AccSystemRefId,
-                    PostedToAccSystemYN: receipt.PostedToAccSystemYN,
-                    PostedById: receipt.PostedToAccSystemYN == 'Y' ? receipt.PostedById : null,
-                    PostedDateTime: new Date(),
-                    UseAccSystemDocYN: receipt.UseAccSystemDocYN,
-                }, {
-                    transaction: dbTransaction,
-                });
-                const receiptItems = yield receipt.DocumentItems;
-                for (const receiptItem of receiptItems) {
-                    yield FinanceCompany._DocumentItemRepository.create({
-                        DocumentItemId: cuid(),
-                        DocNo: receipt.DocNo,
-                        Name: receiptItem.Name,
-                        NameBM: receiptItem.NameBM,
-                        Description: receiptItem.Description,
-                        ItemId: receiptItem.ItemId,
-                        ItemType: receiptItem.ItemType,
-                        ItemSKU: receiptItem.ItemSKU,
-                        ItemSerialNo: receiptItem.ItemSerialNo,
-                        Currency: receiptItem.Currency,
-                        UnitPrice: receiptItem.UnitPrice,
-                        Quantity: receiptItem.Quantity,
-                        QuantityUOM: receiptItem.QuantityUOM,
-                        Amount: receiptItem.Amount,
-                        TaxCode: receiptItem.TaxCode,
-                        TaxAmount: receiptItem.TaxAmount,
-                        TaxRate: receiptItem.TaxRate,
-                        TaxInclusiveYN: receiptItem.TaxInclusiveYN,
-                        DtAccountNo: receiptItem.DtAccountNo
-                            ? receiptItem.DtAccountNo
-                            : null,
-                        CtAccountNo: receiptItem.CtAccountNo
-                            ? receiptItem.CtAccountNo
-                            : null,
-                    }, {
-                        transaction: dbTransaction,
-                    });
-                }
                 payment.PaymentId = cuid();
                 payment.PaymentType = enum_1.PaymentType.PAYMENT_RECEIVED;
                 payment.ReceivedBy = loginUser.ObjectId;
                 payment.IssuedBy = loginUser.ObjectId;
-                payment.ReceiptDocNo = receipt.DocNo;
                 yield FinanceCompany._PaymentRepository.create({
                     PaymentId: payment.PaymentId,
                     PaymentType: payment.PaymentType,
@@ -846,7 +753,7 @@ class FinanceCompany extends general_1.ObjectBase {
                     Description: payment.Description,
                     Currency: payment.Currency,
                     Amount: payment.Amount,
-                    Status: enum_1.PaymentStatus.SUCCESSFUL,
+                    Status: enum_1.PaymentStatus.PENDING,
                     PostedToAccSystemYN: 'N',
                     ReceivedBy: payment.ReceivedBy,
                     IssuedBy: payment.IssuedBy,
@@ -872,6 +779,7 @@ class FinanceCompany extends general_1.ObjectBase {
                     yield paymentItem.paid(dbTransaction);
                 }
                 for (const paymentPaidWithItem of paymentPaidWithItems) {
+                    yield payment_method_type_1.default.initMethodType(dbTransaction, paymentPaidWithItem.MethodTypeId);
                     yield FinanceCompany._PaymentPaidWithRepository.create({
                         PaymentId: payment.PaymentId,
                         MethodTypeId: paymentPaidWithItem.MethodTypeId,
@@ -891,53 +799,6 @@ class FinanceCompany extends general_1.ObjectBase {
                         PaymentMediaId: paymentPaidWithItem.PaymentMediaId,
                     }, { transaction: dbTransaction });
                 }
-                const transactionDate = new Date();
-                for (const paymentPaidWith of paymentPaidWithItems) {
-                    let paymentMethodType;
-                    try {
-                        paymentMethodType = yield payment_method_type_1.default.initMethodType(dbTransaction, paymentPaidWith.MethodTypeId);
-                    }
-                    catch (error) {
-                        if (error instanceof general_1.RecordNotFoundError) {
-                            throw new Error('Invalid Payment Method Type Id');
-                        }
-                        else {
-                            throw error;
-                        }
-                    }
-                    const journalEntry = new journal_entry_1.default(dbTransaction);
-                    journalEntry.init({
-                        CompanyId: this.CompanyId,
-                        Name: 'Collect-payments for ' + payment.PaymentId,
-                    });
-                    const debitLT = yield journalEntry.newLedgerTransaction(enum_1.TransactionTypeOptions.DEBIT);
-                    debitLT.AccountNo = paymentMethodType.AccountNo;
-                    debitLT.Currency = paymentPaidWith.Currency;
-                    debitLT.DebitAmount = paymentPaidWith.Amount;
-                    debitLT.Date = transactionDate;
-                    debitLT.Description = 'Payment Received';
-                    debitLT.Name = customer.FullName;
-                    debitLT.RelatedObjectId = payment.PaymentId;
-                    debitLT.RelatedObjectType = (0, typeof_1.type)(payment);
-                    debitLT.RelatedPaymentId = payment.PaymentId;
-                    const creditLT = yield journalEntry.newLedgerTransaction(enum_1.TransactionTypeOptions.CREDIT);
-                    if (ctAccountNo) {
-                        creditLT.AccountNo = ctAccountNo;
-                    }
-                    else {
-                        const arAccount = yield customer.getAccountReceivable();
-                        creditLT.AccountNo = arAccount.AccountNo;
-                    }
-                    creditLT.Currency = paymentPaidWith.Currency;
-                    creditLT.CreditAmount = paymentPaidWith.Amount;
-                    creditLT.Date = transactionDate;
-                    creditLT.Description = 'Payment Received';
-                    creditLT.Name = paymentMethodType.Name;
-                    creditLT.RelatedObjectId = payment.PaymentId;
-                    creditLT.RelatedObjectType = (0, typeof_1.type)(payment);
-                    creditLT.RelatedPaymentId = payment.PaymentId;
-                    yield this.postJournal(dbTransaction, journalEntry, loginUser);
-                }
                 return payment;
             }
             catch (error) {
@@ -974,7 +835,7 @@ class FinanceCompany extends general_1.ObjectBase {
                     RelatedObjectId: payment.RelatedObjectId,
                     RelatedObjectType: payment.RelatedObjectType,
                     Amount: payment.Amount,
-                    Status: enum_1.PaymentStatus.SUCCESSFUL,
+                    Status: enum_1.PaymentStatus.CONFIRMED,
                     PostedToAccSystemYN: 'N',
                     UpdatedAt: new Date(),
                     UpdatedBy: loginUser.ObjectId,
@@ -1308,7 +1169,7 @@ class FinanceCompany extends general_1.ObjectBase {
                     Description: payment.Description,
                     Currency: payment.Currency,
                     Amount: payment.Amount,
-                    Status: enum_1.PaymentStatus.SUCCESSFUL,
+                    Status: enum_1.PaymentStatus.PENDING,
                     PostedToAccSystemYN: 'N',
                     ReceivedBy: payment.ReceivedBy,
                     IssuedBy: payment.IssuedBy,
@@ -1352,33 +1213,181 @@ class FinanceCompany extends general_1.ObjectBase {
                         PaymentMediaId: paymentPaidWithItem.PaymentMediaId,
                     }, { transaction: dbTransaction });
                 }));
-                const transactionDate = new Date();
-                const journalEntry = new journal_entry_1.default(dbTransaction);
-                journalEntry.init({
-                    CompanyId: this.CompanyId,
-                    Name: 'Collect-payments for ' + payment.PaymentId,
-                });
-                for (const paymentPaidWithItem of paymentPaidWithItems) {
-                    const paymentMethodType = yield payment_method_type_1.default.initMethodType(dbTransaction, paymentPaidWithItem.MethodTypeId);
-                    const debitLT = yield journalEntry.newLedgerTransaction(enum_1.TransactionTypeOptions.DEBIT);
-                    debitLT.AccountNo = paymentMethodType.AccountNo;
-                    debitLT.Currency = paymentPaidWithItem.Currency;
-                    debitLT.DebitAmount = paymentPaidWithItem.Amount;
-                    debitLT.Date = transactionDate;
-                    debitLT.Description = 'Payment Received';
-                    debitLT.RelatedPaymentId = payment.PaymentId;
+                return payment;
+            }
+            catch (error) {
+                throw error;
+            }
+        });
+    }
+    confirmPayment(dbTransaction, loginUser, customer, payment, status, remarks, ctAccountNo, receiptNo) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this._DbTransaction = dbTransaction;
+                const systemCode = config_1.ApplicationConfig.getComponentConfigValue('system-code');
+                const isPrivileged = yield loginUser.checkPrivileges(systemCode, 'FinanceCompany - Confirm Payment');
+                if (!isPrivileged) {
+                    throw new general_1.ClassError('FinanceCompany', 'FinanceCompanyConfirmPaymentErrMsg00', `You do not have 'Payment - Confirm' privilege.`);
                 }
-                for (const ct of creditTransaction) {
-                    const creditLT = yield journalEntry.newLedgerTransaction(enum_1.TransactionTypeOptions.CREDIT);
-                    creditLT.AccountNo = ct.AccountNo;
-                    creditLT.Currency = ct.Currency;
-                    creditLT.CreditAmount = ct.Amount;
-                    creditLT.Date = transactionDate;
-                    creditLT.Description = 'Payment Received';
-                    creditLT.RelatedPaymentId = payment.PaymentId;
+                if (payment.PaymentId === 'New') {
+                    throw new general_1.ClassError('FinanceCompany', 'FinanceCompanyConfirmPaymentErrMsg01', `Payment not found.`);
+                }
+                if (payment.Status !== enum_1.PaymentStatus.PENDING) {
+                    throw new general_1.ClassError('Payment', 'PaymentConfirmPaymentErrMsg02', `Payment status is not 'Pending'.`);
+                }
+                payment.Remarks = remarks;
+                switch (status) {
+                    case enum_1.PaymentStatus.REJECTED:
+                        payment.Status = enum_1.PaymentStatus.REJECTED;
+                        break;
+                    case enum_1.PaymentStatus.FAILED:
+                        payment.Status = enum_1.PaymentStatus.FAILED;
+                        break;
+                    case enum_1.PaymentStatus.CONFIRMED:
+                        payment.Status = enum_1.PaymentStatus.CONFIRMED;
+                        const receiptDocuments = yield FinanceCompany._DocumentRepository.findAll({
+                            where: {
+                                DocType: enum_1.DocType.RECEIPT,
+                                CompanyId: this.ObjectId,
+                            },
+                        });
+                        const receipt = new document_1.default(dbTransaction);
+                        if (receiptNo) {
+                            receipt.DocNo = receiptNo;
+                        }
+                        else {
+                            receipt.DocNo = `EZC-RCT-${receiptDocuments.length + 1}`;
+                        }
+                        receipt.DocType = enum_1.DocType.RECEIPT;
+                        receipt.DocDate = new Date();
+                        receipt.CompanyId = this.ObjectId;
+                        receipt.Currency = payment.Currency;
+                        receipt.Description = 'Payment Received';
+                        receipt.IssuedById = loginUser.ObjectId;
+                        receipt.IssuedToId = customer.CustomerId;
+                        receipt.IssuedToType = (0, typeof_1.type)(customer);
+                        receipt.RelatedObjectId = payment.RelatedObjectId;
+                        receipt.RelatedObjectType = payment.RelatedObjectType;
+                        receipt.UseAccSystemDocYN = 'N';
+                        receipt.CreatedById = loginUser.ObjectId;
+                        receipt.UpdatedById = loginUser.ObjectId;
+                        const paymentItems = yield payment.getPaymentItems();
+                        for (const paymentItem of paymentItems) {
+                            const receiptItem = new document_item_1.default(dbTransaction, receipt);
+                            receiptItem.Name = `Payment for ${paymentItem.PayForObjectType} No. ${paymentItem.PayForObjectId}`;
+                            receiptItem.NameBM = `Bayaran untuk ${paymentItem.PayForObjectType} No. ${paymentItem.PayForObjectId}`;
+                            receiptItem.Description = '-';
+                            receiptItem.Currency = paymentItem.Currency;
+                            receiptItem.UnitPrice = paymentItem.Amount;
+                            receiptItem.Quantity = 1;
+                            receiptItem.Amount = receiptItem.UnitPrice * receiptItem.Quantity;
+                            receiptItem.ItemId = receipt.DocNo;
+                            receiptItem.ItemType = (0, typeof_1.type)(payment);
+                            receiptItem.CtAccountNo = ctAccountNo;
+                            yield receipt.newDocumentItem(receiptItem);
+                        }
+                        const receiptMedia = yield receipt.generateReceipt(receipt.IssuedById, customer, dbTransaction);
+                        yield FinanceCompany._DocumentRepository.create({
+                            DocNo: receipt.DocNo,
+                            DocType: receipt.DocType,
+                            DocDate: receipt.DocDate,
+                            CompanyId: receipt.CompanyId,
+                            Currency: receipt.Currency,
+                            Amount: receipt.Amount,
+                            Description: receipt.Description,
+                            Status: receipt.Status,
+                            IssuedById: receipt.IssuedById,
+                            IssuedToId: receipt.IssuedToId,
+                            IssuedToType: receipt.IssuedToType,
+                            RelatedObjectId: receipt.RelatedObjectId,
+                            RelatedObjectType: receipt.RelatedObjectType,
+                            CreatedById: receipt.CreatedById,
+                            CreatedAt: new Date(),
+                            UpdatedById: receipt.UpdatedById,
+                            UpdatedAt: new Date(),
+                            DocPDFFileMediaId: receiptMedia.PDFMedia.MediaId,
+                            DocHTMLFileMediaId: receiptMedia.HTMLMedia.MediaId,
+                            AccSystemRefId: receipt.AccSystemRefId,
+                            PostedToAccSystemYN: receipt.PostedToAccSystemYN,
+                            PostedById: receipt.PostedToAccSystemYN == 'Y' ? receipt.PostedById : null,
+                            PostedDateTime: new Date(),
+                            UseAccSystemDocYN: receipt.UseAccSystemDocYN,
+                        }, {
+                            transaction: dbTransaction,
+                        });
+                        const receiptItems = yield receipt.DocumentItems;
+                        for (const receiptItem of receiptItems) {
+                            yield FinanceCompany._DocumentItemRepository.create({
+                                DocumentItemId: cuid(),
+                                DocNo: receipt.DocNo,
+                                Name: receiptItem.Name,
+                                NameBM: receiptItem.NameBM,
+                                Description: receiptItem.Description,
+                                ItemId: receiptItem.ItemId,
+                                ItemType: receiptItem.ItemType,
+                                ItemSKU: receiptItem.ItemSKU,
+                                ItemSerialNo: receiptItem.ItemSerialNo,
+                                Currency: receiptItem.Currency,
+                                UnitPrice: receiptItem.UnitPrice,
+                                Quantity: receiptItem.Quantity,
+                                QuantityUOM: receiptItem.QuantityUOM,
+                                Amount: receiptItem.Amount,
+                                TaxCode: receiptItem.TaxCode,
+                                TaxAmount: receiptItem.TaxAmount,
+                                TaxRate: receiptItem.TaxRate,
+                                TaxInclusiveYN: receiptItem.TaxInclusiveYN,
+                                DtAccountNo: receiptItem.DtAccountNo
+                                    ? receiptItem.DtAccountNo
+                                    : null,
+                                CtAccountNo: receiptItem.CtAccountNo
+                                    ? receiptItem.CtAccountNo
+                                    : null,
+                            }, {
+                                transaction: dbTransaction,
+                            });
+                        }
+                        payment.ReceiptDocNo = receipt.DocNo;
+                        const transactionDate = new Date();
+                        const paymentPaidWithItems = yield payment.getPaymentPaidWith();
+                        for (const paymentPaidWith of paymentPaidWithItems) {
+                            let paymentMethodType = yield payment_method_type_1.default.initMethodType(dbTransaction, paymentPaidWith.MethodTypeId);
+                            const journalEntry = new journal_entry_1.default(dbTransaction);
+                            journalEntry.init({
+                                CompanyId: this.CompanyId,
+                                Name: 'Collect-payments for ' + payment.PaymentId,
+                            });
+                            const debitLT = yield journalEntry.newLedgerTransaction(enum_1.TransactionTypeOptions.DEBIT);
+                            debitLT.AccountNo = paymentMethodType.AccountNo;
+                            debitLT.Currency = paymentPaidWith.Currency;
+                            debitLT.DebitAmount = paymentPaidWith.Amount;
+                            debitLT.Date = transactionDate;
+                            debitLT.Description = 'Payment Received';
+                            debitLT.Name = customer.FullName;
+                            debitLT.RelatedObjectId = payment.PaymentId;
+                            debitLT.RelatedObjectType = "Payment";
+                            debitLT.RelatedPaymentId = payment.PaymentId;
+                            const creditLT = yield journalEntry.newLedgerTransaction(enum_1.TransactionTypeOptions.CREDIT);
+                            if (ctAccountNo) {
+                                creditLT.AccountNo = ctAccountNo;
+                            }
+                            else {
+                                const arAccount = yield customer.getAccountReceivable();
+                                creditLT.AccountNo = arAccount.AccountNo;
+                            }
+                            creditLT.Currency = paymentPaidWith.Currency;
+                            creditLT.CreditAmount = paymentPaidWith.Amount;
+                            creditLT.Date = transactionDate;
+                            creditLT.Description = 'Payment Received';
+                            creditLT.Name = paymentMethodType.Name;
+                            creditLT.RelatedObjectId = payment.PaymentId;
+                            creditLT.RelatedObjectType = (0, typeof_1.type)(payment);
+                            creditLT.RelatedPaymentId = payment.PaymentId;
+                            yield yield this.postJournal(dbTransaction, journalEntry, loginUser);
+                        }
+                        break;
+                    default:
+                        throw new general_1.ClassError('FinanceCompany', 'FinanceCompanyConfirmPaymentErrMsg03', `Invalid status.`);
                 }
-                yield this.postJournal(dbTransaction, journalEntry, loginUser);
-                return payment;
             }
             catch (error) {
                 throw error;