SuiteCRM/SuiteCRM-Core
2
0
Fork 0
mirror of https://github.com/SuiteCRM/SuiteCRM-Core.git synced 2025-08-29 21:00:39 +08:00
Code Issues Projects Packages Activity Actions

Fix #478 - Format currency on update value

Browse source
This commit is contained in:
Jack Anderson 2024-09-16 14:57:51 +01:00 • committed by y.yerli
parent b145a923c4
commit 1ebf1390cd
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/app/core/src/lib/fields/field-logic/currency-conversion/update-currency.action.ts
View file

@ -75,10 +75,12 @@ export class UpdateCurrencyAction extends FieldLogicActionHandler {
}
protected updateValue(field: Field, value: number, record: Record): void {
const options = {
mode: 'edit' as ViewMode
}
const formattedValue = this.currencyFormatter.toUserFormat(value.toString(), options)
const formattedValue = this.currencyFormatter.toUserFormat(value.toString(), options);
field.value = formattedValue;
field.formControl.setValue(formattedValue);
// re-validate the parent form-control after value update

16
core/app/core/src/lib/fields/field-logic/update-value/update-value.action.ts
View file

@ -33,6 +33,7 @@ import {StringArrayMap} from '../../../common/types/string-map';
import {StringArrayMatrix} from '../../../common/types/string-matrix';
import {ViewMode} from '../../../common/views/view.model';
import {ActiveFieldsChecker} from "../../../services/condition-operators/active-fields-checker.service";
import {CurrencyFormatter} from "../../../services/formatters/currency/currency-formatter.service";
@Injectable({
providedIn: 'root'
@ -42,7 +43,7 @@ export class UpdateValueAction extends FieldLogicActionHandler {
key = 'updateValue';
modes = ['edit', 'detail', 'list', 'create', 'massupdate', 'filter'] as ViewMode[];
constructor(protected activeFieldsChecker: ActiveFieldsChecker) {
constructor(protected activeFieldsChecker: ActiveFieldsChecker, protected currencyFormatter: CurrencyFormatter) {
super();
}
@ -78,6 +79,13 @@ export class UpdateValueAction extends FieldLogicActionHandler {
value = targetValue;
}
if (this.isCurrencyField(field)) {
const options = {
mode: 'edit' as ViewMode
}
value = this.currencyFormatter.toUserFormat(value, options);
}
this.updateValue(field, value.toString(), record);
}
@ -85,12 +93,18 @@ export class UpdateValueAction extends FieldLogicActionHandler {
/**
* Update the new value
* @param {object} field
* @param value
* @param {object} record
*/
protected updateValue(field: Field, value: string, record: Record): void {
field.value = value.toString();
field.formControl.setValue(value);
// re-validate the parent form-control after value update
record.formGroup.updateValueAndValidity({onlySelf: true, emitEvent: true});
}
protected isCurrencyField(field: Field): boolean {
return field.type === 'currency';
}
}