Skip to content

Commit 1c6864f

Browse files
committed
Hide tax for new users - Intacct and Xero (#916)
* Hide tax for new users - Intacct and Xero * refactor
1 parent 804a9c4 commit 1c6864f

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

src/app/integrations/intacct/intacct-shared/intacct-import-settings/intacct-import-settings.component.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ import { IntacctDestinationAttribute } from 'src/app/core/models/intacct/db/dest
99
import { ExpenseField } from 'src/app/core/models/intacct/db/expense-field.model';
1010
import { LocationEntityMapping } from 'src/app/core/models/intacct/db/location-entity-mapping.model';
1111
import { DependentFieldSetting, ImportSettingGet, ImportSettingPost, ImportSettings, MappingSetting } from 'src/app/core/models/intacct/intacct-configuration/import-settings.model';
12+
import { Org } from 'src/app/core/models/org/org.model';
1213
import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service';
1314
import { StorageService } from 'src/app/core/services/common/storage.service';
1415
import { TrackingService } from 'src/app/core/services/integration/tracking.service';
16+
import { OrgService } from 'src/app/core/services/org/org.service';
1517
import { SiImportSettingService } from 'src/app/core/services/si/si-configuration/si-import-setting.service';
1618
import { IntacctConnectorService } from 'src/app/core/services/si/si-core/intacct-connector.service';
1719
import { SiMappingsService } from 'src/app/core/services/si/si-core/si-mappings.service';
@@ -29,6 +31,8 @@ export class IntacctImportSettingsComponent implements OnInit {
2931

3032
appName = AppName.INTACCT;
3133

34+
org: Org = this.orgService.getCachedOrg();
35+
3236
importSettingsForm: FormGroup;
3337

3438
customFieldForm: FormGroup;
@@ -93,6 +97,7 @@ export class IntacctImportSettingsComponent implements OnInit {
9397
private connectorService: IntacctConnectorService,
9498
private importSettingService: SiImportSettingService,
9599
@Inject(FormBuilder) private formBuilder: FormBuilder,
100+
private orgService: OrgService,
96101
private toastService: IntegrationsToastService,
97102
private trackingService: TrackingService,
98103
private storageService: StorageService,
@@ -409,7 +414,7 @@ export class IntacctImportSettingsComponent implements OnInit {
409414
}
410415

411416
showImportTax(locationEntity: LocationEntityMapping) {
412-
return (locationEntity.country_name && locationEntity.country_name !== 'United States' && locationEntity.destination_id !== 'top_level') ? true : false;
417+
return new Date(this.org.created_at) < new Date('2024-08-19') && locationEntity.country_name && locationEntity.country_name !== 'United States' && locationEntity.destination_id !== 'top_level' ? true : false;
413418
}
414419

415420
private initializeForm(importSettings: ImportSettingGet): void {

src/app/integrations/xero/xero-shared/xero-import-settings/xero-import-settings.component.ts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ import { DestinationAttribute } from 'src/app/core/models/db/destination-attribu
88
import { FyleField, IntegrationField } from 'src/app/core/models/db/mapping.model';
99
import { AppName, ConfigurationCta, ToastSeverity, XeroOnboardingState } from 'src/app/core/models/enum/enum.model';
1010
import { XeroFyleField } from 'src/app/core/models/enum/enum.model';
11+
import { Org } from 'src/app/core/models/org/org.model';
1112
import { XeroWorkspaceGeneralSetting } from 'src/app/core/models/xero/db/xero-workspace-general-setting.model';
1213
import { XeroImportSettingGet, XeroImportSettingModel } from 'src/app/core/models/xero/xero-configuration/xero-import-settings.model';
1314
import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service';
1415
import { MappingService } from 'src/app/core/services/common/mapping.service';
1516
import { WorkspaceService } from 'src/app/core/services/common/workspace.service';
17+
import { OrgService } from 'src/app/core/services/org/org.service';
1618
import { XeroConnectorService } from 'src/app/core/services/xero/xero-configuration/xero-connector.service';
1719
import { XeroImportSettingsService } from 'src/app/core/services/xero/xero-configuration/xero-import-settings.service';
1820
import { XeroHelperService } from 'src/app/core/services/xero/xero-core/xero-helper.service';
@@ -72,6 +74,8 @@ export class XeroImportSettingsComponent implements OnInit {
7274

7375
isCustomerPresent: boolean;
7476

77+
org: Org = this.orgService.getCachedOrg();
78+
7579
readonly brandingFeatureConfig = brandingFeatureConfig;
7680

7781
readonly brandingContent = brandingContent.xero.configuration.importSetting;
@@ -87,6 +91,7 @@ export class XeroImportSettingsComponent implements OnInit {
8791
private mappingService: MappingService,
8892
private xeroHelperService: XeroHelperService,
8993
@Inject(FormBuilder) private formBuilder: FormBuilder,
94+
private orgService: OrgService,
9095
private toastService: IntegrationsToastService,
9196
private xeroConnectorService: XeroConnectorService
9297
) { }
@@ -266,7 +271,7 @@ export class XeroImportSettingsComponent implements OnInit {
266271

267272
this.importSettingsForm = XeroImportSettingModel.mapAPIResponseToFormGroup(this.importSettings, this.xeroExpenseFields, this.isCustomerPresent, this.taxCodes);
268273

269-
if (response[5] && response[5].country !== 'US') {
274+
if (response[5] && response[5].country !== 'US' && new Date(this.org.created_at) < new Date('2024-08-19')) {
270275
this.isTaxGroupSyncAllowed = true;
271276
}
272277
// This is only for C1

0 commit comments

Comments
 (0)