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

packages/server/src/interfaces/PaymentReceive.ts

@@ -74,6 +74,7 @@ export interface IPaymentReceivedEntryDTO {
 
 export interface IPaymentsReceivedFilter extends IDynamicListFilterDTO {
   stringifiedFilterRoles?: string;
+  filterQuery?: (trx: Knex.Transaction) => void;
 }
 
 export interface IPaymentReceivePageEntry {

packages/server/src/models/BillPayment.Settings.ts

@@ -5,6 +5,8 @@ export default {
     sortField: 'bill_date',
   },
   exportable: true,
+  exportFlattenOn: 'entries',
+
   importable: true,
   importAggregator: 'group',
   importAggregateOn: 'entries',
@@ -77,7 +79,7 @@ export default {
     paymentDate: {
       name: 'bill_payment.field.payment_date',
       type: 'date',
-      accessor: 'formattedPaymentDate'
+      accessor: 'formattedPaymentDate',
     },
     paymentNumber: {
       name: 'bill_payment.field.payment_number',
@@ -111,6 +113,34 @@ export default {
       name: 'bill_payment.field.reference',
       type: 'text',
     },
+    entries: {
+      name: 'Entries',
+      accessor: 'entries',
+      type: 'collection',
+      collectionOf: 'object',
+      columns: {
+        date: {
+          name: 'Bill date',
+          accessor: 'bill.formattedBillDate',
+        },
+        billNo: {
+          name: 'Bill No.',
+          accessor: 'bill.billNo',
+        },
+        billRefNo: {
+          name: 'Bill Reference No.',
+          accessor: 'bill.referenceNo',
+        },
+        billAmount: {
+          name: 'Bill Amount',
+          accessor: 'bill.totalFormatted',
+        },
+        paidAmount: {
+          name: 'Paid Amount',
+          accessor: 'paymentAmountFormatted',
+        },
+      },
+    },
   },
   fields2: {
     vendorId: {

packages/server/src/models/PaymentReceive.Settings.ts

@@ -1,6 +1,9 @@
 export default {
   importable: true,
+
   exportable: true,
+  exportFlattenOn: 'entries',
+
   importAggregator: 'group',
   importAggregateOn: 'entries',
   importAggregateBy: 'paymentReceiveNo',
@@ -72,7 +75,7 @@ export default {
     amount: {
       name: 'payment_receive.field.amount',
       type: 'number',
-      accessor: 'formattedAmount'
+      accessor: 'formattedAmount',
     },
     referenceNo: {
       name: 'payment_receive.field.reference_no',
@@ -92,6 +95,34 @@ export default {
       type: 'text',
       printable: false,
     },
+    entries: {
+      name: 'Entries',
+      accessor: 'entries',
+      type: 'collection',
+      collectionOf: 'object',
+      columns: {
+        date: {
+          name: 'Invoice date',
+          accessor: 'invoice.invoiceDateFormatted',
+        },
+        invoiceNo: {
+          name: 'Invoice No.',
+          accessor: 'invoice.invoiceNo',
+        },
+        invoiceRefNo: {
+          name: 'Invoice Reference No.',
+          accessor: 'invoice.referenceNo',
+        },
+        invoiceAmount: {
+          name: 'Invoice Amount',
+          accessor: 'invoice.totalFormatted',
+        },
+        paidAmount: {
+          name: 'Paid Amount',
+          accessor: 'paymentAmountFormatted',
+        },
+      },
+    },
     created_at: {
       name: 'payment_receive.field.created_at',
       type: 'date',

packages/server/src/models/SaleEstimate.Settings.ts

@@ -13,7 +13,7 @@ export default {
   importAggregateBy: 'estimateNumber',
 
   print: {
-    pageTitle: 'Sale Estimates'
+    pageTitle: 'Sale Estimates',
   },
 
   fields: {
@@ -142,6 +142,7 @@ export default {
     delivered: {
       name: 'Delivered',
       type: 'boolean',
+      accessor: 'isDelivered',
       exportable: true,
       printable: false,
     },

packages/server/src/models/SaleInvoice.Settings.ts

@@ -155,6 +155,7 @@ export default {
       name: 'invoice.field.delivered',
       type: 'boolean',
       printable: false,
+      accessor: 'isDelivered',
     },
     entries: {
       name: 'Entries',

packages/server/src/services/Purchases/BillPayments/BillPaymentExportable.ts

@@ -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

packages/server/src/services/Purchases/BillPayments/GetBillPayments.ts

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

packages/server/src/services/Sales/PaymentReceived/GetPaymentsReceived.ts

@@ -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);
 

packages/server/src/services/Sales/PaymentReceived/PaymentsReceivedExportable.ts

@@ -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