Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UIDATIMP-1666: Display correctly Percentage and Currency fields for orders and invoices #1630

Merged
merged 20 commits into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0b480b7
UIDATIMP-1598: Remove MARC Bib option when Action = Create and update…
OleksandrHladchenko1 Mar 8, 2024
cf96ccd
Merge branch 'master' into UIDATIMP-1598
OleksandrHladchenko1 Mar 8, 2024
c9f8931
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 Mar 14, 2024
bcdba95
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 Mar 28, 2024
c185ad8
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 Apr 8, 2024
1167175
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 Apr 12, 2024
0364eba
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 Apr 17, 2024
b0a57c6
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 Apr 19, 2024
11e981f
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 Apr 30, 2024
fda4066
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 May 9, 2024
9e35530
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 May 27, 2024
e098721
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 Jun 26, 2024
ba065b3
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 Jul 23, 2024
042af77
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 Jul 31, 2024
5e8587a
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 Sep 3, 2024
2659af7
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 Sep 10, 2024
afa15d7
Merge branch 'master' of https://github.com/folio-org/ui-data-import
OleksandrHladchenko1 Oct 4, 2024
7ce1d20
UIDATIMP-1666: Display correctly 'Percentage' and 'currency' fields f…
OleksandrHladchenko1 Oct 10, 2024
a2a87f3
Update utils.js
OleksandrHladchenko1 Oct 10, 2024
3eb0b9b
Merge branch 'master' into UIDATIMP-1666
OleksandrHladchenko1 Oct 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
* When navigating to the Invoice field mapping profile edit form the page crashes (UIDATIMP-1646)
* Reset offset when open VievAllLogs page. (UIDATIMP-1645)
* Add missing `source-storage.sourceRecords.get` permission. (UIDATIMP-1652)
* Display correctly "Percentage" and "Currency" fields for orders and invoices. (UIDATIMP-1666)

## [7.1.8](https://github.com/folio-org/ui-data-import/tree/v7.1.8) (2024-05-09)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ export const DonorInformation = ({

return (
<Accordion
id="location"
id="donor-information"
label={<FormattedMessage id={`${TRANSLATION_ID_PREFIX}.order.donorInformation.section`} />}
>
<RepeatableField
Expand Down
4 changes: 2 additions & 2 deletions src/settings/MappingProfiles/detailsSections/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@ export const getAccountNumbersByCode = organization => {
}), {});
};

export const PERCENTAGE_VALUE = 'Percentage';
export const PERCENTAGE_VALUE = 'percentage';

export const renderAmountValue = (amountValue, amountType, currency) => {
const amountSymbol = amountType === `"${PERCENTAGE_VALUE}"` ?
const amountSymbol = amountType?.toLowerCase() === `"${PERCENTAGE_VALUE}"` ?
OleksandrHladchenko1 marked this conversation as resolved.
Show resolved Hide resolved
<FormattedMessage id="stripes-acq-components.fundDistribution.type.sign.percent" /> :
<CurrencySymbol currency={currency} />;

Expand Down
Loading