Skip to content
Draft
Show file tree
Hide file tree
Changes from 9 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
2 changes: 2 additions & 0 deletions src/ONYXKEYS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -977,6 +977,7 @@
EDIT_EXPENSIFY_CARD_NAME_FORM: 'editExpensifyCardName',
EDIT_EXPENSIFY_CARD_NAME_DRAFT_FORM: 'editExpensifyCardNameDraft',
EDIT_EXPENSIFY_CARD_LIMIT_FORM: 'editExpensifyCardLimit',
EDIT_TRAVEL_INVOICING_MONTHLY_LIMIT_FORM: 'editTravelInvoicingMonthlyLimit',
EDIT_EXPENSIFY_CARD_LIMIT_DRAFT_FORM: 'editExpensifyCardLimitDraft',
EDIT_EXPENSIFY_CARD_LIMIT_TYPE_FORM: 'editExpensifyCardLimitType',
EDIT_EXPENSIFY_CARD_LIMIT_TYPE_DRAFT_FORM: 'editExpensifyCardLimitTypeDraft',
Expand Down Expand Up @@ -1144,6 +1145,7 @@
[ONYXKEYS.FORMS.ASSIGN_CARD_FORM]: FormTypes.AssignCardForm;
[ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_NAME_FORM]: FormTypes.EditExpensifyCardNameForm;
[ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_FORM]: FormTypes.EditExpensifyCardLimitForm;
[ONYXKEYS.FORMS.EDIT_TRAVEL_INVOICING_MONTHLY_LIMIT_FORM]: FormTypes.EditTravelInvoicingMonthlyLimitForm;
[ONYXKEYS.FORMS.EDIT_EXPENSIFY_CARD_LIMIT_TYPE_FORM]: FormTypes.EditExpensifyCardLimitTypeForm;
[ONYXKEYS.FORMS.SAGE_INTACCT_CREDENTIALS_FORM]: FormTypes.SageIntactCredentialsForm;
[ONYXKEYS.FORMS.NETSUITE_CUSTOM_FIELD_FORM]: FormTypes.NetSuiteCustomFieldForm;
Expand Down Expand Up @@ -1504,7 +1506,7 @@
type MissingOnyxKeysError = `Error: Types don't match, OnyxKey type is missing: ${Exclude<AllOnyxKeys, OnyxKey>}`;
/** If this type errors, it means that the `OnyxKey` type is missing some keys. */
// eslint-disable-next-line @typescript-eslint/no-unused-vars
type AssertOnyxKeys = AssertTypesEqual<AllOnyxKeys, OnyxKey, MissingOnyxKeysError>;

Check failure on line 1509 in src/ONYXKEYS.ts

View workflow job for this annotation

GitHub Actions / typecheck

Type 'OnyxKey' does not satisfy the constraint 'never'.

export default ONYXKEYS;
export type {
Expand Down
4 changes: 4 additions & 0 deletions src/ROUTES.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2697,6 +2697,10 @@ const ROUTES = {
route: 'workspaces/:policyID/travel/settings/frequency',
getRoute: (policyID: string) => `workspaces/${policyID}/travel/settings/frequency` as const,
},
WORKSPACE_TRAVEL_SETTINGS_MONTHLY_LIMIT: {
route: 'workspaces/:policyID/travel/settings/monthly-limit',
getRoute: (policyID: string) => `workspaces/${policyID}/travel/settings/monthly-limit` as const,
},
WORKSPACE_TRAVEL_MISSING_PERSONAL_DETAILS: {
route: 'workspaces/:policyID/travel/missing-personal-details',
getRoute: (policyID: string) => `workspaces/${policyID}/travel/missing-personal-details` as const,
Expand Down
1 change: 1 addition & 0 deletions src/SCREENS.ts
Original file line number Diff line number Diff line change
Expand Up @@ -763,6 +763,7 @@ const SCREENS = {
TRAVEL: 'Travel',
TRAVEL_SETTINGS_ACCOUNT: 'Workspace_Travel_Settings_Account',
TRAVEL_SETTINGS_FREQUENCY: 'Workspace_Travel_Settings_Frequency',
TRAVEL_SETTINGS_MONTHLY_LIMIT: 'Workspace_Travel_Settings_Monthly_Limit',
TRAVEL_EXPORT: 'Workspace_Travel_Invoicing_Export',
TRAVEL_MISSING_PERSONAL_DETAILS: 'Travel_Missing_Personal_Details',
CREATE_DISTANCE_RATE: 'Create_Distance_Rate',
Expand Down
5 changes: 5 additions & 0 deletions src/languages/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5319,6 +5319,11 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU
settlementAccountLabel: 'Verrechnungskonto',
settlementFrequencyLabel: 'Auszahlungsfrequenz',
settlementFrequencyDescription: 'Wie oft Expensify Ihr Geschäftskonto belastet, um aktuelle Expensify Travel-Transaktionen zu begleichen.',
monthlySpendLimitLabel: 'Monatliches Ausgabelimit pro Mitglied',
monthlySpendLimitDescription: 'Der maximale Betrag, den jedes Mitglied pro Monat für Reisen ausgeben kann.',
reduceLimitTitle: 'Reise-Ausgabelimit reduzieren?',
reduceLimitWarning:
'Wenn Sie das Limit reduzieren, können Mitglieder, die diesen Betrag bereits überschritten haben, bis zum nächsten Monat keine neuen Reisebuchungen vornehmen.',
},
},
disableModal: {
Expand Down
4 changes: 4 additions & 0 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5318,6 +5318,10 @@ const translations = {
settlementAccountLabel: 'Settlement account',
settlementFrequencyLabel: 'Settlement frequency',
settlementFrequencyDescription: 'How often Expensify will pull from your business bank account to settle recent Expensify Travel transactions.',
monthlySpendLimitLabel: 'Monthly spend limit per member',
monthlySpendLimitDescription: 'The maximum amount each member can spend on travel per month.',
reduceLimitTitle: 'Reduce travel spend limit?',
reduceLimitWarning: 'If you reduce the limit, members who have already spent more than this amount will be unable to make new travel bookings until next month.',
},
},
disableModal: {
Expand Down
4 changes: 4 additions & 0 deletions src/languages/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5205,6 +5205,10 @@ ${amount} para ${merchant} - ${date}`,
settlementFrequencyLabel: 'Frecuencia de liquidación',
settlementFrequencyDescription:
'Con qué frecuencia Expensify retirará fondos de la cuenta bancaria de tu empresa para liquidar transacciones recientes de Expensify Travel.',
monthlySpendLimitLabel: 'Límite de gasto mensual por miembro',
monthlySpendLimitDescription: 'El monto máximo que cada miembro puede gastar en viajes por mes.',
reduceLimitTitle: '¿Reducir el límite de gasto en viajes?',
reduceLimitWarning: 'Si reduces el límite, los miembros que ya hayan gastado más de este monto no podrán hacer nuevas reservas de viaje hasta el próximo mes.',
},
},
disableModal: {
Expand Down
5 changes: 5 additions & 0 deletions src/languages/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5339,6 +5339,11 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST.
settlementFrequencyLabel: 'Fréquence de règlement',
settlementFrequencyDescription:
'Fréquence à laquelle Expensify prélèvera sur votre compte bancaire professionnel pour régler les transactions récentes d’Expensify Travel.',
monthlySpendLimitLabel: 'Limite de dépenses mensuelle par membre',
monthlySpendLimitDescription: 'Le montant maximum que chaque membre peut dépenser en déplacements par mois.',
reduceLimitTitle: 'Réduire la limite de dépenses de voyage\u00A0?',
reduceLimitWarning:
'Si vous réduisez la limite, les membres ayant déjà dépensé plus que ce montant ne pourront pas effectuer de nouvelles réservations de voyage avant le mois prochain.',
},
},
disableModal: {
Expand Down
5 changes: 5 additions & 0 deletions src/languages/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5310,6 +5310,11 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST.
settlementFrequencyLabel: 'Frequenza di regolamento',
settlementFrequencyDescription:
'Con quale frequenza Expensify preleverà dal tuo conto bancario aziendale per saldare le recenti transazioni di Expensify Travel.',
monthlySpendLimitLabel: 'Limite di spesa mensile per membro',
monthlySpendLimitDescription: "L'importo massimo che ciascun membro può spendere in viaggi al mese.",
reduceLimitTitle: 'Ridurre il limite di spesa per i viaggi?',
reduceLimitWarning:
'Se riduci il limite, i membri che hanno già speso più di questo importo non potranno effettuare nuove prenotazioni di viaggio fino al mese prossimo.',
},
},
disableModal: {
Expand Down
4 changes: 4 additions & 0 deletions src/languages/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5249,6 +5249,10 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO
settlementAccountLabel: '決済口座',
settlementFrequencyLabel: '清算頻度',
settlementFrequencyDescription: 'Expensify が直近の Expensify Travel 取引を精算するために、あなたのビジネス銀行口座から資金を引き落とす頻度。',
monthlySpendLimitLabel: 'メンバーごとの月間支出上限',
monthlySpendLimitDescription: '各メンバーが1か月に出張に使える最大金額。',
reduceLimitTitle: '出張支出上限を引き下げますか?',
reduceLimitWarning: 'この上限を引き下げると、すでにこの金額を超えて支出しているメンバーは、翌月まで新しい出張予約ができなくなります。',
},
},
disableModal: {
Expand Down
4 changes: 4 additions & 0 deletions src/languages/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5295,6 +5295,10 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_
settlementAccountLabel: 'Verrekeningsrekening',
settlementFrequencyLabel: 'Uitbetalingsfrequentie',
settlementFrequencyDescription: 'Hoe vaak Expensify geld van uw zakelijke bankrekening zal incasseren om recente Expensify Travel-transacties te vereffenen.',
monthlySpendLimitLabel: 'Maandelijks bestedingslimiet per lid',
monthlySpendLimitDescription: 'Het maximale bedrag dat elk lid per maand aan reizen kan besteden.',
reduceLimitTitle: 'Reisbestedingslimiet verlagen?',
reduceLimitWarning: 'Als u het limiet verlaagt, kunnen leden die dit bedrag al hebben overschreden geen nieuwe reisboekingen maken tot volgende maand.',
},
},
disableModal: {
Expand Down
5 changes: 5 additions & 0 deletions src/languages/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5286,6 +5286,11 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy
settlementAccountLabel: 'Konto rozliczeniowe',
settlementFrequencyLabel: 'Częstotliwość rozliczeń',
settlementFrequencyDescription: 'Jak często Expensify będzie pobierać środki z firmowego konta bankowego, aby rozliczyć ostatnie transakcje Expensify Travel.',
monthlySpendLimitLabel: 'Miesięczny limit wydatków na członka',
monthlySpendLimitDescription: 'Maksymalna kwota, jaką każdy członek może wydać na podróże w ciągu miesiąca.',
reduceLimitTitle: 'Zmniejszyć limit wydatków na podróże?',
reduceLimitWarning:
'Jeśli zmniejszysz limit, członkowie, którzy już wydali więcej niż ta kwota, nie będą mogli dokonywać nowych rezerwacji podróży do następnego miesiąca.',
},
},
disableModal: {
Expand Down
4 changes: 4 additions & 0 deletions src/languages/pt-BR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5291,6 +5291,10 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS
settlementFrequencyLabel: 'Frequência de liquidação',
settlementFrequencyDescription:
'Com que frequência o Expensify vai debitar da sua conta bancária empresarial para liquidar as transações recentes do Expensify Travel.',
monthlySpendLimitLabel: 'Limite de gastos mensal por membro',
monthlySpendLimitDescription: 'O valor máximo que cada membro pode gastar em viagens por mês.',
reduceLimitTitle: 'Reduzir o limite de gastos com viagens?',
reduceLimitWarning: 'Se você reduzir o limite, os membros que já gastaram mais do que esse valor não poderão fazer novas reservas de viagem até o próximo mês.',
},
},
disableModal: {
Expand Down
4 changes: 4 additions & 0 deletions src/languages/zh-hans.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5167,6 +5167,10 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM
settlementAccountLabel: '结算账户',
settlementFrequencyLabel: '结算频率',
settlementFrequencyDescription: 'Expensify 从您的企业银行账户中扣款以结算最近 Expensify Travel 交易的频率。',
monthlySpendLimitLabel: '每位成员的月度支出限额',
monthlySpendLimitDescription: '每位成员每月可用于出差的最高金额。',
reduceLimitTitle: '降低出差支出限额?',
reduceLimitWarning: '如果您降低限额,已超出该金额的成员将无法进行新的出差预订,直至下个月。',
},
},
disableModal: {title: '关闭差旅开票?', body: '即将到来的酒店和汽车租赁预订可能需要使用不同的付款方式重新预订,以避免被取消。', confirm: '关闭'},
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
type UpdateTravelInvoicingMonthlyLimitParams = {
domainAccountID: number;
monthlySpendLimitPerUser: number;
};

export default UpdateTravelInvoicingMonthlyLimitParams;
1 change: 1 addition & 0 deletions src/libs/API/parameters/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ export type {default as ConfigureTravelInvoicingForPolicyParams} from './Configu
export type {default as DeactivateTravelInvoicingParams} from './DeactivateTravelInvoicingParams';
export type {default as SetTravelInvoicingSettlementAccountParams} from './SetTravelInvoicingSettlementAccountParams';
export type {default as PayTravelInvoicingSpendParams} from './PayTravelInvoicingSpendParams';
export type {default as UpdateTravelInvoicingMonthlyLimitParams} from './UpdateTravelInvoicingMonthlyLimitParams';
export type {default as UpdateTravelInvoicingSettlementFrequencyParams} from './UpdateTravelInvoicingSettlementFrequencyParams';
export type {default as GetTravelInvoiceStatementPDFParams} from './GetTravelInvoiceStatementPDFParams';
export type {default as ExportTravelInvoiceStatementCSVParams} from './ExportTravelInvoiceStatementCSVParams';
Expand Down
2 changes: 2 additions & 0 deletions src/libs/API/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,7 @@ const WRITE_COMMANDS = {
DEACTIVATE_TRAVEL_INVOICING: 'DeactivateTravelInvoicing',
SET_TRAVEL_INVOICING_SETTLEMENT_ACCOUNT: 'SetTravelInvoicingSettlementAccount',
UPDATE_TRAVEL_INVOICE_SETTLEMENT_FREQUENCY: 'UpdateTravelInvoiceSettlementFrequency',
UPDATE_TRAVEL_INVOICING_MONTHLY_LIMIT: 'UpdateTravelInvoicingMonthlyLimit',
PAY_TRAVEL_INVOICING_SPEND: 'PayTravelInvoicingSpend',
UPDATE_XERO_IMPORT_TRACKING_CATEGORIES: 'UpdateXeroImportTrackingCategories',
UPDATE_XERO_IMPORT_TAX_RATES: 'UpdateXeroImportTaxRates',
Expand Down Expand Up @@ -1085,6 +1086,7 @@ type WriteCommandParameters = {
[WRITE_COMMANDS.DEACTIVATE_TRAVEL_INVOICING]: Parameters.DeactivateTravelInvoicingParams;
[WRITE_COMMANDS.SET_TRAVEL_INVOICING_SETTLEMENT_ACCOUNT]: Parameters.SetTravelInvoicingSettlementAccountParams;
[WRITE_COMMANDS.UPDATE_TRAVEL_INVOICE_SETTLEMENT_FREQUENCY]: Parameters.UpdateTravelInvoicingSettlementFrequencyParams;
[WRITE_COMMANDS.UPDATE_TRAVEL_INVOICING_MONTHLY_LIMIT]: Parameters.UpdateTravelInvoicingMonthlyLimitParams;
[WRITE_COMMANDS.PAY_TRAVEL_INVOICING_SPEND]: Parameters.PayTravelInvoicingSpendParams;
[WRITE_COMMANDS.SET_PERSONAL_DETAILS_AND_SHIP_EXPENSIFY_CARDS]: Parameters.SetPersonalDetailsAndShipExpensifyCardsParams;
[WRITE_COMMANDS.SELF_TOUR_VIEWED]: null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,7 @@ const SettingsModalStackNavigator = createModalStackNavigator<SettingsNavigatorP
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SETTINGS_FREQUENCY]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceSettlementFrequencyPage').default,
[SCREENS.WORKSPACE.TRAVEL_SETTINGS_ACCOUNT]: () => require<ReactComponentModule>('../../../../pages/workspace/travel/WorkspaceTravelInvoicingSettlementAccountPage').default,
[SCREENS.WORKSPACE.TRAVEL_SETTINGS_FREQUENCY]: () => require<ReactComponentModule>('../../../../pages/workspace/travel/WorkspaceTravelInvoicingSettlementFrequencyPage').default,
[SCREENS.WORKSPACE.TRAVEL_SETTINGS_MONTHLY_LIMIT]: () => require<ReactComponentModule>('../../../../pages/workspace/travel/WorkspaceTravelInvoicingMonthlyLimitPage').default,
[SCREENS.WORKSPACE.TRAVEL_EXPORT]: () => require<ReactComponentModule>('../../../../pages/workspace/travel/WorkspaceTravelInvoicingExportPage').default,
[SCREENS.WORKSPACE.TRAVEL_MISSING_PERSONAL_DETAILS]: () => require<ReactComponentModule>('../../../../pages/Travel/TravelLegalNamePage').default,
[SCREENS.WORKSPACE.EXPENSIFY_CARD_SELECT_FEED]: () => require<ReactComponentModule>('../../../../pages/workspace/expensifyCard/WorkspaceExpensifyCardSelectorPage').default,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,7 @@ const WORKSPACE_TO_RHP: Partial<Record<keyof WorkspaceSplitNavigatorParamList, s
[SCREENS.WORKSPACE.TRAVEL]: [
SCREENS.WORKSPACE.TRAVEL_SETTINGS_ACCOUNT,
SCREENS.WORKSPACE.TRAVEL_SETTINGS_FREQUENCY,
SCREENS.WORKSPACE.TRAVEL_SETTINGS_MONTHLY_LIMIT,
SCREENS.WORKSPACE.TRAVEL_EXPORT,
SCREENS.WORKSPACE.TRAVEL_MISSING_PERSONAL_DETAILS,
],
Expand Down
3 changes: 3 additions & 0 deletions src/libs/Navigation/linkingConfig/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -854,6 +854,9 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
[SCREENS.WORKSPACE.TRAVEL_SETTINGS_FREQUENCY]: {
path: ROUTES.WORKSPACE_TRAVEL_SETTINGS_FREQUENCY.route,
},
[SCREENS.WORKSPACE.TRAVEL_SETTINGS_MONTHLY_LIMIT]: {
path: ROUTES.WORKSPACE_TRAVEL_SETTINGS_MONTHLY_LIMIT.route,
},
[SCREENS.WORKSPACE.TRAVEL_EXPORT]: {
path: ROUTES.WORKSPACE_TRAVEL_EXPORT.route,
},
Expand Down
3 changes: 3 additions & 0 deletions src/libs/Navigation/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1288,6 +1288,9 @@ type SettingsNavigatorParamList = {
[SCREENS.WORKSPACE.TRAVEL_SETTINGS_FREQUENCY]: {
policyID: string;
};
[SCREENS.WORKSPACE.TRAVEL_SETTINGS_MONTHLY_LIMIT]: {
policyID: string;
};
[SCREENS.WORKSPACE.TRAVEL_EXPORT]: {
policyID: string;
};
Expand Down
Loading
Loading