mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-12 10:50:31 +00:00
Compare commits
6 Commits
darkmode-u
...
v0.23.0-rc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3f2ab6e8f0 | ||
|
|
f0fae7d148 | ||
|
|
e063597a80 | ||
|
|
9b3f6b22d1 | ||
|
|
0475ce136a | ||
|
|
987ad992a4 |
5
packages/server/src/i18n/en/customer.json
Normal file
5
packages/server/src/i18n/en/customer.json
Normal file
@@ -0,0 +1,5 @@
|
||||
{
|
||||
"type.business": "Business",
|
||||
"type.individual": "Individual"
|
||||
}
|
||||
|
||||
@@ -48,14 +48,30 @@ export class PaginationQueryBuilder<
|
||||
// No relations defined
|
||||
return this.delete();
|
||||
}
|
||||
|
||||
// Only check HasManyRelation and ManyToManyRelation relations, as BelongsToOneRelation are just
|
||||
// foreign key references and shouldn't prevent deletion. Only dependent records should block deletion.
|
||||
const dependentRelationNames = relationNames.filter((name) => {
|
||||
const relation = relationMappings[name];
|
||||
return relation && (
|
||||
relation.relation === Model.HasManyRelation ||
|
||||
relation.relation === Model.ManyToManyRelation
|
||||
);
|
||||
});
|
||||
|
||||
if (dependentRelationNames.length === 0) {
|
||||
// No dependent relations defined, safe to delete
|
||||
return this.delete();
|
||||
}
|
||||
|
||||
const recordQuery = this.clone();
|
||||
|
||||
relationNames.forEach((relationName: string) => {
|
||||
dependentRelationNames.forEach((relationName: string) => {
|
||||
recordQuery.withGraphFetched(relationName);
|
||||
});
|
||||
const record = await recordQuery;
|
||||
|
||||
const hasRelations = relationNames.some((name) => {
|
||||
const hasRelations = dependentRelationNames.some((name) => {
|
||||
const val = record[name];
|
||||
return Array.isArray(val) ? val.length > 0 : val != null;
|
||||
});
|
||||
|
||||
@@ -14,6 +14,7 @@ import { BranchesSettingsService } from '../Branches/BranchesSettings';
|
||||
import { BillPaymentsController } from './BillPayments.controller';
|
||||
import { BillPaymentGLEntries } from './commands/BillPaymentGLEntries';
|
||||
import { BillPaymentGLEntriesSubscriber } from './subscribers/BillPaymentGLEntriesSubscriber';
|
||||
import { BillPaymentBillSyncSubscriber } from './subscribers/BillPaymentBillSyncSubscriber';
|
||||
import { LedgerModule } from '../Ledger/Ledger.module';
|
||||
import { AccountsModule } from '../Accounts/Accounts.module';
|
||||
import { BillPaymentsExportable } from './queries/BillPaymentsExportable';
|
||||
@@ -39,6 +40,7 @@ import { BillPaymentsPages } from './commands/BillPaymentsPages.service';
|
||||
TenancyContext,
|
||||
BillPaymentGLEntries,
|
||||
BillPaymentGLEntriesSubscriber,
|
||||
BillPaymentBillSyncSubscriber,
|
||||
BillPaymentsExportable,
|
||||
BillPaymentsImportable,
|
||||
GetBillPaymentsService,
|
||||
@@ -52,4 +54,4 @@ import { BillPaymentsPages } from './commands/BillPaymentsPages.service';
|
||||
],
|
||||
controllers: [BillPaymentsController],
|
||||
})
|
||||
export class BillPaymentsModule {}
|
||||
export class BillPaymentsModule { }
|
||||
|
||||
@@ -38,7 +38,7 @@ export class CreateBillPaymentService {
|
||||
|
||||
@Inject(BillPayment.name)
|
||||
private readonly billPaymentModel: TenantModelProxy<typeof BillPayment>,
|
||||
) {}
|
||||
) { }
|
||||
|
||||
/**
|
||||
* Creates a new bill payment transcations and store it to the storage
|
||||
@@ -103,11 +103,19 @@ export class CreateBillPaymentService {
|
||||
} as IBillPaymentCreatingPayload);
|
||||
|
||||
// Writes the bill payment graph to the storage.
|
||||
const billPayment = await this.billPaymentModel()
|
||||
const insertedBillPayment = await this.billPaymentModel()
|
||||
.query(trx)
|
||||
.insertGraphAndFetch({
|
||||
...billPaymentObj,
|
||||
});
|
||||
|
||||
// Fetch the bill payment with entries to ensure they're loaded for the subscriber.
|
||||
const billPayment = await this.billPaymentModel()
|
||||
.query(trx)
|
||||
.withGraphFetched('entries')
|
||||
.findById(insertedBillPayment.id)
|
||||
.throwIfNotFound();
|
||||
|
||||
// Triggers `onBillPaymentCreated` event.
|
||||
await this.eventPublisher.emitAsync(events.billPayment.onCreated, {
|
||||
billPayment,
|
||||
|
||||
@@ -29,7 +29,7 @@ export class EditBillPayment {
|
||||
|
||||
@Inject(Vendor.name)
|
||||
private readonly vendorModel: TenantModelProxy<typeof Vendor>,
|
||||
) {}
|
||||
) { }
|
||||
|
||||
/**
|
||||
* Edits the details of the given bill payment.
|
||||
@@ -116,12 +116,20 @@ export class EditBillPayment {
|
||||
} as IBillPaymentEditingPayload);
|
||||
|
||||
// Edits the bill payment transaction graph on the storage.
|
||||
const billPayment = await this.billPaymentModel()
|
||||
await this.billPaymentModel()
|
||||
.query(trx)
|
||||
.upsertGraphAndFetch({
|
||||
.upsertGraph({
|
||||
id: billPaymentId,
|
||||
...billPaymentObj,
|
||||
});
|
||||
|
||||
// Fetch the bill payment with entries to ensure they're loaded for the subscriber.
|
||||
const billPayment = await this.billPaymentModel()
|
||||
.query(trx)
|
||||
.withGraphFetched('entries')
|
||||
.findById(billPaymentId)
|
||||
.throwIfNotFound();
|
||||
|
||||
// Triggers `onBillPaymentEdited` event.
|
||||
await this.eventPublisher.emitAsync(events.billPayment.onEdited, {
|
||||
billPaymentId,
|
||||
|
||||
@@ -16,8 +16,6 @@ export class BillPaymentsExportable extends Exportable {
|
||||
|
||||
/**
|
||||
* Retrieves the accounts data to exportable sheet.
|
||||
* @param {number} tenantId
|
||||
* @returns
|
||||
*/
|
||||
public async exportable(query: any) {
|
||||
const filterQuery = (builder) => {
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
import {
|
||||
IBillPaymentEventCreatedPayload,
|
||||
IBillPaymentEventDeletedPayload,
|
||||
IBillPaymentEventEditedPayload,
|
||||
} from '../types/BillPayments.types';
|
||||
import { BillPaymentBillSync } from '../commands/BillPaymentBillSync.service';
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { OnEvent } from '@nestjs/event-emitter';
|
||||
import { events } from '@/common/events/events';
|
||||
|
||||
@Injectable()
|
||||
export class BillPaymentBillSyncSubscriber {
|
||||
/**
|
||||
* @param {BillPaymentBillSync} billPaymentBillSync - Bill payment bill sync service.
|
||||
*/
|
||||
constructor(private readonly billPaymentBillSync: BillPaymentBillSync) { }
|
||||
|
||||
/**
|
||||
* Handle bill increment/decrement payment amount
|
||||
* once created, edited or deleted.
|
||||
*/
|
||||
@OnEvent(events.billPayment.onCreated)
|
||||
async handleBillIncrementPaymentOnceCreated({
|
||||
billPayment,
|
||||
trx,
|
||||
}: IBillPaymentEventCreatedPayload) {
|
||||
// Ensure entries are available - they should be included in insertGraphAndFetch
|
||||
const entries = billPayment.entries || [];
|
||||
await this.billPaymentBillSync.saveChangeBillsPaymentAmount(
|
||||
entries.map((entry) => ({
|
||||
billId: entry.billId,
|
||||
paymentAmount: entry.paymentAmount,
|
||||
})),
|
||||
null,
|
||||
trx,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle bill increment/decrement payment amount once edited.
|
||||
*/
|
||||
@OnEvent(events.billPayment.onEdited)
|
||||
async handleBillIncrementPaymentOnceEdited({
|
||||
billPayment,
|
||||
oldBillPayment,
|
||||
trx,
|
||||
}: IBillPaymentEventEditedPayload) {
|
||||
const entries = billPayment.entries || [];
|
||||
const oldEntries = oldBillPayment?.entries || null;
|
||||
|
||||
await this.billPaymentBillSync.saveChangeBillsPaymentAmount(
|
||||
entries.map((entry) => ({
|
||||
billId: entry.billId,
|
||||
paymentAmount: entry.paymentAmount,
|
||||
})),
|
||||
oldEntries,
|
||||
trx,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle revert bills payment amount once bill payment deleted.
|
||||
*/
|
||||
@OnEvent(events.billPayment.onDeleted)
|
||||
async handleBillDecrementPaymentAmount({
|
||||
oldBillPayment,
|
||||
trx,
|
||||
}: IBillPaymentEventDeletedPayload) {
|
||||
const oldEntries = oldBillPayment.entries || [];
|
||||
|
||||
await this.billPaymentBillSync.saveChangeBillsPaymentAmount(
|
||||
oldEntries.map((entry) => ({
|
||||
billId: entry.billId,
|
||||
paymentAmount: 0,
|
||||
})),
|
||||
oldEntries,
|
||||
trx,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -7,9 +7,13 @@ import { CreditNotesRefundsApplication } from './CreditNotesRefundsApplication.s
|
||||
import { CreditNoteRefundsController } from './CreditNoteRefunds.controller';
|
||||
import { CreditNotesModule } from '../CreditNotes/CreditNotes.module';
|
||||
import { GetCreditNoteRefundsService } from './queries/GetCreditNoteRefunds.service';
|
||||
import { RefundCreditNoteGLEntries } from './commands/RefundCreditNoteGLEntries';
|
||||
import { RefundCreditNoteGLEntriesSubscriber } from '../CreditNotes/subscribers/RefundCreditNoteGLEntriesSubscriber';
|
||||
import { LedgerModule } from '../Ledger/Ledger.module';
|
||||
import { AccountsModule } from '../Accounts/Accounts.module';
|
||||
|
||||
@Module({
|
||||
imports: [forwardRef(() => CreditNotesModule)],
|
||||
imports: [forwardRef(() => CreditNotesModule), LedgerModule, AccountsModule],
|
||||
providers: [
|
||||
CreateRefundCreditNoteService,
|
||||
DeleteRefundCreditNoteService,
|
||||
@@ -17,8 +21,10 @@ import { GetCreditNoteRefundsService } from './queries/GetCreditNoteRefunds.serv
|
||||
RefundSyncCreditNoteBalanceService,
|
||||
CreditNotesRefundsApplication,
|
||||
GetCreditNoteRefundsService,
|
||||
RefundCreditNoteGLEntries,
|
||||
RefundCreditNoteGLEntriesSubscriber,
|
||||
],
|
||||
exports: [RefundSyncCreditNoteBalanceService],
|
||||
controllers: [CreditNoteRefundsController],
|
||||
})
|
||||
export class CreditNoteRefundsModule {}
|
||||
export class CreditNoteRefundsModule { }
|
||||
|
||||
@@ -10,6 +10,7 @@ import {
|
||||
import { FinancialSheet } from '../../common/FinancialSheet';
|
||||
import { JournalSheetRepository } from './JournalSheetRepository';
|
||||
import { ILedgerEntry } from '@/modules/Ledger/types/Ledger.types';
|
||||
import { getTransactionTypeLabel } from '@/modules/BankingTransactions/utils';
|
||||
|
||||
export class JournalSheet extends FinancialSheet {
|
||||
readonly query: IJournalReportQuery;
|
||||
@@ -97,10 +98,13 @@ export class JournalSheet extends FinancialSheet {
|
||||
|
||||
transactionType: groupEntry.transactionType,
|
||||
referenceId: groupEntry.transactionId,
|
||||
referenceTypeFormatted: this.i18n.t(groupEntry.transactionType),
|
||||
|
||||
referenceTypeFormatted: this.i18n.t(
|
||||
getTransactionTypeLabel(
|
||||
groupEntry.transactionType,
|
||||
groupEntry.transactionSubType,
|
||||
),
|
||||
),
|
||||
entries: this.entriesMapper(entriesGroup),
|
||||
|
||||
currencyCode: this.baseCurrency,
|
||||
|
||||
credit: totalCredit,
|
||||
|
||||
@@ -6,6 +6,7 @@ import { SaleInvoice } from '@/modules/SaleInvoices/models/SaleInvoice';
|
||||
import { SaleReceipt } from '@/modules/SaleReceipts/models/SaleReceipt';
|
||||
import { Item } from '@/modules/Items/models/Item';
|
||||
import { BaseModel } from '@/models/Model';
|
||||
import { ItemEntry } from '@/modules/TransactionItemEntry/models/ItemEntry';
|
||||
|
||||
export class InventoryCostLotTracker extends BaseModel {
|
||||
date: Date;
|
||||
@@ -27,6 +28,7 @@ export class InventoryCostLotTracker extends BaseModel {
|
||||
warehouseId: number;
|
||||
|
||||
item?: Item;
|
||||
itemEntry?: ItemEntry;
|
||||
invoice?: SaleInvoice;
|
||||
receipt?: SaleReceipt;
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ export class InventoryCostSubscriber {
|
||||
private readonly itemsQuantitySync: InventoryItemsQuantitySyncService,
|
||||
private readonly inventoryService: InventoryComputeCostService,
|
||||
private readonly importAls: ImportAls,
|
||||
) {}
|
||||
) { }
|
||||
|
||||
/**
|
||||
* Sync inventory items quantity once inventory transactions created.
|
||||
@@ -60,7 +60,7 @@ export class InventoryCostSubscriber {
|
||||
* Marks items cost compute running state.
|
||||
*/
|
||||
@OnEvent(events.inventory.onInventoryTransactionsCreated)
|
||||
async markGlobalSettingsComputeItems({}) {
|
||||
async markGlobalSettingsComputeItems({ }) {
|
||||
await this.inventoryService.markItemsCostComputeRunning(true);
|
||||
}
|
||||
|
||||
@@ -68,7 +68,7 @@ export class InventoryCostSubscriber {
|
||||
* Marks items cost compute as completed.
|
||||
*/
|
||||
@OnEvent(events.inventory.onInventoryCostEntriesWritten)
|
||||
async markGlobalSettingsComputeItemsCompeted({}) {
|
||||
async markGlobalSettingsComputeItemsCompeted({ }) {
|
||||
await this.inventoryService.markItemsCostComputeRunning(false);
|
||||
}
|
||||
|
||||
@@ -80,15 +80,13 @@ export class InventoryCostSubscriber {
|
||||
itemId,
|
||||
startingDate,
|
||||
}: IComputeItemCostJobCompletedPayload) {
|
||||
// const dependsComputeJobs = await this.agenda.jobs({
|
||||
// name: 'compute-item-cost',
|
||||
// nextRunAt: { $ne: null },
|
||||
// 'data.tenantId': tenantId,
|
||||
// });
|
||||
// // There is no scheduled compute jobs waiting.
|
||||
// if (dependsComputeJobs.length === 0) {
|
||||
// await this.saleInvoicesCost.scheduleWriteJournalEntries(startingDate);
|
||||
// }
|
||||
// Convert startingDate to Date if it's a string
|
||||
const startingDateObj = startingDate instanceof Date
|
||||
? startingDate
|
||||
: new Date(startingDate);
|
||||
|
||||
// Write GL entries for inventory cost lots after cost computation completes
|
||||
await this.saleInvoicesCost.writeCostLotsGLEntries(startingDateObj);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -38,7 +38,8 @@ export class SaleInvoiceCostGLEntries {
|
||||
.modify('filterDateRange', startingDate)
|
||||
.orderBy('date', 'ASC')
|
||||
.withGraphFetched('invoice')
|
||||
.withGraphFetched('item');
|
||||
.withGraphFetched('item')
|
||||
.withGraphFetched('itemEntry');
|
||||
|
||||
const ledger = this.getInventoryCostLotsLedger(inventoryCostLotTrans);
|
||||
|
||||
@@ -79,6 +80,9 @@ export class SaleInvoiceCostGLEntries {
|
||||
transactionType: inventoryCostLot.transactionType,
|
||||
transactionId: inventoryCostLot.transactionId,
|
||||
|
||||
transactionNumber: inventoryCostLot.invoice.invoiceNo,
|
||||
referenceNumber: inventoryCostLot.invoice.referenceNo,
|
||||
|
||||
date: inventoryCostLot.date,
|
||||
indexGroup: 20,
|
||||
costable: true,
|
||||
@@ -105,6 +109,9 @@ export class SaleInvoiceCostGLEntries {
|
||||
const costAccountId =
|
||||
inventoryCostLot.costAccountId || inventoryCostLot.item.costAccountId;
|
||||
|
||||
// Get description from item entry if available
|
||||
const description = inventoryCostLot.itemEntry?.description || null;
|
||||
|
||||
// XXX Debit - Cost account.
|
||||
const costEntry = {
|
||||
...commonEntry,
|
||||
@@ -112,6 +119,7 @@ export class SaleInvoiceCostGLEntries {
|
||||
accountId: costAccountId,
|
||||
accountNormal: AccountNormal.DEBIT,
|
||||
itemId: inventoryCostLot.itemId,
|
||||
note: description,
|
||||
index: getIndexIncrement(),
|
||||
};
|
||||
// XXX Credit - Inventory account.
|
||||
@@ -121,6 +129,7 @@ export class SaleInvoiceCostGLEntries {
|
||||
accountId: inventoryCostLot.item.inventoryAccountId,
|
||||
accountNormal: AccountNormal.DEBIT,
|
||||
itemId: inventoryCostLot.itemId,
|
||||
note: description,
|
||||
index: getIndexIncrement(),
|
||||
};
|
||||
return [costEntry, inventoryEntry];
|
||||
|
||||
@@ -1,15 +1,18 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { OnEvent } from '@nestjs/event-emitter';
|
||||
import { events } from '@/common/events/events';
|
||||
import { IInventoryCostLotsGLEntriesWriteEvent } from '@/modules/InventoryCost/types/InventoryCost.types';
|
||||
import { SaleInvoiceCostGLEntries } from '../SaleInvoiceCostGLEntries';
|
||||
|
||||
@Injectable()
|
||||
export class InvoiceCostGLEntriesSubscriber {
|
||||
constructor(private readonly invoiceCostEntries: SaleInvoiceCostGLEntries) {}
|
||||
constructor(private readonly invoiceCostEntries: SaleInvoiceCostGLEntries) { }
|
||||
|
||||
/**
|
||||
* Writes the invoices cost GL entries once the inventory cost lots be written.
|
||||
* @param {IInventoryCostLotsGLEntriesWriteEvent}
|
||||
*/
|
||||
@OnEvent(events.inventory.onCostLotsGLEntriesWrite)
|
||||
async writeInvoicesCostEntriesOnCostLotsWritten({
|
||||
trx,
|
||||
startingDate,
|
||||
|
||||
@@ -6,15 +6,21 @@ import { VendorCreditsRefundApplication } from './VendorCreditsRefund.applicatio
|
||||
import { CreateRefundVendorCredit } from './commands/CreateRefundVendorCredit.service';
|
||||
import { WarehousesModule } from '../Warehouses/Warehouses.module';
|
||||
import { BranchesModule } from '../Branches/Branches.module';
|
||||
import { RefundVendorCreditGLEntries } from './commands/RefundVendorCreditGLEntries';
|
||||
import { RefundVendorCreditGLEntriesSubscriber } from './subscribers/RefundVendorCreditGLEntriesSubscriber';
|
||||
import { LedgerModule } from '../Ledger/Ledger.module';
|
||||
import { AccountsModule } from '../Accounts/Accounts.module';
|
||||
|
||||
@Module({
|
||||
imports: [WarehousesModule, BranchesModule],
|
||||
imports: [WarehousesModule, BranchesModule, LedgerModule, AccountsModule],
|
||||
providers: [
|
||||
GetRefundVendorCreditsService,
|
||||
DeleteRefundVendorCreditService,
|
||||
CreateRefundVendorCredit,
|
||||
VendorCreditsRefundApplication
|
||||
VendorCreditsRefundApplication,
|
||||
RefundVendorCreditGLEntries,
|
||||
RefundVendorCreditGLEntriesSubscriber,
|
||||
],
|
||||
controllers: [VendorCreditsRefundController],
|
||||
})
|
||||
export class VendorCreditsRefundModule {}
|
||||
export class VendorCreditsRefundModule { }
|
||||
|
||||
@@ -1,159 +1,172 @@
|
||||
// import { Inject, Service } from 'typedi';
|
||||
// import { Knex } from 'knex';
|
||||
// import { AccountNormal, ILedgerEntry } from '@/interfaces';
|
||||
// import { IRefundVendorCredit } from '@/interfaces';
|
||||
// import JournalPosterService from '@/services/Sales/JournalPosterService';
|
||||
// import LedgerRepository from '@/services/Ledger/LedgerRepository';
|
||||
// import HasTenancyService from '@/services/Tenancy/TenancyService';
|
||||
import { LedgerStorageService } from '@/modules/Ledger/LedgerStorage.service';
|
||||
import { Inject, Injectable } from '@nestjs/common';
|
||||
import { RefundVendorCredit } from '../models/RefundVendorCredit';
|
||||
import { Ledger } from '@/modules/Ledger/Ledger';
|
||||
import { Knex } from 'knex';
|
||||
import { TenantModelProxy } from '@/modules/System/models/TenantBaseModel';
|
||||
import { Account } from '@/modules/Accounts/models/Account.model';
|
||||
import { ILedgerEntry } from '@/modules/Ledger/types/Ledger.types';
|
||||
import { AccountNormal } from '@/interfaces/Account';
|
||||
import { AccountRepository } from '@/modules/Accounts/repositories/Account.repository';
|
||||
|
||||
// @Service()
|
||||
// export default class RefundVendorCreditGLEntries {
|
||||
// @Inject()
|
||||
// private journalService: JournalPosterService;
|
||||
@Injectable()
|
||||
export class RefundVendorCreditGLEntries {
|
||||
constructor(
|
||||
private readonly ledgerStorage: LedgerStorageService,
|
||||
private readonly accountRepository: AccountRepository,
|
||||
|
||||
// @Inject()
|
||||
// private ledgerRepository: LedgerRepository;
|
||||
@Inject(Account.name)
|
||||
private readonly accountModel: TenantModelProxy<typeof Account>,
|
||||
|
||||
// @Inject()
|
||||
// private tenancy: HasTenancyService;
|
||||
@Inject(RefundVendorCredit.name)
|
||||
private readonly refundVendorCreditModel: TenantModelProxy<
|
||||
typeof RefundVendorCredit
|
||||
>,
|
||||
) { }
|
||||
|
||||
// /**
|
||||
// * Retrieves the refund credit common GL entry.
|
||||
// * @param {IRefundVendorCredit} refundCredit
|
||||
// */
|
||||
// private getRefundCreditGLCommonEntry = (
|
||||
// refundCredit: IRefundVendorCredit
|
||||
// ) => {
|
||||
// return {
|
||||
// exchangeRate: refundCredit.exchangeRate,
|
||||
// currencyCode: refundCredit.currencyCode,
|
||||
/**
|
||||
* Retrieves the refund vendor credit common GL entry.
|
||||
* @param {RefundVendorCredit} refundVendorCredit
|
||||
* @returns
|
||||
*/
|
||||
private getRefundVendorCreditCommonGLEntry = (
|
||||
refundVendorCredit: RefundVendorCredit,
|
||||
) => {
|
||||
const model = refundVendorCredit as any;
|
||||
return {
|
||||
currencyCode: refundVendorCredit.currencyCode,
|
||||
exchangeRate: refundVendorCredit.exchangeRate,
|
||||
|
||||
// transactionType: 'RefundVendorCredit',
|
||||
// transactionId: refundCredit.id,
|
||||
transactionType: 'RefundVendorCredit',
|
||||
transactionId: refundVendorCredit.id,
|
||||
date: refundVendorCredit.date,
|
||||
userId: refundVendorCredit.vendorCredit?.userId,
|
||||
|
||||
// date: refundCredit.date,
|
||||
// userId: refundCredit.userId,
|
||||
// referenceNumber: refundCredit.referenceNo,
|
||||
// createdAt: refundCredit.createdAt,
|
||||
// indexGroup: 10,
|
||||
referenceNumber: refundVendorCredit.referenceNo,
|
||||
|
||||
// credit: 0,
|
||||
// debit: 0,
|
||||
createdAt: model.createdAt,
|
||||
indexGroup: 10,
|
||||
|
||||
// note: refundCredit.description,
|
||||
// branchId: refundCredit.branchId,
|
||||
// };
|
||||
// };
|
||||
credit: 0,
|
||||
debit: 0,
|
||||
|
||||
// /**
|
||||
// * Retrieves the refund credit payable GL entry.
|
||||
// * @param {IRefundVendorCredit} refundCredit
|
||||
// * @param {number} APAccountId
|
||||
// * @returns {ILedgerEntry}
|
||||
// */
|
||||
// private getRefundCreditGLPayableEntry = (
|
||||
// refundCredit: IRefundVendorCredit,
|
||||
// APAccountId: number
|
||||
// ): ILedgerEntry => {
|
||||
// const commonEntry = this.getRefundCreditGLCommonEntry(refundCredit);
|
||||
note: refundVendorCredit.description,
|
||||
branchId: refundVendorCredit.branchId,
|
||||
};
|
||||
};
|
||||
|
||||
// return {
|
||||
// ...commonEntry,
|
||||
// credit: refundCredit.amount,
|
||||
// accountId: APAccountId,
|
||||
// contactId: refundCredit.vendorCredit.vendorId,
|
||||
// index: 1,
|
||||
// accountNormal: AccountNormal.CREDIT,
|
||||
// };
|
||||
// };
|
||||
/**
|
||||
* Retrieves the refund vendor credit payable GL entry.
|
||||
* @param {RefundVendorCredit} refundVendorCredit
|
||||
* @param {number} APAccountId
|
||||
* @returns {ILedgerEntry}
|
||||
*/
|
||||
private getRefundVendorCreditGLPayableEntry = (
|
||||
refundVendorCredit: RefundVendorCredit,
|
||||
APAccountId: number,
|
||||
): ILedgerEntry => {
|
||||
const commonEntry = this.getRefundVendorCreditCommonGLEntry(
|
||||
refundVendorCredit,
|
||||
);
|
||||
|
||||
// /**
|
||||
// * Retrieves the refund credit deposit GL entry.
|
||||
// * @param {IRefundVendorCredit} refundCredit
|
||||
// * @returns {ILedgerEntry}
|
||||
// */
|
||||
// private getRefundCreditGLDepositEntry = (
|
||||
// refundCredit: IRefundVendorCredit
|
||||
// ): ILedgerEntry => {
|
||||
// const commonEntry = this.getRefundCreditGLCommonEntry(refundCredit);
|
||||
return {
|
||||
...commonEntry,
|
||||
credit: refundVendorCredit.amount,
|
||||
accountId: APAccountId,
|
||||
contactId: refundVendorCredit.vendorCredit.vendorId,
|
||||
index: 1,
|
||||
accountNormal: AccountNormal.CREDIT,
|
||||
};
|
||||
};
|
||||
|
||||
// return {
|
||||
// ...commonEntry,
|
||||
// debit: refundCredit.amount,
|
||||
// accountId: refundCredit.depositAccountId,
|
||||
// index: 2,
|
||||
// accountNormal: AccountNormal.DEBIT,
|
||||
// };
|
||||
// };
|
||||
/**
|
||||
* Retrieves the refund vendor credit deposit GL entry.
|
||||
* @param {RefundVendorCredit} refundVendorCredit
|
||||
* @returns {ILedgerEntry}
|
||||
*/
|
||||
private getRefundVendorCreditGLDepositEntry = (
|
||||
refundVendorCredit: RefundVendorCredit,
|
||||
): ILedgerEntry => {
|
||||
const commonEntry = this.getRefundVendorCreditCommonGLEntry(
|
||||
refundVendorCredit,
|
||||
);
|
||||
|
||||
// /**
|
||||
// * Retrieve refund vendor credit GL entries.
|
||||
// * @param {IRefundVendorCredit} refundCredit
|
||||
// * @param {number} APAccountId
|
||||
// * @returns {ILedgerEntry[]}
|
||||
// */
|
||||
// public getRefundCreditGLEntries = (
|
||||
// refundCredit: IRefundVendorCredit,
|
||||
// APAccountId: number
|
||||
// ): ILedgerEntry[] => {
|
||||
// const payableEntry = this.getRefundCreditGLPayableEntry(
|
||||
// refundCredit,
|
||||
// APAccountId
|
||||
// );
|
||||
// const depositEntry = this.getRefundCreditGLDepositEntry(refundCredit);
|
||||
return {
|
||||
...commonEntry,
|
||||
debit: refundVendorCredit.amount,
|
||||
accountId: refundVendorCredit.depositAccountId,
|
||||
index: 2,
|
||||
accountNormal: AccountNormal.DEBIT,
|
||||
};
|
||||
};
|
||||
|
||||
// return [payableEntry, depositEntry];
|
||||
// };
|
||||
/**
|
||||
* Retrieve refund vendor credit GL entries.
|
||||
* @param {RefundVendorCredit} refundVendorCredit
|
||||
* @param {number} APAccountId
|
||||
* @returns {ILedgerEntry[]}
|
||||
*/
|
||||
public getRefundVendorCreditGLEntries(
|
||||
refundVendorCredit: RefundVendorCredit,
|
||||
APAccountId: number,
|
||||
): ILedgerEntry[] {
|
||||
const payableEntry = this.getRefundVendorCreditGLPayableEntry(
|
||||
refundVendorCredit,
|
||||
APAccountId,
|
||||
);
|
||||
const depositEntry = this.getRefundVendorCreditGLDepositEntry(
|
||||
refundVendorCredit,
|
||||
);
|
||||
|
||||
// /**
|
||||
// * Saves refund credit note GL entries.
|
||||
// * @param {number} tenantId
|
||||
// * @param {IRefundVendorCredit} refundCredit -
|
||||
// * @param {Knex.Transaction} trx -
|
||||
// * @return {Promise<void>}
|
||||
// */
|
||||
// public saveRefundCreditGLEntries = async (
|
||||
// tenantId: number,
|
||||
// refundCreditId: number,
|
||||
// trx?: Knex.Transaction
|
||||
// ): Promise<void> => {
|
||||
// const { Account, RefundVendorCredit } = this.tenancy.models(tenantId);
|
||||
return [payableEntry, depositEntry];
|
||||
}
|
||||
|
||||
// // Retireve refund with associated vendor credit entity.
|
||||
// const refundCredit = await RefundVendorCredit.query()
|
||||
// .findById(refundCreditId)
|
||||
// .withGraphFetched('vendorCredit');
|
||||
/**
|
||||
* Creates refund vendor credit GL entries.
|
||||
* @param {number} refundVendorCreditId
|
||||
* @param {Knex.Transaction} trx
|
||||
*/
|
||||
public createRefundVendorCreditGLEntries = async (
|
||||
refundVendorCreditId: number,
|
||||
trx?: Knex.Transaction,
|
||||
) => {
|
||||
// Retrieve the refund with associated vendor credit.
|
||||
const refundVendorCredit = await this.refundVendorCreditModel()
|
||||
.query(trx)
|
||||
.findById(refundVendorCreditId)
|
||||
.withGraphFetched('vendorCredit');
|
||||
|
||||
// const payableAccount = await Account.query().findOne(
|
||||
// 'slug',
|
||||
// 'accounts-payable'
|
||||
// );
|
||||
// // Generates the GL entries of the given refund credit.
|
||||
// const entries = this.getRefundCreditGLEntries(
|
||||
// refundCredit,
|
||||
// payableAccount.id
|
||||
// );
|
||||
// // Saves the ledegr to the storage.
|
||||
// await this.ledgerRepository.saveLedgerEntries(tenantId, entries, trx);
|
||||
// };
|
||||
// Retrieve the payable account (A/P) account based on the given currency.
|
||||
const APAccount = await this.accountRepository.findOrCreateAccountsPayable(
|
||||
refundVendorCredit.currencyCode,
|
||||
{},
|
||||
trx,
|
||||
);
|
||||
|
||||
// /**
|
||||
// * Reverts refund credit note GL entries.
|
||||
// * @param {number} tenantId
|
||||
// * @param {number} refundCreditId
|
||||
// * @param {Knex.Transaction} trx
|
||||
// * @return {Promise<void>}
|
||||
// */
|
||||
// public revertRefundCreditGLEntries = async (
|
||||
// tenantId: number,
|
||||
// refundCreditId: number,
|
||||
// trx?: Knex.Transaction
|
||||
// ) => {
|
||||
// await this.journalService.revertJournalTransactions(
|
||||
// tenantId,
|
||||
// refundCreditId,
|
||||
// 'RefundVendorCredit',
|
||||
// trx
|
||||
// );
|
||||
// };
|
||||
// }
|
||||
// Retrieve refund vendor credit GL entries.
|
||||
const refundGLEntries = this.getRefundVendorCreditGLEntries(
|
||||
refundVendorCredit,
|
||||
APAccount.id,
|
||||
);
|
||||
const ledger = new Ledger(refundGLEntries);
|
||||
|
||||
// Saves refund ledger entries.
|
||||
await this.ledgerStorage.commit(ledger, trx);
|
||||
};
|
||||
|
||||
/**
|
||||
* Reverts refund vendor credit GL entries.
|
||||
* @param {number} refundVendorCreditId
|
||||
* @param {Knex.Transaction} trx
|
||||
*/
|
||||
public revertRefundVendorCreditGLEntries = async (
|
||||
refundVendorCreditId: number,
|
||||
trx?: Knex.Transaction,
|
||||
) => {
|
||||
await this.ledgerStorage.deleteByReference(
|
||||
refundVendorCreditId,
|
||||
'RefundVendorCredit',
|
||||
trx,
|
||||
);
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
import { events } from '@/common/events/events';
|
||||
import { RefundVendorCreditGLEntries } from '../commands/RefundVendorCreditGLEntries';
|
||||
import {
|
||||
IRefundVendorCreditCreatedPayload,
|
||||
IRefundVendorCreditDeletedPayload,
|
||||
} from '../types/VendorCreditRefund.types';
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { OnEvent } from '@nestjs/event-emitter';
|
||||
|
||||
@Injectable()
|
||||
export class RefundVendorCreditGLEntriesSubscriber {
|
||||
constructor(
|
||||
private readonly refundVendorCreditGLEntries: RefundVendorCreditGLEntries,
|
||||
) { }
|
||||
|
||||
/**
|
||||
* Writes refund vendor credit GL entries once the transaction created.
|
||||
* @param {IRefundVendorCreditCreatedPayload} payload -
|
||||
*/
|
||||
@OnEvent(events.vendorCredit.onRefundCreated)
|
||||
async writeRefundVendorCreditGLEntriesOnceCreated({
|
||||
trx,
|
||||
refundVendorCredit,
|
||||
vendorCredit,
|
||||
}: IRefundVendorCreditCreatedPayload) {
|
||||
await this.refundVendorCreditGLEntries.createRefundVendorCreditGLEntries(
|
||||
refundVendorCredit.id,
|
||||
trx,
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Reverts refund vendor credit GL entries once the transaction deleted.
|
||||
* @param {IRefundVendorCreditDeletedPayload} payload -
|
||||
*/
|
||||
@OnEvent(events.vendorCredit.onRefundDeleted)
|
||||
async revertRefundVendorCreditGLEntriesOnceDeleted({
|
||||
trx,
|
||||
refundCreditId,
|
||||
oldRefundCredit,
|
||||
}: IRefundVendorCreditDeletedPayload) {
|
||||
await this.refundVendorCreditGLEntries.revertRefundVendorCreditGLEntries(
|
||||
refundCreditId,
|
||||
trx,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ import { Intent, Alert } from '@blueprintjs/core';
|
||||
import { queryCache } from 'react-query';
|
||||
import { AppToaster } from '@/components';
|
||||
|
||||
import { withAccountsActions } from '@/containers/Accounts/withAccountsTableActions';
|
||||
// import { withAccountsActions } from '@/containers/Accounts/withAccountsTableActions';
|
||||
import { withAlertStoreConnect } from '@/containers/Alert/withAlertStoreConnect';
|
||||
import { withAlertActions } from '@/containers/Alert/withAlertActions';
|
||||
|
||||
@@ -22,7 +22,7 @@ function AccountBulkInactivateAlert({
|
||||
|
||||
closeAlert,
|
||||
}) {
|
||||
|
||||
|
||||
const [isLoading, setLoading] = useState(false);
|
||||
const selectedRowsCount = 0;
|
||||
|
||||
@@ -41,7 +41,7 @@ function AccountBulkInactivateAlert({
|
||||
});
|
||||
queryCache.invalidateQueries('accounts-table');
|
||||
})
|
||||
.catch((errors) => {})
|
||||
.catch((errors) => { })
|
||||
.finally(() => {
|
||||
setLoading(false);
|
||||
closeAlert(name);
|
||||
@@ -68,5 +68,5 @@ function AccountBulkInactivateAlert({
|
||||
export default compose(
|
||||
withAlertStoreConnect(),
|
||||
withAlertActions,
|
||||
withAccountsActions,
|
||||
// withAccountsActions,
|
||||
)(AccountBulkInactivateAlert);
|
||||
|
||||
@@ -70,16 +70,16 @@ function VendorCreditNoteForm({
|
||||
() => ({
|
||||
...(!isEmpty(vendorCredit)
|
||||
? {
|
||||
...transformToEditForm(vendorCredit),
|
||||
}
|
||||
...transformToEditForm(vendorCredit),
|
||||
}
|
||||
: {
|
||||
...defaultVendorsCreditNote,
|
||||
...(vendorcreditAutoIncrement && {
|
||||
vendor_credit_number: vendorCreditNumber,
|
||||
}),
|
||||
currency_code: base_currency,
|
||||
...newVendorCredit,
|
||||
...defaultVendorsCreditNote,
|
||||
...(vendorcreditAutoIncrement && {
|
||||
vendor_credit_number: vendorCreditNumber,
|
||||
}),
|
||||
currency_code: base_currency,
|
||||
...newVendorCredit,
|
||||
}),
|
||||
}),
|
||||
[vendorCredit, base_currency],
|
||||
);
|
||||
|
||||
@@ -24,6 +24,7 @@ import {
|
||||
VendorsSelect,
|
||||
Stack,
|
||||
FDateInput,
|
||||
FInputGroup,
|
||||
} from '@/components';
|
||||
import {
|
||||
vendorsFieldShouldUpdate,
|
||||
@@ -74,6 +75,7 @@ function VendorCreditNoteFormHeaderFields({
|
||||
}) {
|
||||
const theme = useTheme();
|
||||
const fieldsClassName = getFieldsStyle(theme);
|
||||
const { values } = useFormikContext();
|
||||
|
||||
// Handle vendor credit number changing.
|
||||
const handleVendorCreditNumberChange = () => {
|
||||
@@ -81,10 +83,11 @@ function VendorCreditNoteFormHeaderFields({
|
||||
};
|
||||
|
||||
// Handle vendor credit no. field blur.
|
||||
const handleVendorCreditNoBlur = (form, field) => (event) => {
|
||||
const handleVendorCreditNoBlur = (event) => {
|
||||
const newValue = event.target.value;
|
||||
const oldValue = values.vendor_credit_number;
|
||||
|
||||
if (field.value !== newValue && vendorcreditAutoIncrement) {
|
||||
if (oldValue !== newValue && vendorcreditAutoIncrement) {
|
||||
openDialog('vendor-credit-form', {
|
||||
initialFormValues: {
|
||||
manualTransactionNo: newValue,
|
||||
@@ -109,7 +112,6 @@ function VendorCreditNoteFormHeaderFields({
|
||||
name={'exchange_rate'}
|
||||
formGroupProps={{ label: ' ', inline: true }}
|
||||
/>
|
||||
|
||||
{/* ------- Vendor Credit date ------- */}
|
||||
<FFormGroup
|
||||
name={'vendor_credit_date'}
|
||||
@@ -130,7 +132,6 @@ function VendorCreditNoteFormHeaderFields({
|
||||
</FFormGroup>
|
||||
|
||||
{/* ----------- Vendor Credit No # ----------- */}
|
||||
|
||||
<FFormGroup
|
||||
name={'vendor_credit_number'}
|
||||
label={<T id={'credit_note.label_credit_note'} />}
|
||||
@@ -163,7 +164,7 @@ function VendorCreditNoteFormHeaderFields({
|
||||
</FFormGroup>
|
||||
|
||||
{/* ----------- Reference ----------- */}
|
||||
<FFormGroup label={<T id={'reference_no'} />} inline={true} fastField>
|
||||
<FFormGroup name={'reference_no'} label={<T id={'reference_no'} />} inline={true} fastField>
|
||||
<FInputGroup name={'reference_no'} minimal={true} fastField />
|
||||
</FFormGroup>
|
||||
</Stack>
|
||||
|
||||
@@ -40,10 +40,10 @@ import { compose } from '@/utils';
|
||||
* Payment made actions bar.
|
||||
*/
|
||||
function PaymentMadeActionsBar({
|
||||
// #withPaymentMadesActions
|
||||
// #withPaymentMadeActions
|
||||
setPaymentMadesTableState,
|
||||
|
||||
// #withPaymentMades
|
||||
// #withPaymentMade
|
||||
paymentMadesFilterConditions,
|
||||
|
||||
// #withSettings
|
||||
@@ -133,7 +133,7 @@ function PaymentMadeActionsBar({
|
||||
icon={<Icon icon={'trash-16'} iconSize={16} />}
|
||||
text={<T id={'delete'} />}
|
||||
intent={Intent.DANGER}
|
||||
// onClick={handleBulkDelete}
|
||||
// onClick={handleBulkDelete}
|
||||
/>
|
||||
</If>
|
||||
<Button
|
||||
|
||||
@@ -8,7 +8,7 @@ import { PaymentMadesListProvider } from './PaymentMadesListProvider';
|
||||
import PaymentMadeActionsBar from './PaymentMadeActionsBar';
|
||||
import PaymentMadesTable from './PaymentMadesTable';
|
||||
|
||||
import { withPaymentMades } from './withPaymentMade';
|
||||
import { withPaymentMade } from './withPaymentMade';
|
||||
import { withPaymentMadeActions } from './withPaymentMadeActions';
|
||||
|
||||
import { compose, transformTableStateToQuery } from '@/utils';
|
||||
@@ -17,7 +17,7 @@ import { compose, transformTableStateToQuery } from '@/utils';
|
||||
* Payment mades list.
|
||||
*/
|
||||
function PaymentMadeList({
|
||||
// #withPaymentMades
|
||||
// #withPaymentMade
|
||||
paymentMadesTableState,
|
||||
paymentsTableStateChanged,
|
||||
|
||||
@@ -47,7 +47,7 @@ function PaymentMadeList({
|
||||
}
|
||||
|
||||
export default compose(
|
||||
withPaymentMades(({ paymentMadesTableState, paymentsTableStateChanged }) => ({
|
||||
withPaymentMade(({ paymentMadesTableState, paymentsTableStateChanged }) => ({
|
||||
paymentMadesTableState,
|
||||
paymentsTableStateChanged,
|
||||
})),
|
||||
|
||||
@@ -15,7 +15,7 @@ import { withPaymentMadeActions } from './withPaymentMadeActions';
|
||||
* Payment made views tabs.
|
||||
*/
|
||||
function PaymentMadeViewTabs({
|
||||
// #withPaymentMadesActions
|
||||
// #withPaymentMadeActions
|
||||
setPaymentMadesTableState,
|
||||
|
||||
// #withPaymentMade
|
||||
|
||||
@@ -54,6 +54,11 @@ export default defineConfig(({ mode }) => {
|
||||
target: env.VITE_API_PROXY_TARGET || 'http://localhost:3000',
|
||||
changeOrigin: true,
|
||||
},
|
||||
'/socket': {
|
||||
target: env.VITE_API_PROXY_TARGET || 'http://localhost:3000',
|
||||
changeOrigin: true,
|
||||
ws: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
build: {
|
||||
|
||||
Reference in New Issue
Block a user