Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions src/libs/Violations/ViolationsUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import * as CurrencyUtils from '@libs/CurrencyUtils';
import DateUtils from '@libs/DateUtils';
import {isReceiptError} from '@libs/ErrorUtils';
import Parser from '@libs/Parser';
import {getDistanceRateCustomUnitRate, getSortedTagKeys} from '@libs/PolicyUtils';
import {getDistanceRateCustomUnitRate, getPerDiemRateCustomUnitRate, getSortedTagKeys} from '@libs/PolicyUtils';
import * as TransactionUtils from '@libs/TransactionUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
Expand Down Expand Up @@ -292,8 +292,10 @@ const ViolationsUtils = {

const customUnitRateID = updatedTransaction?.comment?.customUnit?.customUnitRateID;
if (customUnitRateID && customUnitRateID.length > 0) {
const distanceRateCustomRate = getDistanceRateCustomUnitRate(policy, customUnitRateID);
if (distanceRateCustomRate) {
const isPerDiem = TransactionUtils.isPerDiemRequest(updatedTransaction);
const customRate = isPerDiem ? getPerDiemRateCustomUnitRate(policy, customUnitRateID) : getDistanceRateCustomUnitRate(policy, customUnitRateID);

if (customRate) {
newTransactionViolations = reject(newTransactionViolations, {name: CONST.VIOLATIONS.CUSTOM_UNIT_OUT_OF_POLICY});
} else {
newTransactionViolations.push({
Expand Down
39 changes: 39 additions & 0 deletions tests/unit/ViolationUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,45 @@ describe('getViolationsOnyxData', () => {
});
});

describe('per diem rate validation', () => {
beforeEach(() => {
transactionViolations = [customUnitOutOfPolicyViolation];

const customUnitRateID = 'per_diem_rate_id';
transaction.comment = {
...transaction.comment,
customUnit: {
...(transaction?.comment?.customUnit ?? {}),
customUnitRateID,
},
};
transaction.iouRequestType = CONST.IOU.REQUEST_TYPE.PER_DIEM;
policy.customUnits = {
perDiemUnitId: {
customUnitID: 'perDiemUnitId',
defaultCategory: '',
enabled: true,
name: CONST.CUSTOM_UNITS.NAME_PER_DIEM_INTERNATIONAL,
rates: {
[customUnitRateID]: {
currency: 'USD',
customUnitRateID,
enabled: true,
name: 'Spain',
rate: 0,
},
},
},
};
});

it('should remove the customUnitOutOfPolicy violation if the per diem rate is valid for the policy', () => {
const result = ViolationsUtils.getViolationsOnyxData(transaction, transactionViolations, policy, policyTags, policyCategories, false, false);

expect(result.value).not.toContainEqual(customUnitOutOfPolicyViolation);
});
});

describe('controlPolicyViolations', () => {
beforeEach(() => {
policy.type = 'corporate';
Expand Down
Loading