Skip to content

Pass rates in cents when importing Per diem #55867

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.

Sign up for GitHub

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

Merged
MarioExpensify merged 3 commits into from
Jan 28, 2025
Merged

Pass rates in cents when importing Per diem #55867

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6794a54
Pass rates in cents when importing Per diem
Gonals Jan 28, 2025
3c9e264
lint
Gonals Jan 28, 2025
4c1916e
rename for lint
Gonals Jan 28, 2025
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
12 changes: 6 additions & 6 deletions src/pages/workspace/perDiem/ImportedPerDiemPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
import useLocalize from '@hooks/useLocalize';
import usePolicy from '@hooks/usePolicy';
import {closeImportPage} from '@libs/actions/ImportSpreadsheet';
import * as PerDiem from '@libs/actions/Policy/PerDiem';
import {generateCustomUnitID, importPerDiemRates} from '@libs/actions/Policy/PerDiem';
import {sanitizeCurrencyCode} from '@libs/CurrencyUtils';
import {findDuplicate, generateColumnNames} from '@libs/importSpreadsheetUtils';
import Navigation from '@libs/Navigation/Navigation';
Expand All @@ -35,9 +35,9 @@ function generatePerDiemUnits(perDiemDestination: string[], perDiemSubRate: stri
subRates: [],
};
perDiemUnits[perDiemDestination[i]].subRates?.push({
id: PerDiem.generateCustomUnitID(),
id: generateCustomUnitID(),
name: perDiemSubRate.at(i) ?? '',
rate: Number(perDiemAmount.at(i)) ?? 0,
rate: (Number(perDiemAmount.at(i)) ?? 0) * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET,
});
}
return Object.values(perDiemUnits);
Expand Down Expand Up @@ -95,7 +95,7 @@ function ImportedPerDiemPage({route}: ImportedPerDiemPageProps) {
return errors;
}, [requiredColumns, spreadsheet?.columns, translate, columnRoles]);

const importPerDiemRates = useCallback(() => {
const importRates = useCallback(() => {
setIsValidationEnabled(true);
const errors = validate();
if (Object.keys(errors).length > 0 || !perDiemCustomUnit?.customUnitID) {
Expand All @@ -122,7 +122,7 @@ function ImportedPerDiemPage({route}: ImportedPerDiemPageProps) {

if (perDiemUnits) {
setIsImportingPerDiemRates(true);
PerDiem.importPerDiemRates(policyID, perDiemCustomUnit.customUnitID, perDiemUnits, rowsLength);
importPerDiemRates(policyID, perDiemCustomUnit.customUnitID, perDiemUnits, rowsLength);
}
}, [validate, spreadsheet?.columns, spreadsheet?.data, containsHeader, policyID, perDiemCustomUnit?.customUnitID]);

Expand All @@ -149,7 +149,7 @@ function ImportedPerDiemPage({route}: ImportedPerDiemPageProps) {
<ImportSpreadsheetColumns
spreadsheetColumns={spreadsheetColumns}
columnNames={columnNames}
importFunction={importPerDiemRates}
importFunction={importRates}
errors={isValidationEnabled ? validate() : undefined}
columnRoles={columnRoles}
isButtonLoading={isImportingPerDiemRates}
Expand Down