-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Enable/disable per diem rates #51232
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
904ca23
Enable/disable per diem rates
shubham1206agra 81b4213
Fix illustration file name
shubham1206agra eff827c
Adjusting comments
shubham1206agra 0d0ffa1
Fix illustration file name
shubham1206agra cc201f0
Fix getPerDiemCustomUnit
shubham1206agra 84afa28
Fix access
shubham1206agra feb8e97
Fix button color
shubham1206agra 4b6ccc7
Making feature control only
shubham1206agra 95e7819
Fixing text:
shubham1206agra c6ade13
Fixing command EnablePolicyPerDiem
shubham1206agra c70846d
Fixing ts
shubham1206agra bc92c1a
Fixing command name
shubham1206agra 078e6b0
Merge branch 'Expensify:main' into per-diem-1
shubham1206agra fd961f6
Merge branch 'Expensify:main' into per-diem-1
shubham1206agra c6c7c42
Merge branch 'main' into per-diem-1
shubham1206agra d5e9497
Fixing wrong navigation
shubham1206agra 0736acc
Merge branch 'main' into per-diem-1
shubham1206agra 5db6a7f
Hiding option behind beta
shubham1206agra 58d9ff8
Fixing some more functions
shubham1206agra 9d6cf46
Fixing translations
shubham1206agra c9eb213
Merge branch 'Expensify:main' into per-diem-1
shubham1206agra 5e7769c
Apply suggestions from code review
shubham1206agra 9ba1217
Merge branch 'main' into per-diem-1
shubham1206agra 64226e9
Merge branch 'main' into per-diem-1
shubham1206agra 79867aa
Fixing feature name variable
shubham1206agra a7a5974
Added spanish translations
shubham1206agra 5fd7a43
Apply suggestions from code review
shubham1206agra 5be926c
Fix page alignment
shubham1206agra 42a19ae
Added per diem learn more link
shubham1206agra File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
82 changes: 82 additions & 0 deletions
82
assets/images/simple-illustrations/simple-illustration__perdiem.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2358,6 +2358,7 @@ const translations = { | |
| rules: 'Reglas', | ||
| plan: 'Plan', | ||
| profile: 'Perfil', | ||
| perDiem: 'Per diem', | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @Gonals Can we get spansish translations please? |
||
| bankAccount: 'Cuenta bancaria', | ||
| displayedAs: 'Mostrado como', | ||
| connectBankAccount: 'Conectar cuenta bancaria', | ||
|
|
@@ -2424,6 +2425,25 @@ const translations = { | |
| } | ||
| }, | ||
| }, | ||
| perDiem: { | ||
| subtitle: 'Establece las tasas per diem para controlar los gastos diarios de los empleados. ', | ||
| destination: 'Destino', | ||
| subrate: 'Subtasa', | ||
| amount: 'Cantidad', | ||
| deleteRates: () => ({ | ||
| one: 'Eliminar tasa', | ||
| other: 'Eliminar tasas', | ||
| }), | ||
| deletePerDiemRate: 'Eliminar tasa per diem', | ||
| areYouSureDelete: () => ({ | ||
| one: '¿Estás seguro de que quieres eliminar esta tasa?', | ||
| other: '¿Estás seguro de que quieres eliminar estas tasas?', | ||
| }), | ||
| emptyList: { | ||
| title: 'Per diem', | ||
| subtitle: 'Establece dietas per diem para controlar el gasto diario de los empleados. Importa las tarifas desde una hoja de cálculo para comenzar.', | ||
| }, | ||
| }, | ||
| qbd: { | ||
| exportOutOfPocketExpensesDescription: 'Establezca cómo se exportan los gastos de bolsillo a QuickBooks Desktop.', | ||
| exportOutOfPocketExpensesCheckToogle: 'Marcar los cheques como “imprimir más tarde”', | ||
|
|
@@ -3332,6 +3352,10 @@ const translations = { | |
| title: 'Tasas de distancia', | ||
| subtitle: 'Añade, actualiza y haz cumplir las tasas.', | ||
| }, | ||
| perDiem: { | ||
| title: 'Per diem', | ||
| subtitle: 'Establece las tasas per diem para controlar los gastos diarios de los empleados.', | ||
| }, | ||
| expensifyCard: { | ||
| title: 'Tarjeta Expensify', | ||
| subtitle: 'Obtén información y control sobre tus gastos.', | ||
|
|
@@ -4113,6 +4137,12 @@ const translations = { | |
| description: `Las reglas se ejecutan en segundo plano y mantienen tus gastos bajo control para que no tengas que preocuparte por los detalles pequeños.\n\nExige detalles de los gastos, como recibos y descripciones, establece límites y valores predeterminados, y automatiza las aprobaciones y los pagos, todo en un mismo lugar.`, | ||
| onlyAvailableOnPlan: 'Las reglas están disponibles solo en el plan Control, que comienza en ', | ||
| }, | ||
| perDiem: { | ||
| title: 'Per diem', | ||
| description: | ||
| 'Las dietas per diem (ej.: $100 por día para comidas) son una excelente forma de mantener los gastos diarios predecibles y ajustados a las políticas de la empresa, especialmente si tus empleados viajan por negocios. Disfruta de funciones como tasas personalizadas, categorías por defecto y detalles más específicos como destinos y subtasas.', | ||
| onlyAvailableOnPlan: 'Las dietas per diem solo están disponibles en el plan Control, a partir de ', | ||
| }, | ||
| note: { | ||
| upgradeWorkspace: 'Mejore su espacio de trabajo para acceder a esta función, o', | ||
| learnMore: 'más información', | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| type OpenPolicyPerDiemRatesPageParams = { | ||
| policyID: string; | ||
| }; | ||
|
|
||
| export default OpenPolicyPerDiemRatesPageParams; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| type TogglePolicyPerDiemParams = { | ||
| policyID: string; | ||
| enabled: boolean; | ||
| customUnitID: string; | ||
| }; | ||
|
|
||
| export default TogglePolicyPerDiemParams; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NIT: Google says plural for per diem is per diems.
So, it might need to be confirmed if this should be "Per diems are" or "Per diem is" or retain as it is.