mirror of
https://github.com/bigcapitalhq/bigcapital.git
synced 2026-02-17 21:30:31 +00:00
feat: auto-increment sale invoice, receipt, estimate and payment receive.
feat: style sales and purchases forms.
This commit is contained in:
@@ -103,4 +103,14 @@ export default {
|
||||
type: "string",
|
||||
},
|
||||
],
|
||||
payment_receives: [
|
||||
{
|
||||
key: 'next_number',
|
||||
type: 'number',
|
||||
},
|
||||
{
|
||||
key: 'number_prefix',
|
||||
type: 'string',
|
||||
},
|
||||
]
|
||||
};
|
||||
|
||||
@@ -10,3 +10,5 @@ import 'subscribers/customers';
|
||||
import 'subscribers/vendors';
|
||||
import 'subscribers/paymentMades';
|
||||
import 'subscribers/paymentReceives';
|
||||
import 'subscribers/saleEstimates';
|
||||
import 'subscribers/saleReceipts';
|
||||
@@ -400,6 +400,7 @@ export default class SaleInvoicesService extends SalesInvoicesCost {
|
||||
salesInvoicesFilter.page - 1,
|
||||
salesInvoicesFilter.pageSize,
|
||||
);
|
||||
|
||||
return {
|
||||
salesInvoices: results,
|
||||
pagination,
|
||||
|
||||
30
server/src/services/Settings/SettingsService.ts
Normal file
30
server/src/services/Settings/SettingsService.ts
Normal 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();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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.');
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -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',
|
||||
});
|
||||
}
|
||||
}
|
||||
29
server/src/subscribers/saleEstimates.ts
Normal file
29
server/src/subscribers/saleEstimates.ts
Normal 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',
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -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'
|
||||
});
|
||||
}
|
||||
}
|
||||
29
server/src/subscribers/saleReceipts.ts
Normal file
29
server/src/subscribers/saleReceipts.ts
Normal 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',
|
||||
});
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user