QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-16 12:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: issue in edit payment receive with invoices payment amount chaning.

Browse Source
This commit is contained in:
a.bouhuolia
2020-12-19 17:04:11 +02:00
parent 1a0aad7dc4
commit fb135913bb
8 changed files with 103 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/src/api/controllers/Sales/PaymentReceives.ts
View File

@@ -80,7 +80,6 @@ export default class PaymentReceivesController extends BaseController {
*/
get paymentReceiveSchema(): ValidationChain[] {
return [
check('customer_id').exists().isNumeric().toInt(),
check('payment_date').exists(),
check('reference_no').optional(),
check('deposit_account_id').exists().isNumeric().toInt(),
@@ -121,7 +120,10 @@ export default class PaymentReceivesController extends BaseController {
* @return {Array}
*/
get newPaymentReceiveValidation() {
return [...this.paymentReceiveSchema];
return [
check('customer_id').exists().isNumeric().toInt(),
...this.paymentReceiveSchema,
];
}
/**
@@ -172,7 +174,10 @@ export default class PaymentReceivesController extends BaseController {
await this.paymentReceiveService.editPaymentReceive(
tenantId, paymentReceiveId, paymentReceive,
);
return res.status(200).send({ id: paymentReceiveId });
return res.status(200).send({
id: paymentReceiveId,
message: 'The payment receive has been edited successfully.'
});
} catch (error) {
next(error);
}

2
server/src/api/controllers/Sales/SalesInvoices.ts
View File

@@ -206,7 +206,7 @@ export default class SaleInvoicesController extends BaseController {
return res.status(200).send({
id: saleInvoiceId,
message: 'The given sale invoice has been published successfully',
message: 'The given sale invoice has been delivered successfully',
});
} catch (error) {
next(error);

12
server/src/interfaces/PaymentReceive.ts
View File

@@ -13,7 +13,7 @@ export interface IPaymentReceive {
entries: IPaymentReceiveEntry[],
userId: number,
};
export interface IPaymentReceiveDTO {
export interface IPaymentReceiveCreateDTO {
customerId: number,
paymentDate: Date,
amount: number,
@@ -24,6 +24,16 @@ export interface IPaymentReceiveDTO {
entries: IPaymentReceiveEntryDTO[],
};
export interface IPaymentReceiveEditDTO {
paymentDate: Date,
amount: number,
referenceNo: string,
depositAccountId: number,
paymentReceiveNo?: string,
description: string,
entries: IPaymentReceiveEntryDTO[],
};
export interface IPaymentReceiveEntry {
id?: number,
paymentReceiveId: number,

2
server/src/interfaces/SaleInvoice.ts
View File

@@ -25,7 +25,7 @@ export interface ISaleInvoiceDTO {
}
export interface ISaleInvoiceCreateDTO extends ISaleInvoiceDTO {
fromEstiamteId: number,
fromEstimateId: number,
};
export interface ISaleInvoiceEditDTO extends ISaleInvoiceDTO {

56
server/src/services/Sales/HasItemsEntries.ts
View File

@@ -8,62 +8,6 @@ export default class HasItemEntries {
@Inject()
tenancy: TenancyService;
/**
* Patch items entries to the storage.
*
* @param {Array} newEntries -
* @param {Array} oldEntries -
* @param {String} referenceType -
* @param {String|Number} referenceId -
* @return {Promise}
*/
async patchItemsEntries(
tenantId: number,
newEntries: Array<any>,
oldEntries: Array<any>,
referenceType: string,
referenceId: string|number
) {
const { ItemEntry } = this.tenancy.models(tenantId);
const entriesHasIds = newEntries.filter((entry) => entry.id);
const entriesHasNoIds = newEntries.filter((entry) => !entry.id);
const entriesIds = entriesHasIds.map(entry => entry.id);
const oldEntriesIds = oldEntries.map((e) => e.id);
const excludeAttrs = ['id', 'amount'];
const opers = [];
const entriesIdsShouldDelete = difference(
oldEntriesIds,
entriesIds,
);
if (entriesIdsShouldDelete.length > 0) {
const deleteOper = ItemEntry.query()
.whereIn('id', entriesIdsShouldDelete)
.delete();
opers.push(deleteOper);
}
entriesHasIds.forEach((entry) => {
const updateOper = ItemEntry.query()
.where('id', entry.id)
.update({
...omit(entry, excludeAttrs),
});
opers.push(updateOper);
});
entriesHasNoIds.forEach((entry) => {
const insertOper = ItemEntry.query()
.insert({
reference_id: referenceId,
reference_type: referenceType,
...omit(entry, excludeAttrs),
});
opers.push(insertOper);
});
return Promise.all([...opers]);
}
filterNonInventoryEntries(entries: [], items: []) {
const nonInventoryItems = items.filter((item: any) => item.type !== 'inventory');
const nonInventoryItemsIds = nonInventoryItems.map((i: any) => i.id);

13
server/src/services/Sales/PaymentsReceives.ts
View File

@@ -12,6 +12,8 @@ import {
IPaginationMeta,
IPaymentReceive,
IPaymentReceiveDTO,
IPaymentReceiveCreateDTO,
IPaymentReceiveEditDTO,
IPaymentReceiveEntry,
IPaymentReceiveEntryDTO,
IPaymentReceivesFilter,
@@ -236,7 +238,7 @@ export default class PaymentReceiveService {
* @param {number} tenantId - Tenant id.
* @param {IPaymentReceive} paymentReceive
*/
public async createPaymentReceive(tenantId: number, paymentReceiveDTO: IPaymentReceiveDTO) {
public async createPaymentReceive(tenantId: number, paymentReceiveDTO: IPaymentReceiveCreateDTO) {
const { PaymentReceive } = this.tenancy.models(tenantId);
const paymentAmount = sumBy(paymentReceiveDTO.entries, 'paymentAmount');
@@ -293,7 +295,7 @@ export default class PaymentReceiveService {
public async editPaymentReceive(
tenantId: number,
paymentReceiveId: number,
paymentReceiveDTO: any,
paymentReceiveDTO: IPaymentReceiveEditDTO,
) {
const { PaymentReceive } = this.tenancy.models(tenantId);
const paymentAmount = sumBy(paymentReceiveDTO.entries, 'paymentAmount');
@@ -310,14 +312,11 @@ export default class PaymentReceiveService {
// Validate the deposit account existance and type.
this.getDepositAccountOrThrowError(tenantId, paymentReceiveDTO.depositAccountId);
// Validate customer existance.
await this.customersService.getCustomerByIdOrThrowError(tenantId, paymentReceiveDTO.customerId);
// Validate the entries ids existance on payment receive type.
await this.validateEntriesIdsExistance(tenantId, paymentReceiveId, paymentReceiveDTO.entries);
// Validate payment receive invoices IDs existance and associated to the given customer id.
await this.validateInvoicesIDsExistance(tenantId, paymentReceiveDTO.customerId, paymentReceiveDTO.entries);
await this.validateInvoicesIDsExistance(tenantId, oldPaymentReceive.customerId, paymentReceiveDTO.entries);
// Validate invoice payment amount.
await this.validateInvoicesPaymentsAmount(tenantId, paymentReceiveDTO.entries, oldPaymentReceive.entries);
@@ -536,7 +535,7 @@ export default class PaymentReceiveService {
* @param {number} tenantId - Tenant id.
* @param {Array} paymentReceiveEntries
* @param {Array} newPaymentReceiveEntries
* @return
* @return {Promise<void>}
*/
public async saveChangeInvoicePaymentAmount(
tenantId: number,

106
server/src/subscribers/paymentReceives.ts
View File

@@ -17,7 +17,6 @@ export default class PaymentReceivesSubscriber {
this.tenancy = Container.get(TenancyService);
this.logger = Container.get('logger');
this.paymentReceivesService = Container.get(PaymentReceiveService);
this.settingsService = Container.get(SettingsService);
}
@@ -25,39 +24,17 @@ export default class PaymentReceivesSubscriber {
* Handle customer balance decrement once payment receive created.
*/
@On(events.paymentReceive.onCreated)
async handleCustomerBalanceDecrement({ tenantId, paymentReceiveId, paymentReceive }) {
async handleCustomerBalanceDecrement({
tenantId,
paymentReceiveId,
paymentReceive,
}) {
const { customerRepository } = this.tenancy.repositories(tenantId);
this.logger.info('[payment_receive] trying to decrement customer balance.');
await customerRepository.changeBalance(paymentReceive.customerId, paymentReceive.amount * -1);
}
/**
* Handle sale invoice increment/decrement payment amount once created, edited or deleted.
*/
@On(events.paymentReceive.onCreated)
@On(events.paymentReceive.onEdited)
async handleInvoiceIncrementPaymentAmount({ tenantId, paymentReceiveId, paymentReceive, oldPaymentReceive }) {
this.logger.info('[payment_receive] trying to change sale invoice payment amount.', { tenantId });
await this.paymentReceivesService.saveChangeInvoicePaymentAmount(
tenantId,
paymentReceive.entries,
oldPaymentReceive?.entries || null,
);
}
/**
* Handle revert invoices payment amount once payment receive deleted.
*/
@On(events.paymentReceive.onDeleted)
async handleInvoiceDecrementPaymentAmount({ tenantId, paymentReceiveId, oldPaymentReceive }) {
this.logger.info('[payment_receive] trying to decrement sale invoice payment amount.');
await this.paymentReceivesService.saveChangeInvoicePaymentAmount(
tenantId,
oldPaymentReceive.entries.map((entry) => ({ ...entry, paymentAmount: 0 })),
oldPaymentReceive.entries,
await customerRepository.changeBalance(
paymentReceive.customerId,
paymentReceive.amount * -1
);
}
@@ -65,13 +42,17 @@ export default class PaymentReceivesSubscriber {
* Handle customer balance increment once payment receive deleted.
*/
@On(events.paymentReceive.onDeleted)
async handleCustomerBalanceIncrement({ tenantId, paymentReceiveId, oldPaymentReceive }) {
async handleCustomerBalanceIncrement({
tenantId,
paymentReceiveId,
oldPaymentReceive,
}) {
const { customerRepository } = this.tenancy.repositories(tenantId);
this.logger.info('[payment_receive] trying to increment customer balance.');
await customerRepository.changeBalance(
oldPaymentReceive.customerId,
oldPaymentReceive.amount,
oldPaymentReceive.amount
);
}
@@ -79,14 +60,62 @@ export default class PaymentReceivesSubscriber {
* Handles customer balance diff balance change once payment receive edited.
*/
@On(events.paymentReceive.onEdited)
async handleCustomerBalanceDiffChange({ tenantId, paymentReceiveId, paymentReceive, oldPaymentReceive }) {
async handleCustomerBalanceDiffChange({
tenantId,
paymentReceiveId,
paymentReceive,
oldPaymentReceive,
}) {
const { customerRepository } = this.tenancy.repositories(tenantId);
await customerRepository.changeDiffBalance(
paymentReceive.customerId,
paymentReceive.amount * -1,
oldPaymentReceive.amount * -1,
oldPaymentReceive.customerId,
);
}
/**
* Handle sale invoice increment/decrement payment amount once created, edited or deleted.
*/
@On(events.paymentReceive.onCreated)
@On(events.paymentReceive.onEdited)
async handleInvoiceIncrementPaymentAmount({
tenantId,
paymentReceiveId,
paymentReceive,
oldPaymentReceive,
}) {
this.logger.info(
'[payment_receive] trying to change sale invoice payment amount.',
{ tenantId }
);
await this.paymentReceivesService.saveChangeInvoicePaymentAmount(
tenantId,
paymentReceive.entries,
oldPaymentReceive?.entries || null
);
}
/**
* Handle revert invoices payment amount once payment receive deleted.
*/
@On(events.paymentReceive.onDeleted)
async handleInvoiceDecrementPaymentAmount({
tenantId,
paymentReceiveId,
oldPaymentReceive,
}) {
this.logger.info(
'[payment_receive] trying to decrement sale invoice payment amount.'
);
await this.paymentReceivesService.saveChangeInvoicePaymentAmount(
tenantId,
oldPaymentReceive.entries.map((entry) => ({
...entry,
paymentAmount: 0,
})),
oldPaymentReceive.entries
);
}
@@ -94,10 +123,13 @@ export default class PaymentReceivesSubscriber {
* Handles increment next number of payment receive once be created.
*/
@On(events.paymentReceive.onCreated)
public async handlePaymentNextNumberIncrement({ tenantId, paymentReceiveId }) {
public async handlePaymentNextNumberIncrement({
tenantId,
paymentReceiveId,
}) {
await this.settingsService.incrementNextNumber(tenantId, {
key: 'next_number',
group: 'payment_receives',
});
}
}
}

9
server/src/utils/index.js
View File

@@ -190,10 +190,15 @@ const entriesAmountDiff = (
.mapValues((group) => _.sumBy(group, amountAttribute) || 0)
.value();
return _.chain(newEntries)
const newEntriesTable = _.chain(newEntries)
.groupBy(idAttribute)
.mapValues((group) => _.sumBy(group, amountAttribute) || 0)
.mapValues((value, key) => value - (oldEntriesTable[key] || 0))
.mergeWith(oldEntriesTable, (objValue, srcValue) => {
return (_.isNumber(objValue) ? objValue - srcValue : srcValue * -1);
})
.value();
return _.chain(newEntriesTable)
.mapValues((value, key) => ({
[idAttribute]: key,
[amountAttribute]: value,