diff --git a/src/ROUTES.ts b/src/ROUTES.ts index e4e6f71a1e50..c725f7de2d37 100644 --- a/src/ROUTES.ts +++ b/src/ROUTES.ts @@ -4089,6 +4089,26 @@ const ROUTES = { route: 'workspaces/:policyID/accounting/rillet/export/default-company-card-vendor', getRoute: (policyID: string) => `workspaces/${policyID}/accounting/rillet/export/default-company-card-vendor` as const, }, + POLICY_ACCOUNTING_RILLET_ADVANCED: { + route: 'workspaces/:policyID/accounting/rillet/advanced', + getRoute: (policyID: string) => `workspaces/${policyID}/accounting/rillet/advanced` as const, + }, + POLICY_ACCOUNTING_RILLET_EXPORT_METHOD: { + route: 'workspaces/:policyID/accounting/rillet/advanced/export-method', + getRoute: (policyID: string) => `workspaces/${policyID}/accounting/rillet/advanced/export-method` as const, + }, + POLICY_ACCOUNTING_RILLET_BILL_PAYMENT_ACCOUNT: { + route: 'workspaces/:policyID/accounting/rillet/advanced/bill-payment-account', + getRoute: (policyID: string) => `workspaces/${policyID}/accounting/rillet/advanced/bill-payment-account` as const, + }, + POLICY_ACCOUNTING_RILLET_EXPENSIFY_CARD_SETTLEMENT_ACCOUNT: { + route: 'workspaces/:policyID/accounting/rillet/advanced/expensify-card-settlement-account', + getRoute: (policyID: string) => `workspaces/${policyID}/accounting/rillet/advanced/expensify-card-settlement-account` as const, + }, + POLICY_ACCOUNTING_RILLET_TRAVEL_INVOICING_SETTLEMENT_ACCOUNT: { + route: 'workspaces/:policyID/accounting/rillet/advanced/travel-invoicing-settlement-account', + getRoute: (policyID: string) => `workspaces/${policyID}/accounting/rillet/advanced/travel-invoicing-settlement-account` as const, + }, ADD_EXISTING_EXPENSE: { route: 'search/r/:reportID/add-existing-expense/:backToReport?', getRoute: (reportID: string | undefined, backToReport?: string) => `search/r/${reportID}/add-existing-expense/${backToReport ?? ''}` as const, diff --git a/src/SCREENS.ts b/src/SCREENS.ts index c3ac338fd17c..01067a841a98 100644 --- a/src/SCREENS.ts +++ b/src/SCREENS.ts @@ -672,6 +672,11 @@ const SCREENS = { RILLET_VENDOR_BILL_DATE: 'Policy_Accounting_Rillet_Vendor_Bill_Date', RILLET_COMPANY_CARD_ACCOUNT: 'Policy_Accounting_Rillet_Company_Card_Account', RILLET_DEFAULT_COMPANY_CARD_VENDOR: 'Policy_Accounting_Rillet_Default_Company_Card_Vendor', + RILLET_ADVANCED: 'Policy_Accounting_Rillet_Advanced', + RILLET_EXPORT_METHOD: 'Policy_Accounting_Rillet_Export_Method', + RILLET_BILL_PAYMENT_ACCOUNT: 'Policy_Accounting_Rillet_Bill_Payment_Account', + RILLET_EXPENSIFY_CARD_SETTLEMENT_ACCOUNT: 'Policy_Accounting_Rillet_Expensify_Card_Settlement_Account', + RILLET_TRAVEL_INVOICING_SETTLEMENT_ACCOUNT: 'Policy_Accounting_Rillet_Travel_Invoicing_Settlement_Account', CARD_RECONCILIATION: 'Policy_Accounting_Card_Reconciliation', CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC: 'Policy_Accounting_Card_Reconciliation_Sage_Intacct_Auto_Sync', DYNAMIC_RECONCILIATION_ACCOUNT_SETTINGS: 'Dynamic_Policy_Accounting_Reconciliation_Account_Settings', diff --git a/src/languages/de.ts b/src/languages/de.ts index e56b69f24489..c35343e7e158 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -5571,6 +5571,28 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU description: 'Wählen Sie einen standardmäßigen Rillet-Anbieter für Ausgaben, die nicht automatisch zugeordnet werden.', }, companyCardAccount: {label: 'Firmenkartenkonto', description: 'Wählen Sie aus, wohin die Firmenkartentransaktionen exportiert werden sollen.'}, + noBankAccountsFound: 'Keine Bankkonten gefunden', + noBankAccountsFoundDescription: 'Bitte fügen Sie Bankkonten in Rillet hinzu und synchronisieren Sie die Verbindung erneut', + autoSyncDescription: 'Synchronisieren Sie Rillet und Expensify automatisch – jeden Tag. Berichte werden in Echtzeit synchronisiert.', + accountingMethods: { + label: 'Exportmethode', + description: 'Wählen Sie, wann Ausgaben exportiert werden sollen.', + values: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Periodenabgrenzung', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Barzahlung', + }, + alternateText: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Auslagen aus eigener Tasche werden nach endgültiger Genehmigung exportiert', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Auslagen werden beim Bezahlen exportiert', + }, + }, + syncReimbursedReports: 'Erstattete Berichte synchronisieren', + syncReimbursedReportsDescription: 'Wenn ein Bericht per ACH bezahlt wird, wird in diesem Konto eine Rechnungszahlung erzeugt.', + billPaymentAccount: {label: 'Rechnungskonto', description: 'Wählen Sie aus, von wo Sie Rechnungen bezahlen möchten, und wir erstellen die Zahlung in Rillet.'}, + syncExpensifyCardSettlements: 'Expensify Kartenabrechnungen synchronisieren', + settlementAccount: {label: 'Verrechnungskonto für Expensify Karte', description: 'Wählen Sie Ihr Abrechnungskonto, und wir erstellen die Zahlung in Rillet.'}, + syncTravelInvoicingSettlements: 'Abrechnungen für Reiseabrechnungen synchronisieren', + travelInvoicingSettlementAccount: {label: 'Abrechnungskonto für Reiseabrechnungen', description: 'Wählen Sie Ihr Abrechnungskonto, und wir erstellen die Zahlung in Rillet.'}, }, type: { free: 'Kostenlos', diff --git a/src/languages/en.ts b/src/languages/en.ts index a103073238a4..66b0c72f5441 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -5602,6 +5602,8 @@ const translations = { noVendorsFoundDescription: 'Please add vendors in Rillet and sync the connection again', noAccountsFound: 'No accounts found', noAccountsFoundDescription: 'Please add accounts in Rillet and sync the connection again', + noBankAccountsFound: 'No bank accounts found', + noBankAccountsFoundDescription: 'Please add bank accounts in Rillet and sync the connection again', accountTypesDescription: 'Your Rillet accounts will import as categories.', enableNewAccountsTitle: 'Enable newly imported accounts', enableNewAccountsDescription: 'New Rillet accounts will be available as categories.', @@ -5650,6 +5652,35 @@ const translations = { label: 'Company card account', description: 'Choose where to export company card transactions.', }, + autoSyncDescription: 'Sync Rillet and Expensify automatically, every day. Reports sync in realtime.', + accountingMethods: { + label: 'Export method', + description: 'Choose when to export expenses.', + values: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Accrual', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Cash', + }, + alternateText: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Out-of-pocket expenses will export when final approved', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Out-of-pocket expenses will export when paid', + }, + }, + syncReimbursedReports: 'Sync reimbursed reports', + syncReimbursedReportsDescription: 'When a report is paid via ACH, a bill payment will be generated in this account.', + billPaymentAccount: { + label: 'Bill payment account', + description: "Choose where to pay bills from and we'll create the payment in Rillet.", + }, + syncExpensifyCardSettlements: 'Sync Expensify Card settlements', + settlementAccount: { + label: 'Expensify Card settlement account', + description: "Choose your settlement account and we'll create the payment in Rillet.", + }, + syncTravelInvoicingSettlements: 'Sync Travel Invoicing settlements', + travelInvoicingSettlementAccount: { + label: 'Travel Invoicing settlement account', + description: "Choose your settlement account and we'll create the payment in Rillet.", + }, }, type: { free: 'Free', diff --git a/src/languages/es.ts b/src/languages/es.ts index 7bedc025fdf3..5e4a8e11b995 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -5405,6 +5405,28 @@ ${amount} para ${merchant} - ${date}`, description: 'Elige un proveedor Rillet predeterminado para los gastos que no se asignen automáticamente.', }, companyCardAccount: {label: 'Cuenta de tarjeta de empresa', description: 'Elige dónde exportar las transacciones de las tarjetas de la empresa.'}, + noBankAccountsFound: 'No se encontraron cuentas bancarias', + noBankAccountsFoundDescription: 'Por favor, añade cuentas bancarias en Rillet y sincroniza la conexión de nuevo', + autoSyncDescription: 'Sincroniza Rillet y Expensify automáticamente, todos los días. Los informes se sincronizan en tiempo real.', + accountingMethods: { + label: 'Método de exportación', + description: 'Elige cuándo exportar los gastos.', + values: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Devengo', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Efectivo', + }, + alternateText: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Los gastos por cuenta propia se exportarán cuando se aprueben de forma definitiva', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Los gastos por cuenta propia se exportarán cuando se paguen', + }, + }, + syncReimbursedReports: 'Sincronizar informes reembolsados', + syncReimbursedReportsDescription: 'Cuando se pague un informe mediante ACH, se generará un pago de factura en esta cuenta.', + billPaymentAccount: {label: 'Cuenta de pago de facturas', description: 'Elige desde dónde pagar las facturas y crearemos el pago en Rillet.'}, + syncExpensifyCardSettlements: 'Sincronizar liquidaciones de la Tarjeta Expensify', + settlementAccount: {label: 'Cuenta de liquidación de la Tarjeta Expensify', description: 'Elige tu cuenta de liquidación y crearemos el pago en Rillet.'}, + syncTravelInvoicingSettlements: 'Sincronizar liquidaciones de facturación de viajes', + travelInvoicingSettlementAccount: {label: 'Cuenta de liquidación de facturación de viajes', description: 'Elige tu cuenta de liquidación y crearemos el pago en Rillet.'}, }, type: { free: 'Gratis', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index db68d4cce651..177d8c0a6bd4 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -5582,6 +5582,31 @@ _Pour des instructions plus détaillées, [visitez notre site d’aide](${CONST. description: 'Choisissez un fournisseur Rillet par défaut pour les dépenses qui ne correspondent pas automatiquement.', }, companyCardAccount: {label: 'Compte de carte d’entreprise', description: 'Choisissez où exporter les transactions de carte d’entreprise.'}, + noBankAccountsFound: 'Aucun compte bancaire trouvé', + noBankAccountsFoundDescription: 'Veuillez ajouter des comptes bancaires dans Rillet et synchroniser à nouveau la connexion', + autoSyncDescription: 'Synchronisez Rillet et Expensify automatiquement, chaque jour. Les notes de frais se synchronisent en temps réel.', + accountingMethods: { + label: 'Méthode d’exportation', + description: 'Choisissez quand exporter les dépenses.', + values: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Comptabilité d’exercice', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Espèces', + }, + alternateText: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Les dépenses hors poche seront exportées une fois définitivement approuvées', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Les dépenses payées de votre poche seront exportées une fois réglées', + }, + }, + syncReimbursedReports: 'Synchroniser les notes de frais remboursées', + syncReimbursedReportsDescription: 'Lorsqu’une note de frais est payée par virement ACH, un règlement de facture est généré sur ce compte.', + billPaymentAccount: {label: 'Compte de paiement des factures', description: 'Choisissez d’où payer les factures et nous créerons le paiement dans Rillet.'}, + syncExpensifyCardSettlements: 'Synchroniser les règlements de Carte Expensify', + settlementAccount: {label: 'Compte de règlement de la Carte Expensify', description: 'Choisissez votre compte de règlement et nous créerons le paiement dans Rillet.'}, + syncTravelInvoicingSettlements: 'Synchroniser les règlements de facturation de voyage', + travelInvoicingSettlementAccount: { + label: 'Compte de règlement de facturation de voyage', + description: 'Choisissez votre compte de règlement et nous créerons le paiement dans Rillet.', + }, }, type: { free: 'Gratuit', diff --git a/src/languages/it.ts b/src/languages/it.ts index cc400bdbda4d..9a09e028c282 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -5554,6 +5554,28 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST. description: 'Scegli un fornitore Rillet predefinito per le spese che non vengono abbinate automaticamente.', }, companyCardAccount: {label: 'Conto carta aziendale', description: 'Scegli dove esportare le transazioni delle carte aziendali.'}, + noBankAccountsFound: 'Nessun conto bancario trovato', + noBankAccountsFoundDescription: 'Aggiungi i conti bancari in Rillet e sincronizza di nuovo la connessione', + autoSyncDescription: 'Sincronizza automaticamente Rillet ed Expensify ogni giorno. I report si sincronizzano in tempo reale.', + accountingMethods: { + label: 'Metodo di esportazione', + description: 'Scegli quando esportare le spese.', + values: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Competenza', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Contanti', + }, + alternateText: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Le spese anticipate verranno esportate dopo l’approvazione finale', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Le spese anticipate verranno esportate quando saranno rimborsate', + }, + }, + syncReimbursedReports: 'Sincronizza i report rimborsati', + syncReimbursedReportsDescription: 'Quando un report viene pagato tramite ACH, verrà generato un pagamento fattura in questo conto.', + billPaymentAccount: {label: 'Conto per il pagamento delle bollette', description: 'Scegli da dove pagare le fatture e creeremo il pagamento in Rillet.'}, + syncExpensifyCardSettlements: 'Sincronizza le liquidazioni della Carta Expensify', + settlementAccount: {label: 'Conto di regolamento Carta Expensify', description: 'Scegli il tuo conto di regolamento e creeremo il pagamento in Rillet.'}, + syncTravelInvoicingSettlements: 'Sincronizza le liquidazioni di fatturazione viaggi', + travelInvoicingSettlementAccount: {label: 'Conto di regolamento fatturazione viaggi', description: 'Scegli il tuo conto di regolamento e creeremo il pagamento in Rillet.'}, }, type: { free: 'Gratis', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index 149db1e82d2e..f4ba4f36555b 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -5494,6 +5494,28 @@ _詳しい手順については、[ヘルプサイトをご覧ください](${CO exportCompanyCard: {label: '会社カード経費のエクスポート形式', values: {[CONST.RILLET_EXPORT_COMPANY_CARD.CREDIT_CARD]: {label: 'クレジットカード'}}}, defaultCompanyCardVendor: {label: 'デフォルトの会社カードベンダー', description: '自動的に一致しない経費に使用する既定の Rillet ベンダーを選択してください。'}, companyCardAccount: {label: '会社カード口座', description: '会社カード取引のエクスポート先を選択してください。'}, + noBankAccountsFound: '銀行口座が見つかりません', + noBankAccountsFoundDescription: 'Rillet に銀行口座を追加して、もう一度接続を同期してください', + autoSyncDescription: 'Rillet と Expensify を毎日自動で同期します。レポートはリアルタイムで同期されます。', + accountingMethods: { + label: 'エクスポート方法', + description: '経費をいつエクスポートするかを選択します。', + values: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: '発生主義', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: '現金', + }, + alternateText: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: '立替経費は最終承認後にエクスポートされます', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: '立替経費は支払われるとエクスポートされます', + }, + }, + syncReimbursedReports: '精算済みレポートを同期', + syncReimbursedReportsDescription: 'レポートがACHで支払われると、この勘定科目に買掛金支払が生成されます。', + billPaymentAccount: {label: '請求支払用口座', description: '請求書の支払い元を選択すると、Rillet 内に支払いを作成します。'}, + syncExpensifyCardSettlements: 'Expensify カードの清算を同期する', + settlementAccount: {label: 'Expensify カードの決済口座', description: '精算用の口座を選択すると、Rillet で支払いを作成します。'}, + syncTravelInvoicingSettlements: '出張請求の精算を同期', + travelInvoicingSettlementAccount: {label: '出張請求の精算口座', description: '精算用の口座を選択すると、Rillet で支払いを作成します。'}, }, type: { free: '無料', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index b6efd89929b2..5241dec5601c 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -5541,6 +5541,31 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_ exportCompanyCard: {label: 'Bedrijfspaskosten exporteren als', values: {[CONST.RILLET_EXPORT_COMPANY_CARD.CREDIT_CARD]: {label: 'Creditcards'}}}, defaultCompanyCardVendor: {label: 'Standaard leverancier bedrijfspas', description: 'Kies een standaard Rillet-leverancier voor uitgaven die niet automatisch worden gekoppeld.'}, companyCardAccount: {label: 'Bedrijfskaartrekening', description: 'Kies waar je transacties van bedrijfskaarten naartoe wilt exporteren.'}, + noBankAccountsFound: 'Geen bankrekeningen gevonden', + noBankAccountsFoundDescription: 'Voeg bankrekeningen toe in Rillet en synchroniseer de verbinding opnieuw', + autoSyncDescription: 'Synchroniseer Rillet en Expensify automatisch, elke dag. Rapporten worden in realtime gesynchroniseerd.', + accountingMethods: { + label: 'Exportmethode', + description: 'Kies wanneer je onkosten wilt exporteren.', + values: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Toerekening', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Contant', + }, + alternateText: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Contante uitgaven worden geëxporteerd zodra ze definitief zijn goedgekeurd', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Uitgaven uit eigen zak worden geëxporteerd zodra ze zijn betaald', + }, + }, + syncReimbursedReports: 'Vergoede rapporten synchroniseren', + syncReimbursedReportsDescription: 'Wanneer een rapport via ACH wordt betaald, wordt er een rekeningbetaling in deze rekening aangemaakt.', + billPaymentAccount: {label: 'Rekening voor het betalen van rekeningen', description: 'Kies van waar je rekeningen wilt betalen en we maken de betaling aan in Rillet.'}, + syncExpensifyCardSettlements: 'Expensify Kaartafrekeningen synchroniseren', + settlementAccount: {label: 'Rekening voor verrekening van Expensify Kaart', description: 'Kies je vereffeningsrekening en we maken de betaling voor je aan in Rillet.'}, + syncTravelInvoicingSettlements: 'Reisfacturatie-afrekeningen synchroniseren', + travelInvoicingSettlementAccount: { + label: 'Rekening voor verrekening van reiskostenfacturen', + description: 'Kies je vereffeningsrekening en we maken de betaling voor je aan in Rillet.', + }, }, type: { free: 'Gratis', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index c0ea100866d1..6299e6fe9ff1 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -5527,6 +5527,28 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy exportCompanyCard: {label: 'Eksportuj wydatki z firmowej karty jako', values: {[CONST.RILLET_EXPORT_COMPANY_CARD.CREDIT_CARD]: {label: 'Karty kredytowe'}}}, defaultCompanyCardVendor: {label: 'Domyślny dostawca karty firmowej', description: 'Wybierz domyślnego dostawcę Rillet dla wydatków, które nie dopasują się automatycznie.'}, companyCardAccount: {label: 'Konto karty firmowej', description: 'Wybierz miejsce eksportu transakcji z kart firmowych.'}, + noBankAccountsFound: 'Nie znaleziono żadnych kont bankowych', + noBankAccountsFoundDescription: 'Dodaj proszę konta bankowe w Rillet i zsynchronizuj połączenie ponownie', + autoSyncDescription: 'Synchronizuj Rillet i Expensify automatycznie, każdego dnia. Raporty synchronizują się w czasie rzeczywistym.', + accountingMethods: { + label: 'Metoda eksportu', + description: 'Wybierz, kiedy eksportować wydatki.', + values: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Memoriał', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Gotówka', + }, + alternateText: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Wydatki z własnej kieszeni zostaną wyeksportowane po ostatecznym zatwierdzeniu', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Wydatki z własnej kieszeni zostaną wyeksportowane po ich opłaceniu', + }, + }, + syncReimbursedReports: 'Synchronizuj rozliczone raporty', + syncReimbursedReportsDescription: 'Gdy raport zostanie opłacony przez ACH, na tym koncie zostanie wygenerowana płatność rachunku.', + billPaymentAccount: {label: 'Konto do opłacania rachunków', description: 'Wybierz, z którego konta chcesz opłacać rachunki, a my utworzymy płatność w Rillet.'}, + syncExpensifyCardSettlements: 'Synchronizuj rozliczenia Karty Expensify', + settlementAccount: {label: 'Rachunek rozliczeniowy Karty Expensify', description: 'Wybierz swoje konto rozliczeniowe, a my utworzymy płatność w Rillet.'}, + syncTravelInvoicingSettlements: 'Synchronizuj rozliczenia fakturowania podróży', + travelInvoicingSettlementAccount: {label: 'Konto rozliczeniowe fakturowania podróży', description: 'Wybierz swoje konto rozliczeniowe, a my utworzymy płatność w Rillet.'}, }, type: { free: 'Darmowy', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index 75e1664254f0..7591f62084bb 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -5535,6 +5535,28 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS description: 'Escolha um fornecedor Rillet padrão para despesas que não forem correspondidas automaticamente.', }, companyCardAccount: {label: 'Conta de cartão corporativo', description: 'Escolha para onde exportar as transações do cartão corporativo.'}, + noBankAccountsFound: 'Nenhuma conta bancária encontrada', + noBankAccountsFoundDescription: 'Adicione contas bancárias no Rillet e sincronize a conexão novamente', + autoSyncDescription: 'Sincronize Rillet e Expensify automaticamente, todos os dias. Relatórios são sincronizados em tempo real.', + accountingMethods: { + label: 'Método de exportação', + description: 'Escolha quando exportar as despesas.', + values: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Regime de competência', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Dinheiro', + }, + alternateText: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: 'Despesas reembolsáveis serão exportadas após a aprovação final', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: 'Despesas reembolsáveis serão exportadas quando forem pagas', + }, + }, + syncReimbursedReports: 'Sincronizar relatórios reembolsados', + syncReimbursedReportsDescription: 'Quando um relatório for pago via ACH, um pagamento de conta será gerado nesta conta.', + billPaymentAccount: {label: 'Conta de pagamento de contas', description: 'Escolha de onde pagar as contas e nós vamos criar o pagamento no Rillet.'}, + syncExpensifyCardSettlements: 'Sincronizar liquidações do Cartão Expensify', + settlementAccount: {label: 'Conta de liquidação do Cartão Expensify', description: 'Escolha sua conta de liquidação e nós criaremos o pagamento no Rillet.'}, + syncTravelInvoicingSettlements: 'Sincronizar liquidações de faturamento de viagens', + travelInvoicingSettlementAccount: {label: 'Conta de liquidação de faturamento de viagem', description: 'Escolha sua conta de liquidação e nós criaremos o pagamento no Rillet.'}, }, type: { free: 'Grátis', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 7fb4affaad41..de449274ed1d 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -5384,6 +5384,28 @@ _如需更详细的说明,请[访问我们的帮助网站](${CONST.NETSUITE_IM exportCompanyCard: {label: '导出公司卡费用为', values: {[CONST.RILLET_EXPORT_COMPANY_CARD.CREDIT_CARD]: {label: '信用卡'}}}, defaultCompanyCardVendor: {label: '默认公司卡供应商', description: '为未自动匹配的报销选择一个默认的 Rillet 供应商。'}, companyCardAccount: {label: '公司卡账户', description: '选择公司卡交易的导出位置。'}, + noBankAccountsFound: '未找到银行账户', + noBankAccountsFoundDescription: '请在 Rillet 中添加银行账户,然后再次同步连接', + autoSyncDescription: '每天自动同步 Rillet 和 Expensify。报表实时同步。', + accountingMethods: { + label: '导出方式', + description: '选择导出报销的时间。', + values: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: '应计', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: '现金', + }, + alternateText: { + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL]: '自付费用将在最终批准后导出', + [COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.CASH]: '自付报销在支付后会导出', + }, + }, + syncReimbursedReports: '同步已报销报表', + syncReimbursedReportsDescription: '当报销单通过 ACH 支付时,将在此账户中生成一笔账单付款。', + billPaymentAccount: {label: '账单支付账户', description: '选择从哪里支付账单,我们会在 Rillet 中创建付款。'}, + syncExpensifyCardSettlements: '同步 Expensify 卡结算', + settlementAccount: {label: 'Expensify 卡结算账户', description: '选择您的结算账户,我们会在 Rillet 中创建这笔付款。'}, + syncTravelInvoicingSettlements: '同步差旅发票结算', + travelInvoicingSettlementAccount: {label: '差旅开票结算账户', description: '选择您的结算账户,我们会在 Rillet 中创建这笔付款。'}, }, type: { free: '免费', diff --git a/src/libs/API/parameters/UpdateRilletAccountingMethodParams.ts b/src/libs/API/parameters/UpdateRilletAccountingMethodParams.ts new file mode 100644 index 000000000000..551112f0abff --- /dev/null +++ b/src/libs/API/parameters/UpdateRilletAccountingMethodParams.ts @@ -0,0 +1,9 @@ +import type {CONST as COMMON_CONST} from 'expensify-common'; +import type {ValueOf} from 'type-fest'; + +type UpdateRilletAccountingMethodParams = { + policyID: string; + accountingMethod: ValueOf; +}; + +export default UpdateRilletAccountingMethodParams; diff --git a/src/libs/API/parameters/UpdateRilletAutoSyncParams.ts b/src/libs/API/parameters/UpdateRilletAutoSyncParams.ts new file mode 100644 index 000000000000..9dd8064f04fe --- /dev/null +++ b/src/libs/API/parameters/UpdateRilletAutoSyncParams.ts @@ -0,0 +1,6 @@ +type UpdateRilletAutoSyncParams = { + policyID: string; + enabled: boolean; +}; + +export default UpdateRilletAutoSyncParams; diff --git a/src/libs/API/parameters/UpdateRilletBillPaymentAccountParams.ts b/src/libs/API/parameters/UpdateRilletBillPaymentAccountParams.ts new file mode 100644 index 000000000000..e192321e9f6f --- /dev/null +++ b/src/libs/API/parameters/UpdateRilletBillPaymentAccountParams.ts @@ -0,0 +1,8 @@ +import type {RilletAccount} from '@src/types/onyx/Policy'; + +type UpdateRilletBillPaymentAccountParams = { + policyID: string; + billPaymentAccountCode: RilletAccount['code']; +}; + +export default UpdateRilletBillPaymentAccountParams; diff --git a/src/libs/API/parameters/UpdateRilletSettlementsAccountParams.ts b/src/libs/API/parameters/UpdateRilletSettlementsAccountParams.ts new file mode 100644 index 000000000000..ce76513ff2a4 --- /dev/null +++ b/src/libs/API/parameters/UpdateRilletSettlementsAccountParams.ts @@ -0,0 +1,8 @@ +import type {RilletBankAccount} from '@src/types/onyx/Policy'; + +type UpdateRilletSettlementsAccountParams = { + policyID: string; + settlementsBankAccountID: RilletBankAccount['id']; +}; + +export default UpdateRilletSettlementsAccountParams; diff --git a/src/libs/API/parameters/UpdateRilletSyncExpensifyCardSettlementsParams.ts b/src/libs/API/parameters/UpdateRilletSyncExpensifyCardSettlementsParams.ts new file mode 100644 index 000000000000..16363d562147 --- /dev/null +++ b/src/libs/API/parameters/UpdateRilletSyncExpensifyCardSettlementsParams.ts @@ -0,0 +1,6 @@ +type UpdateRilletSyncExpensifyCardSettlementsParams = { + policyID: string; + enabled: boolean; +}; + +export default UpdateRilletSyncExpensifyCardSettlementsParams; diff --git a/src/libs/API/parameters/UpdateRilletSyncReimbursedReportsParams.ts b/src/libs/API/parameters/UpdateRilletSyncReimbursedReportsParams.ts new file mode 100644 index 000000000000..c92600f0fad8 --- /dev/null +++ b/src/libs/API/parameters/UpdateRilletSyncReimbursedReportsParams.ts @@ -0,0 +1,6 @@ +type UpdateRilletSyncReimbursedReportsParams = { + policyID: string; + enabled: boolean; +}; + +export default UpdateRilletSyncReimbursedReportsParams; diff --git a/src/libs/API/parameters/UpdateRilletSyncTravelInvoicingSettlementsParams.ts b/src/libs/API/parameters/UpdateRilletSyncTravelInvoicingSettlementsParams.ts new file mode 100644 index 000000000000..67a781047dcb --- /dev/null +++ b/src/libs/API/parameters/UpdateRilletSyncTravelInvoicingSettlementsParams.ts @@ -0,0 +1,6 @@ +type UpdateRilletSyncTravelInvoicingSettlementsParams = { + policyID: string; + enabled: boolean; +}; + +export default UpdateRilletSyncTravelInvoicingSettlementsParams; diff --git a/src/libs/API/parameters/UpdateRilletTravelInvoicingSettlementsAccountParams.ts b/src/libs/API/parameters/UpdateRilletTravelInvoicingSettlementsAccountParams.ts new file mode 100644 index 000000000000..5926265f2dfa --- /dev/null +++ b/src/libs/API/parameters/UpdateRilletTravelInvoicingSettlementsAccountParams.ts @@ -0,0 +1,8 @@ +import type {RilletBankAccount} from '@src/types/onyx/Policy'; + +type UpdateRilletTravelInvoicingSettlementsAccountParams = { + policyID: string; + travelInvoicingSettlementsBankAccountID: RilletBankAccount['id']; +}; + +export default UpdateRilletTravelInvoicingSettlementsAccountParams; diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts index d8eb0ebd65b6..c3ffceae66d0 100644 --- a/src/libs/API/parameters/index.ts +++ b/src/libs/API/parameters/index.ts @@ -43,6 +43,14 @@ export type {default as UpdateRilletCreditCardAccountParams} from './UpdateRille export type {default as UpdateRilletDefaultVendorParams} from './UpdateRilletDefaultVendorParams'; export type {default as UpdateRilletExportDateParams} from './UpdateRilletExportDateParams'; export type {default as UpdateRilletExporterParams} from './UpdateRilletExporterParams'; +export type {default as UpdateRilletAutoSyncParams} from './UpdateRilletAutoSyncParams'; +export type {default as UpdateRilletAccountingMethodParams} from './UpdateRilletAccountingMethodParams'; +export type {default as UpdateRilletSyncReimbursedReportsParams} from './UpdateRilletSyncReimbursedReportsParams'; +export type {default as UpdateRilletBillPaymentAccountParams} from './UpdateRilletBillPaymentAccountParams'; +export type {default as UpdateRilletSyncExpensifyCardSettlementsParams} from './UpdateRilletSyncExpensifyCardSettlementsParams'; +export type {default as UpdateRilletSettlementsAccountParams} from './UpdateRilletSettlementsAccountParams'; +export type {default as UpdateRilletSyncTravelInvoicingSettlementsParams} from './UpdateRilletSyncTravelInvoicingSettlementsParams'; +export type {default as UpdateRilletTravelInvoicingSettlementsAccountParams} from './UpdateRilletTravelInvoicingSettlementsAccountParams'; export type {default as UpdateNetSuiteAccountingMethodParams} from './UpdateNetSuiteAccountingMethodParams'; export type {default as UpdateQuickbooksOnlineAccountingMethodParams} from './UpdateQuickbooksOnlineAccountingMethodParams'; export type {default as UpdateXeroAccountingMethodParams} from './UpdateXeroAccountingMethodParams'; diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index 48a09d623a7d..c5642f846150 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -510,6 +510,15 @@ const WRITE_COMMANDS = { UPDATE_RILLET_DEFAULT_VENDOR: 'UpdateRilletDefaultVendor', UPDATE_RILLET_EXPORT_DATE: 'UpdateRilletExportDate', UPDATE_RILLET_EXPORTER: 'UpdateRilletExporter', + UPDATE_RILLET_AUTO_SYNC: 'UpdateRilletAutoSync', + UPDATE_RILLET_ACCOUNTING_METHOD: 'UpdateRilletAccountingMethod', + UPDATE_RILLET_SYNC_REIMBURSED_REPORTS: 'UpdateRilletSyncReimbursedReports', + UPDATE_RILLET_BILL_PAYMENT_ACCOUNT: 'UpdateRilletBillPaymentAccount', + UPDATE_RILLET_SYNC_EXPENSIFY_CARD_SETTLEMENTS: 'UpdateRilletSyncExpensifyCardSettlements', + UPDATE_RILLET_SETTLEMENTS_ACCOUNT: 'UpdateRilletSettlementsAccount', + UPDATE_RILLET_SYNC_TRAVEL_INVOICING_SETTLEMENTS: 'UpdateRilletSyncTravelInvoicingSettlements', + UPDATE_RILLET_TRAVEL_INVOICING_SETTLEMENTS_ACCOUNT: 'UpdateRilletTravelInvoicingSettlementsAccount', + SET_PROMO_CODE: 'User_SetPromoCode', REQUEST_TAX_EXEMPTION: 'RequestTaxExemption', EXPORT_SEARCH_ITEMS_TO_CSV: 'ExportSearchToCSV', @@ -1122,6 +1131,14 @@ type WriteCommandParameters = { [WRITE_COMMANDS.UPDATE_RILLET_DEFAULT_VENDOR]: Parameters.UpdateRilletDefaultVendorParams; [WRITE_COMMANDS.UPDATE_RILLET_EXPORT_DATE]: Parameters.UpdateRilletExportDateParams; [WRITE_COMMANDS.UPDATE_RILLET_EXPORTER]: Parameters.UpdateRilletExporterParams; + [WRITE_COMMANDS.UPDATE_RILLET_AUTO_SYNC]: Parameters.UpdateRilletAutoSyncParams; + [WRITE_COMMANDS.UPDATE_RILLET_ACCOUNTING_METHOD]: Parameters.UpdateRilletAccountingMethodParams; + [WRITE_COMMANDS.UPDATE_RILLET_SYNC_REIMBURSED_REPORTS]: Parameters.UpdateRilletSyncReimbursedReportsParams; + [WRITE_COMMANDS.UPDATE_RILLET_BILL_PAYMENT_ACCOUNT]: Parameters.UpdateRilletBillPaymentAccountParams; + [WRITE_COMMANDS.UPDATE_RILLET_SYNC_EXPENSIFY_CARD_SETTLEMENTS]: Parameters.UpdateRilletSyncExpensifyCardSettlementsParams; + [WRITE_COMMANDS.UPDATE_RILLET_SETTLEMENTS_ACCOUNT]: Parameters.UpdateRilletSettlementsAccountParams; + [WRITE_COMMANDS.UPDATE_RILLET_SYNC_TRAVEL_INVOICING_SETTLEMENTS]: Parameters.UpdateRilletSyncTravelInvoicingSettlementsParams; + [WRITE_COMMANDS.UPDATE_RILLET_TRAVEL_INVOICING_SETTLEMENTS_ACCOUNT]: Parameters.UpdateRilletTravelInvoicingSettlementsAccountParams; [WRITE_COMMANDS.UPGRADE_TO_CORPORATE]: Parameters.UpgradeToCorporateParams; [WRITE_COMMANDS.DOWNGRADE_TO_TEAM]: Parameters.DowngradeToTeamParams; diff --git a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx index fa6445d07e65..1696138923cc 100644 --- a/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx +++ b/src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx @@ -871,6 +871,14 @@ const SettingsModalStackNavigator = createModalStackNavigator('../../../../pages/workspace/accounting/rillet/export/RilletCompanyCardAccountPage').default, [SCREENS.WORKSPACE.ACCOUNTING.RILLET_DEFAULT_COMPANY_CARD_VENDOR]: () => require('../../../../pages/workspace/accounting/rillet/export/RilletDefaultCompanyCardVendorPage').default, + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_ADVANCED]: () => require('../../../../pages/workspace/accounting/rillet/advanced/RilletAdvancedPage').default, + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_EXPORT_METHOD]: () => require('../../../../pages/workspace/accounting/rillet/advanced/RilletExportMethodPage').default, + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_BILL_PAYMENT_ACCOUNT]: () => + require('../../../../pages/workspace/accounting/rillet/advanced/RilletBillPaymentAccountPage').default, + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_EXPENSIFY_CARD_SETTLEMENT_ACCOUNT]: () => + require('../../../../pages/workspace/accounting/rillet/advanced/RilletExpensifyCardSettlementAccountPage').default, + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_TRAVEL_INVOICING_SETTLEMENT_ACCOUNT]: () => + require('../../../../pages/workspace/accounting/rillet/advanced/RilletTravelInvoicingSettlementAccountPage').default, [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: () => require('../../../../pages/workspace/accounting/reconciliation/CardReconciliationPage').default, [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC]: () => require('../../../../pages/workspace/accounting/reconciliation/CardReconciliationSageIntacctAutoSyncPage').default, diff --git a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts index 71d18f9d5575..e0c1d93e1118 100755 --- a/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts +++ b/src/libs/Navigation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts @@ -208,6 +208,11 @@ const WORKSPACE_TO_RHP: Partial['config'] = { [SCREENS.WORKSPACE.ACCOUNTING.RILLET_VENDOR_BILL_DATE]: {path: ROUTES.POLICY_ACCOUNTING_RILLET_VENDOR_BILL_DATE.route}, [SCREENS.WORKSPACE.ACCOUNTING.RILLET_COMPANY_CARD_ACCOUNT]: {path: ROUTES.POLICY_ACCOUNTING_RILLET_COMPANY_CARD_ACCOUNT.route}, [SCREENS.WORKSPACE.ACCOUNTING.RILLET_DEFAULT_COMPANY_CARD_VENDOR]: {path: ROUTES.POLICY_ACCOUNTING_RILLET_DEFAULT_COMPANY_CARD_VENDOR.route}, + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_ADVANCED]: {path: ROUTES.POLICY_ACCOUNTING_RILLET_ADVANCED.route}, + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_EXPORT_METHOD]: {path: ROUTES.POLICY_ACCOUNTING_RILLET_EXPORT_METHOD.route}, + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_BILL_PAYMENT_ACCOUNT]: {path: ROUTES.POLICY_ACCOUNTING_RILLET_BILL_PAYMENT_ACCOUNT.route}, + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_EXPENSIFY_CARD_SETTLEMENT_ACCOUNT]: {path: ROUTES.POLICY_ACCOUNTING_RILLET_EXPENSIFY_CARD_SETTLEMENT_ACCOUNT.route}, + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_TRAVEL_INVOICING_SETTLEMENT_ACCOUNT]: {path: ROUTES.POLICY_ACCOUNTING_RILLET_TRAVEL_INVOICING_SETTLEMENT_ACCOUNT.route}, [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: {path: ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.route}, [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC]: { path: ROUTES.POLICY_ACCOUNTING_CARD_RECONCILIATION_SAGE_INTACCT_AUTO_SYNC.route, diff --git a/src/libs/Navigation/types.ts b/src/libs/Navigation/types.ts index fd2bb8f8a0be..06e4a176e536 100644 --- a/src/libs/Navigation/types.ts +++ b/src/libs/Navigation/types.ts @@ -1204,6 +1204,21 @@ type SettingsNavigatorParamList = { [SCREENS.WORKSPACE.ACCOUNTING.RILLET_DEFAULT_COMPANY_CARD_VENDOR]: { policyID: string; }; + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_ADVANCED]: { + policyID: string; + }; + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_EXPORT_METHOD]: { + policyID: string; + }; + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_BILL_PAYMENT_ACCOUNT]: { + policyID: string; + }; + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_EXPENSIFY_CARD_SETTLEMENT_ACCOUNT]: { + policyID: string; + }; + [SCREENS.WORKSPACE.ACCOUNTING.RILLET_TRAVEL_INVOICING_SETTLEMENT_ACCOUNT]: { + policyID: string; + }; [SCREENS.WORKSPACE.ACCOUNTING.CARD_RECONCILIATION]: { policyID: string; connection: ValueOf; diff --git a/src/libs/actions/connections/Rillet.ts b/src/libs/actions/connections/Rillet.ts index 3e585e7aec66..84375191fc85 100644 --- a/src/libs/actions/connections/Rillet.ts +++ b/src/libs/actions/connections/Rillet.ts @@ -1,21 +1,29 @@ import {write} from '@libs/API'; import type { ConnectPolicyToRilletParams, + UpdateRilletAccountingMethodParams, + UpdateRilletAutoSyncParams, + UpdateRilletBillPaymentAccountParams, UpdateRilletCreditCardAccountParams, UpdateRilletDefaultVendorParams, UpdateRilletEnableNewCategoriesParams, UpdateRilletExportDateParams, UpdateRilletExporterParams, UpdateRilletFieldMappingParams, + UpdateRilletSettlementsAccountParams, UpdateRilletSubsidiaryParams, + UpdateRilletSyncExpensifyCardSettlementsParams, + UpdateRilletSyncReimbursedReportsParams, UpdateRilletSyncTaxRatesParams, + UpdateRilletSyncTravelInvoicingSettlementsParams, + UpdateRilletTravelInvoicingSettlementsAccountParams, } from '@libs/API/parameters'; import {WRITE_COMMANDS} from '@libs/API/types'; import {getMicroSecondOnyxErrorWithTranslationKey} from '@libs/ErrorUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; -import type {RilletCoding, RilletConnectionsConfig, RilletExport} from '@src/types/onyx/Policy'; +import type {RilletAutoSync, RilletCoding, RilletConnectionsConfig, RilletExport, RilletSync} from '@src/types/onyx/Policy'; import type {OnyxUpdate} from 'react-native-onyx'; import type {ValueOf} from 'type-fest'; @@ -53,7 +61,7 @@ function clearRilletErrorField(policyID: string, fieldName: string) { }); } -function prepareRilletOptimisticData( +function prepareRilletOnyxData( policyID: string, settingName: TSettingName, settingValue: Partial, @@ -124,7 +132,7 @@ function prepareRilletOptimisticData( +function prepareRilletCodingOnyxData( policyID: string, settingName: TSettingName, settingValue: Partial, @@ -199,7 +207,7 @@ function prepareRilletCodingOptimisticData, mapping: ValueOf>, @@ -280,7 +288,7 @@ function prepareRilletFieldMappingOptimisticData( return {optimisticData, successData, failureData}; } -function prepareRilletExportOptimisticData( +function prepareRilletExportOnyxData( policyID: string, settingName: TSettingName, settingValue: Partial, @@ -355,8 +363,153 @@ function prepareRilletExportOptimisticData> = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, + value: { + connections: { + rillet: { + config: { + autoSync: { + enabled, + }, + pendingFields: { + [CONST.RILLET_CONFIG.AUTO_SYNC]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + }, + errorFields: { + [CONST.RILLET_CONFIG.AUTO_SYNC]: null, + }, + }, + }, + }, + }, + }, + ]; + + const successData: Array> = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, + value: { + connections: { + rillet: { + config: { + pendingFields: { + [CONST.RILLET_CONFIG.AUTO_SYNC]: null, + }, + }, + }, + }, + }, + }, + ]; + + const failureData: Array> = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, + value: { + connections: { + rillet: { + config: { + autoSync: { + enabled: oldEnabled ?? null, + }, + pendingFields: { + [CONST.RILLET_CONFIG.AUTO_SYNC]: null, + }, + errorFields: { + [CONST.RILLET_CONFIG.AUTO_SYNC]: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), + }, + }, + }, + }, + }, + }, + ]; + + return {optimisticData, successData, failureData}; +} + +function prepareRilletSyncOnyxData( + policyID: string, + settingName: TSettingName, + settingValue: Partial, + oldSettingValue: Partial | null, +) { + const optimisticData: Array> = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, + value: { + connections: { + rillet: { + config: { + sync: { + [settingName]: settingValue ?? null, + }, + pendingFields: { + [settingName]: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + }, + errorFields: { + [settingName]: null, + }, + }, + }, + }, + }, + }, + ]; + + const successData: Array> = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, + value: { + connections: { + rillet: { + config: { + pendingFields: { + [settingName]: null, + }, + }, + }, + }, + }, + }, + ]; + + const failureData: Array> = [ + { + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, + value: { + connections: { + rillet: { + config: { + sync: { + [settingName]: oldSettingValue ?? null, + }, + pendingFields: { + [settingName]: null, + }, + errorFields: { + [settingName]: getMicroSecondOnyxErrorWithTranslationKey('common.genericErrorMessage'), + }, + }, + }, + }, + }, + }, + ]; + + return {optimisticData, successData, failureData}; +} + function updateRilletSubsidiary(policyID: string, subsidiaryID: RilletConnectionsConfig['subsidiaryID'], oldSubsidiaryID?: RilletConnectionsConfig['subsidiaryID']) { - const onyxData = prepareRilletOptimisticData(policyID, CONST.RILLET_CONFIG.SUBSIDIARY_ID, subsidiaryID, oldSubsidiaryID ?? null); + const onyxData = prepareRilletOnyxData(policyID, CONST.RILLET_CONFIG.SUBSIDIARY_ID, subsidiaryID, oldSubsidiaryID ?? null); const params: UpdateRilletSubsidiaryParams = { policyID, subsidiaryID, @@ -365,7 +518,7 @@ function updateRilletSubsidiary(policyID: string, subsidiaryID: RilletConnection } function updateRilletEnableNewCategories(policyID: string, enabled: RilletConnectionsConfig['enableNewCategories'], oldEnabled?: RilletConnectionsConfig['enableNewCategories']) { - const onyxData = prepareRilletOptimisticData(policyID, CONST.RILLET_CONFIG.ENABLE_NEW_CATEGORIES, enabled, oldEnabled ?? null); + const onyxData = prepareRilletOnyxData(policyID, CONST.RILLET_CONFIG.ENABLE_NEW_CATEGORIES, enabled, oldEnabled ?? null); const parameters: UpdateRilletEnableNewCategoriesParams = { policyID, enabled, @@ -374,7 +527,7 @@ function updateRilletEnableNewCategories(policyID: string, enabled: RilletConnec } function updateRilletSyncTaxRates(policyID: string, enabled: RilletCoding['syncTaxRates'], oldEnabled?: RilletCoding['syncTaxRates']) { - const onyxData = prepareRilletCodingOptimisticData(policyID, CONST.RILLET_CONFIG.SYNC_TAX_RATES, enabled, oldEnabled ?? null); + const onyxData = prepareRilletCodingOnyxData(policyID, CONST.RILLET_CONFIG.SYNC_TAX_RATES, enabled, oldEnabled ?? null); const parameters: UpdateRilletSyncTaxRatesParams = { policyID, enabled, @@ -388,7 +541,7 @@ function updateRilletFieldMapping( mapping: ValueOf>, oldMapping?: ValueOf>, ) { - const onyxData = prepareRilletFieldMappingOptimisticData(policyID, fieldID, mapping, oldMapping ?? null); + const onyxData = prepareRilletFieldMappingOnyxData(policyID, fieldID, mapping, oldMapping ?? null); const parameters: UpdateRilletFieldMappingParams = { policyID, fieldID, @@ -398,7 +551,7 @@ function updateRilletFieldMapping( } function updateRilletExporter(policyID: string, email: RilletExport['exporter'], oldEmail?: RilletExport['exporter']) { - const onyxData = prepareRilletExportOptimisticData(policyID, CONST.RILLET_CONFIG.EXPORTER, email, oldEmail ?? null); + const onyxData = prepareRilletExportOnyxData(policyID, CONST.RILLET_CONFIG.EXPORTER, email, oldEmail ?? null); const parameters: UpdateRilletExporterParams = { policyID, email, @@ -407,7 +560,7 @@ function updateRilletExporter(policyID: string, email: RilletExport['exporter'], } function updateRilletExportDate(policyID: string, value: RilletExport['exportDate'], oldValue?: RilletExport['exportDate']) { - const onyxData = prepareRilletExportOptimisticData(policyID, CONST.RILLET_CONFIG.EXPORT_DATE, value, oldValue ?? null); + const onyxData = prepareRilletExportOnyxData(policyID, CONST.RILLET_CONFIG.EXPORT_DATE, value, oldValue ?? null); const parameters: UpdateRilletExportDateParams = { policyID, value, @@ -416,7 +569,7 @@ function updateRilletExportDate(policyID: string, value: RilletExport['exportDat } function updateRilletDefaultVendor(policyID: string, vendorID: RilletExport['defaultVendorID'], oldVendorID?: RilletExport['defaultVendorID']) { - const onyxData = prepareRilletExportOptimisticData(policyID, CONST.RILLET_CONFIG.DEFAULT_VENDORID, vendorID, oldVendorID ?? null); + const onyxData = prepareRilletExportOnyxData(policyID, CONST.RILLET_CONFIG.DEFAULT_VENDORID, vendorID, oldVendorID ?? null); const parameters: UpdateRilletDefaultVendorParams = { policyID, vendorID, @@ -425,7 +578,7 @@ function updateRilletDefaultVendor(policyID: string, vendorID: RilletExport['def } function updateRilletCreditCardAccount(policyID: string, creditCardAccountCode: RilletExport['creditCardAccountCode'], oldCreditCardAccountCode?: RilletExport['creditCardAccountCode']) { - const onyxData = prepareRilletExportOptimisticData(policyID, CONST.RILLET_CONFIG.CREDIT_CARD_ACCOUNTCODE, creditCardAccountCode, oldCreditCardAccountCode ?? null); + const onyxData = prepareRilletExportOnyxData(policyID, CONST.RILLET_CONFIG.CREDIT_CARD_ACCOUNTCODE, creditCardAccountCode, oldCreditCardAccountCode ?? null); const parameters: UpdateRilletCreditCardAccountParams = { policyID, creditCardAccountCode, @@ -433,6 +586,91 @@ function updateRilletCreditCardAccount(policyID: string, creditCardAccountCode: write(WRITE_COMMANDS.UPDATE_RILLET_CREDIT_CARD_ACCOUNT, parameters, onyxData); } +function updateRilletAutoSync(policyID: string, enabled: RilletAutoSync['enabled'], oldEnabled?: RilletAutoSync['enabled']) { + const onyxData = prepareRilletAutoSyncOnyxData(policyID, enabled, oldEnabled ?? null); + const parameters: UpdateRilletAutoSyncParams = { + policyID, + enabled, + }; + write(WRITE_COMMANDS.UPDATE_RILLET_AUTO_SYNC, parameters, onyxData); +} + +function updateRilletAccountingMethod(policyID: string, accountingMethod: RilletExport['accountingMethod'], oldAccountingMethod?: RilletExport['accountingMethod']) { + const onyxData = prepareRilletExportOnyxData(policyID, CONST.RILLET_CONFIG.ACCOUNTING_METHOD, accountingMethod, oldAccountingMethod ?? null); + const parameters: UpdateRilletAccountingMethodParams = { + policyID, + accountingMethod, + }; + write(WRITE_COMMANDS.UPDATE_RILLET_ACCOUNTING_METHOD, parameters, onyxData); +} + +function updateRilletSyncReimbursedReports(policyID: string, enabled: RilletSync['syncReimbursedReports'], oldEnabled?: RilletSync['syncReimbursedReports']) { + const onyxData = prepareRilletSyncOnyxData(policyID, CONST.RILLET_CONFIG.SYNC_REIMBURSED_REPORTS, enabled, oldEnabled ?? null); + const parameters: UpdateRilletSyncReimbursedReportsParams = { + policyID, + enabled, + }; + write(WRITE_COMMANDS.UPDATE_RILLET_SYNC_REIMBURSED_REPORTS, parameters, onyxData); +} + +function updateRilletBillPaymentAccount(policyID: string, billPaymentAccountCode: RilletSync['billPaymentAccountCode'], oldBillPaymentAccountCode?: RilletSync['billPaymentAccountCode']) { + const onyxData = prepareRilletSyncOnyxData(policyID, CONST.RILLET_CONFIG.BILL_PAYMENT_ACCOUNT_CODE, billPaymentAccountCode, oldBillPaymentAccountCode ?? null); + const parameters: UpdateRilletBillPaymentAccountParams = { + policyID, + billPaymentAccountCode, + }; + write(WRITE_COMMANDS.UPDATE_RILLET_BILL_PAYMENT_ACCOUNT, parameters, onyxData); +} + +function updateRilletSyncExpensifyCardSettlements(policyID: string, enabled: RilletSync['syncExpensifyCardSettlements'], oldEnabled?: RilletSync['syncExpensifyCardSettlements']) { + const onyxData = prepareRilletSyncOnyxData(policyID, CONST.RILLET_CONFIG.SYNC_EXPENSIFY_CARD_SETTLEMENTS, enabled, oldEnabled ?? null); + const parameters: UpdateRilletSyncExpensifyCardSettlementsParams = { + policyID, + enabled, + }; + write(WRITE_COMMANDS.UPDATE_RILLET_SYNC_EXPENSIFY_CARD_SETTLEMENTS, parameters, onyxData); +} + +function updateRilletSettlementsAccount( + policyID: string, + settlementsBankAccountID: RilletSync['settlementsBankAccountID'], + oldSettlementsBankAccountID?: RilletSync['settlementsBankAccountID'], +) { + const onyxData = prepareRilletSyncOnyxData(policyID, CONST.RILLET_CONFIG.SETTLEMENTS_BANK_ACCOUNT_ID, settlementsBankAccountID, oldSettlementsBankAccountID ?? null); + const parameters: UpdateRilletSettlementsAccountParams = { + policyID, + settlementsBankAccountID, + }; + write(WRITE_COMMANDS.UPDATE_RILLET_SETTLEMENTS_ACCOUNT, parameters, onyxData); +} + +function updateRilletSyncTravelInvoicingSettlements(policyID: string, enabled: RilletSync['syncTravelInvoicingSettlements'], oldEnabled?: RilletSync['syncTravelInvoicingSettlements']) { + const onyxData = prepareRilletSyncOnyxData(policyID, CONST.RILLET_CONFIG.SYNC_TRAVEL_INVOICING_SETTLEMENTS, enabled, oldEnabled ?? null); + const parameters: UpdateRilletSyncTravelInvoicingSettlementsParams = { + policyID, + enabled, + }; + write(WRITE_COMMANDS.UPDATE_RILLET_SYNC_TRAVEL_INVOICING_SETTLEMENTS, parameters, onyxData); +} + +function updateRilletTravelInvoicingSettlementsAccount( + policyID: string, + travelInvoicingSettlementsBankAccountID: RilletSync['travelInvoicingSettlementsBankAccountID'], + oldTravelInvoicingSettlementsBankAccountID?: RilletSync['travelInvoicingSettlementsBankAccountID'], +) { + const onyxData = prepareRilletSyncOnyxData( + policyID, + CONST.RILLET_CONFIG.TRAVEL_INVOICING_SETTLEMENTS_BANK_ACCOUNT_ID, + travelInvoicingSettlementsBankAccountID, + oldTravelInvoicingSettlementsBankAccountID ?? null, + ); + const parameters: UpdateRilletTravelInvoicingSettlementsAccountParams = { + policyID, + travelInvoicingSettlementsBankAccountID, + }; + write(WRITE_COMMANDS.UPDATE_RILLET_TRAVEL_INVOICING_SETTLEMENTS_ACCOUNT, parameters, onyxData); +} + export { connectToRillet, clearRilletErrorField, @@ -444,4 +682,12 @@ export { updateRilletExportDate, updateRilletDefaultVendor, updateRilletCreditCardAccount, + updateRilletAutoSync, + updateRilletAccountingMethod, + updateRilletSyncReimbursedReports, + updateRilletBillPaymentAccount, + updateRilletSyncExpensifyCardSettlements, + updateRilletSettlementsAccount, + updateRilletSyncTravelInvoicingSettlements, + updateRilletTravelInvoicingSettlementsAccount, }; diff --git a/src/pages/workspace/accounting/rillet/advanced/RilletAdvancedPage.tsx b/src/pages/workspace/accounting/rillet/advanced/RilletAdvancedPage.tsx new file mode 100644 index 000000000000..9928dea9e0f9 --- /dev/null +++ b/src/pages/workspace/accounting/rillet/advanced/RilletAdvancedPage.tsx @@ -0,0 +1,208 @@ +import Accordion from '@components/Accordion'; +import ConnectionLayout from '@components/ConnectionLayout'; +import MenuItemWithTopDescription from '@components/MenuItemWithTopDescription'; +import OfflineWithFeedback from '@components/OfflineWithFeedback'; + +import useAccordionAnimation from '@hooks/useAccordionAnimation'; +import useExpensifyCardFeeds from '@hooks/useExpensifyCardFeeds'; +import useLocalize from '@hooks/useLocalize'; +import useOnyx from '@hooks/useOnyx'; +import useThemeStyles from '@hooks/useThemeStyles'; +import useWorkspaceAccountID from '@hooks/useWorkspaceAccountID'; + +import { + clearRilletErrorField, + updateRilletAutoSync, + updateRilletSyncExpensifyCardSettlements, + updateRilletSyncReimbursedReports, + updateRilletSyncTravelInvoicingSettlements, +} from '@libs/actions/connections/Rillet'; +import {getCardSettings, isExpensifyCardFullySetUp} from '@libs/CardUtils'; +import {getLatestErrorField} from '@libs/ErrorUtils'; +import Navigation from '@libs/Navigation/Navigation'; +import {areSettingsInErrorFields, settingsPendingAction} from '@libs/PolicyUtils'; +import {getIsTravelInvoicingEnabled, getTravelInvoicingCardSettingsKey} from '@libs/TravelInvoicingUtils'; + +import withPolicyConnections from '@pages/workspace/withPolicyConnections'; +import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections'; +import ToggleSettingOptionRow from '@pages/workspace/workflows/ToggleSettingsOptionRow'; + +import CONST from '@src/CONST'; +import ROUTES from '@src/ROUTES'; + +import {CONST as COMMON_CONST} from 'expensify-common'; +import React from 'react'; +import {View} from 'react-native'; + +function RilletAdvancedPage({policy}: WithPolicyConnectionsProps) { + const {translate} = useLocalize(); + const styles = useThemeStyles(); + const policyID = policy?.id; + const rilletConfig = policy?.connections?.rillet?.config; + const rilletData = policy?.connections?.rillet?.data; + const autoSync = rilletConfig?.autoSync?.enabled ?? true; + const accountingMethod = rilletConfig?.export?.accountingMethod ?? COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL; + const syncReimbursedReports = rilletConfig?.sync?.syncReimbursedReports ?? true; + const billPaymentAccount = rilletData?.accounts?.find((account) => account.code === rilletConfig?.sync?.billPaymentAccountCode); + const syncExpensifyCardSettlements = rilletConfig?.sync?.syncExpensifyCardSettlements ?? true; + const settlementsBankAccount = rilletData?.bankAccounts?.find((bankAccount) => bankAccount.id === rilletConfig?.sync?.settlementsBankAccountID); + const syncTravelInvoicingSettlements = rilletConfig?.sync?.syncTravelInvoicingSettlements ?? true; + const travelInvoicingSettlementsBankAccount = rilletData?.bankAccounts?.find((bankAccount) => bankAccount.id === rilletConfig?.sync?.travelInvoicingSettlementsBankAccountID); + const allCardSettings = useExpensifyCardFeeds(policyID); + const isExpensifyCardsEnabled = Object.values(allCardSettings ?? {})?.some((cardSetting) => isExpensifyCardFullySetUp(policy, cardSetting)); + const workspaceAccountID = useWorkspaceAccountID(policyID); + const [cardSettings] = useOnyx(getTravelInvoicingCardSettingsKey(workspaceAccountID)); + const travelSettings = getCardSettings(cardSettings, CONST.TRAVEL.PROGRAM_TRAVEL_US); + const isTravelInvoicingEnabled = getIsTravelInvoicingEnabled(travelSettings); + + const {isAccordionExpanded: isAutoSyncAccordionExpanded, shouldAnimateAccordionSection: shouldAnimateAutoSyncAccordionSection} = useAccordionAnimation(autoSync); + const {isAccordionExpanded: isSyncReimbursedReportsAccordionExpanded, shouldAnimateAccordionSection: shouldAnimateSyncReimbursedReportsAccordionSection} = + useAccordionAnimation(syncReimbursedReports); + const {isAccordionExpanded: isSyncExpensifyCardSettlementsAccordionExpanded, shouldAnimateAccordionSection: shouldAnimateSyncExpensifyCardSettlementsAccordionSection} = + useAccordionAnimation(syncExpensifyCardSettlements); + const {isAccordionExpanded: isSyncTravelInvoicingSettlementsAccordionExpanded, shouldAnimateAccordionSection: shouldAnimateSyncTravelInvoicingSettlementsAccordionSection} = + useAccordionAnimation(syncTravelInvoicingSettlements); + + return ( + + policyID && updateRilletAutoSync(policyID, !autoSync, autoSync)} + pendingAction={settingsPendingAction([CONST.RILLET_CONFIG.AUTO_SYNC], rilletConfig?.pendingFields)} + errors={getLatestErrorField(rilletConfig ?? {}, CONST.RILLET_CONFIG.AUTO_SYNC)} + onCloseError={() => policyID && clearRilletErrorField(policyID, CONST.RILLET_CONFIG.AUTO_SYNC)} + /> + + + (policyID ? Navigation.navigate(ROUTES.POLICY_ACCOUNTING_RILLET_EXPORT_METHOD.getRoute(policyID)) : undefined)} + shouldShowRightIcon + brickRoadIndicator={ + areSettingsInErrorFields([CONST.RILLET_CONFIG.ACCOUNTING_METHOD], rilletConfig?.errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined + } + /> + + + + policyID && updateRilletSyncReimbursedReports(policyID, !syncReimbursedReports, syncReimbursedReports)} + pendingAction={settingsPendingAction([CONST.RILLET_CONFIG.SYNC_REIMBURSED_REPORTS], rilletConfig?.pendingFields)} + errors={getLatestErrorField(rilletConfig ?? {}, CONST.RILLET_CONFIG.SYNC_REIMBURSED_REPORTS)} + onCloseError={() => policyID && clearRilletErrorField(policyID, CONST.RILLET_CONFIG.SYNC_REIMBURSED_REPORTS)} + /> + + + (policyID ? Navigation.navigate(ROUTES.POLICY_ACCOUNTING_RILLET_BILL_PAYMENT_ACCOUNT.getRoute(policyID)) : undefined)} + shouldShowRightIcon + brickRoadIndicator={ + areSettingsInErrorFields([CONST.RILLET_CONFIG.BILL_PAYMENT_ACCOUNT_CODE], rilletConfig?.errorFields) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined + } + /> + + + {isExpensifyCardsEnabled && ( + <> + + policyID && updateRilletSyncExpensifyCardSettlements(policyID, !syncExpensifyCardSettlements, syncExpensifyCardSettlements)} + pendingAction={settingsPendingAction([CONST.RILLET_CONFIG.SYNC_EXPENSIFY_CARD_SETTLEMENTS], rilletConfig?.pendingFields)} + errors={getLatestErrorField(rilletConfig ?? {}, CONST.RILLET_CONFIG.SYNC_EXPENSIFY_CARD_SETTLEMENTS)} + onCloseError={() => policyID && clearRilletErrorField(policyID, CONST.RILLET_CONFIG.SYNC_EXPENSIFY_CARD_SETTLEMENTS)} + /> + + + (policyID ? Navigation.navigate(ROUTES.POLICY_ACCOUNTING_RILLET_EXPENSIFY_CARD_SETTLEMENT_ACCOUNT.getRoute(policyID)) : undefined)} + shouldShowRightIcon + brickRoadIndicator={ + areSettingsInErrorFields([CONST.RILLET_CONFIG.SETTLEMENTS_BANK_ACCOUNT_ID], rilletConfig?.errorFields) + ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR + : undefined + } + /> + + + + )} + {isTravelInvoicingEnabled && ( + <> + + policyID && updateRilletSyncTravelInvoicingSettlements(policyID, !syncTravelInvoicingSettlements, syncTravelInvoicingSettlements)} + pendingAction={settingsPendingAction([CONST.RILLET_CONFIG.SYNC_TRAVEL_INVOICING_SETTLEMENTS], rilletConfig?.pendingFields)} + errors={getLatestErrorField(rilletConfig ?? {}, CONST.RILLET_CONFIG.SYNC_TRAVEL_INVOICING_SETTLEMENTS)} + onCloseError={() => policyID && clearRilletErrorField(policyID, CONST.RILLET_CONFIG.SYNC_TRAVEL_INVOICING_SETTLEMENTS)} + /> + + + (policyID ? Navigation.navigate(ROUTES.POLICY_ACCOUNTING_RILLET_TRAVEL_INVOICING_SETTLEMENT_ACCOUNT.getRoute(policyID)) : undefined)} + shouldShowRightIcon + brickRoadIndicator={ + areSettingsInErrorFields([CONST.RILLET_CONFIG.TRAVEL_INVOICING_SETTLEMENTS_BANK_ACCOUNT_ID], rilletConfig?.errorFields) + ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR + : undefined + } + /> + + + + )} + + ); +} + +export default withPolicyConnections(RilletAdvancedPage); diff --git a/src/pages/workspace/accounting/rillet/advanced/RilletBillPaymentAccountPage.tsx b/src/pages/workspace/accounting/rillet/advanced/RilletBillPaymentAccountPage.tsx new file mode 100644 index 000000000000..95e3d64ddc07 --- /dev/null +++ b/src/pages/workspace/accounting/rillet/advanced/RilletBillPaymentAccountPage.tsx @@ -0,0 +1,102 @@ +import BlockingView from '@components/BlockingViews/BlockingView'; +import type {ListItem} from '@components/SelectionList/types'; +import SelectionScreen from '@components/SelectionScreen'; +import Text from '@components/Text'; + +import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; +import useLocalize from '@hooks/useLocalize'; +import useThemeStyles from '@hooks/useThemeStyles'; + +import {clearRilletErrorField, updateRilletBillPaymentAccount} from '@libs/actions/connections/Rillet'; +import {getLatestErrorField} from '@libs/ErrorUtils'; +import Navigation from '@libs/Navigation/Navigation'; +import {settingsPendingAction} from '@libs/PolicyUtils'; + +import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections'; +import withPolicyConnections from '@pages/workspace/withPolicyConnections'; + +import variables from '@styles/variables'; + +import CONST from '@src/CONST'; +import ROUTES from '@src/ROUTES'; +import type {RilletAccount} from '@src/types/onyx/Policy'; + +import React from 'react'; +import {View} from 'react-native'; + +type AccountListItem = ListItem & { + value: RilletAccount['code']; +}; + +function RilletBillPaymentAccountPage({policy}: WithPolicyConnectionsProps) { + const {translate} = useLocalize(); + const styles = useThemeStyles(); + const illustrations = useMemoizedLazyIllustrations(['Telescope']); + const policyID = policy?.id; + const rilletConfig = policy?.connections?.rillet?.config; + const rilletData = policy?.connections?.rillet?.data; + const billPaymentAccountCode = rilletConfig?.sync?.billPaymentAccountCode; + const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_RILLET_ADVANCED.getRoute(policyID) : undefined; + + const syncReimbursedReports = rilletConfig?.sync?.syncReimbursedReports ?? true; + const shouldBeBlocked = !syncReimbursedReports; + + const data: AccountListItem[] = + rilletData?.accounts + ?.filter((accountItem) => accountItem.type === CONST.RILLET_ACCOUNT_TYPE.ASSET && accountItem.status === CONST.RILLET_ACCOUNT_STATUS.ACTIVE) + .map((accountItem) => ({ + value: accountItem.code, + text: accountItem.name, + keyForList: accountItem.code, + isSelected: billPaymentAccountCode === accountItem.code, + })) ?? []; + + const headerContent = ( + + {translate('workspace.rillet.billPaymentAccount.description')} + + ); + + const listEmptyContent = ( + + ); + + const setBillPaymentAccount = (item: AccountListItem) => { + if (item.value !== billPaymentAccountCode && policyID) { + updateRilletBillPaymentAccount(policyID, item.value, billPaymentAccountCode); + } + Navigation.goBack(backPath); + }; + + return ( + Navigation.goBack(backPath)} + connectionName={CONST.POLICY.CONNECTIONS.NAME.RILLET} + pendingAction={settingsPendingAction([CONST.RILLET_CONFIG.BILL_PAYMENT_ACCOUNT_CODE], rilletConfig?.pendingFields)} + errors={getLatestErrorField(rilletConfig, CONST.RILLET_CONFIG.BILL_PAYMENT_ACCOUNT_CODE)} + errorRowStyles={[styles.ph5, styles.pv3]} + onClose={() => policyID && clearRilletErrorField(policyID, CONST.RILLET_CONFIG.BILL_PAYMENT_ACCOUNT_CODE)} + /> + ); +} + +export default withPolicyConnections(RilletBillPaymentAccountPage); diff --git a/src/pages/workspace/accounting/rillet/advanced/RilletExpensifyCardSettlementAccountPage.tsx b/src/pages/workspace/accounting/rillet/advanced/RilletExpensifyCardSettlementAccountPage.tsx new file mode 100644 index 000000000000..704779c9c5bd --- /dev/null +++ b/src/pages/workspace/accounting/rillet/advanced/RilletExpensifyCardSettlementAccountPage.tsx @@ -0,0 +1,102 @@ +import BlockingView from '@components/BlockingViews/BlockingView'; +import type {ListItem} from '@components/SelectionList/types'; +import SelectionScreen from '@components/SelectionScreen'; +import Text from '@components/Text'; + +import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; +import useLocalize from '@hooks/useLocalize'; +import useThemeStyles from '@hooks/useThemeStyles'; + +import {clearRilletErrorField, updateRilletSettlementsAccount} from '@libs/actions/connections/Rillet'; +import {getLatestErrorField} from '@libs/ErrorUtils'; +import Navigation from '@libs/Navigation/Navigation'; +import {settingsPendingAction} from '@libs/PolicyUtils'; + +import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections'; +import withPolicyConnections from '@pages/workspace/withPolicyConnections'; + +import variables from '@styles/variables'; + +import CONST from '@src/CONST'; +import ROUTES from '@src/ROUTES'; +import type {RilletBankAccount} from '@src/types/onyx/Policy'; + +import React from 'react'; +import {View} from 'react-native'; + +type BankAccountListItem = ListItem & { + value: RilletBankAccount['id']; +}; + +function RilletExpensifyCardSettlementAccountPage({policy}: WithPolicyConnectionsProps) { + const {translate} = useLocalize(); + const styles = useThemeStyles(); + const illustrations = useMemoizedLazyIllustrations(['Telescope']); + const policyID = policy?.id; + const rilletConfig = policy?.connections?.rillet?.config; + const rilletData = policy?.connections?.rillet?.data; + const settlementsBankAccountID = rilletConfig?.sync?.settlementsBankAccountID; + const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_RILLET_ADVANCED.getRoute(policyID) : undefined; + + const syncExpensifyCardSettlements = rilletConfig?.sync?.syncExpensifyCardSettlements ?? true; + const shouldBeBlocked = !syncExpensifyCardSettlements; + + const data: BankAccountListItem[] = + rilletData?.bankAccounts + ?.filter((bankAccountItem) => bankAccountItem.status === CONST.RILLET_ACCOUNT_STATUS.ACTIVE) + .map((bankAccountItem) => ({ + value: bankAccountItem.id, + text: bankAccountItem.name, + keyForList: bankAccountItem.id, + isSelected: settlementsBankAccountID === bankAccountItem.id, + })) ?? []; + + const headerContent = ( + + {translate('workspace.rillet.settlementAccount.description')} + + ); + + const listEmptyContent = ( + + ); + + const setSettlementsAccount = (item: BankAccountListItem) => { + if (item.value !== settlementsBankAccountID && policyID) { + updateRilletSettlementsAccount(policyID, item.value, settlementsBankAccountID); + } + Navigation.goBack(backPath); + }; + + return ( + Navigation.goBack(backPath)} + connectionName={CONST.POLICY.CONNECTIONS.NAME.RILLET} + pendingAction={settingsPendingAction([CONST.RILLET_CONFIG.SETTLEMENTS_BANK_ACCOUNT_ID], rilletConfig?.pendingFields)} + errors={getLatestErrorField(rilletConfig, CONST.RILLET_CONFIG.SETTLEMENTS_BANK_ACCOUNT_ID)} + errorRowStyles={[styles.ph5, styles.pv3]} + onClose={() => policyID && clearRilletErrorField(policyID, CONST.RILLET_CONFIG.SETTLEMENTS_BANK_ACCOUNT_ID)} + /> + ); +} + +export default withPolicyConnections(RilletExpensifyCardSettlementAccountPage); diff --git a/src/pages/workspace/accounting/rillet/advanced/RilletExportMethodPage.tsx b/src/pages/workspace/accounting/rillet/advanced/RilletExportMethodPage.tsx new file mode 100644 index 000000000000..8aff81cd8d9e --- /dev/null +++ b/src/pages/workspace/accounting/rillet/advanced/RilletExportMethodPage.tsx @@ -0,0 +1,83 @@ +import type {ListItem} from '@components/SelectionList/types'; +import SelectionScreen from '@components/SelectionScreen'; +import Text from '@components/Text'; + +import useLocalize from '@hooks/useLocalize'; +import useThemeStyles from '@hooks/useThemeStyles'; + +import {clearRilletErrorField, updateRilletAccountingMethod} from '@libs/actions/connections/Rillet'; +import {getLatestErrorField} from '@libs/ErrorUtils'; +import Navigation from '@libs/Navigation/Navigation'; +import {settingsPendingAction} from '@libs/PolicyUtils'; + +import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections'; +import withPolicyConnections from '@pages/workspace/withPolicyConnections'; + +import CONST from '@src/CONST'; +import ROUTES from '@src/ROUTES'; +import type {RilletExport} from '@src/types/onyx/Policy'; + +import {CONST as COMMON_CONST} from 'expensify-common'; +import React from 'react'; +import {View} from 'react-native'; + +type AccountingMethodListItem = ListItem & { + value: RilletExport['accountingMethod']; +}; + +function RilletExportMethodPage({policy}: WithPolicyConnectionsProps) { + const {translate} = useLocalize(); + const styles = useThemeStyles(); + const policyID = policy?.id; + const rilletConfig = policy?.connections?.rillet?.config; + const accountingMethod = rilletConfig?.export?.accountingMethod ?? COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD.ACCRUAL; + const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_RILLET_ADVANCED.getRoute(policyID) : undefined; + + const autoSync = rilletConfig?.autoSync?.enabled ?? true; + const shouldBeBlocked = !autoSync; + + const data: AccountingMethodListItem[] = Object.values(COMMON_CONST.INTEGRATIONS.ACCOUNTING_METHOD).map((accountingMethodItem) => ({ + value: accountingMethodItem, + text: translate(`workspace.rillet.accountingMethods.values.${accountingMethodItem}`), + alternateText: translate(`workspace.rillet.accountingMethods.alternateText.${accountingMethodItem}`), + keyForList: accountingMethodItem, + isSelected: accountingMethod === accountingMethodItem, + })); + + const headerContent = ( + + {translate('workspace.rillet.accountingMethods.description')} + + ); + + const selectAccountingMethod = (item: AccountingMethodListItem) => { + if (item.value !== accountingMethod && policyID) { + updateRilletAccountingMethod(policyID, item.value, accountingMethod); + } + Navigation.goBack(backPath); + }; + + return ( + Navigation.goBack(backPath)} + connectionName={CONST.POLICY.CONNECTIONS.NAME.RILLET} + pendingAction={settingsPendingAction([CONST.RILLET_CONFIG.ACCOUNTING_METHOD], rilletConfig?.pendingFields)} + errors={getLatestErrorField(rilletConfig, CONST.RILLET_CONFIG.ACCOUNTING_METHOD)} + errorRowStyles={[styles.ph5, styles.pv3]} + onClose={() => policyID && clearRilletErrorField(policyID, CONST.RILLET_CONFIG.ACCOUNTING_METHOD)} + /> + ); +} + +export default withPolicyConnections(RilletExportMethodPage); diff --git a/src/pages/workspace/accounting/rillet/advanced/RilletTravelInvoicingSettlementAccountPage.tsx b/src/pages/workspace/accounting/rillet/advanced/RilletTravelInvoicingSettlementAccountPage.tsx new file mode 100644 index 000000000000..006d0b289aad --- /dev/null +++ b/src/pages/workspace/accounting/rillet/advanced/RilletTravelInvoicingSettlementAccountPage.tsx @@ -0,0 +1,102 @@ +import BlockingView from '@components/BlockingViews/BlockingView'; +import type {ListItem} from '@components/SelectionList/types'; +import SelectionScreen from '@components/SelectionScreen'; +import Text from '@components/Text'; + +import {useMemoizedLazyIllustrations} from '@hooks/useLazyAsset'; +import useLocalize from '@hooks/useLocalize'; +import useThemeStyles from '@hooks/useThemeStyles'; + +import {clearRilletErrorField, updateRilletTravelInvoicingSettlementsAccount} from '@libs/actions/connections/Rillet'; +import {getLatestErrorField} from '@libs/ErrorUtils'; +import Navigation from '@libs/Navigation/Navigation'; +import {settingsPendingAction} from '@libs/PolicyUtils'; + +import type {WithPolicyConnectionsProps} from '@pages/workspace/withPolicyConnections'; +import withPolicyConnections from '@pages/workspace/withPolicyConnections'; + +import variables from '@styles/variables'; + +import CONST from '@src/CONST'; +import ROUTES from '@src/ROUTES'; +import type {RilletBankAccount} from '@src/types/onyx/Policy'; + +import React from 'react'; +import {View} from 'react-native'; + +type BankAccountListItem = ListItem & { + value: RilletBankAccount['id']; +}; + +function RilletTravelInvoicingSettlementAccountPage({policy}: WithPolicyConnectionsProps) { + const {translate} = useLocalize(); + const styles = useThemeStyles(); + const illustrations = useMemoizedLazyIllustrations(['Telescope']); + const policyID = policy?.id; + const rilletConfig = policy?.connections?.rillet?.config; + const rilletData = policy?.connections?.rillet?.data; + const travelInvoicingSettlementsBankAccountID = rilletConfig?.sync?.travelInvoicingSettlementsBankAccountID; + const backPath = policyID ? ROUTES.POLICY_ACCOUNTING_RILLET_ADVANCED.getRoute(policyID) : undefined; + + const syncTravelInvoicingSettlements = rilletConfig?.sync?.syncTravelInvoicingSettlements ?? true; + const shouldBeBlocked = !syncTravelInvoicingSettlements; + + const data: BankAccountListItem[] = + rilletData?.bankAccounts + ?.filter((bankAccountItem) => bankAccountItem.status === CONST.RILLET_ACCOUNT_STATUS.ACTIVE) + .map((bankAccountItem) => ({ + value: bankAccountItem.id, + text: bankAccountItem.name, + keyForList: bankAccountItem.id, + isSelected: travelInvoicingSettlementsBankAccountID === bankAccountItem.id, + })) ?? []; + + const headerContent = ( + + {translate('workspace.rillet.travelInvoicingSettlementAccount.description')} + + ); + + const listEmptyContent = ( + + ); + + const setTravelInvoicingSettlementsAccount = (item: BankAccountListItem) => { + if (item.value !== travelInvoicingSettlementsBankAccountID && policyID) { + updateRilletTravelInvoicingSettlementsAccount(policyID, item.value, travelInvoicingSettlementsBankAccountID); + } + Navigation.goBack(backPath); + }; + + return ( + Navigation.goBack(backPath)} + connectionName={CONST.POLICY.CONNECTIONS.NAME.RILLET} + pendingAction={settingsPendingAction([CONST.RILLET_CONFIG.TRAVEL_INVOICING_SETTLEMENTS_BANK_ACCOUNT_ID], rilletConfig?.pendingFields)} + errors={getLatestErrorField(rilletConfig, CONST.RILLET_CONFIG.TRAVEL_INVOICING_SETTLEMENTS_BANK_ACCOUNT_ID)} + errorRowStyles={[styles.ph5, styles.pv3]} + onClose={() => policyID && clearRilletErrorField(policyID, CONST.RILLET_CONFIG.TRAVEL_INVOICING_SETTLEMENTS_BANK_ACCOUNT_ID)} + /> + ); +} + +export default withPolicyConnections(RilletTravelInvoicingSettlementAccountPage); diff --git a/src/pages/workspace/accounting/utils.tsx b/src/pages/workspace/accounting/utils.tsx index 6addb11ecedd..f325ff5233f4 100644 --- a/src/pages/workspace/accounting/utils.tsx +++ b/src/pages/workspace/accounting/utils.tsx @@ -427,7 +427,7 @@ function getAccountingIntegrationData( CONST.RILLET_CONFIG.CARD_PROGRAM_ACCOUNTS, ], onCardReconciliationPagePress: () => Navigation.navigate(ROUTES.WORKSPACE_ACCOUNTING_CARD_RECONCILIATION.getRoute(policyID, CONST.POLICY.CONNECTIONS.ROUTE.RILLET)), - onAdvancedPagePress: () => null, + onAdvancedPagePress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_RILLET_ADVANCED.getRoute(policyID)), subscribedAdvancedSettings: [ CONST.RILLET_CONFIG.ACCOUNTING_METHOD, CONST.RILLET_CONFIG.AUTO_SYNC, diff --git a/src/types/onyx/Policy.ts b/src/types/onyx/Policy.ts index bb0601e85ffa..3d3145fcc186 100644 --- a/src/types/onyx/Policy.ts +++ b/src/types/onyx/Policy.ts @@ -1804,7 +1804,7 @@ type RilletExport = { cardProgramAccounts: Record; /** Accounting method used during export. */ - accountingMethod: string; + accountingMethod: ValueOf; }; /** @@ -2878,4 +2878,7 @@ export type { RilletCoding, RilletConnectionsConfig, RilletExport, + RilletBankAccount, + RilletAutoSync, + RilletSync, };