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

New Feature: "When to export" selector for auto-sync for NetSuite #51949

Merged
merged 17 commits into from
Nov 14, 2024
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
address comments
twilight2294 authored Nov 7, 2024

Verified

This commit was signed with the committer’s verified signature.
commit 2b105915eb4a9529e08b1a36a16ea103a9de8084
Original file line number Diff line number Diff line change
@@ -23,14 +23,14 @@ function NetSuiteAccountingMethodPage({policy}: WithPolicyConnectionsProps) {
const {translate} = useLocalize();
const policyID = policy?.id ?? '-1';
const styles = useThemeStyles();
const config = policy?.connections?.netsuite.options.config;
const accountingMehtod = config?.accountingMethod ?? CONST.NETSUITE_ACCOUNTING_METHODS.CASH;
const data: MenuListItem[] = Object.values(CONST.NETSUITE_ACCOUNTING_METHODS).map((accountingMehtodType) => ({
value: accountingMehtodType,
text: translate(`workspace.netsuite.advancedConfig.accountingMethods.values.${accountingMehtodType}`),
alternateText: translate(`workspace.netsuite.advancedConfig.accountingMethods.alternateText.${accountingMehtodType}`),
keyForList: accountingMehtodType,
isSelected: accountingMehtod === accountingMehtodType,
const config = policy?.connections?.netsuite?.options?.config;
const accountingMethod = config?.accountingMethod ?? CONST.NETSUITE_ACCOUNTING_METHODS.CASH;
const data: MenuListItem[] = Object.values(CONST.NETSUITE_ACCOUNTING_METHODS).map((accountingMethodType) => ({
value: accountingMethodType,
text: translate(`workspace.netsuite.advancedConfig.accountingMethods.values.${accountingMethodType}`),
alternateText: translate(`workspace.netsuite.advancedConfig.accountingMethods.alternateText.${accountingMethodType}`),
keyForList: accountingMethodType,
isSelected: accountingMethod === accountingMethodType,
}));

const headerContent = useMemo(
Original file line number Diff line number Diff line change
@@ -64,11 +64,11 @@ function NetSuiteAdvancedPage({policy}: WithPolicyConnectionsProps) {
const menuItems: Array<MenuItemWithSubscribedSettings | ToggleItem | DividerLineItem> = [
{
type: 'menuitem',
title: autoSyncConfig?.autoSync.enabled ? translate('common.enabled') : translate('common.disabled'),
title: autoSyncConfig?.autoSync?.enabled ? translate('common.enabled') : translate('common.disabled'),
description: translate('workspace.accounting.autoSync'),
onPress: () => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_AUTO_SYNC.getRoute(policyID)),
hintText: (() => {
if (!autoSyncConfig?.autoSync.enabled) {
if (!autoSyncConfig?.autoSync?.enabled) {
return undefined;
}
return translate(`workspace.netsuite.advancedConfig.accountingMethods.alternateText.${accountingMethod ?? CONST.NETSUITE_ACCOUNTING_METHODS.CASH}`);
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ function NetSuiteAutoSyncPage({policy, route}: WithPolicyConnectionsProps) {
const {translate} = useLocalize();
const autoSyncConfig = policy?.connections?.netsuite?.config;
const policyID = route.params.policyID ?? '-1';
const accountingMethod = policy?.connections?.netsuite?.options.config.accountingMethod;
const accountingMethod = policy?.connections?.netsuite?.options?.config?.accountingMethod;

return (
<AccessOrNotFoundWrapper
@@ -42,7 +42,7 @@ function NetSuiteAutoSyncPage({policy, route}: WithPolicyConnectionsProps) {
title={translate('workspace.accounting.autoSync')}
// wil be converted to translate and spanish translation too
subtitle={translate('workspace.accounting.autoSyncDescription')}
isActive={!!autoSyncConfig?.autoSync.enabled}
isActive={!!autoSyncConfig?.autoSync?.enabled}
wrapperStyle={[styles.pv2, styles.mh5]}
switchAccessibilityLabel={translate('workspace.netsuite.advancedConfig.autoSyncDescription')}
shouldPlaceSubtitleBelowSwitch
@@ -51,10 +51,14 @@ function NetSuiteAutoSyncPage({policy, route}: WithPolicyConnectionsProps) {
pendingAction={settingsPendingAction([CONST.NETSUITE_CONFIG.AUTO_SYNC], autoSyncConfig?.pendingFields)}
errors={ErrorUtils.getLatestErrorField(autoSyncConfig, CONST.NETSUITE_CONFIG.AUTO_SYNC)}
/>
{!!autoSyncConfig?.autoSync.enabled && (
{!!autoSyncConfig?.autoSync?.enabled && (
<MenuItemWithTopDescription
title={accountingMethod === CONST.NETSUITE_ACCOUNTING_METHODS.ACCRUAL ? 'Accural' : 'Cash'}
description="When to export"
title={
accountingMethod === CONST.NETSUITE_ACCOUNTING_METHODS.ACCRUAL
? translate(`workspace.netsuite.advancedConfig.accountingMethods.values.${CONST.NETSUITE_ACCOUNTING_METHODS.ACCRUAL}`)
: translate(`workspace.netsuite.advancedConfig.accountingMethods.values.${CONST.NETSUITE_ACCOUNTING_METHODS.CASH}`)
}
description={translate('workspace.netsuite.advancedConfig.accountingMethods.label')}
shouldShowRightIcon
onPress={() => Navigation.navigate(ROUTES.POLICY_ACCOUNTING_NETSUITE_ACCOUNTING_METHOD.getRoute(policyID))}
/>