Enable account balance update for fee and interest activities (#3145)
* Enable account balance update for fee and interest activities * Update changelog
This commit is contained in:
parent
00c2ede85e
commit
3b895afc9e
@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
|
- Added support to update the cash balance of an account when adding a fee activity
|
||||||
|
- Added support to update the cash balance of an account when adding an interest activity
|
||||||
- Extended the content of the _General_ section by the product roadmap on the Frequently Asked Questions (FAQ) page
|
- Extended the content of the _General_ section by the product roadmap on the Frequently Asked Questions (FAQ) page
|
||||||
|
|
||||||
### Changed
|
### Changed
|
||||||
|
@ -148,7 +148,7 @@ export class OrderService {
|
|||||||
.plus(data.fee)
|
.plus(data.fee)
|
||||||
.toNumber();
|
.toNumber();
|
||||||
|
|
||||||
if (data.type === 'BUY') {
|
if (['BUY', 'FEE'].includes(data.type)) {
|
||||||
amount = new Big(amount).mul(-1).toNumber();
|
amount = new Big(amount).mul(-1).toNumber();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -260,6 +260,17 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
|
|||||||
this.activityForm.controls['currency'].setValue(currency);
|
this.activityForm.controls['currency'].setValue(currency);
|
||||||
this.activityForm.controls['currencyOfFee'].setValue(currency);
|
this.activityForm.controls['currencyOfFee'].setValue(currency);
|
||||||
this.activityForm.controls['currencyOfUnitPrice'].setValue(currency);
|
this.activityForm.controls['currencyOfUnitPrice'].setValue(currency);
|
||||||
|
|
||||||
|
if (['FEE', 'INTEREST'].includes(type)) {
|
||||||
|
if (this.activityForm.controls['accountId'].value) {
|
||||||
|
this.activityForm.controls['updateAccountBalance'].enable();
|
||||||
|
} else {
|
||||||
|
this.activityForm.controls['updateAccountBalance'].disable();
|
||||||
|
this.activityForm.controls['updateAccountBalance'].setValue(
|
||||||
|
false
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
@ -374,8 +385,15 @@ export class CreateOrUpdateActivityDialog implements OnDestroy {
|
|||||||
this.activityForm.controls['unitPriceInCustomCurrency'].setValue(0);
|
this.activityForm.controls['unitPriceInCustomCurrency'].setValue(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.activityForm.controls['updateAccountBalance'].disable();
|
if (
|
||||||
this.activityForm.controls['updateAccountBalance'].setValue(false);
|
['FEE', 'INTEREST'].includes(type) &&
|
||||||
|
this.activityForm.controls['accountId'].value
|
||||||
|
) {
|
||||||
|
this.activityForm.controls['updateAccountBalance'].enable();
|
||||||
|
} else {
|
||||||
|
this.activityForm.controls['updateAccountBalance'].disable();
|
||||||
|
this.activityForm.controls['updateAccountBalance'].setValue(false);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
this.activityForm.controls['accountId'].setValidators(
|
this.activityForm.controls['accountId'].setValidators(
|
||||||
Validators.required
|
Validators.required
|
||||||
|
Loading…
x
Reference in New Issue
Block a user