diff --git a/server/src/api/controllers/ManualJournals.ts b/server/src/api/controllers/ManualJournals.ts index 879390143..266bddcaf 100644 --- a/server/src/api/controllers/ManualJournals.ts +++ b/server/src/api/controllers/ManualJournals.ts @@ -244,7 +244,9 @@ export default class ManualJournalsController extends BaseController { tenantId, manualJournalId ); - return res.status(200).send({ manualJournal }); + return res.status(200).send({ + manual_journal: manualJournal + }); } catch (error) { next(error); } diff --git a/server/src/api/controllers/Sales/PaymentReceives.ts b/server/src/api/controllers/Sales/PaymentReceives.ts index b3129cc19..9c4070a85 100644 --- a/server/src/api/controllers/Sales/PaymentReceives.ts +++ b/server/src/api/controllers/Sales/PaymentReceives.ts @@ -216,7 +216,7 @@ export default class PaymentReceivesController extends BaseController { * @param {Response} res - */ async getPaymentReceive(req: Request, res: Response, next: NextFunction) { - const { tenantId } = req; + const { tenantId, user } = req; const { id: paymentReceiveId } = req.params; try { diff --git a/server/src/models/ManualJournalEntry.js b/server/src/models/ManualJournalEntry.js index dbc59a6a3..70c08ed49 100644 --- a/server/src/models/ManualJournalEntry.js +++ b/server/src/models/ManualJournalEntry.js @@ -15,4 +15,22 @@ export default class ManualJournalEntry extends TenantModel { get timestamps() { return []; } + + /** + * Relationship mapping. + */ + static get relationMappings() { + const Account = require('models/Account'); + + return { + account: { + relation: Model.BelongsToOneRelation, + modelClass: Account.default, + join: { + from: 'manual_journals_entries.accountId', + to: 'accounts.id', + }, + }, + }; + } } diff --git a/server/src/services/Sales/PaymentsReceives.ts b/server/src/services/Sales/PaymentsReceives.ts index 0cef3b14c..8cab34e9a 100644 --- a/server/src/services/Sales/PaymentsReceives.ts +++ b/server/src/services/Sales/PaymentsReceives.ts @@ -17,6 +17,7 @@ import { IPaymentReceiveEntryDTO, IPaymentReceivesFilter, ISaleInvoice, + ISystemService, ISystemUser, } from 'interfaces'; import AccountsService from 'services/Accounts/AccountsService'; @@ -481,6 +482,7 @@ export default class PaymentReceiveService { public async getPaymentReceive( tenantId: number, paymentReceiveId: number, + authorizedUser: ISystemService ): Promise<{ paymentReceive: IPaymentReceive; receivableInvoices: ISaleInvoice[];