feat: auto-increment sale invoice, receipt, estimate and payment receive.

feat: style sales and purchases forms.
This commit is contained in:
Ahmed Bouhuolia
2020-10-27 21:05:43 +02:00
parent 0ec0865a6e
commit 8e9abb4d7d
24 changed files with 689 additions and 362 deletions

View File

@@ -103,4 +103,14 @@ export default {
type: "string",
},
],
payment_receives: [
{
key: 'next_number',
type: 'number',
},
{
key: 'number_prefix',
type: 'string',
},
]
};

View File

@@ -10,3 +10,5 @@ import 'subscribers/customers';
import 'subscribers/vendors';
import 'subscribers/paymentMades';
import 'subscribers/paymentReceives';
import 'subscribers/saleEstimates';
import 'subscribers/saleReceipts';

View File

@@ -400,6 +400,7 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
salesInvoicesFilter.page - 1,
salesInvoicesFilter.pageSize,
);
return {
salesInvoices: results,
pagination,

View File

@@ -0,0 +1,30 @@
import { Service, Inject } from "typedi";
import TenancyService from 'services/Tenancy/TenancyService';
@Service()
export default class SettingsService {
@Inject()
tenancy: TenancyService;
@Inject('logger')
logger: any;
/**
* Increment next number based on the given find query.
* @param {number} tenantId
* @param {any} findQuery
*/
async incrementNextNumber(tenantId: number, findQuery: any): Promise<void> {
const settings = this.tenancy.settings(tenantId);
this.logger.info('[settings] increment the next number.', { tenantId, findQuery });
const currentNumber = settings.find(findQuery);
if (currentNumber) {
const nextNumber = parseInt(currentNumber.value, 10) + 1;
settings.set(findQuery, nextNumber);
await settings.save();
}
}
}

View File

@@ -103,4 +103,10 @@ export default class HasTenancyService {
return tenantCacheLoader(tenantId);
});
}
settings(tenantId: number) {
return this.singletonService(tenantId, 'settings', () => {
throw new Error('Settings is not injected yet.');
});
}
}

View File

@@ -3,6 +3,7 @@ import { EventSubscriber, On } from 'event-dispatch';
import events from 'subscribers/events';
import TenancyService from 'services/Tenancy/TenancyService';
import PaymentReceiveService from 'services/Sales/PaymentsReceives';
import SettingsService from 'services/Settings/SettingsService';
@EventSubscriber()
export default class PaymentReceivesSubscriber {
@@ -10,10 +11,14 @@ export default class PaymentReceivesSubscriber {
logger: any;
paymentReceivesService: PaymentReceiveService;
settingsService: SettingsService;
constructor() {
this.tenancy = Container.get(TenancyService);
this.logger = Container.get('logger');
this.paymentReceivesService = Container.get(PaymentReceiveService);
this.settingsService = Container.get(SettingsService);
}
/**
@@ -84,4 +89,15 @@ export default class PaymentReceivesSubscriber {
oldPaymentReceive.customerId,
);
}
/**
* Handles increment next number of payment receive once be created.
*/
@On(events.paymentReceive.onCreated)
public async handlePaymentNextNumberIncrement({ tenantId, paymentReceiveId }) {
await this.settingsService.incrementNextNumber(tenantId, {
key: 'next_number',
group: 'payment_receives',
});
}
}

View File

@@ -0,0 +1,29 @@
import { Container } from 'typedi';
import { On, EventSubscriber } from "event-dispatch";
import events from 'subscribers/events';
import TenancyService from 'services/Tenancy/TenancyService';
import SettingsService from 'services/Settings/SettingsService';
@EventSubscriber()
export default class SaleEstimateSubscriber {
logger: any;
tenancy: TenancyService;
settingsService: SettingsService;
constructor() {
this.logger = Container.get('logger');
this.tenancy = Container.get(TenancyService);
this.settingsService = Container.get(SettingsService);
}
/**
* Handle sale estimate increment next number once be created.
*/
@On(events.saleEstimate.onCreated)
public async handleEstimateNextNumberIncrement({ tenantId, saleEstimateId }) {
await this.settingsService.incrementNextNumber(tenantId, {
key: 'next_number',
group: 'sales_estimates',
});
}
}

View File

@@ -2,15 +2,18 @@ import { Container } from 'typedi';
import { On, EventSubscriber } from "event-dispatch";
import events from 'subscribers/events';
import TenancyService from 'services/Tenancy/TenancyService';
import SettingsService from 'services/Settings/SettingsService';
@EventSubscriber()
export default class SaleInvoiceSubscriber {
logger: any;
tenancy: TenancyService;
settingsService: SettingsService;
constructor() {
this.logger = Container.get('logger');
this.tenancy = Container.get(TenancyService);
this.settingsService = Container.get(SettingsService);
}
/**
@@ -48,9 +51,20 @@ export default class SaleInvoiceSubscriber {
const { customerRepository } = this.tenancy.repositories(tenantId);
this.logger.info('[sale_invoice] trying to decrement customer balance.', { tenantId });
await customerRepository.changeBalance(
await customerRepository.changeBalance(
oldSaleInvoice.customerId,
oldSaleInvoice.balance * -1,
);
}
/**
* Handles sale invoice next number increment once invoice created.
*/
@On(events.saleInvoice.onCreated)
public async handleInvoiceNextNumberIncrement({ tenantId, saleInvoiceId, saleInvoice }) {
await this.settingsService.incrementNextNumber(tenantId, {
key: 'next_number',
group: 'sales_invoices'
});
}
}

View File

@@ -0,0 +1,29 @@
import { Container } from 'typedi';
import { On, EventSubscriber } from "event-dispatch";
import events from 'subscribers/events';
import TenancyService from 'services/Tenancy/TenancyService';
import SettingsService from 'services/Settings/SettingsService';
@EventSubscriber()
export default class SaleReceiptSubscriber {
logger: any;
tenancy: TenancyService;
settingsService: SettingsService;
constructor() {
this.logger = Container.get('logger');
this.tenancy = Container.get(TenancyService);
this.settingsService = Container.get(SettingsService);
}
/**
* Handle sale receipt increment next number once be created.
*/
@On(events.saleReceipt.onCreated)
public async handleReceiptNextNumberIncrement({ tenantId, saleReceiptId }) {
await this.settingsService.incrementNextNumber(tenantId, {
key: 'next_number',
group: 'sales_receipts',
});
}
}