fix(server): rename term to

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

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

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, [

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, [

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;

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';

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 },

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.

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

@@ -7,18 +7,18 @@ import {
   IPaymentReceiveCreatingPayload,
   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;
@@ -39,7 +39,7 @@ export class CreatePaymentReceive {
    * @param {number} tenantId - Tenant id.
    * @param {IPaymentReceive} paymentReceive
    */
-  public async createPaymentReceive(
+  public async createPaymentReceived(
     tenantId: number,
     paymentReceiveDTO: IPaymentReceiveCreateDTO,
     authorizedUser: ISystemUser,

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

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

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

@@ -8,8 +8,8 @@ import {
   IPaymentReceiveEditingPayload,
   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;

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

@@ -3,11 +3,11 @@ import { IPaymentReceive } 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;
 

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.

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

@@ -1,7 +1,7 @@
 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 {
@@ -12,7 +12,7 @@ export default class GetPaymentReceivePdf {
   private templateInjectable: TemplateInjectable;
 
   @Inject()
-  private getPaymentService: GetPaymentReceive;
+  private getPaymentService: GetPaymentReceived;
 
   /**
    * Retrieve sale invoice pdf content.

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

@@ -6,7 +6,7 @@ import {
   IPaymentReceive,
   IPaymentReceivesFilter,
 } 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';

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

@@ -10,35 +10,35 @@ import {
   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 GetPaymentReceivePdf 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;
@@ -56,12 +56,12 @@ export class PaymentReceivesApplication {
    * @param {ISystemUser} authorizedUser
    * @returns
    */
-  public createPaymentReceive(
+  public createPaymentReceived(
     tenantId: number,
     paymentReceiveDTO: IPaymentReceiveCreateDTO,
     authorizedUser: ISystemUser
   ) {
-    return this.createPaymentReceiveService.createPaymentReceive(
+    return this.createPaymentReceivedService.createPaymentReceived(
       tenantId,
       paymentReceiveDTO,
       authorizedUser
@@ -82,7 +82,7 @@ export class PaymentReceivesApplication {
     paymentReceiveDTO: IPaymentReceiveEditDTO,
     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
@@ -123,7 +123,7 @@ export class PaymentReceivesApplication {
     pagination: IPaginationMeta;
     filterMeta: IFilterMeta;
   }> {
-    return this.getPaymentReceivesService.getPaymentReceives(
+    return this.getPaymentsReceivedService.getPaymentReceives(
       tenantId,
       filterDTO
     );
@@ -139,7 +139,7 @@ export class PaymentReceivesApplication {
     tenantId: number,
     paymentReceiveId: number
   ): Promise<IPaymentReceive> {
-    return this.getPaymentReceiveService.getPaymentReceive(
+    return this.getPaymentReceivedService.getPaymentReceive(
       tenantId,
       paymentReceiveId
     );

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

@@ -7,18 +7,18 @@ import {
   IPaymentReceiveCreateDTO,
   IPaymentReceiveEditDTO,
 } 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;

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}

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

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

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;
 

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

@@ -5,7 +5,7 @@ import HasTenancyService from '@/services/Tenancy/TenancyService';
 import { entriesAmountDiff } from '@/utils';
 
 @Service()
-export class PaymentReceiveInvoiceSync {
+export class PaymentReceivedInvoiceSync {
   @Inject()
   private tenancy: HasTenancyService;
 

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;

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.
    */

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

@@ -12,7 +12,7 @@ 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.

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 {

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

@@ -1,7 +1,7 @@
 import { IPaymentReceive, IPaymentReceiveEntry } 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 {
   /**
@@ -73,6 +73,6 @@ export class PaymentReceiveTransfromer extends Transformer {
    * @returns {IPaymentReceiveEntry[]}
    */
   protected entries = (payment: IPaymentReceive): IPaymentReceiveEntry[] => {
-    return this.item(payment.entries, new PaymentReceiveEntryTransfromer());
+    return this.item(payment.entries, new PaymentReceivedEntryTransfromer());
   };
 }

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

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

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

@@ -1,7 +1,7 @@
 import { Inject, Service } from 'typedi';
 import { IAccountsStructureType, IPaymentReceivesFilter } from '@/interfaces';
 import { Exportable } from '@/services/Export/Exportable';
-import { PaymentReceivesApplication } from './PaymentReceivesApplication';
+import { PaymentReceivesApplication } from './PaymentReceivedApplication';
 
 @Service()
 export class PaymentsReceivedExportable extends Exportable {

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

@@ -2,13 +2,13 @@ import { Inject, Service } from 'typedi';
 import { Knex } from 'knex';
 import { IPaymentReceiveCreateDTO } 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.
@@ -21,7 +21,7 @@ export class PaymentReceivesImportable extends Importable {
     createPaymentDTO: IPaymentReceiveCreateDTO,
     trx?: Knex.Transaction
   ) {
-    return this.createPaymentReceiveService.createPaymentReceive(
+    return this.createPaymentReceiveService.createPaymentReceived(
       tenantId,
       createPaymentDTO,
       {},

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

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

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 { PaymentReceivedIncrement } from '@/services/Sales/PaymentReceived/PaymentReceivedIncrement';
 import { IPaymentReceiveCreatedPayload } from '@/interfaces';
 
 @Service()
 export default class PaymentReceiveAutoSerialSubscriber extends EventSubscriber {
   @Inject()
-  private paymentIncrement: PaymentReceiveIncrement;
+  private paymentIncrement: PaymentReceivedIncrement;
 
   /**
    * Attaches the events with handles.

packages/server/src/subscribers/PaymentReceive/PaymentReceiveSyncInvoices.ts

@@ -1,6 +1,6 @@
 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,
@@ -10,7 +10,7 @@ import {
 @Service()
 export default class PaymentReceiveSyncInvoicesSubscriber {
   @Inject()
-  private paymentSyncInvoice: PaymentReceiveInvoiceSync;
+  private paymentSyncInvoice: PaymentReceivedInvoiceSync;
 
   /**
    * Attaches the events to handles.

packages/server/src/subscribers/PaymentReceive/SendSmsNotificationToCustomer.ts

@@ -1,6 +1,6 @@
 import { Service, Inject } from 'typedi';
 import events from '@/subscribers/events';
-import { PaymentReceiveNotifyBySms } from '@/services/Sales/PaymentReceives/PaymentReceiveSmsNotify';
+import { PaymentReceiveNotifyBySms } from '@/services/Sales/PaymentReceived/PaymentReceivedSmsNotify';
 import { IPaymentReceiveCreatedPayload } from '@/interfaces';
 import { runAfterTransaction } from '@/services/UnitOfWork/TransactionsHooks';
 
@@ -34,7 +34,7 @@ export default class SendSmsNotificationPaymentReceive {
           tenantId,
           paymentReceiveId
         );
-      } catch (error) {}
+      } catch (error) { }
     });
   };
 }

packages/server/src/subscribers/PaymentReceive/WriteGLEntries.ts

@@ -5,12 +5,12 @@ import {
   IPaymentReceiveEditedPayload,
 } 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.