diff --git a/packages/server/src/api/controllers/Sales/PaymentReceives.ts b/packages/server/src/api/controllers/Sales/PaymentReceives.ts index b1a40dd7b..10cbb0c28 100644 --- a/packages/server/src/api/controllers/Sales/PaymentReceives.ts +++ b/packages/server/src/api/controllers/Sales/PaymentReceives.ts @@ -9,9 +9,9 @@ import { } from '@/interfaces'; import BaseController from '@/api/controllers/BaseController'; import asyncMiddleware from '@/api/middleware/asyncMiddleware'; -import PaymentReceivesPages from '@/services/Sales/PaymentReceives/PaymentReceivesPages'; +import PaymentsReceivedPages from '@/services/Sales/PaymentReceived/PaymentsReceivedPages'; +import { PaymentReceivesApplication } from '@/services/Sales/PaymentReceived/PaymentReceivedApplication'; import DynamicListingService from '@/services/DynamicListing/DynamicListService'; -import { PaymentReceivesApplication } from '@/services/Sales/PaymentReceives/PaymentReceivesApplication'; import CheckPolicies from '@/api/middleware/CheckPolicies'; import { ServiceError } from '@/exceptions'; import { ACCEPT_TYPE } from '@/interfaces/Http'; @@ -22,7 +22,7 @@ export default class PaymentReceivesController extends BaseController { private paymentReceiveApplication: PaymentReceivesApplication; @Inject() - private PaymentReceivesPages: PaymentReceivesPages; + private PaymentsReceivedPages: PaymentsReceivedPages; @Inject() private dynamicListService: DynamicListingService; @@ -229,7 +229,7 @@ export default class PaymentReceivesController extends BaseController { try { const storedPaymentReceive = - await this.paymentReceiveApplication.createPaymentReceive( + await this.paymentReceiveApplication.createPaymentReceived( tenantId, paymentReceive, user @@ -376,7 +376,7 @@ export default class PaymentReceivesController extends BaseController { const { customerId } = this.matchedQueryData(req); try { - const entries = await this.PaymentReceivesPages.getNewPageEntries( + const entries = await this.PaymentsReceivedPages.getNewPageEntries( tenantId, customerId ); @@ -404,7 +404,7 @@ export default class PaymentReceivesController extends BaseController { try { const { paymentReceive, entries } = - await this.PaymentReceivesPages.getPaymentReceiveEditPage( + await this.PaymentsReceivedPages.getPaymentReceiveEditPage( tenantId, paymentReceiveId, user diff --git a/packages/server/src/interfaces/PaymentReceive.ts b/packages/server/src/interfaces/PaymentReceive.ts index 68ecb0eb6..e9910b709 100644 --- a/packages/server/src/interfaces/PaymentReceive.ts +++ b/packages/server/src/interfaces/PaymentReceive.ts @@ -8,7 +8,7 @@ import { ILedgerEntry } from './Ledger'; import { ISaleInvoice } from './SaleInvoice'; import { AttachmentLinkDTO } from './Attachments'; -export interface IPaymentReceive { +export interface IPaymentReceived { id?: number; customerId: number; paymentDate: Date; @@ -19,14 +19,14 @@ export interface IPaymentReceive { depositAccountId: number; paymentReceiveNo: string; statement: string; - entries: IPaymentReceiveEntry[]; + entries: IPaymentReceivedEntry[]; userId: number; createdAt: Date; updatedAt: Date; localAmount?: number; branchId?: number; } -export interface IPaymentReceiveCreateDTO { +export interface IPaymentReceivedCreateDTO { customerId: number; paymentDate: Date; amount: number; @@ -35,13 +35,13 @@ export interface IPaymentReceiveCreateDTO { depositAccountId: number; paymentReceiveNo?: string; statement: string; - entries: IPaymentReceiveEntryDTO[]; + entries: IPaymentReceivedEntryDTO[]; branchId?: number; attachments?: AttachmentLinkDTO[]; } -export interface IPaymentReceiveEditDTO { +export interface IPaymentReceivedEditDTO { customerId: number; paymentDate: Date; amount: number; @@ -50,12 +50,12 @@ export interface IPaymentReceiveEditDTO { depositAccountId: number; paymentReceiveNo?: string; statement: string; - entries: IPaymentReceiveEntryDTO[]; + entries: IPaymentReceivedEntryDTO[]; branchId?: number; attachments?: AttachmentLinkDTO[]; } -export interface IPaymentReceiveEntry { +export interface IPaymentReceivedEntry { id?: number; paymentReceiveId: number; invoiceId: number; @@ -64,7 +64,7 @@ export interface IPaymentReceiveEntry { invoice?: ISaleInvoice; } -export interface IPaymentReceiveEntryDTO { +export interface IPaymentReceivedEntryDTO { id?: number; index: number; paymentReceiveId: number; @@ -72,7 +72,7 @@ export interface IPaymentReceiveEntryDTO { paymentAmount: number; } -export interface IPaymentReceivesFilter extends IDynamicListFilterDTO { +export interface IPaymentsReceivedFilter extends IDynamicListFilterDTO { stringifiedFilterRoles?: string; } @@ -88,65 +88,65 @@ export interface IPaymentReceivePageEntry { date: Date | string; } -export interface IPaymentReceiveEditPage { - paymentReceive: IPaymentReceive; +export interface IPaymentReceivedEditPage { + paymentReceive: IPaymentReceived; entries: IPaymentReceivePageEntry[]; } -export interface IPaymentsReceiveService { +export interface IPaymentsReceivedService { validateCustomerHasNoPayments( tenantId: number, customerId: number ): Promise; } -export interface IPaymentReceiveSmsDetails { +export interface IPaymentReceivedSmsDetails { customerName: string; customerPhoneNumber: string; smsMessage: string; } -export interface IPaymentReceiveCreatingPayload { +export interface IPaymentReceivedCreatingPayload { tenantId: number; - paymentReceiveDTO: IPaymentReceiveCreateDTO; + paymentReceiveDTO: IPaymentReceivedCreateDTO; trx: Knex.Transaction; } -export interface IPaymentReceiveCreatedPayload { +export interface IPaymentReceivedCreatedPayload { tenantId: number; - paymentReceive: IPaymentReceive; + paymentReceive: IPaymentReceived; paymentReceiveId: number; authorizedUser: ISystemUser; - paymentReceiveDTO: IPaymentReceiveCreateDTO; + paymentReceiveDTO: IPaymentReceivedCreateDTO; trx: Knex.Transaction; } -export interface IPaymentReceiveEditedPayload { +export interface IPaymentReceivedEditedPayload { tenantId: number; paymentReceiveId: number; - paymentReceive: IPaymentReceive; - oldPaymentReceive: IPaymentReceive; - paymentReceiveDTO: IPaymentReceiveEditDTO; + paymentReceive: IPaymentReceived; + oldPaymentReceive: IPaymentReceived; + paymentReceiveDTO: IPaymentReceivedEditDTO; authorizedUser: ISystemUser; trx: Knex.Transaction; } -export interface IPaymentReceiveEditingPayload { +export interface IPaymentReceivedEditingPayload { tenantId: number; - oldPaymentReceive: IPaymentReceive; - paymentReceiveDTO: IPaymentReceiveEditDTO; + oldPaymentReceive: IPaymentReceived; + paymentReceiveDTO: IPaymentReceivedEditDTO; trx: Knex.Transaction; } -export interface IPaymentReceiveDeletingPayload { +export interface IPaymentReceivedDeletingPayload { tenantId: number; - oldPaymentReceive: IPaymentReceive; + oldPaymentReceive: IPaymentReceived; trx: Knex.Transaction; } -export interface IPaymentReceiveDeletedPayload { +export interface IPaymentReceivedDeletedPayload { tenantId: number; paymentReceiveId: number; - oldPaymentReceive: IPaymentReceive; + oldPaymentReceive: IPaymentReceived; authorizedUser: ISystemUser; trx: Knex.Transaction; } diff --git a/packages/server/src/loaders/events.ts b/packages/server/src/loaders/events.ts index f402a6087..9591e6b90 100644 --- a/packages/server/src/loaders/events.ts +++ b/packages/server/src/loaders/events.ts @@ -34,4 +34,4 @@ // import 'services/Sales/SaleInvoiceWriteoffSubscriber'; // import 'subscribers/SaleInvoices/SendSmsNotificationToCustomer'; // import 'subscribers/SaleReceipt/SendNotificationToCustomer'; -// import 'services/Sales/PaymentReceives/PaymentReceiveSmsSubscriber'; \ No newline at end of file +// import 'services/Sales/PaymentReceived/PaymentReceiveSmsSubscriber'; \ No newline at end of file diff --git a/packages/server/src/loaders/jobs.ts b/packages/server/src/loaders/jobs.ts index d3a4dbc1a..3ca6ec25f 100644 --- a/packages/server/src/loaders/jobs.ts +++ b/packages/server/src/loaders/jobs.ts @@ -9,7 +9,7 @@ import { SendSaleInvoiceMailJob } from '@/services/Sales/Invoices/SendSaleInvoic import { SendSaleInvoiceReminderMailJob } from '@/services/Sales/Invoices/SendSaleInvoiceMailReminderJob'; import { SendSaleEstimateMailJob } from '@/services/Sales/Estimates/SendSaleEstimateMailJob'; import { SaleReceiptMailNotificationJob } from '@/services/Sales/Receipts/SaleReceiptMailNotificationJob'; -import { PaymentReceiveMailNotificationJob } from '@/services/Sales/PaymentReceives/PaymentReceiveMailNotificationJob'; +import { PaymentReceivedMailNotificationJob } from '@/services/Sales/PaymentReceived/PaymentReceivedMailNotificationJob'; import { PlaidFetchTransactionsJob } from '@/services/Banking/Plaid/PlaidFetchTransactionsJob'; import { ImportDeleteExpiredFilesJobs } from '@/services/Import/jobs/ImportDeleteExpiredFilesJob'; import { SendVerifyMailJob } from '@/services/Authentication/jobs/SendVerifyMailJob'; @@ -28,7 +28,7 @@ export default ({ agenda }: { agenda: Agenda }) => { new SendSaleInvoiceReminderMailJob(agenda); new SendSaleEstimateMailJob(agenda); new SaleReceiptMailNotificationJob(agenda); - new PaymentReceiveMailNotificationJob(agenda); + new PaymentReceivedMailNotificationJob(agenda); new PlaidFetchTransactionsJob(agenda); new ImportDeleteExpiredFilesJobs(agenda); new SendVerifyMailJob(agenda); diff --git a/packages/server/src/models/BillPayment.ts b/packages/server/src/models/BillPayment.ts index d3f0dfe21..ab4b41bec 100644 --- a/packages/server/src/models/BillPayment.ts +++ b/packages/server/src/models/BillPayment.ts @@ -3,7 +3,7 @@ import TenantModel from 'models/TenantModel'; import ModelSetting from './ModelSetting'; import BillPaymentSettings from './BillPayment.Settings'; import CustomViewBaseModel from './CustomViewBaseModel'; -import { DEFAULT_VIEWS } from '@/services/Sales/PaymentReceives/constants'; +import { DEFAULT_VIEWS } from '@/services/Sales/PaymentReceived/constants'; import ModelSearchable from './ModelSearchable'; export default class BillPayment extends mixin(TenantModel, [ diff --git a/packages/server/src/models/PaymentReceive.ts b/packages/server/src/models/PaymentReceive.ts index b9c2b87bf..0fc013962 100644 --- a/packages/server/src/models/PaymentReceive.ts +++ b/packages/server/src/models/PaymentReceive.ts @@ -3,7 +3,7 @@ import TenantModel from 'models/TenantModel'; import ModelSetting from './ModelSetting'; import PaymentReceiveSettings from './PaymentReceive.Settings'; import CustomViewBaseModel from './CustomViewBaseModel'; -import { DEFAULT_VIEWS } from '@/services/Sales/PaymentReceives/constants'; +import { DEFAULT_VIEWS } from '@/services/Sales/PaymentReceived/constants'; import ModelSearchable from './ModelSearchable'; export default class PaymentReceive extends mixin(TenantModel, [ diff --git a/packages/server/src/services/Attachments/events/AttachmentsOnPaymentsReceived.ts b/packages/server/src/services/Attachments/events/AttachmentsOnPaymentsReceived.ts index f4e876c6a..311fbb8ea 100644 --- a/packages/server/src/services/Attachments/events/AttachmentsOnPaymentsReceived.ts +++ b/packages/server/src/services/Attachments/events/AttachmentsOnPaymentsReceived.ts @@ -1,10 +1,10 @@ import { Inject, Service } from 'typedi'; import { isEmpty } from 'lodash'; import { - IPaymentReceiveCreatedPayload, - IPaymentReceiveCreatingPayload, - IPaymentReceiveDeletingPayload, - IPaymentReceiveEditedPayload, + IPaymentReceivedCreatedPayload, + IPaymentReceivedCreatingPayload, + IPaymentReceivedDeletingPayload, + IPaymentReceivedEditedPayload, } from '@/interfaces'; import events from '@/subscribers/events'; import { LinkAttachment } from '../LinkAttachment'; @@ -50,13 +50,13 @@ export class AttachmentsOnPaymentsReceived { /** * Validates the attachment keys on creating payment. - * @param {IPaymentReceiveCreatingPayload} + * @param {IPaymentReceivedCreatingPayload} * @returns {Promise} */ private async validateAttachmentsOnPaymentCreate({ paymentReceiveDTO, tenantId, - }: IPaymentReceiveCreatingPayload): Promise { + }: IPaymentReceivedCreatingPayload): Promise { if (isEmpty(paymentReceiveDTO.attachments)) { return; } @@ -67,7 +67,7 @@ export class AttachmentsOnPaymentsReceived { /** * Handles linking the attachments of the created payment. - * @param {IPaymentReceiveCreatedPayload} + * @param {IPaymentReceivedCreatedPayload} * @returns {Promise} */ private async handleAttachmentsOnPaymentCreated({ @@ -75,7 +75,7 @@ export class AttachmentsOnPaymentsReceived { paymentReceiveDTO, paymentReceive, trx, - }: IPaymentReceiveCreatedPayload): Promise { + }: IPaymentReceivedCreatedPayload): Promise { if (isEmpty(paymentReceiveDTO.attachments)) return; const keys = paymentReceiveDTO.attachments?.map( @@ -92,14 +92,14 @@ export class AttachmentsOnPaymentsReceived { /** * Handles unlinking all the unpresented keys of the edited payment. - * @param {IPaymentReceiveEditedPayload} + * @param {IPaymentReceivedEditedPayload} */ private async handleUnlinkUnpresentedKeysOnPaymentEdited({ tenantId, paymentReceiveDTO, oldPaymentReceive, trx, - }: IPaymentReceiveEditedPayload) { + }: IPaymentReceivedEditedPayload) { const keys = paymentReceiveDTO.attachments?.map( (attachment) => attachment.key ); @@ -114,7 +114,7 @@ export class AttachmentsOnPaymentsReceived { /** * Handles linking all the presented keys of the edited payment. - * @param {IPaymentReceiveEditedPayload} + * @param {IPaymentReceivedEditedPayload} * @returns {Promise} */ private async handleLinkPresentedKeysOnPaymentEdited({ @@ -122,7 +122,7 @@ export class AttachmentsOnPaymentsReceived { paymentReceiveDTO, oldPaymentReceive, trx, - }: IPaymentReceiveEditedPayload) { + }: IPaymentReceivedEditedPayload) { if (isEmpty(paymentReceiveDTO.attachments)) return; const keys = paymentReceiveDTO.attachments?.map( @@ -146,7 +146,7 @@ export class AttachmentsOnPaymentsReceived { tenantId, oldPaymentReceive, trx, - }: IPaymentReceiveDeletingPayload) { + }: IPaymentReceivedDeletingPayload) { await this.unlinkAttachmentService.unlinkAllModelKeys( tenantId, 'PaymentReceive', diff --git a/packages/server/src/services/Banking/Matching/events/ValidateMatchingOnPaymentMadeDelete.ts b/packages/server/src/services/Banking/Matching/events/ValidateMatchingOnPaymentMadeDelete.ts index c57c28729..e0f3572e8 100644 --- a/packages/server/src/services/Banking/Matching/events/ValidateMatchingOnPaymentMadeDelete.ts +++ b/packages/server/src/services/Banking/Matching/events/ValidateMatchingOnPaymentMadeDelete.ts @@ -1,7 +1,7 @@ import { Inject, Service } from 'typedi'; import { IBillPaymentEventDeletedPayload, - IPaymentReceiveDeletedPayload, + IPaymentReceivedDeletedPayload, } from '@/interfaces'; import { ValidateTransactionMatched } from '../ValidateTransactionsMatched'; import events from '@/subscribers/events'; @@ -23,7 +23,7 @@ export class ValidateMatchingOnPaymentMadeDelete { /** * Validates the payment made transaction whether matched with bank transaction on deleting. - * @param {IPaymentReceiveDeletedPayload} + * @param {IPaymentReceivedDeletedPayload} */ public async validateMatchingOnPaymentMadeDeleting({ tenantId, diff --git a/packages/server/src/services/Banking/Matching/events/ValidateMatchingOnPaymentReceivedDelete.ts b/packages/server/src/services/Banking/Matching/events/ValidateMatchingOnPaymentReceivedDelete.ts index 446f3d5f1..385f55512 100644 --- a/packages/server/src/services/Banking/Matching/events/ValidateMatchingOnPaymentReceivedDelete.ts +++ b/packages/server/src/services/Banking/Matching/events/ValidateMatchingOnPaymentReceivedDelete.ts @@ -1,5 +1,5 @@ import { Inject, Service } from 'typedi'; -import { IPaymentReceiveDeletedPayload } from '@/interfaces'; +import { IPaymentReceivedDeletedPayload } from '@/interfaces'; import { ValidateTransactionMatched } from '../ValidateTransactionsMatched'; import events from '@/subscribers/events'; @@ -20,13 +20,13 @@ export class ValidateMatchingOnPaymentReceivedDelete { /** * Validates the payment received transaction whether matched with bank transaction on deleting. - * @param {IPaymentReceiveDeletedPayload} + * @param {IPaymentReceivedDeletedPayload} */ public async validateMatchingOnPaymentReceivedDeleting({ tenantId, oldPaymentReceive, trx, - }: IPaymentReceiveDeletedPayload) { + }: IPaymentReceivedDeletedPayload) { await this.validateNoMatchingLinkedService.validateTransactionNoMatchLinking( tenantId, 'PaymentReceive', diff --git a/packages/server/src/services/Branches/Subscribers/Validators/PaymentReceiveBranchSubscriber.ts b/packages/server/src/services/Branches/Subscribers/Validators/PaymentReceiveBranchSubscriber.ts index e08b78489..8aa9b5d6e 100644 --- a/packages/server/src/services/Branches/Subscribers/Validators/PaymentReceiveBranchSubscriber.ts +++ b/packages/server/src/services/Branches/Subscribers/Validators/PaymentReceiveBranchSubscriber.ts @@ -1,8 +1,8 @@ import { Inject, Service } from 'typedi'; import events from '@/subscribers/events'; import { - IPaymentReceiveCreatingPayload, - IPaymentReceiveEditingPayload, + IPaymentReceivedCreatingPayload, + IPaymentReceivedEditingPayload, } from '@/interfaces'; import { ValidateBranchExistance } from '../../Integrations/ValidateBranchExistance'; @@ -28,12 +28,12 @@ export class PaymentReceiveBranchValidateSubscriber { /** * Validate branch existance on estimate creating. - * @param {IPaymentReceiveCreatingPayload} payload + * @param {IPaymentReceivedCreatingPayload} payload */ private validateBranchExistanceOnPaymentCreating = async ({ tenantId, paymentReceiveDTO, - }: IPaymentReceiveCreatingPayload) => { + }: IPaymentReceivedCreatingPayload) => { await this.validateBranchExistance.validateTransactionBranchWhenActive( tenantId, paymentReceiveDTO.branchId @@ -42,12 +42,12 @@ export class PaymentReceiveBranchValidateSubscriber { /** * Validate branch existance once estimate editing. - * @param {IPaymentReceiveEditingPayload} payload + * @param {IPaymentReceivedEditingPayload} payload */ private validateBranchExistanceOnPaymentEditing = async ({ paymentReceiveDTO, tenantId, - }: IPaymentReceiveEditingPayload) => { + }: IPaymentReceivedEditingPayload) => { await this.validateBranchExistance.validateTransactionBranchWhenActive( tenantId, paymentReceiveDTO.branchId diff --git a/packages/server/src/services/CreditNotes/CreditNoteApplyToInvoices.ts b/packages/server/src/services/CreditNotes/CreditNoteApplyToInvoices.ts index 5156dbd56..12ffc95b3 100644 --- a/packages/server/src/services/CreditNotes/CreditNoteApplyToInvoices.ts +++ b/packages/server/src/services/CreditNotes/CreditNoteApplyToInvoices.ts @@ -9,7 +9,7 @@ import { } from '@/interfaces'; import { EventPublisher } from '@/lib/EventPublisher/EventPublisher'; import UnitOfWork from '@/services/UnitOfWork'; -import { PaymentReceiveValidators } from '../Sales/PaymentReceives/PaymentReceiveValidators'; +import { PaymentReceivedValidators } from '../Sales/PaymentReceived/PaymentReceivedValidators'; import BaseCreditNotes from './CreditNotes'; import { IApplyCreditToInvoicesDTO, @@ -26,7 +26,7 @@ export default class CreditNoteApplyToInvoices extends BaseCreditNotes { private tenancy: HasTenancyService; @Inject() - private paymentReceiveValidators: PaymentReceiveValidators; + private paymentReceiveValidators: PaymentReceivedValidators; @Inject() private uow: UnitOfWork; diff --git a/packages/server/src/services/Export/ExportResources.ts b/packages/server/src/services/Export/ExportResources.ts index e7308e4dc..fd3fce276 100644 --- a/packages/server/src/services/Export/ExportResources.ts +++ b/packages/server/src/services/Export/ExportResources.ts @@ -9,7 +9,7 @@ import { SaleInvoicesExportable } from '../Sales/Invoices/SaleInvoicesExportable import { SaleEstimatesExportable } from '../Sales/Estimates/SaleEstimatesExportable'; import { SaleReceiptsExportable } from '../Sales/Receipts/SaleReceiptsExportable'; import { BillsExportable } from '../Purchases/Bills/BillsExportable'; -import { PaymentsReceivedExportable } from '../Sales/PaymentReceives/PaymentsReceivedExportable'; +import { PaymentsReceivedExportable } from '../Sales/PaymentReceived/PaymentsReceivedExportable'; import { BillPaymentExportable } from '../Purchases/BillPayments/BillPaymentExportable'; import { ManualJournalsExportable } from '../ManualJournals/ManualJournalExportable'; import { CreditNotesExportable } from '../CreditNotes/CreditNotesExportable'; diff --git a/packages/server/src/services/Import/ImportableResources.ts b/packages/server/src/services/Import/ImportableResources.ts index 1a0d6cbf0..f79ceb36f 100644 --- a/packages/server/src/services/Import/ImportableResources.ts +++ b/packages/server/src/services/Import/ImportableResources.ts @@ -13,7 +13,7 @@ import { SaleInvoicesImportable } from '../Sales/Invoices/SaleInvoicesImportable import { SaleEstimatesImportable } from '../Sales/Estimates/SaleEstimatesImportable'; import { BillPaymentsImportable } from '../Purchases/BillPayments/BillPaymentsImportable'; import { VendorCreditsImportable } from '../Purchases/VendorCredits/VendorCreditsImportable'; -import { PaymentReceivesImportable } from '../Sales/PaymentReceives/PaymentReceivesImportable'; +import { PaymentsReceivedImportable } from '../Sales/PaymentReceived/PaymentsReceivedImportable'; import { CreditNotesImportable } from '../CreditNotes/CreditNotesImportable'; import { SaleReceiptsImportable } from '../Sales/Receipts/SaleReceiptsImportable'; import { TaxRatesImportable } from '../TaxRates/TaxRatesImportable'; @@ -45,7 +45,7 @@ export class ImportableResources { { resource: 'SaleInvoice', importable: SaleInvoicesImportable }, { resource: 'SaleEstimate', importable: SaleEstimatesImportable }, { resource: 'BillPayment', importable: BillPaymentsImportable }, - { resource: 'PaymentReceive', importable: PaymentReceivesImportable }, + { resource: 'PaymentReceive', importable: PaymentsReceivedImportable }, { resource: 'VendorCredit', importable: VendorCreditsImportable }, { resource: 'CreditNote', importable: CreditNotesImportable }, { resource: 'SaleReceipt', importable: SaleReceiptsImportable }, diff --git a/packages/server/src/services/Sales/Estimates/SaleEstimateSmsNotify.ts b/packages/server/src/services/Sales/Estimates/SaleEstimateSmsNotify.ts index 3757b15d7..d90d11769 100644 --- a/packages/server/src/services/Sales/Estimates/SaleEstimateSmsNotify.ts +++ b/packages/server/src/services/Sales/Estimates/SaleEstimateSmsNotify.ts @@ -6,7 +6,7 @@ import SaleNotifyBySms from '../SaleNotifyBySms'; import SmsNotificationsSettingsService from '@/services/Settings/SmsNotificationsSettings'; import { ICustomer, - IPaymentReceiveSmsDetails, + IPaymentReceivedSmsDetails, ISaleEstimate, SMS_NOTIFICATION_KEY, } from '@/interfaces'; @@ -173,12 +173,12 @@ export class SaleEstimateNotifyBySms { * Retrieve the SMS details of the given payment receive transaction. * @param {number} tenantId * @param {number} saleEstimateId - * @returns {Promise} + * @returns {Promise} */ public smsDetails = async ( tenantId: number, saleEstimateId: number - ): Promise => { + ): Promise => { const { SaleEstimate } = this.tenancy.models(tenantId); // Retrieve the sale invoice or throw not found service error. diff --git a/packages/server/src/services/Sales/Estimates/SaleEstimatesApplication.ts b/packages/server/src/services/Sales/Estimates/SaleEstimatesApplication.ts index f1c7b3cdf..cce664b0e 100644 --- a/packages/server/src/services/Sales/Estimates/SaleEstimatesApplication.ts +++ b/packages/server/src/services/Sales/Estimates/SaleEstimatesApplication.ts @@ -3,7 +3,7 @@ import { CreateSaleEstimate } from './CreateSaleEstimate'; import { IFilterMeta, IPaginationMeta, - IPaymentReceiveSmsDetails, + IPaymentReceivedSmsDetails, ISaleEstimate, ISaleEstimateDTO, ISalesEstimatesFilter, @@ -191,12 +191,12 @@ export class SaleEstimatesApplication { * Retrieve the SMS details of the given payment receive transaction. * @param {number} tenantId * @param {number} saleEstimateId - * @returns {Promise} + * @returns {Promise} */ public getSaleEstimateSmsDetails = ( tenantId: number, saleEstimateId: number - ): Promise => { + ): Promise => { return this.saleEstimateNotifyBySmsService.smsDetails( tenantId, saleEstimateId diff --git a/packages/server/src/services/Sales/Invoices/InvoicePaymentsGLRewrite.ts b/packages/server/src/services/Sales/Invoices/InvoicePaymentsGLRewrite.ts index 3e3e9ffda..9e9998647 100644 --- a/packages/server/src/services/Sales/Invoices/InvoicePaymentsGLRewrite.ts +++ b/packages/server/src/services/Sales/Invoices/InvoicePaymentsGLRewrite.ts @@ -2,7 +2,7 @@ import { Knex } from 'knex'; import async from 'async'; import { Inject, Service } from 'typedi'; import HasTenancyService from '@/services/Tenancy/TenancyService'; -import { PaymentReceiveGLEntries } from '../PaymentReceives/PaymentReceiveGLEntries'; +import { PaymentReceivedGLEntries } from '../PaymentReceived/PaymentReceivedGLEntries'; @Service() export class InvoicePaymentsGLEntriesRewrite { @@ -10,7 +10,7 @@ export class InvoicePaymentsGLEntriesRewrite { public tenancy: HasTenancyService; @Inject() - public paymentGLEntries: PaymentReceiveGLEntries; + public paymentGLEntries: PaymentReceivedGLEntries; /** * Rewrites the payment GL entries task. diff --git a/packages/server/src/services/Sales/PaymentReceives/CreatePaymentReceive.ts b/packages/server/src/services/Sales/PaymentReceived/CreatePaymentReceived.ts similarity index 84% rename from packages/server/src/services/Sales/PaymentReceives/CreatePaymentReceive.ts rename to packages/server/src/services/Sales/PaymentReceived/CreatePaymentReceived.ts index 7649177d3..89af2dd6e 100644 --- a/packages/server/src/services/Sales/PaymentReceives/CreatePaymentReceive.ts +++ b/packages/server/src/services/Sales/PaymentReceived/CreatePaymentReceived.ts @@ -2,23 +2,23 @@ import { Inject, Service } from 'typedi'; import { Knex } from 'knex'; import { ICustomer, - IPaymentReceiveCreateDTO, - IPaymentReceiveCreatedPayload, - IPaymentReceiveCreatingPayload, + IPaymentReceivedCreateDTO, + IPaymentReceivedCreatedPayload, + IPaymentReceivedCreatingPayload, ISystemUser, } from '@/interfaces'; -import { PaymentReceiveValidators } from './PaymentReceiveValidators'; +import { PaymentReceivedValidators } from './PaymentReceivedValidators'; import events from '@/subscribers/events'; import HasTenancyService from '@/services/Tenancy/TenancyService'; import UnitOfWork from '@/services/UnitOfWork'; -import { PaymentReceiveDTOTransformer } from './PaymentReceiveDTOTransformer'; +import { PaymentReceiveDTOTransformer } from './PaymentReceivedDTOTransformer'; import { TenantMetadata } from '@/system/models'; import { EventPublisher } from '@/lib/EventPublisher/EventPublisher'; @Service() -export class CreatePaymentReceive { +export class CreatePaymentReceived { @Inject() - private validators: PaymentReceiveValidators; + private validators: PaymentReceivedValidators; @Inject() private eventPublisher: EventPublisher; @@ -37,11 +37,11 @@ export class CreatePaymentReceive { * with associated invoices payment and journal transactions. * @async * @param {number} tenantId - Tenant id. - * @param {IPaymentReceive} paymentReceive + * @param {IPaymentReceived} paymentReceive */ - public async createPaymentReceive( + public async createPaymentReceived( tenantId: number, - paymentReceiveDTO: IPaymentReceiveCreateDTO, + paymentReceiveDTO: IPaymentReceivedCreateDTO, authorizedUser: ISystemUser, trx?: Knex.Transaction ) { @@ -97,7 +97,7 @@ export class CreatePaymentReceive { trx, paymentReceiveDTO, tenantId, - } as IPaymentReceiveCreatingPayload); + } as IPaymentReceivedCreatingPayload); // Inserts the payment receive transaction. const paymentReceive = await PaymentReceive.query( @@ -113,7 +113,7 @@ export class CreatePaymentReceive { paymentReceiveDTO, authorizedUser, trx, - } as IPaymentReceiveCreatedPayload); + } as IPaymentReceivedCreatedPayload); return paymentReceive; }, @@ -125,13 +125,13 @@ export class CreatePaymentReceive { * Transform the create payment receive DTO. * @param {number} tenantId * @param {ICustomer} customer - * @param {IPaymentReceiveCreateDTO} paymentReceiveDTO + * @param {IPaymentReceivedCreateDTO} paymentReceiveDTO * @returns */ private transformCreateDTOToModel = async ( tenantId: number, customer: ICustomer, - paymentReceiveDTO: IPaymentReceiveCreateDTO + paymentReceiveDTO: IPaymentReceivedCreateDTO ) => { return this.transformer.transformPaymentReceiveDTOToModel( tenantId, diff --git a/packages/server/src/services/Sales/PaymentReceives/DeletePaymentReceive.ts b/packages/server/src/services/Sales/PaymentReceived/DeletePaymentReceived.ts similarity index 89% rename from packages/server/src/services/Sales/PaymentReceives/DeletePaymentReceive.ts rename to packages/server/src/services/Sales/PaymentReceived/DeletePaymentReceived.ts index 3a7d211a7..d1bc62590 100644 --- a/packages/server/src/services/Sales/PaymentReceives/DeletePaymentReceive.ts +++ b/packages/server/src/services/Sales/PaymentReceived/DeletePaymentReceived.ts @@ -1,8 +1,8 @@ import { Inject, Service } from 'typedi'; import { Knex } from 'knex'; import { - IPaymentReceiveDeletedPayload, - IPaymentReceiveDeletingPayload, + IPaymentReceivedDeletedPayload, + IPaymentReceivedDeletingPayload, ISystemUser, } from '@/interfaces'; import UnitOfWork from '@/services/UnitOfWork'; @@ -11,7 +11,7 @@ import events from '@/subscribers/events'; import { EventPublisher } from '@/lib/EventPublisher/EventPublisher'; @Service() -export class DeletePaymentReceive { +export class DeletePaymentReceived { @Inject() private eventPublisher: EventPublisher; @@ -33,7 +33,7 @@ export class DeletePaymentReceive { * @async * @param {number} tenantId - Tenant id. * @param {Integer} paymentReceiveId - Payment receive id. - * @param {IPaymentReceive} paymentReceive - Payment receive object. + * @param {IPaymentReceived} paymentReceive - Payment receive object. */ public async deletePaymentReceive( tenantId: number, @@ -56,7 +56,7 @@ export class DeletePaymentReceive { tenantId, oldPaymentReceive, trx, - } as IPaymentReceiveDeletingPayload); + } as IPaymentReceivedDeletingPayload); // Deletes the payment receive associated entries. await PaymentReceiveEntry.query(trx) @@ -73,7 +73,7 @@ export class DeletePaymentReceive { oldPaymentReceive, authorizedUser, trx, - } as IPaymentReceiveDeletedPayload); + } as IPaymentReceivedDeletedPayload); }); } } diff --git a/packages/server/src/services/Sales/PaymentReceives/EditPaymentReceive.ts b/packages/server/src/services/Sales/PaymentReceived/EditPaymentReceived.ts similarity index 87% rename from packages/server/src/services/Sales/PaymentReceives/EditPaymentReceive.ts rename to packages/server/src/services/Sales/PaymentReceived/EditPaymentReceived.ts index b0f757baa..1e508c094 100644 --- a/packages/server/src/services/Sales/PaymentReceives/EditPaymentReceive.ts +++ b/packages/server/src/services/Sales/PaymentReceived/EditPaymentReceived.ts @@ -2,14 +2,14 @@ import { Inject, Service } from 'typedi'; import { Knex } from 'knex'; import { ICustomer, - IPaymentReceive, - IPaymentReceiveEditDTO, - IPaymentReceiveEditedPayload, - IPaymentReceiveEditingPayload, + IPaymentReceived, + IPaymentReceivedEditDTO, + IPaymentReceivedEditedPayload, + IPaymentReceivedEditingPayload, ISystemUser, } from '@/interfaces'; -import { PaymentReceiveDTOTransformer } from './PaymentReceiveDTOTransformer'; -import { PaymentReceiveValidators } from './PaymentReceiveValidators'; +import { PaymentReceiveDTOTransformer } from './PaymentReceivedDTOTransformer'; +import { PaymentReceivedValidators } from './PaymentReceivedValidators'; import { EventPublisher } from '@/lib/EventPublisher/EventPublisher'; import events from '@/subscribers/events'; import UnitOfWork from '@/services/UnitOfWork'; @@ -17,12 +17,12 @@ import HasTenancyService from '@/services/Tenancy/TenancyService'; import { TenantMetadata } from '@/system/models'; @Service() -export class EditPaymentReceive { +export class EditPaymentReceived { @Inject() private transformer: PaymentReceiveDTOTransformer; @Inject() - private validators: PaymentReceiveValidators; + private validators: PaymentReceivedValidators; @Inject() private eventPublisher: EventPublisher; @@ -46,12 +46,12 @@ export class EditPaymentReceive { * @async * @param {number} tenantId - * @param {Integer} paymentReceiveId - - * @param {IPaymentReceive} paymentReceive - + * @param {IPaymentReceived} paymentReceive - */ public async editPaymentReceive( tenantId: number, paymentReceiveId: number, - paymentReceiveDTO: IPaymentReceiveEditDTO, + paymentReceiveDTO: IPaymentReceivedEditDTO, authorizedUser: ISystemUser ) { const { PaymentReceive, Contact } = this.tenancy.models(tenantId); @@ -131,7 +131,7 @@ export class EditPaymentReceive { tenantId, oldPaymentReceive, paymentReceiveDTO, - } as IPaymentReceiveEditingPayload); + } as IPaymentReceivedEditingPayload); // Update the payment receive transaction. const paymentReceive = await PaymentReceive.query( @@ -149,7 +149,7 @@ export class EditPaymentReceive { paymentReceiveDTO, authorizedUser, trx, - } as IPaymentReceiveEditedPayload); + } as IPaymentReceivedEditedPayload); return paymentReceive; }); @@ -159,15 +159,15 @@ export class EditPaymentReceive { * Transform the edit payment receive DTO. * @param {number} tenantId * @param {ICustomer} customer - * @param {IPaymentReceiveEditDTO} paymentReceiveDTO - * @param {IPaymentReceive} oldPaymentReceive + * @param {IPaymentReceivedEditDTO} paymentReceiveDTO + * @param {IPaymentReceived} oldPaymentReceive * @returns */ private transformEditDTOToModel = async ( tenantId: number, customer: ICustomer, - paymentReceiveDTO: IPaymentReceiveEditDTO, - oldPaymentReceive: IPaymentReceive + paymentReceiveDTO: IPaymentReceivedEditDTO, + oldPaymentReceive: IPaymentReceived ) => { return this.transformer.transformPaymentReceiveDTOToModel( tenantId, diff --git a/packages/server/src/services/Sales/PaymentReceives/GetPaymentReceive.ts b/packages/server/src/services/Sales/PaymentReceived/GetPaymentReceived.ts similarity index 83% rename from packages/server/src/services/Sales/PaymentReceives/GetPaymentReceive.ts rename to packages/server/src/services/Sales/PaymentReceived/GetPaymentReceived.ts index c89697588..36ba5c06b 100644 --- a/packages/server/src/services/Sales/PaymentReceives/GetPaymentReceive.ts +++ b/packages/server/src/services/Sales/PaymentReceived/GetPaymentReceived.ts @@ -1,13 +1,13 @@ import { ServiceError } from '@/exceptions'; -import { IPaymentReceive } from '@/interfaces'; +import { IPaymentReceived } from '@/interfaces'; import HasTenancyService from '@/services/Tenancy/TenancyService'; import { Inject, Service } from 'typedi'; import { ERRORS } from './constants'; -import { PaymentReceiveTransfromer } from './PaymentReceiveTransformer'; +import { PaymentReceiveTransfromer } from './PaymentReceivedTransformer'; import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable'; @Service() -export class GetPaymentReceive { +export class GetPaymentReceived { @Inject() private tenancy: HasTenancyService; @@ -18,12 +18,12 @@ export class GetPaymentReceive { * Retrieve payment receive details. * @param {number} tenantId - Tenant id. * @param {number} paymentReceiveId - Payment receive id. - * @return {Promise} + * @return {Promise} */ public async getPaymentReceive( tenantId: number, paymentReceiveId: number - ): Promise { + ): Promise { const { PaymentReceive } = this.tenancy.models(tenantId); const paymentReceive = await PaymentReceive.query() diff --git a/packages/server/src/services/Sales/PaymentReceives/GetPaymentReceiveInvoices.ts b/packages/server/src/services/Sales/PaymentReceived/GetPaymentReceivedInvoices.ts similarity index 86% rename from packages/server/src/services/Sales/PaymentReceives/GetPaymentReceiveInvoices.ts rename to packages/server/src/services/Sales/PaymentReceived/GetPaymentReceivedInvoices.ts index 901c6b492..d573406ce 100644 --- a/packages/server/src/services/Sales/PaymentReceives/GetPaymentReceiveInvoices.ts +++ b/packages/server/src/services/Sales/PaymentReceived/GetPaymentReceivedInvoices.ts @@ -1,14 +1,14 @@ import { Inject, Service } from 'typedi'; import HasTenancyService from '@/services/Tenancy/TenancyService'; -import { PaymentReceiveValidators } from './PaymentReceiveValidators'; +import { PaymentReceivedValidators } from './PaymentReceivedValidators'; @Service() -export class GetPaymentReceiveInvoices { +export class GetPaymentReceivedInvoices { @Inject() private tenancy: HasTenancyService; @Inject() - private validators: PaymentReceiveValidators; + private validators: PaymentReceivedValidators; /** * Retrieve sale invoices that assocaited to the given payment receive. diff --git a/packages/server/src/services/Sales/PaymentReceives/GetPaymentReeceivePdf.ts b/packages/server/src/services/Sales/PaymentReceived/GetPaymentReceivedPdf.ts similarity index 83% rename from packages/server/src/services/Sales/PaymentReceives/GetPaymentReeceivePdf.ts rename to packages/server/src/services/Sales/PaymentReceived/GetPaymentReceivedPdf.ts index e3d3cfb26..0a357e5ea 100644 --- a/packages/server/src/services/Sales/PaymentReceives/GetPaymentReeceivePdf.ts +++ b/packages/server/src/services/Sales/PaymentReceived/GetPaymentReceivedPdf.ts @@ -1,10 +1,10 @@ import { Inject, Service } from 'typedi'; import { ChromiumlyTenancy } from '@/services/ChromiumlyTenancy/ChromiumlyTenancy'; import { TemplateInjectable } from '@/services/TemplateInjectable/TemplateInjectable'; -import { GetPaymentReceive } from './GetPaymentReceive'; +import { GetPaymentReceived } from './GetPaymentReceived'; @Service() -export default class GetPaymentReceivePdf { +export default class GetPaymentReceivedPdf { @Inject() private chromiumlyTenancy: ChromiumlyTenancy; @@ -12,12 +12,12 @@ export default class GetPaymentReceivePdf { private templateInjectable: TemplateInjectable; @Inject() - private getPaymentService: GetPaymentReceive; + private getPaymentService: GetPaymentReceived; /** * Retrieve sale invoice pdf content. * @param {number} tenantId - - * @param {IPaymentReceive} paymentReceive - + * @param {IPaymentReceived} paymentReceive - * @returns {Promise} */ async getPaymentReceivePdf( diff --git a/packages/server/src/services/Sales/PaymentReceives/GetPaymentReceives.ts b/packages/server/src/services/Sales/PaymentReceived/GetPaymentsReceived.ts similarity index 88% rename from packages/server/src/services/Sales/PaymentReceives/GetPaymentReceives.ts rename to packages/server/src/services/Sales/PaymentReceived/GetPaymentsReceived.ts index 3c076b442..4ff97f7ed 100644 --- a/packages/server/src/services/Sales/PaymentReceives/GetPaymentReceives.ts +++ b/packages/server/src/services/Sales/PaymentReceived/GetPaymentsReceived.ts @@ -3,10 +3,10 @@ import * as R from 'ramda'; import { IFilterMeta, IPaginationMeta, - IPaymentReceive, - IPaymentReceivesFilter, + IPaymentReceived, + IPaymentsReceivedFilter, } from '@/interfaces'; -import { PaymentReceiveTransfromer } from './PaymentReceiveTransformer'; +import { PaymentReceiveTransfromer } from './PaymentReceivedTransformer'; import HasTenancyService from '@/services/Tenancy/TenancyService'; import { TransformerInjectable } from '@/lib/Transformer/TransformerInjectable'; import DynamicListingService from '@/services/DynamicListing/DynamicListService'; @@ -25,13 +25,13 @@ export class GetPaymentReceives { /** * Retrieve payment receives paginated and filterable list. * @param {number} tenantId - * @param {IPaymentReceivesFilter} paymentReceivesFilter + * @param {IPaymentsReceivedFilter} paymentReceivesFilter */ public async getPaymentReceives( tenantId: number, - filterDTO: IPaymentReceivesFilter + filterDTO: IPaymentsReceivedFilter ): Promise<{ - paymentReceives: IPaymentReceive[]; + paymentReceives: IPaymentReceived[]; pagination: IPaginationMeta; filterMeta: IFilterMeta; }> { diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceivesApplication.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedApplication.ts similarity index 69% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceivesApplication.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentReceivedApplication.ts index 0d5669bf8..27e92f69e 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceivesApplication.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedApplication.ts @@ -1,44 +1,44 @@ import { IFilterMeta, IPaginationMeta, - IPaymentReceive, - IPaymentReceiveCreateDTO, - IPaymentReceiveEditDTO, - IPaymentReceiveSmsDetails, - IPaymentReceivesFilter, + IPaymentReceived, + IPaymentReceivedCreateDTO, + IPaymentReceivedEditDTO, + IPaymentReceivedSmsDetails, + IPaymentsReceivedFilter, ISystemUser, PaymentReceiveMailOptsDTO, } from '@/interfaces'; import { Inject, Service } from 'typedi'; -import { CreatePaymentReceive } from './CreatePaymentReceive'; -import { EditPaymentReceive } from './EditPaymentReceive'; -import { DeletePaymentReceive } from './DeletePaymentReceive'; -import { GetPaymentReceives } from './GetPaymentReceives'; -import { GetPaymentReceive } from './GetPaymentReceive'; -import { GetPaymentReceiveInvoices } from './GetPaymentReceiveInvoices'; -import { PaymentReceiveNotifyBySms } from './PaymentReceiveSmsNotify'; -import GetPaymentReceivePdf from './GetPaymentReeceivePdf'; -import { SendPaymentReceiveMailNotification } from './PaymentReceiveMailNotification'; +import { CreatePaymentReceived } from './CreatePaymentReceived'; +import { EditPaymentReceived } from './EditPaymentReceived'; +import { DeletePaymentReceived } from './DeletePaymentReceived'; +import { GetPaymentReceives } from './GetPaymentsReceived'; +import { GetPaymentReceived } from './GetPaymentReceived'; +import { GetPaymentReceivedInvoices } from './GetPaymentReceivedInvoices'; +import { PaymentReceiveNotifyBySms } from './PaymentReceivedSmsNotify'; +import GetPaymentReceivedPdf from './GetPaymentReceivedPdf'; +import { SendPaymentReceiveMailNotification } from './PaymentReceivedMailNotification'; @Service() export class PaymentReceivesApplication { @Inject() - private createPaymentReceiveService: CreatePaymentReceive; + private createPaymentReceivedService: CreatePaymentReceived; @Inject() - private editPaymentReceiveService: EditPaymentReceive; + private editPaymentReceivedService: EditPaymentReceived; @Inject() - private deletePaymentReceiveService: DeletePaymentReceive; + private deletePaymentReceivedService: DeletePaymentReceived; @Inject() - private getPaymentReceivesService: GetPaymentReceives; + private getPaymentsReceivedService: GetPaymentReceives; @Inject() - private getPaymentReceiveService: GetPaymentReceive; + private getPaymentReceivedService: GetPaymentReceived; @Inject() - private getPaymentReceiveInvoicesService: GetPaymentReceiveInvoices; + private getPaymentReceiveInvoicesService: GetPaymentReceivedInvoices; @Inject() private paymentSmsNotify: PaymentReceiveNotifyBySms; @@ -47,21 +47,21 @@ export class PaymentReceivesApplication { private paymentMailNotify: SendPaymentReceiveMailNotification; @Inject() - private getPaymentReceivePdfService: GetPaymentReceivePdf; + private getPaymentReceivePdfService: GetPaymentReceivedPdf; /** * Creates a new payment receive. * @param {number} tenantId - * @param {IPaymentReceiveCreateDTO} paymentReceiveDTO + * @param {IPaymentReceivedCreateDTO} paymentReceiveDTO * @param {ISystemUser} authorizedUser * @returns */ - public createPaymentReceive( + public createPaymentReceived( tenantId: number, - paymentReceiveDTO: IPaymentReceiveCreateDTO, + paymentReceiveDTO: IPaymentReceivedCreateDTO, authorizedUser: ISystemUser ) { - return this.createPaymentReceiveService.createPaymentReceive( + return this.createPaymentReceivedService.createPaymentReceived( tenantId, paymentReceiveDTO, authorizedUser @@ -72,17 +72,17 @@ export class PaymentReceivesApplication { * Edit details the given payment receive with associated entries. * @param {number} tenantId * @param {number} paymentReceiveId - * @param {IPaymentReceiveEditDTO} paymentReceiveDTO + * @param {IPaymentReceivedEditDTO} paymentReceiveDTO * @param {ISystemUser} authorizedUser * @returns */ public editPaymentReceive( tenantId: number, paymentReceiveId: number, - paymentReceiveDTO: IPaymentReceiveEditDTO, + paymentReceiveDTO: IPaymentReceivedEditDTO, authorizedUser: ISystemUser ) { - return this.editPaymentReceiveService.editPaymentReceive( + return this.editPaymentReceivedService.editPaymentReceive( tenantId, paymentReceiveId, paymentReceiveDTO, @@ -102,7 +102,7 @@ export class PaymentReceivesApplication { paymentReceiveId: number, authorizedUser: ISystemUser ) { - return this.deletePaymentReceiveService.deletePaymentReceive( + return this.deletePaymentReceivedService.deletePaymentReceive( tenantId, paymentReceiveId, authorizedUser @@ -112,18 +112,18 @@ export class PaymentReceivesApplication { /** * Retrieve payment receives paginated and filterable. * @param {number} tenantId - * @param {IPaymentReceivesFilter} filterDTO + * @param {IPaymentsReceivedFilter} filterDTO * @returns */ public async getPaymentReceives( tenantId: number, - filterDTO: IPaymentReceivesFilter + filterDTO: IPaymentsReceivedFilter ): Promise<{ - paymentReceives: IPaymentReceive[]; + paymentReceives: IPaymentReceived[]; pagination: IPaginationMeta; filterMeta: IFilterMeta; }> { - return this.getPaymentReceivesService.getPaymentReceives( + return this.getPaymentsReceivedService.getPaymentReceives( tenantId, filterDTO ); @@ -133,13 +133,13 @@ export class PaymentReceivesApplication { * Retrieves the given payment receive. * @param {number} tenantId * @param {number} paymentReceiveId - * @returns {Promise} + * @returns {Promise} */ public async getPaymentReceive( tenantId: number, paymentReceiveId: number - ): Promise { - return this.getPaymentReceiveService.getPaymentReceive( + ): Promise { + return this.getPaymentReceivedService.getPaymentReceive( tenantId, paymentReceiveId ); @@ -175,7 +175,7 @@ export class PaymentReceivesApplication { public getPaymentSmsDetails = async ( tenantId: number, paymentReceiveId: number - ): Promise => { + ): Promise => { return this.paymentSmsNotify.smsDetails(tenantId, paymentReceiveId); }; diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveDTOTransformer.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedDTOTransformer.ts similarity index 69% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceiveDTOTransformer.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentReceivedDTOTransformer.ts index a84569ac9..e9eed9110 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveDTOTransformer.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedDTOTransformer.ts @@ -3,22 +3,22 @@ import { Inject, Service } from 'typedi'; import { omit, sumBy } from 'lodash'; import { ICustomer, - IPaymentReceive, - IPaymentReceiveCreateDTO, - IPaymentReceiveEditDTO, + IPaymentReceived, + IPaymentReceivedCreateDTO, + IPaymentReceivedEditDTO, } from '@/interfaces'; -import { PaymentReceiveValidators } from './PaymentReceiveValidators'; -import { PaymentReceiveIncrement } from './PaymentReceiveIncrement'; +import { PaymentReceivedValidators } from './PaymentReceivedValidators'; +import { PaymentReceivedIncrement } from './PaymentReceivedIncrement'; import { BranchTransactionDTOTransform } from '@/services/Branches/Integrations/BranchTransactionDTOTransform'; import { formatDateFields } from '@/utils'; @Service() export class PaymentReceiveDTOTransformer { @Inject() - private validators: PaymentReceiveValidators; + private validators: PaymentReceivedValidators; @Inject() - private increments: PaymentReceiveIncrement; + private increments: PaymentReceivedIncrement; @Inject() private branchDTOTransform: BranchTransactionDTOTransform; @@ -26,16 +26,16 @@ export class PaymentReceiveDTOTransformer { /** * Transformes the create payment receive DTO to model object. * @param {number} tenantId - * @param {IPaymentReceiveCreateDTO|IPaymentReceiveEditDTO} paymentReceiveDTO - Payment receive DTO. - * @param {IPaymentReceive} oldPaymentReceive - - * @return {IPaymentReceive} + * @param {IPaymentReceivedCreateDTO|IPaymentReceivedEditDTO} paymentReceiveDTO - Payment receive DTO. + * @param {IPaymentReceived} oldPaymentReceive - + * @return {IPaymentReceived} */ public async transformPaymentReceiveDTOToModel( tenantId: number, customer: ICustomer, - paymentReceiveDTO: IPaymentReceiveCreateDTO | IPaymentReceiveEditDTO, - oldPaymentReceive?: IPaymentReceive - ): Promise { + paymentReceiveDTO: IPaymentReceivedCreateDTO | IPaymentReceivedEditDTO, + oldPaymentReceive?: IPaymentReceived + ): Promise { const amount = paymentReceiveDTO.amount ?? sumBy(paymentReceiveDTO.entries, 'paymentAmount'); @@ -65,7 +65,7 @@ export class PaymentReceiveDTOTransformer { })), }; return R.compose( - this.branchDTOTransform.transformDTO(tenantId) + this.branchDTOTransform.transformDTO(tenantId) )(initialDTO); } } diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveEntryTransformer.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedEntryTransformer.ts similarity index 91% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceiveEntryTransformer.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentReceivedEntryTransformer.ts index 7a7af28c1..b20d8801d 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveEntryTransformer.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedEntryTransformer.ts @@ -2,7 +2,7 @@ import { Transformer } from '@/lib/Transformer/Transformer'; import { SaleInvoiceTransformer } from '../Invoices/SaleInvoiceTransformer'; import { formatNumber } from '@/utils'; -export class PaymentReceiveEntryTransfromer extends Transformer { +export class PaymentReceivedEntryTransfromer extends Transformer { /** * Include these attributes to payment receive entry object. * @returns {Array} diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveGLEntries.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedGLEntries.ts similarity index 92% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceiveGLEntries.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentReceivedGLEntries.ts index e804733c0..8c30c10f4 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveGLEntries.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedGLEntries.ts @@ -4,7 +4,7 @@ import { Knex } from 'knex'; import Ledger from '@/services/Accounting/Ledger'; import TenancyService from '@/services/Tenancy/TenancyService'; import { - IPaymentReceive, + IPaymentReceived, ILedgerEntry, AccountNormal, IPaymentReceiveGLCommonEntry, @@ -13,7 +13,7 @@ import LedgerStorageService from '@/services/Accounting/LedgerStorageService'; import { TenantMetadata } from '@/system/models'; @Service() -export class PaymentReceiveGLEntries { +export class PaymentReceivedGLEntries { @Inject() private tenancy: TenancyService; @@ -93,14 +93,14 @@ export class PaymentReceiveGLEntries { /** * Retrieves the payment receive general ledger. * @param {number} tenantId - - * @param {IPaymentReceive} paymentReceive - + * @param {IPaymentReceived} paymentReceive - * @param {string} baseCurrencyCode - * @param {Knex.Transaction} trx - * @returns {Ledger} */ public getPaymentReceiveGLedger = async ( tenantId: number, - paymentReceive: IPaymentReceive, + paymentReceive: IPaymentReceived, baseCurrencyCode: string, trx?: Knex.Transaction ): Promise => { @@ -132,7 +132,7 @@ export class PaymentReceiveGLEntries { * @returns {number} */ private getPaymentExGainOrLoss = ( - paymentReceive: IPaymentReceive + paymentReceive: IPaymentReceived ): number => { return sumBy(paymentReceive.entries, (entry) => { const paymentLocalAmount = @@ -145,11 +145,11 @@ export class PaymentReceiveGLEntries { /** * Retrieves the common entry of payment receive. - * @param {IPaymentReceive} paymentReceive + * @param {IPaymentReceived} paymentReceive * @returns {} */ private getPaymentReceiveCommonEntry = ( - paymentReceive: IPaymentReceive + paymentReceive: IPaymentReceived ): IPaymentReceiveGLCommonEntry => { return { debit: 0, @@ -174,14 +174,14 @@ export class PaymentReceiveGLEntries { /** * Retrieves the payment exchange gain/loss entry. - * @param {IPaymentReceive} paymentReceive - + * @param {IPaymentReceived} paymentReceive - * @param {number} ARAccountId - * @param {number} exchangeGainOrLossAccountId - * @param {string} baseCurrencyCode - * @returns {ILedgerEntry[]} */ private getPaymentExchangeGainLossEntry = ( - paymentReceive: IPaymentReceive, + paymentReceive: IPaymentReceived, ARAccountId: number, exchangeGainOrLossAccountId: number, baseCurrencyCode: string @@ -219,11 +219,11 @@ export class PaymentReceiveGLEntries { /** * Retrieves the payment deposit GL entry. - * @param {IPaymentReceive} paymentReceive + * @param {IPaymentReceived} paymentReceive * @returns {ILedgerEntry} */ private getPaymentDepositGLEntry = ( - paymentReceive: IPaymentReceive + paymentReceive: IPaymentReceived ): ILedgerEntry => { const commonJournal = this.getPaymentReceiveCommonEntry(paymentReceive); @@ -238,12 +238,12 @@ export class PaymentReceiveGLEntries { /** * Retrieves the payment receivable entry. - * @param {IPaymentReceive} paymentReceive + * @param {IPaymentReceived} paymentReceive * @param {number} ARAccountId * @returns {ILedgerEntry} */ private getPaymentReceivableEntry = ( - paymentReceive: IPaymentReceive, + paymentReceive: IPaymentReceived, ARAccountId: number ): ILedgerEntry => { const commonJournal = this.getPaymentReceiveCommonEntry(paymentReceive); @@ -267,14 +267,14 @@ export class PaymentReceiveGLEntries { * - Payment account [current asset] -> Credit * * @param {number} tenantId - * @param {IPaymentReceive} paymentRecieve - Payment receive model. + * @param {IPaymentReceived} paymentRecieve - Payment receive model. * @param {number} ARAccountId - A/R account id. * @param {number} exGainOrLossAccountId - Exchange gain/loss account id. * @param {string} baseCurrency - Base currency code. * @returns {Promise} */ public getPaymentReceiveGLEntries = ( - paymentReceive: IPaymentReceive, + paymentReceive: IPaymentReceived, ARAccountId: number, exGainOrLossAccountId: number, baseCurrency: string diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveIncrement.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedIncrement.ts similarity index 95% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceiveIncrement.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentReceivedIncrement.ts index 804fb1fbc..01cef7f48 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveIncrement.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedIncrement.ts @@ -2,7 +2,7 @@ import { Inject, Service } from 'typedi'; import AutoIncrementOrdersService from '../AutoIncrementOrdersService'; @Service() -export class PaymentReceiveIncrement { +export class PaymentReceivedIncrement { @Inject() private autoIncrementOrdersService: AutoIncrementOrdersService; diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveInvoiceSync.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedInvoiceSync.ts similarity index 84% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceiveInvoiceSync.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentReceivedInvoiceSync.ts index 0f7831237..4cc51e60c 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveInvoiceSync.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedInvoiceSync.ts @@ -1,11 +1,11 @@ import { Inject, Service } from 'typedi'; import { Knex } from 'knex'; -import { IPaymentReceiveEntryDTO } from '@/interfaces'; +import { IPaymentReceivedEntryDTO } from '@/interfaces'; import HasTenancyService from '@/services/Tenancy/TenancyService'; import { entriesAmountDiff } from '@/utils'; @Service() -export class PaymentReceiveInvoiceSync { +export class PaymentReceivedInvoiceSync { @Inject() private tenancy: HasTenancyService; @@ -19,8 +19,8 @@ export class PaymentReceiveInvoiceSync { */ public async saveChangeInvoicePaymentAmount( tenantId: number, - newPaymentReceiveEntries: IPaymentReceiveEntryDTO[], - oldPaymentReceiveEntries?: IPaymentReceiveEntryDTO[], + newPaymentReceiveEntries: IPaymentReceivedEntryDTO[], + oldPaymentReceiveEntries?: IPaymentReceivedEntryDTO[], trx?: Knex.Transaction ): Promise { const { SaleInvoice } = this.tenancy.models(tenantId); diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveMailNotification.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedMailNotification.ts similarity index 97% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceiveMailNotification.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentReceivedMailNotification.ts index bd8d4fa64..5429b4441 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveMailNotification.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedMailNotification.ts @@ -11,7 +11,7 @@ import { DEFAULT_PAYMENT_MAIL_CONTENT, DEFAULT_PAYMENT_MAIL_SUBJECT, } from './constants'; -import { GetPaymentReceive } from './GetPaymentReceive'; +import { GetPaymentReceived } from './GetPaymentReceived'; import { ContactMailNotification } from '@/services/MailNotification/ContactMailNotification'; import { parseAndValidateMailOptions } from '@/services/MailNotification/utils'; import { EventPublisher } from '@/lib/EventPublisher/EventPublisher'; @@ -23,7 +23,7 @@ export class SendPaymentReceiveMailNotification { private tenancy: HasTenancyService; @Inject() - private getPaymentService: GetPaymentReceive; + private getPaymentService: GetPaymentReceived; @Inject() private contactMailNotification: ContactMailNotification; diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveMailNotificationJob.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedMailNotificationJob.ts similarity index 91% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceiveMailNotificationJob.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentReceivedMailNotificationJob.ts index b29570d42..4614ce9b4 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveMailNotificationJob.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedMailNotificationJob.ts @@ -1,8 +1,8 @@ import Container, { Service } from 'typedi'; -import { SendPaymentReceiveMailNotification } from './PaymentReceiveMailNotification'; +import { SendPaymentReceiveMailNotification } from './PaymentReceivedMailNotification'; @Service() -export class PaymentReceiveMailNotificationJob { +export class PaymentReceivedMailNotificationJob { /** * Constructor method. */ diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveSmsNotify.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedSmsNotify.ts similarity index 91% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceiveSmsNotify.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentReceivedSmsNotify.ts index 67810aa85..961bec572 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveSmsNotify.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedSmsNotify.ts @@ -2,17 +2,17 @@ import { Service, Inject } from 'typedi'; import HasTenancyService from '@/services/Tenancy/TenancyService'; import events from '@/subscribers/events'; import { - IPaymentReceiveSmsDetails, + IPaymentReceivedSmsDetails, SMS_NOTIFICATION_KEY, - IPaymentReceive, - IPaymentReceiveEntry, + IPaymentReceived, + IPaymentReceivedEntry, } from '@/interfaces'; import SmsNotificationsSettingsService from '@/services/Settings/SmsNotificationsSettings'; import { formatNumber, formatSmsMessage } from 'utils'; import { TenantMetadata } from '@/system/models'; import SaleNotifyBySms from '../SaleNotifyBySms'; import { EventPublisher } from '@/lib/EventPublisher/EventPublisher'; -import { PaymentReceiveValidators } from './PaymentReceiveValidators'; +import { PaymentReceivedValidators } from './PaymentReceivedValidators'; @Service() export class PaymentReceiveNotifyBySms { @@ -29,7 +29,7 @@ export class PaymentReceiveNotifyBySms { private saleSmsNotification: SaleNotifyBySms; @Inject() - private validators: PaymentReceiveValidators; + private validators: PaymentReceivedValidators; /** * Notify customer via sms about payment receive details. @@ -71,12 +71,12 @@ export class PaymentReceiveNotifyBySms { /** * Sends the payment details sms notification of the given customer. * @param {number} tenantId - * @param {IPaymentReceive} paymentReceive + * @param {IPaymentReceived} paymentReceive * @param {ICustomer} customer */ private sendSmsNotification = async ( tenantId: number, - paymentReceive: IPaymentReceive + paymentReceive: IPaymentReceived ) => { const smsClient = this.tenancy.smsClient(tenantId); const tenantMetadata = await TenantMetadata.query().findOne({ tenantId }); @@ -116,12 +116,12 @@ export class PaymentReceiveNotifyBySms { /** * Formates the payment receive details sms message. * @param {number} tenantId - - * @param {IPaymentReceive} payment - + * @param {IPaymentReceived} payment - * @param {ICustomer} customer - */ private formattedPaymentDetailsMessage = ( tenantId: number, - payment: IPaymentReceive, + payment: IPaymentReceived, tenantMetadata: TenantMetadata ) => { const notification = this.smsNotificationsSettings.getSmsNotificationMeta( @@ -138,14 +138,14 @@ export class PaymentReceiveNotifyBySms { /** * Formattes the payment details sms notification messafge. * @param {string} smsMessage - * @param {IPaymentReceive} payment + * @param {IPaymentReceived} payment * @param {ICustomer} customer * @param {TenantMetadata} tenantMetadata * @returns {string} */ private formatPaymentDetailsMessage = ( smsMessage: string, - payment: IPaymentReceive, + payment: IPaymentReceived, tenantMetadata: any ): string => { const invoiceNumbers = this.stringifyPaymentInvoicesNumber(payment); @@ -167,12 +167,12 @@ export class PaymentReceiveNotifyBySms { /** * Stringify payment receive invoices to numbers as string. - * @param {IPaymentReceive} payment + * @param {IPaymentReceived} payment * @returns {string} */ - private stringifyPaymentInvoicesNumber(payment: IPaymentReceive) { + private stringifyPaymentInvoicesNumber(payment: IPaymentReceived) { const invoicesNumberes = payment.entries.map( - (entry: IPaymentReceiveEntry) => entry.invoice.invoiceNo + (entry: IPaymentReceivedEntry) => entry.invoice.invoiceNo ); return invoicesNumberes.join(', '); } @@ -185,7 +185,7 @@ export class PaymentReceiveNotifyBySms { public smsDetails = async ( tenantId: number, paymentReceiveid: number - ): Promise => { + ): Promise => { const { PaymentReceive } = this.tenancy.models(tenantId); // Retrieve the payment receive or throw not found service error. diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveSmsSubscriber.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedSmsSubscriber.ts similarity index 81% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceiveSmsSubscriber.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentReceivedSmsSubscriber.ts index 3793ca5ed..c6f4af9e3 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveSmsSubscriber.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedSmsSubscriber.ts @@ -1,8 +1,7 @@ import { Container } from 'typedi'; import { On, EventSubscriber } from 'event-dispatch'; import events from '@/subscribers/events'; -import SaleReceiptNotifyBySms from '@/services/Sales/SaleReceiptNotifyBySms'; -import PaymentReceiveNotifyBySms from './PaymentReceiveSmsNotify'; +import { PaymentReceiveNotifyBySms } from './PaymentReceivedSmsNotify'; @EventSubscriber() export default class SendSmsNotificationPaymentReceive { diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveTransformer.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedTransformer.ts similarity index 62% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceiveTransformer.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentReceivedTransformer.ts index eaf4dfe9e..2ab49dfe7 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveTransformer.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedTransformer.ts @@ -1,7 +1,7 @@ -import { IPaymentReceive, IPaymentReceiveEntry } from '@/interfaces'; +import { IPaymentReceived, IPaymentReceivedEntry } from '@/interfaces'; import { Transformer } from '@/lib/Transformer/Transformer'; import { formatNumber } from 'utils'; -import { PaymentReceiveEntryTransfromer } from './PaymentReceiveEntryTransformer'; +import { PaymentReceivedEntryTransfromer } from './PaymentReceivedEntryTransformer'; export class PaymentReceiveTransfromer extends Transformer { /** @@ -24,25 +24,25 @@ export class PaymentReceiveTransfromer extends Transformer { * @param {ISaleInvoice} invoice * @returns {String} */ - protected formattedPaymentDate = (payment: IPaymentReceive): string => { + protected formattedPaymentDate = (payment: IPaymentReceived): string => { return this.formatDate(payment.paymentDate); }; /** * Retrieves the formatted created at date. - * @param {IPaymentReceive} payment + * @param {IPaymentReceived} payment * @returns {string} */ - protected formattedCreatedAt = (payment: IPaymentReceive): string => { + protected formattedCreatedAt = (payment: IPaymentReceived): string => { return this.formatDate(payment.createdAt); }; /** * Retrieve the formatted payment subtotal. - * @param {IPaymentReceive} payment + * @param {IPaymentReceived} payment * @returns {string} */ - protected subtotalFormatted = (payment: IPaymentReceive): string => { + protected subtotalFormatted = (payment: IPaymentReceived): string => { return formatNumber(payment.amount, { currencyCode: payment.currencyCode, money: false, @@ -54,25 +54,25 @@ export class PaymentReceiveTransfromer extends Transformer { * @param {ISaleInvoice} invoice * @returns {string} */ - protected formattedAmount = (payment: IPaymentReceive): string => { + protected formattedAmount = (payment: IPaymentReceived): string => { return formatNumber(payment.amount, { currencyCode: payment.currencyCode }); }; /** * Retrieve the formatted exchange rate. - * @param {IPaymentReceive} payment + * @param {IPaymentReceived} payment * @returns {string} */ - protected formattedExchangeRate = (payment: IPaymentReceive): string => { + protected formattedExchangeRate = (payment: IPaymentReceived): string => { return formatNumber(payment.exchangeRate, { money: false }); }; /** * Retrieves the payment entries. - * @param {IPaymentReceive} payment - * @returns {IPaymentReceiveEntry[]} + * @param {IPaymentReceived} payment + * @returns {IPaymentReceivedEntry[]} */ - protected entries = (payment: IPaymentReceive): IPaymentReceiveEntry[] => { - return this.item(payment.entries, new PaymentReceiveEntryTransfromer()); + protected entries = (payment: IPaymentReceived): IPaymentReceivedEntry[] => { + return this.item(payment.entries, new PaymentReceivedEntryTransfromer()); }; } diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveValidators.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedValidators.ts similarity index 90% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceiveValidators.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentReceivedValidators.ts index 35899e057..4adbe8f6d 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceiveValidators.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentReceivedValidators.ts @@ -2,10 +2,10 @@ import { Inject, Service } from 'typedi'; import { difference, sumBy } from 'lodash'; import { IAccount, - IPaymentReceive, - IPaymentReceiveEditDTO, - IPaymentReceiveEntry, - IPaymentReceiveEntryDTO, + IPaymentReceived, + IPaymentReceivedEditDTO, + IPaymentReceivedEntry, + IPaymentReceivedEntryDTO, ISaleInvoice, } from '@/interfaces'; import { ServiceError } from '@/exceptions'; @@ -15,7 +15,7 @@ import { ACCOUNT_TYPE } from '@/data/AccountTypes'; import { PaymentReceive } from '@/models'; @Service() -export class PaymentReceiveValidators { +export class PaymentReceivedValidators { @Inject() private tenancy: HasTenancyService; @@ -58,7 +58,7 @@ export class PaymentReceiveValidators { * Validates the invoices IDs existance. * @param {number} tenantId - * @param {number} customerId - - * @param {IPaymentReceiveEntryDTO[]} paymentReceiveEntries - + * @param {IPaymentReceivedEntryDTO[]} paymentReceiveEntries - */ public async validateInvoicesIDsExistance( tenantId: number, @@ -100,12 +100,12 @@ export class PaymentReceiveValidators { */ public async validateInvoicesPaymentsAmount( tenantId: number, - paymentReceiveEntries: IPaymentReceiveEntryDTO[], - oldPaymentEntries: IPaymentReceiveEntry[] = [] + paymentReceiveEntries: IPaymentReceivedEntryDTO[], + oldPaymentEntries: IPaymentReceivedEntry[] = [] ) { const { SaleInvoice } = this.tenancy.models(tenantId); const invoicesIds = paymentReceiveEntries.map( - (e: IPaymentReceiveEntryDTO) => e.invoiceId + (e: IPaymentReceivedEntryDTO) => e.invoiceId ); const storedInvoices = await SaleInvoice.query().whereIn('id', invoicesIds); @@ -124,7 +124,7 @@ export class PaymentReceiveValidators { const hasWrongPaymentAmount: any[] = []; paymentReceiveEntries.forEach( - (entry: IPaymentReceiveEntryDTO, index: number) => { + (entry: IPaymentReceivedEntryDTO, index: number) => { const entryInvoice = storedInvoicesMap.get(entry.invoiceId); const { dueAmount } = entryInvoice; @@ -140,9 +140,9 @@ export class PaymentReceiveValidators { /** * Validate the payment receive number require. - * @param {IPaymentReceive} paymentReceiveObj + * @param {IPaymentReceived} paymentReceiveObj */ - public validatePaymentReceiveNoRequire(paymentReceiveObj: IPaymentReceive) { + public validatePaymentReceiveNoRequire(paymentReceiveObj: IPaymentReceived) { if (!paymentReceiveObj.paymentReceiveNo) { throw new ServiceError(ERRORS.PAYMENT_RECEIVE_NO_IS_REQUIRED); } @@ -152,12 +152,12 @@ export class PaymentReceiveValidators { * Validate the payment receive entries IDs existance. * @param {number} tenantId * @param {number} paymentReceiveId - * @param {IPaymentReceiveEntryDTO[]} paymentReceiveEntries + * @param {IPaymentReceivedEntryDTO[]} paymentReceiveEntries */ public async validateEntriesIdsExistance( tenantId: number, paymentReceiveId: number, - paymentReceiveEntries: IPaymentReceiveEntryDTO[] + paymentReceiveEntries: IPaymentReceivedEntryDTO[] ) { const { PaymentReceiveEntry } = this.tenancy.models(tenantId); @@ -189,12 +189,12 @@ export class PaymentReceiveValidators { /** * Validate the payment customer whether modified. - * @param {IPaymentReceiveEditDTO} paymentReceiveDTO - * @param {IPaymentReceive} oldPaymentReceive + * @param {IPaymentReceivedEditDTO} paymentReceiveDTO + * @param {IPaymentReceived} oldPaymentReceive */ public validateCustomerNotModified( - paymentReceiveDTO: IPaymentReceiveEditDTO, - oldPaymentReceive: IPaymentReceive + paymentReceiveDTO: IPaymentReceivedEditDTO, + oldPaymentReceive: IPaymentReceived ) { if (paymentReceiveDTO.customerId !== oldPaymentReceive.customerId) { throw new ServiceError(ERRORS.PAYMENT_CUSTOMER_SHOULD_NOT_UPDATE); @@ -230,7 +230,7 @@ export class PaymentReceiveValidators { async getPaymentReceiveOrThrowError( tenantId: number, paymentReceiveId: number - ): Promise { + ): Promise { const { PaymentReceive } = this.tenancy.models(tenantId); const paymentReceive = await PaymentReceive.query() .withGraphFetched('entries') diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentsReceivedExportable.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentsReceivedExportable.ts similarity index 69% rename from packages/server/src/services/Sales/PaymentReceives/PaymentsReceivedExportable.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentsReceivedExportable.ts index 932c0f5f3..0a2b62e33 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentsReceivedExportable.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentsReceivedExportable.ts @@ -1,7 +1,7 @@ import { Inject, Service } from 'typedi'; -import { IAccountsStructureType, IPaymentReceivesFilter } from '@/interfaces'; +import { IAccountsStructureType, IPaymentsReceivedFilter } from '@/interfaces'; import { Exportable } from '@/services/Export/Exportable'; -import { PaymentReceivesApplication } from './PaymentReceivesApplication'; +import { PaymentReceivesApplication } from './PaymentReceivedApplication'; @Service() export class PaymentsReceivedExportable extends Exportable { @@ -11,17 +11,17 @@ export class PaymentsReceivedExportable extends Exportable { /** * Retrieves the accounts data to exportable sheet. * @param {number} tenantId - * @param {IPaymentReceivesFilter} query - + * @param {IPaymentsReceivedFilter} query - * @returns */ - public exportable(tenantId: number, query: IPaymentReceivesFilter) { + public exportable(tenantId: number, query: IPaymentsReceivedFilter) { const parsedQuery = { sortOrder: 'desc', columnSortBy: 'created_at', inactiveMode: false, ...query, structure: IAccountsStructureType.Flat, - } as IPaymentReceivesFilter; + } as IPaymentsReceivedFilter; return this.paymentReceivedApp .getPaymentReceives(tenantId, parsedQuery) diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceivesImportable.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentsReceivedImportable.ts similarity index 74% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceivesImportable.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentsReceivedImportable.ts index 540f50824..eeefd6ca0 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceivesImportable.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentsReceivedImportable.ts @@ -1,14 +1,14 @@ import { Inject, Service } from 'typedi'; import { Knex } from 'knex'; -import { IPaymentReceiveCreateDTO } from '@/interfaces'; +import { IPaymentReceivedCreateDTO } from '@/interfaces'; import { Importable } from '@/services/Import/Importable'; -import { CreatePaymentReceive } from './CreatePaymentReceive'; +import { CreatePaymentReceived } from './CreatePaymentReceived'; import { PaymentsReceiveSampleData } from './constants'; @Service() -export class PaymentReceivesImportable extends Importable { +export class PaymentsReceivedImportable extends Importable { @Inject() - private createPaymentReceiveService: CreatePaymentReceive; + private createPaymentReceiveService: CreatePaymentReceived; /** * Importing to account service. @@ -18,10 +18,10 @@ export class PaymentReceivesImportable extends Importable { */ public importable( tenantId: number, - createPaymentDTO: IPaymentReceiveCreateDTO, + createPaymentDTO: IPaymentReceivedCreateDTO, trx?: Knex.Transaction ) { - return this.createPaymentReceiveService.createPaymentReceive( + return this.createPaymentReceiveService.createPaymentReceived( tenantId, createPaymentDTO, {}, diff --git a/packages/server/src/services/Sales/PaymentReceives/PaymentReceivesPages.ts b/packages/server/src/services/Sales/PaymentReceived/PaymentsReceivedPages.ts similarity index 94% rename from packages/server/src/services/Sales/PaymentReceives/PaymentReceivesPages.ts rename to packages/server/src/services/Sales/PaymentReceived/PaymentsReceivedPages.ts index 72068225c..6fd52882f 100644 --- a/packages/server/src/services/Sales/PaymentReceives/PaymentReceivesPages.ts +++ b/packages/server/src/services/Sales/PaymentReceived/PaymentsReceivedPages.ts @@ -3,7 +3,7 @@ import { omit } from 'lodash'; import { ISaleInvoice, IPaymentReceivePageEntry, - IPaymentReceive, + IPaymentReceived, ISystemUser, } from '@/interfaces'; import TenancyService from '@/services/Tenancy/TenancyService'; @@ -14,12 +14,9 @@ import { ERRORS } from './constants'; * Payment receives edit/new pages service. */ @Service() -export default class PaymentReceivesPages { +export default class PaymentsReceivedPages { @Inject() - tenancy: TenancyService; - - @Inject('logger') - logger: any; + private tenancy: TenancyService; /** * Retrive page invoices entries from the given sale invoices models. @@ -68,7 +65,7 @@ export default class PaymentReceivesPages { tenantId: number, paymentReceiveId: number ): Promise<{ - paymentReceive: Omit; + paymentReceive: Omit; entries: IPaymentReceivePageEntry[]; }> { const { PaymentReceive, SaleInvoice } = this.tenancy.models(tenantId); diff --git a/packages/server/src/services/Sales/PaymentReceives/constants.ts b/packages/server/src/services/Sales/PaymentReceived/constants.ts similarity index 100% rename from packages/server/src/services/Sales/PaymentReceives/constants.ts rename to packages/server/src/services/Sales/PaymentReceived/constants.ts diff --git a/packages/server/src/services/TransactionsLocking/SalesTransactionLockingGuardSubscriber.ts b/packages/server/src/services/TransactionsLocking/SalesTransactionLockingGuardSubscriber.ts index a2e55fc21..9b80bca26 100644 --- a/packages/server/src/services/TransactionsLocking/SalesTransactionLockingGuardSubscriber.ts +++ b/packages/server/src/services/TransactionsLocking/SalesTransactionLockingGuardSubscriber.ts @@ -5,9 +5,9 @@ import { ISaleInvoiceCreatingPaylaod, ISaleReceiptDeletingPayload, ICreditNoteDeletingPayload, - IPaymentReceiveCreatingPayload, + IPaymentReceivedCreatingPayload, IRefundCreditNoteDeletingPayload, - IPaymentReceiveDeletingPayload, + IPaymentReceivedDeletingPayload, ISaleEstimateDeletingPayload, ISaleEstimateCreatingPayload, ISaleEstimateEditingPayload, @@ -17,7 +17,7 @@ import { ISaleInvoiceWrittenOffCancelPayload, ICreditNoteEditingPayload, ISaleReceiptEditingPayload, - IPaymentReceiveEditingPayload, + IPaymentReceivedEditingPayload, ISaleReceiptEventClosingPayload, ICreditNoteCreatingPayload, } from '@/interfaces'; @@ -454,13 +454,13 @@ export default class SalesTransactionLockingGuardSubscriber { /** * Transaction locking guard on payment receive editing. - * @param {IPaymentReceiveEditingPayload} + * @param {IPaymentReceivedEditingPayload} */ private transactionLockingGuardOnPaymentEditing = async ({ tenantId, oldPaymentReceive, paymentReceiveDTO, - }: IPaymentReceiveEditingPayload) => { + }: IPaymentReceivedEditingPayload) => { // Validate the old payment date. await this.salesLockingGuard.transactionLockingGuard( tenantId, @@ -475,12 +475,12 @@ export default class SalesTransactionLockingGuardSubscriber { /** * Transaction locking guard on payment creating. - * @param {IPaymentReceiveCreatingPayload} + * @param {IPaymentReceivedCreatingPayload} */ private transactionLockingGuardOnPaymentCreating = async ({ tenantId, paymentReceiveDTO, - }: IPaymentReceiveCreatingPayload) => { + }: IPaymentReceivedCreatingPayload) => { await this.salesLockingGuard.transactionLockingGuard( tenantId, paymentReceiveDTO.paymentDate @@ -489,12 +489,12 @@ export default class SalesTransactionLockingGuardSubscriber { /** * Transaction locking guard on payment deleting. - * @param {IPaymentReceiveDeletingPayload} payload - + * @param {IPaymentReceivedDeletingPayload} payload - */ private transactionLockingGuardPaymentDeleting = async ({ oldPaymentReceive, tenantId, - }: IPaymentReceiveDeletingPayload) => { + }: IPaymentReceivedDeletingPayload) => { await this.salesLockingGuard.transactionLockingGuard( tenantId, oldPaymentReceive.paymentDate diff --git a/packages/server/src/subscribers/PaymentReceive/AutoSerialIncrement.ts b/packages/server/src/subscribers/PaymentReceive/AutoSerialIncrement.ts index f8cdceba2..89f60a9e6 100644 --- a/packages/server/src/subscribers/PaymentReceive/AutoSerialIncrement.ts +++ b/packages/server/src/subscribers/PaymentReceive/AutoSerialIncrement.ts @@ -1,13 +1,13 @@ import { Service, Inject } from 'typedi'; import events from '@/subscribers/events'; import { EventSubscriber } from '@/lib/EventPublisher/EventPublisher'; -import { PaymentReceiveIncrement } from '@/services/Sales/PaymentReceives/PaymentReceiveIncrement'; -import { IPaymentReceiveCreatedPayload } from '@/interfaces'; +import { PaymentReceivedIncrement } from '@/services/Sales/PaymentReceived/PaymentReceivedIncrement'; +import { IPaymentReceivedCreatedPayload } from '@/interfaces'; @Service() export default class PaymentReceiveAutoSerialSubscriber extends EventSubscriber { @Inject() - private paymentIncrement: PaymentReceiveIncrement; + private paymentIncrement: PaymentReceivedIncrement; /** * Attaches the events with handles. @@ -22,13 +22,13 @@ export default class PaymentReceiveAutoSerialSubscriber extends EventSubscriber /** * Handles increment next number of payment receive once be created. - * @param {IPaymentReceiveCreatedPayload} payload - + * @param {IPaymentReceivedCreatedPayload} payload - */ private handlePaymentNextNumberIncrement = async ({ tenantId, paymentReceiveId, trx, - }: IPaymentReceiveCreatedPayload) => { + }: IPaymentReceivedCreatedPayload) => { await this.paymentIncrement.incrementNextPaymentReceiveNumber(tenantId); }; } diff --git a/packages/server/src/subscribers/PaymentReceive/PaymentReceiveSyncInvoices.ts b/packages/server/src/subscribers/PaymentReceive/PaymentReceiveSyncInvoices.ts index d257de18c..643ca94d4 100644 --- a/packages/server/src/subscribers/PaymentReceive/PaymentReceiveSyncInvoices.ts +++ b/packages/server/src/subscribers/PaymentReceive/PaymentReceiveSyncInvoices.ts @@ -1,16 +1,16 @@ import { Inject, Service } from 'typedi'; import events from '@/subscribers/events'; -import { PaymentReceiveInvoiceSync } from '@/services/Sales/PaymentReceives/PaymentReceiveInvoiceSync'; +import { PaymentReceivedInvoiceSync } from '@/services/Sales/PaymentReceived/PaymentReceivedInvoiceSync'; import { - IPaymentReceiveCreatedPayload, - IPaymentReceiveDeletedPayload, - IPaymentReceiveEditedPayload, + IPaymentReceivedCreatedPayload, + IPaymentReceivedDeletedPayload, + IPaymentReceivedEditedPayload, } from '@/interfaces'; @Service() export default class PaymentReceiveSyncInvoicesSubscriber { @Inject() - private paymentSyncInvoice: PaymentReceiveInvoiceSync; + private paymentSyncInvoice: PaymentReceivedInvoiceSync; /** * Attaches the events to handles. @@ -39,7 +39,7 @@ export default class PaymentReceiveSyncInvoicesSubscriber { tenantId, paymentReceive, trx, - }: IPaymentReceiveCreatedPayload) => { + }: IPaymentReceivedCreatedPayload) => { await this.paymentSyncInvoice.saveChangeInvoicePaymentAmount( tenantId, paymentReceive.entries, @@ -57,7 +57,7 @@ export default class PaymentReceiveSyncInvoicesSubscriber { paymentReceive, oldPaymentReceive, trx, - }: IPaymentReceiveEditedPayload) => { + }: IPaymentReceivedEditedPayload) => { await this.paymentSyncInvoice.saveChangeInvoicePaymentAmount( tenantId, paymentReceive.entries, @@ -74,7 +74,7 @@ export default class PaymentReceiveSyncInvoicesSubscriber { paymentReceiveId, oldPaymentReceive, trx, - }: IPaymentReceiveDeletedPayload) => { + }: IPaymentReceivedDeletedPayload) => { await this.paymentSyncInvoice.saveChangeInvoicePaymentAmount( tenantId, oldPaymentReceive.entries.map((entry) => ({ diff --git a/packages/server/src/subscribers/PaymentReceive/SendSmsNotificationToCustomer.ts b/packages/server/src/subscribers/PaymentReceive/SendSmsNotificationToCustomer.ts index 988260856..840698831 100644 --- a/packages/server/src/subscribers/PaymentReceive/SendSmsNotificationToCustomer.ts +++ b/packages/server/src/subscribers/PaymentReceive/SendSmsNotificationToCustomer.ts @@ -1,7 +1,7 @@ import { Service, Inject } from 'typedi'; import events from '@/subscribers/events'; -import { PaymentReceiveNotifyBySms } from '@/services/Sales/PaymentReceives/PaymentReceiveSmsNotify'; -import { IPaymentReceiveCreatedPayload } from '@/interfaces'; +import { PaymentReceiveNotifyBySms } from '@/services/Sales/PaymentReceived/PaymentReceivedSmsNotify'; +import { IPaymentReceivedCreatedPayload } from '@/interfaces'; import { runAfterTransaction } from '@/services/UnitOfWork/TransactionsHooks'; @Service() @@ -26,7 +26,7 @@ export default class SendSmsNotificationPaymentReceive { tenantId, paymentReceiveId, trx, - }: IPaymentReceiveCreatedPayload) => { + }: IPaymentReceivedCreatedPayload) => { // Notify via Sms after transactions complete running. runAfterTransaction(trx, async () => { try { @@ -34,7 +34,7 @@ export default class SendSmsNotificationPaymentReceive { tenantId, paymentReceiveId ); - } catch (error) {} + } catch (error) { } }); }; } diff --git a/packages/server/src/subscribers/PaymentReceive/WriteGLEntries.ts b/packages/server/src/subscribers/PaymentReceive/WriteGLEntries.ts index bffe4260f..b1b197a96 100644 --- a/packages/server/src/subscribers/PaymentReceive/WriteGLEntries.ts +++ b/packages/server/src/subscribers/PaymentReceive/WriteGLEntries.ts @@ -1,16 +1,16 @@ import { Inject, Service } from 'typedi'; import { - IPaymentReceiveCreatedPayload, - IPaymentReceiveDeletedPayload, - IPaymentReceiveEditedPayload, + IPaymentReceivedCreatedPayload, + IPaymentReceivedDeletedPayload, + IPaymentReceivedEditedPayload, } from '@/interfaces'; import events from '@/subscribers/events'; -import { PaymentReceiveGLEntries } from '@/services/Sales/PaymentReceives/PaymentReceiveGLEntries'; +import { PaymentReceivedGLEntries } from '@/services/Sales/PaymentReceived/PaymentReceivedGLEntries'; @Service() export default class PaymentReceivesWriteGLEntriesSubscriber { @Inject() - private paymentReceiveGLEntries: PaymentReceiveGLEntries; + private paymentReceiveGLEntries: PaymentReceivedGLEntries; /** * Attaches events with handlers. @@ -37,7 +37,7 @@ export default class PaymentReceivesWriteGLEntriesSubscriber { tenantId, paymentReceiveId, trx, - }: IPaymentReceiveCreatedPayload) => { + }: IPaymentReceivedCreatedPayload) => { await this.paymentReceiveGLEntries.writePaymentGLEntries( tenantId, paymentReceiveId, @@ -52,7 +52,7 @@ export default class PaymentReceivesWriteGLEntriesSubscriber { tenantId, paymentReceive, trx, - }: IPaymentReceiveEditedPayload) => { + }: IPaymentReceivedEditedPayload) => { await this.paymentReceiveGLEntries.rewritePaymentGLEntries( tenantId, paymentReceive.id, @@ -67,7 +67,7 @@ export default class PaymentReceivesWriteGLEntriesSubscriber { tenantId, paymentReceiveId, trx, - }: IPaymentReceiveDeletedPayload) => { + }: IPaymentReceivedDeletedPayload) => { await this.paymentReceiveGLEntries.revertPaymentGLEntries( tenantId, paymentReceiveId, diff --git a/packages/webapp/src/components/DialogsContainer.tsx b/packages/webapp/src/components/DialogsContainer.tsx index 284c3cfbc..94ecdcc4d 100644 --- a/packages/webapp/src/components/DialogsContainer.tsx +++ b/packages/webapp/src/components/DialogsContainer.tsx @@ -49,7 +49,7 @@ import InvoiceExchangeRateChangeDialog from '@/containers/Sales/Invoices/Invoice import InvoiceMailDialog from '@/containers/Sales/Invoices/InvoiceMailDialog/InvoiceMailDialog'; import EstimateMailDialog from '@/containers/Sales/Estimates/EstimateMailDialog/EstimateMailDialog'; import ReceiptMailDialog from '@/containers/Sales/Receipts/ReceiptMailDialog/ReceiptMailDialog'; -import PaymentMailDialog from '@/containers/Sales/PaymentReceives/PaymentMailDialog/PaymentMailDialog'; +import PaymentMailDialog from '@/containers/Sales/PaymentsReceived/PaymentMailDialog/PaymentMailDialog'; import { ExportDialog } from '@/containers/Dialogs/ExportDialog'; import { RuleFormDialog } from '@/containers/Banking/Rules/RuleFormDialog/RuleFormDialog'; import { DisconnectBankAccountDialog } from '@/containers/CashFlow/AccountTransactions/dialogs/DisconnectBankAccountDialog/DisconnectBankAccountDialog'; diff --git a/packages/webapp/src/components/DrawersContainer.tsx b/packages/webapp/src/components/DrawersContainer.tsx index cf9451d1c..6165fda85 100644 --- a/packages/webapp/src/components/DrawersContainer.tsx +++ b/packages/webapp/src/components/DrawersContainer.tsx @@ -39,7 +39,7 @@ export default function DrawersContainer() { - + diff --git a/packages/webapp/src/constants/drawers.ts b/packages/webapp/src/constants/drawers.ts index c4e477352..5a3a96cd3 100644 --- a/packages/webapp/src/constants/drawers.ts +++ b/packages/webapp/src/constants/drawers.ts @@ -6,7 +6,7 @@ export enum DRAWERS { BILL_DETAILS = 'bill-drawer', INVOICE_DETAILS = 'invoice-detail-drawer', RECEIPT_DETAILS = 'receipt-detail-drawer', - PAYMENT_RECEIVE_DETAILS = 'payment-receive-detail-drawer', + PAYMENT_RECEIVED_DETAILS = 'payment-receive-detail-drawer', PAYMENT_MADE_DETAILS = 'payment-made-drawer', ESTIMATE_DETAILS = 'estimate-detail-drawer', ITEM_DETAILS = 'item-detail-drawer', diff --git a/packages/webapp/src/constants/homepageOptions.tsx b/packages/webapp/src/constants/homepageOptions.tsx index 06688802c..208a349f5 100644 --- a/packages/webapp/src/constants/homepageOptions.tsx +++ b/packages/webapp/src/constants/homepageOptions.tsx @@ -55,7 +55,7 @@ export const accountsReceivable = [ description: ( ), - link: '/payment-receives', + link: '/payments-received', subject: AbilitySubject.PaymentReceive, ability: PaymentReceiveAction.View, }, diff --git a/packages/webapp/src/constants/sidebarMenu.tsx b/packages/webapp/src/constants/sidebarMenu.tsx index 7f2b203a7..f81322c42 100644 --- a/packages/webapp/src/constants/sidebarMenu.tsx +++ b/packages/webapp/src/constants/sidebarMenu.tsx @@ -179,8 +179,8 @@ export const SidebarMenu = [ type: ISidebarMenuItemType.Link, }, { - text: , - href: '/payment-receives', + text: , + href: '/payments-received', type: ISidebarMenuItemType.Link, permission: { subject: AbilitySubject.PaymentReceive, @@ -226,8 +226,8 @@ export const SidebarMenu = [ type: ISidebarMenuItemType.Link, }, { - text: , - href: '/payment-receives/new', + text: , + href: '/payment-received/new', type: ISidebarMenuItemType.Link, permission: { subject: AbilitySubject.PaymentReceive, diff --git a/packages/webapp/src/containers/Alerts/PaymentReceives/ClearingAllLinesAlert.tsx b/packages/webapp/src/containers/Alerts/PaymentReceived/ClearingAllLinesAlert.tsx similarity index 100% rename from packages/webapp/src/containers/Alerts/PaymentReceives/ClearingAllLinesAlert.tsx rename to packages/webapp/src/containers/Alerts/PaymentReceived/ClearingAllLinesAlert.tsx diff --git a/packages/webapp/src/containers/Alerts/PaymentReceives/PaymentReceiveDeleteAlert.tsx b/packages/webapp/src/containers/Alerts/PaymentReceived/PaymentReceivedDeleteAlert.tsx similarity index 88% rename from packages/webapp/src/containers/Alerts/PaymentReceives/PaymentReceiveDeleteAlert.tsx rename to packages/webapp/src/containers/Alerts/PaymentReceived/PaymentReceivedDeleteAlert.tsx index 553bfb2c7..11ce47773 100644 --- a/packages/webapp/src/containers/Alerts/PaymentReceives/PaymentReceiveDeleteAlert.tsx +++ b/packages/webapp/src/containers/Alerts/PaymentReceived/PaymentReceivedDeleteAlert.tsx @@ -21,7 +21,7 @@ import { DRAWERS } from '@/constants/drawers'; /** * Payment receive delete alert. */ -function PaymentReceiveDeleteAlert({ +function PaymentReceivedDeleteAlert({ name, // #withAlertStoreConnect @@ -48,11 +48,11 @@ function PaymentReceiveDeleteAlert({ .then(() => { AppToaster.show({ message: intl.get( - 'the_payment_receive_has_been_deleted_successfully', + 'the_payment_received_has_been_deleted_successfully', ), intent: Intent.SUCCESS, }); - closeDrawer(DRAWERS.PAYMENT_RECEIVE_DETAILS); + closeDrawer(DRAWERS.PAYMENT_RECEIVED_DETAILS); }) .catch( ({ @@ -81,7 +81,7 @@ function PaymentReceiveDeleteAlert({ >

@@ -92,4 +92,4 @@ export default compose( withAlertStoreConnect(), withAlertActions, withDrawerActions, -)(PaymentReceiveDeleteAlert); +)(PaymentReceivedDeleteAlert); diff --git a/packages/webapp/src/containers/Alerts/PaymentReceives/_utils.ts b/packages/webapp/src/containers/Alerts/PaymentReceived/_utils.ts similarity index 100% rename from packages/webapp/src/containers/Alerts/PaymentReceives/_utils.ts rename to packages/webapp/src/containers/Alerts/PaymentReceived/_utils.ts diff --git a/packages/webapp/src/containers/AlertsContainer/registered.tsx b/packages/webapp/src/containers/AlertsContainer/registered.tsx index 3d96227c7..ba2d44e41 100644 --- a/packages/webapp/src/containers/AlertsContainer/registered.tsx +++ b/packages/webapp/src/containers/AlertsContainer/registered.tsx @@ -6,7 +6,7 @@ import InventoryAdjustmentsAlerts from '@/containers/InventoryAdjustments/Invent import EstimatesAlerts from '@/containers/Sales/Estimates/EstimatesAlerts'; import InvoicesAlerts from '@/containers/Sales/Invoices/InvoicesAlerts'; import ReceiptsAlerts from '@/containers/Sales/Receipts/ReceiptsAlerts'; -import PaymentReceiveAlerts from '@/containers/Sales/PaymentReceives/PaymentReceiveAlerts'; +import PaymentsReceivedAlerts from '@/containers/Sales/PaymentsReceived/PaymentsReceivedAlerts'; import BillsAlerts from '@/containers/Purchases/Bills/BillsLanding/BillsAlerts'; import PaymentsMadeAlerts from '@/containers/Purchases/PaymentsMade/PaymentsMadeAlerts'; import CustomersAlerts from '@/containers/Customers/CustomersAlerts'; @@ -38,7 +38,7 @@ export default [ ...EstimatesAlerts, ...InvoicesAlerts, ...ReceiptsAlerts, - ...PaymentReceiveAlerts, + ...PaymentsReceivedAlerts, ...BillsAlerts, ...PaymentsMadeAlerts, ...CustomersAlerts, diff --git a/packages/webapp/src/containers/CashFlow/AccountTransactions/utils.tsx b/packages/webapp/src/containers/CashFlow/AccountTransactions/utils.tsx index c76ebb813..58535e389 100644 --- a/packages/webapp/src/containers/CashFlow/AccountTransactions/utils.tsx +++ b/packages/webapp/src/containers/CashFlow/AccountTransactions/utils.tsx @@ -66,7 +66,7 @@ export const handleCashFlowTransactionType = (reference, openDrawer) => { expenseId: reference.reference_id, }); case 'PaymentReceive': - return openDrawer(DRAWERS.PAYMENT_RECEIVE_DETAILS, { + return openDrawer(DRAWERS.PAYMENT_RECEIVED_DETAILS, { paymentReceiveId: reference.reference_id, }); case 'BillPayment': diff --git a/packages/webapp/src/containers/Dialogs/PaymentReceivePdfPreviewDialog/index.tsx b/packages/webapp/src/containers/Dialogs/PaymentReceivePdfPreviewDialog/index.tsx index 89a86709d..a4a52fa65 100644 --- a/packages/webapp/src/containers/Dialogs/PaymentReceivePdfPreviewDialog/index.tsx +++ b/packages/webapp/src/containers/Dialogs/PaymentReceivePdfPreviewDialog/index.tsx @@ -25,7 +25,7 @@ function PaymentReceivePdfPreviewDialog({ return ( } + title={} className={classNames(CLASSES.DIALOG_PDF_PREVIEW)} autoFocus={true} canEscapeKeyClose={true} diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceive.schema.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceive.schema.tsx index ef8c20c2a..46a159e23 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceive.schema.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceive.schema.tsx @@ -9,7 +9,7 @@ const Schema = Yup.object().shape({ .required() .nullable() .max(DATATYPES_LENGTH.STRING) - .label(intl.get('payment_receive_no_')), + .label(intl.get('payment_received_no_')), payment_date: Yup.date().required().label(intl.get('payment_date_')), deposit_account_id: Yup.number() .required() diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.tsx index b2326c525..2b9d83115 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/QuickPaymentReceiveForm.tsx @@ -70,7 +70,7 @@ function QuickPaymentReceiveForm({ // Handle request response success. const onSaved = (response) => { AppToaster.show({ - message: intl.get('the_payment_receive_transaction_has_been_created'), + message: intl.get('the_payment_received_transaction_has_been_created'), intent: Intent.SUCCESS, }); closeDialog(dialogName); diff --git a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/utils.tsx b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/utils.tsx index c6e7a8bb9..b02e74295 100644 --- a/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/utils.tsx +++ b/packages/webapp/src/containers/Dialogs/QuickPaymentReceiveFormDialog/utils.tsx @@ -34,7 +34,7 @@ export const transformErrors = (errors, { setFieldError }) => { if (getError('PAYMENT_RECEIVE_NO_REQUIRED')) { setFieldError( 'payment_receive_no', - intl.get('payment_receive_number_required'), + intl.get('payment_received_number_required'), ); } if (getError('INVALID_PAYMENT_AMOUNT')) { diff --git a/packages/webapp/src/containers/Drawers/CustomerDetailsDrawer/CustomerDetailsActionsBar.tsx b/packages/webapp/src/containers/Drawers/CustomerDetailsDrawer/CustomerDetailsActionsBar.tsx index 61343f5ec..edaf98c3b 100644 --- a/packages/webapp/src/containers/Drawers/CustomerDetailsDrawer/CustomerDetailsActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/CustomerDetailsDrawer/CustomerDetailsActionsBar.tsx @@ -68,7 +68,7 @@ function CustomerDetailsActionsBar({ }; // Handle new payment receive button click. const handleNewPaymentClick = () => { - history.push('/payment-receives/new'); + history.push('/payment-received/new'); closeDrawer(DRAWERS.CUSTOMER_DETAILS); }; // Handle new estimate button click. diff --git a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/InvoicePaymentTransactionsTable.tsx b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/InvoicePaymentTransactionsTable.tsx index 2a88ac028..7f778c049 100644 --- a/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/InvoicePaymentTransactionsTable.tsx +++ b/packages/webapp/src/containers/Drawers/InvoiceDetailDrawer/InvoicePaymentTransactions/InvoicePaymentTransactionsTable.tsx @@ -47,14 +47,14 @@ function InvoicePaymentTransactionsTable({ // Handles delete payment transactions. const handleDeletePaymentTransactons = ({ payment_receive_id }) => { - openAlert('payment-receive-delete', { + openAlert('payment-received-delete', { paymentReceiveId: payment_receive_id, }); }; // Handles edit payment transactions. const handleEditPaymentTransactions = ({ payment_receive_id }) => { - history.push(`/payment-receives/${payment_receive_id}/edit`); + history.push(`/payments-received/${payment_receive_id}/edit`); closeDrawer(DRAWERS.INVOICE_DETAILS); }; return ( diff --git a/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveActionsBar.tsx b/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveActionsBar.tsx index 6cfa62edc..cad001a72 100644 --- a/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveActionsBar.tsx +++ b/packages/webapp/src/containers/Drawers/PaymentReceiveDetailDrawer/PaymentReceiveActionsBar.tsx @@ -33,7 +33,7 @@ import { DialogsName } from '@/constants/dialogs'; /** * Payment receive actions bar. */ -function PaymentReceiveActionsBar({ +function PaymentsReceivedActionsBar({ // #withAlertsActions openAlert, @@ -50,13 +50,13 @@ function PaymentReceiveActionsBar({ // Handle edit payment receive. const handleEditPaymentReceive = () => { - history.push(`/payment-receives/${paymentReceiveId}/edit`); - closeDrawer(DRAWERS.PAYMENT_RECEIVE_DETAILS); + history.push(`/payments-received/${paymentReceiveId}/edit`); + closeDrawer(DRAWERS.PAYMENT_RECEIVED_DETAILS); }; // Handle delete payment receive. const handleDeletePaymentReceive = () => { - openAlert('payment-receive-delete', { paymentReceiveId }); + openAlert('payment-received-delete', { paymentReceiveId }); }; // Handle notify via SMS. @@ -80,7 +80,7 @@ function PaymentReceiveActionsBar({