Skip to content
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

Prevent invalid configuration between location and JE selection #41638

Merged
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
faa4eb7
fix: lock the toggle for disabling location when the account selected…
May 4, 2024
43d57ac
fix the boolean condition
May 5, 2024
102c2bf
chore: filter out account options depending on whether the location t…
May 5, 2024
056c362
chore: lock the toggle button when the location import should be off
May 6, 2024
e74a7ae
chore: add a todo comment not to forget to change the description text
May 6, 2024
d3be0c3
Merge branch 'main' into hayata-do-not-allow-invalid-location-account…
May 10, 2024
add3daf
fix: wrong conditional statement
May 11, 2024
c771c51
change const name and don't force in-active state
May 11, 2024
21aef13
fix: use existing value to determine if the location is enabled or not
May 14, 2024
01d10e5
fix: don't use conditional rendering
May 14, 2024
286980f
fix: the ordering of items
May 14, 2024
a9f76f4
fix: the ordering of items
May 14, 2024
b9cf433
don't disable the switch for the location import if the location is a…
May 14, 2024
3c1b841
chore: remove todo comments
May 14, 2024
bcecada
update the UI copy
May 15, 2024
30cfcac
Merge branch 'main' into hayata-do-not-allow-invalid-location-account…
May 15, 2024
dd891b7
style: get config value from the destructuring statement
May 15, 2024
4774590
Merge branch 'main' into hayata-do-not-allow-invalid-location-account…
May 15, 2024
9b08271
fix: update the spanish translation
May 20, 2024
6ba9dc4
fix: use `isSwitchOn` to decide if the admin should be allowed to tog…
May 23, 2024
14943e7
fix: move the hint text to the entity select page
May 23, 2024
ac3e90b
fix: issue with the footer component
May 24, 2024
023c313
chore: remove unnecessary hint text
May 24, 2024
cdb176a
chore: fix the style of hint texts when there is no account to display
May 27, 2024
0688088
chore: don't display the hint text when there is misconfiguration
May 27, 2024
f5e4c04
fix: delete unnecessary UI text
May 28, 2024
a0845eb
fix: add back the footer
May 29, 2024
805b67e
chore: revert the commit for changing the hint display behavior in lo…
May 29, 2024
a313d7a
chore: change the hint text behavior on the taxes page
May 29, 2024
427ca57
fix: the display text
May 29, 2024
5925a85
chore: update the text
May 29, 2024
948b665
fix: check if the company card export destination is vendor bill & cr…
May 29, 2024
911d494
chore: add the word "checks"
May 29, 2024
a421cdd
remove outdated conditions
s77rt May 30, 2024
15452e6
Merge pull request #42883 from s77rt/s77rt-do-not-allow-invalid-locat…
May 31, 2024
7cd358e
fix: add back the check to see if the error should be shown
May 31, 2024
f769502
Merge branch 'qbo-freeze-branch' into hayata-do-not-allow-invalid-loc…
May 31, 2024
5d5d2cd
remove mistype
May 31, 2024
5ffc623
chore: replace with accountDescription
May 31, 2024
52a8ac0
remove isLocationEnabled check
May 31, 2024
362167d
Fix footer styles
s77rt May 31, 2024
c97ffd3
Update src/pages/workspace/accounting/qbo/export/QuickbooksOutOfPocke…
s77rt May 31, 2024
da6232d
Merge branch 'qbo-freeze-branch' into hayata-do-not-allow-invalid-loc…
lakchote May 31, 2024
715f3da
fix prettier
lakchote May 31, 2024
f8a9176
Merge pull request #42921 from s77rt/s77rt-do-not-allow-invalid-locat…
lakchote May 31, 2024
a3729d4
chore: update outdated spanish copy
May 31, 2024
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
Prev Previous commit
Next Next commit
fix: the display text
  • Loading branch information
Hayata Suenaga committed May 29, 2024

Unverified

No user is associated with the committer email.
commit 427ca571cfce07f4edb75214bef2e1639d8b7efa
4 changes: 2 additions & 2 deletions src/languages/en.ts
Original file line number Diff line number Diff line change
@@ -1935,6 +1935,8 @@ export default {
locationsDescription: 'Choose whether to import locations, and see where locations are displayed.',
taxesDescription: 'Choose whether to import tax rates and tax defaults from your accounting integration.',
locationsAdditionalDescription: `QuickBooks Online does not support adding a location to vendor bills or checks. Update your export preference to journal entry if you'd like to import locations as tags.`,
outOfPocketLocationEnabledDescription:
'Note: QuickBooks Online does not support a field for locations as tags on vendor bills or check exports. As you import locations from, this this export option is unavailable.',
taxesJournalEntrySwitchNote:
'Note: QuickBooks Online does not support a field for tax on Journal Entry exports. Change your export preference to Vendor Bill or Check to import taxes.',
export: 'Export',
@@ -1988,8 +1990,6 @@ export default {
"Note: QuickBooks Online doesn't support a field for tax on Journal Entry exports. Because you have tax tracking enabled on your workspace, this export option is unavailable.",
outOfPocketTaxEnabledError: 'Journal entry is not available when taxes enabled. please select a different export option.',
outOfPocketLocationEnabledError: 'Vendor Bills are not available when locations are enabled. Please select a different export option.',
outOfPocketLocationEnabledDescription:
'Note: QuickBooks Online does not support a field for Locations as Tags on Vendor Bills exports. As you import Locations as Tags, this export option is unavailable.',
advancedConfig: {
advanced: 'Advanced',
autoSync: 'Auto-sync',
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ function Footer({isTaxEnabled, isLocationsEnabled}: {isTaxEnabled: boolean; isLo
return (
<View style={[styles.flex1, styles.alignItemsCenter, styles.gap2, styles.mt1]}>
hayata-suenaga marked this conversation as resolved.
Show resolved Hide resolved
{isTaxEnabled && <Text style={[styles.mutedNormalTextLabel, styles.pt2]}>{translate('workspace.qbo.outOfPocketTaxEnabledDescription')}</Text>}
{isLocationsEnabled && <Text style={styles.mutedTextLabel}>{translate('workspace.qbo.locationsAdditionalDescription')}</Text>}
{isLocationsEnabled && <Text style={styles.mutedTextLabel}>{translate('workspace.qbo.outOfPocketLocationEnabledDescription')}</Text>}
</View>
);
}