diff --git a/server/src/api/controllers/Sales/SalesInvoices.ts b/server/src/api/controllers/Sales/SalesInvoices.ts index df4fb1fa0..0f5e1dcf0 100644 --- a/server/src/api/controllers/Sales/SalesInvoices.ts +++ b/server/src/api/controllers/Sales/SalesInvoices.ts @@ -202,7 +202,7 @@ export default class SaleInvoicesController extends BaseController{ const { tenantId } = req; try { - const saleInvoice = await this.saleInvoiceService.getSaleInvoiceWithEntries( + const saleInvoice = await this.saleInvoiceService.getSaleInvoice( tenantId, saleInvoiceId, ); return res.status(200).send({ sale_invoice: saleInvoice }); @@ -255,7 +255,7 @@ export default class SaleInvoicesController extends BaseController{ const filter: ISalesInvoicesFilter = { filterRoles: [], sortOrder: 'asc', - columnSortBy: 'name', + columnSortBy: 'created_at', ...this.matchedQueryData(req), }; if (filter.stringifiedFilterRoles) { diff --git a/server/src/models/SaleInvoice.js b/server/src/models/SaleInvoice.js index 3b1262445..b8ab76fdc 100644 --- a/server/src/models/SaleInvoice.js +++ b/server/src/models/SaleInvoice.js @@ -85,7 +85,7 @@ export default class SaleInvoice extends TenantModel { to: 'contacts.id', }, filter(query) { - query.where('contact_type', 'Customer'); + query.where('contact_service', 'Customer'); } }, diff --git a/server/src/services/Sales/SalesInvoices.ts b/server/src/services/Sales/SalesInvoices.ts index 8af2f5ef4..7a7f3dba3 100644 --- a/server/src/services/Sales/SalesInvoices.ts +++ b/server/src/services/Sales/SalesInvoices.ts @@ -301,13 +301,18 @@ export default class SaleInvoicesService extends SalesInvoicesCost { * @async * @param {Number} saleInvoiceId */ - public async getSaleInvoiceWithEntries(tenantId: number, saleInvoiceId: number) { + public async getSaleInvoice(tenantId: number, saleInvoiceId: number): Promise { const { SaleInvoice } = this.tenancy.models(tenantId); - return SaleInvoice.query() - .where('id', saleInvoiceId) + + const saleInvoice = await SaleInvoice.query() + .findById(saleInvoiceId) .withGraphFetched('entries') - .withGraphFetched('customer') - .first(); + .withGraphFetched('customer'); + + if (!saleInvoice) { + throw new ServiceError(ERRORS.SALE_INVOICE_NOT_FOUND); + } + return saleInvoice; } /**