fix: Add the missing columns to the payment received and made models

This commit is contained in:
Ahmed Bouhuolia
2024-09-01 15:00:51 +02:00
parent 7c07d6b5ff
commit 7f5ffb8da1
9 changed files with 79 additions and 3 deletions

View File

@@ -14,12 +14,16 @@ export class BillPaymentExportable extends Exportable {
* @returns
*/
public exportable(tenantId: number, query: any) {
const filterQuery = (builder) => {
builder.withGraphFetched('entries.bill');
};
const parsedQuery = {
sortOrder: 'desc',
columnSortBy: 'created_at',
...query,
page: 1,
pageSize: EXPORT_SIZE_LIMIT,
filterQuery
} as any;
return this.billPaymentsApplication

View File

@@ -52,6 +52,7 @@ export class GetBillPayments {
builder.withGraphFetched('paymentAccount');
dynamicList.buildQuery()(builder);
filter?.filterQuery && filter?.filterQuery(builder);
})
.pagination(filter.page - 1, filter.pageSize);

View File

@@ -50,7 +50,9 @@ export class GetPaymentReceives {
.onBuild((builder) => {
builder.withGraphFetched('customer');
builder.withGraphFetched('depositAccount');
dynamicList.buildQuery()(builder);
filterDTO?.filterQuery && filterDTO.filterQuery(builder);
})
.pagination(filter.page - 1, filter.pageSize);

View File

@@ -16,6 +16,10 @@ export class PaymentsReceivedExportable extends Exportable {
* @returns
*/
public exportable(tenantId: number, query: IPaymentsReceivedFilter) {
const filterQuery = (builder) => {
builder.withGraphFetched('entries.invoice');
};
const parsedQuery = {
sortOrder: 'desc',
columnSortBy: 'created_at',
@@ -24,6 +28,7 @@ export class PaymentsReceivedExportable extends Exportable {
structure: IAccountsStructureType.Flat,
page: 1,
pageSize: EXPORT_SIZE_LIMIT,
filterQuery,
} as IPaymentsReceivedFilter;
return this.paymentReceivedApp