From 5e87581f4e7832e8da3d7c6e416bcba3d6496b52 Mon Sep 17 00:00:00 2001 From: Ahmed Bouhuolia Date: Mon, 15 Apr 2024 22:48:54 +0200 Subject: [PATCH] hotfix: creating a vendor --- .../server/src/api/controllers/Contacts/Vendors.ts | 4 +--- .../src/api/controllers/Purchases/VendorCredit.ts | 3 +-- .../src/api/controllers/Sales/CreditNotes.ts | 3 +-- packages/server/src/models/Contact.ts | 14 -------------- .../Contacts/Customers/CustomersApplication.ts | 5 +---- .../Contacts/Vendors/VendorsApplication.ts | 9 +++------ .../src/services/CreditNotes/CreateCreditNote.ts | 1 - .../Purchases/VendorCredits/CreateVendorCredit.ts | 1 + 8 files changed, 8 insertions(+), 32 deletions(-) diff --git a/packages/server/src/api/controllers/Contacts/Vendors.ts b/packages/server/src/api/controllers/Contacts/Vendors.ts index 679719a0f..8ed06d703 100644 --- a/packages/server/src/api/controllers/Contacts/Vendors.ts +++ b/packages/server/src/api/controllers/Contacts/Vendors.ts @@ -144,10 +144,8 @@ export default class VendorsController extends ContactsController { try { const vendor = await this.vendorsApplication.createVendor( tenantId, - contactDTO, - user + contactDTO ); - return res.status(200).send({ id: vendor.id, message: 'The vendor has been created successfully.', diff --git a/packages/server/src/api/controllers/Purchases/VendorCredit.ts b/packages/server/src/api/controllers/Purchases/VendorCredit.ts index 79ae6741b..02f82b2d1 100644 --- a/packages/server/src/api/controllers/Purchases/VendorCredit.ts +++ b/packages/server/src/api/controllers/Purchases/VendorCredit.ts @@ -297,8 +297,7 @@ export default class VendorCreditController extends BaseController { try { const vendorCredit = await this.createVendorCreditService.newVendorCredit( tenantId, - vendorCreditCreateDTO, - user + vendorCreditCreateDTO ); return res.status(200).send({ diff --git a/packages/server/src/api/controllers/Sales/CreditNotes.ts b/packages/server/src/api/controllers/Sales/CreditNotes.ts index 4644b55c5..20b002e33 100644 --- a/packages/server/src/api/controllers/Sales/CreditNotes.ts +++ b/packages/server/src/api/controllers/Sales/CreditNotes.ts @@ -338,8 +338,7 @@ export default class PaymentReceivesController extends BaseController { try { const creditNote = await this.createCreditNoteService.newCreditNote( tenantId, - creditNoteDTO, - user + creditNoteDTO ); return res.status(200).send({ id: creditNote.id, diff --git a/packages/server/src/models/Contact.ts b/packages/server/src/models/Contact.ts index 69661f639..04b17727c 100644 --- a/packages/server/src/models/Contact.ts +++ b/packages/server/src/models/Contact.ts @@ -187,18 +187,4 @@ export default class Contact extends TenantModel { }, }; } - - static get fields() { - return { - contact_service: { - column: 'contact_service', - }, - display_name: { - column: 'display_name', - }, - created_at: { - column: 'created_at', - }, - }; - } } diff --git a/packages/server/src/services/Contacts/Customers/CustomersApplication.ts b/packages/server/src/services/Contacts/Customers/CustomersApplication.ts index 5edd4dccf..3cf222c02 100644 --- a/packages/server/src/services/Contacts/Customers/CustomersApplication.ts +++ b/packages/server/src/services/Contacts/Customers/CustomersApplication.ts @@ -50,10 +50,7 @@ export class CustomersApplication { * @param {ISystemUser} authorizedUser * @returns {Promise} */ - public createCustomer = ( - tenantId: number, - customerDTO: ICustomerNewDTO, - ) => { + public createCustomer = (tenantId: number, customerDTO: ICustomerNewDTO) => { return this.createCustomerService.createCustomer(tenantId, customerDTO); }; diff --git a/packages/server/src/services/Contacts/Vendors/VendorsApplication.ts b/packages/server/src/services/Contacts/Vendors/VendorsApplication.ts index e4101acab..45dc64384 100644 --- a/packages/server/src/services/Contacts/Vendors/VendorsApplication.ts +++ b/packages/server/src/services/Contacts/Vendors/VendorsApplication.ts @@ -1,4 +1,5 @@ import { Inject, Service } from 'typedi'; +import { Knex } from 'knex'; import { ISystemUser, IVendorEditDTO, @@ -42,13 +43,9 @@ export class VendorsApplication { public createVendor = ( tenantId: number, vendorDTO: IVendorNewDTO, - authorizedUser: ISystemUser + trx?: Knex.Transaction ) => { - return this.createVendorService.createVendor( - tenantId, - vendorDTO, - authorizedUser - ); + return this.createVendorService.createVendor(tenantId, vendorDTO, trx); }; /** diff --git a/packages/server/src/services/CreditNotes/CreateCreditNote.ts b/packages/server/src/services/CreditNotes/CreateCreditNote.ts index 2f4071c27..c47587fbe 100644 --- a/packages/server/src/services/CreditNotes/CreateCreditNote.ts +++ b/packages/server/src/services/CreditNotes/CreateCreditNote.ts @@ -4,7 +4,6 @@ import { ICreditNoteCreatedPayload, ICreditNoteCreatingPayload, ICreditNoteNewDTO, - ISystemUser, } from '@/interfaces'; import HasTenancyService from '@/services/Tenancy/TenancyService'; import ItemsEntriesService from '@/services/Items/ItemsEntriesService'; diff --git a/packages/server/src/services/Purchases/VendorCredits/CreateVendorCredit.ts b/packages/server/src/services/Purchases/VendorCredits/CreateVendorCredit.ts index 32bf59386..f66c6d834 100644 --- a/packages/server/src/services/Purchases/VendorCredits/CreateVendorCredit.ts +++ b/packages/server/src/services/Purchases/VendorCredits/CreateVendorCredit.ts @@ -30,6 +30,7 @@ export default class CreateVendorCredit extends BaseVendorCredit { * Creates a new vendor credit. * @param {number} tenantId - * @param {IVendorCreditCreateDTO} vendorCreditCreateDTO - + * @param {Knex.Transaction} trx - */ public newVendorCredit = async ( tenantId: number,