Skip to content

Commit b627967

Browse files
DhaaraniCITDhaaraniCIT
authored
fix: QBD direct bug fixes (#1101)
1 parent fb0a576 commit b627967

File tree

20 files changed

+46
-33
lines changed

20 files changed

+46
-33
lines changed

‎src/app/branding/c1-contents-config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const c1Contents = {
1717
},
1818
connector: {
1919
configurationHeaderText: 'Connect to QuickBooks Desktop',
20-
configurationSubHeaderText: 'Connect to QuickBooks desktop by completing the following steps.',
20+
configurationSubHeaderText: 'Connect to QuickBooks Desktop by completing the following steps.',
2121
stepName: 'Connect to QuickBooks Desktop',
2222
subLabel: 'Provide your credentials to establish a secure connection between your Expense Management and NetSuite account'
2323
},

‎src/app/branding/fyle-branding-config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,6 @@ export const fyleDemoVideoLinks: DemoVideo[string] = {
147147
TRAVELPERK: 'https://www.youtube.com/embed/2oYdc8KcQnk',
148148
XERO: 'https://www.youtube.com/embed/IplJd7tGWBk',
149149
NETSUITE: 'https://www.youtube.com/embed/wQXQYTLsVH8',
150-
QBD_DIRECT: 'https://www.youtube.com/embed/wQXQYTLsVH8'
150+
QBD_DIRECT: 'https://www.youtube.com/embed/b63lS2DG5j4'
151151
}
152152
};

‎src/app/branding/fyle-contents-config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ export const fyleContents = {
1616
configurationSubHeaderText: 'Begin your QuickBooks integration by completing the following steps.'
1717
},
1818
connector: {
19-
configurationHeaderText: 'Connect to QuickBooks desktop',
20-
configurationSubHeaderText: 'Connect to QuickBooks desktop by completing the following steps.',
19+
configurationHeaderText: 'Connect to QuickBooks Desktop',
20+
configurationSubHeaderText: 'Connect to QuickBooks Desktop by completing the following steps.',
2121
stepName: 'Connect to QuickBooks Desktop',
2222
subLabel: 'Expenses will be posted to the NetSuite Tenant Mapping selected here. Once configured, you can not change ' + brandingConfig.brandName + ' organization or Tenant Mapping.'
2323
},

‎src/app/core/models/common/advanced-settings.model.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export class AdvancedSettingsModel {
105105
merchant: 'Pizza Hut',
106106
report_number: 'C/2021/12/R/1',
107107
spent_on: today.toLocaleDateString(),
108-
expense_key: 'txDdlUFWkahX',
108+
expense_key: 'E/2024/02/T/11',
109109
expense_link: `${environment.fyle_app_url}/app/main/#/enterprise/view_expense/`
110110
};
111111
let memoPreviewText = '';

‎src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-advanced-settings.model.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export type QbdDirectAdvancedSettingsPost = {
99
emails_added: EmailOption[],
1010
interval_hours: number,
1111
auto_create_merchant_as_vendor: boolean
12-
auto_create_reimbursable_enitity: boolean,
12+
auto_create_reimbursable_entity: boolean,
1313
}
1414

1515
export interface QbdDirectAdvancedSettingsGet extends QbdDirectAdvancedSettingsPost {
@@ -56,7 +56,7 @@ export class QbdDirectAdvancedSettingsModel extends AdvancedSettingsModel {
5656
exportSchedule: new FormControl(advancedSettings?.schedule_is_enabled ? advancedSettings?.schedule_is_enabled : false),
5757
email: new FormControl(advancedSettings?.emails_selected ? advancedSettings?.emails_selected : null),
5858
exportScheduleFrequency: new FormControl(advancedSettings?.schedule_is_enabled ? advancedSettings?.interval_hours : 1),
59-
autoCreateReimbursableEnitity: new FormControl(advancedSettings?.auto_create_reimbursable_enitity ? advancedSettings?.auto_create_reimbursable_enitity : false),
59+
autoCreateReimbursableEnitity: new FormControl(advancedSettings?.auto_create_reimbursable_entity ? advancedSettings?.auto_create_reimbursable_entity : false),
6060
autoCreateMerchantsAsVendors: new FormControl(advancedSettings?.auto_create_merchant_as_vendor ? advancedSettings?.auto_create_merchant_as_vendor : false),
6161
skipExport: new FormControl(isSkipExportEnabled),
6262
searchOption: new FormControl('')
@@ -79,7 +79,7 @@ export class QbdDirectAdvancedSettingsModel extends AdvancedSettingsModel {
7979
schedule_is_enabled: advancedSettingForm.get('exportSchedule')?.value ? advancedSettingForm.get('exportSchedule')?.value : false,
8080
emails_selected: advancedSettingForm.get('exportSchedule')?.value ? selectedEmailsEmails : [],
8181
interval_hours: advancedSettingForm.get('exportSchedule')?.value ? advancedSettingForm.get('exportScheduleFrequency')?.value : null,
82-
auto_create_reimbursable_enitity: advancedSettingForm.get('autoCreateReimbursableEnitity')?.value ? advancedSettingForm.get('autoCreateReimbursableEnitity')?.value : false,
82+
auto_create_reimbursable_entity: advancedSettingForm.get('autoCreateReimbursableEnitity')?.value ? advancedSettingForm.get('autoCreateReimbursableEnitity')?.value : false,
8383
auto_create_merchant_as_vendor: advancedSettingForm.get('autoCreateMerchantsAsVendors')?.value ? advancedSettingForm.get('autoCreateMerchantsAsVendors')?.value : false,
8484
emails_added: advancedSettingForm.get('exportSchedule')?.value ? additionalEmails : []
8585
};

‎src/app/core/services/common/dashboard.service.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ export class DashboardService {
3636
return this.apiService.post(url, {});
3737
}
3838

39-
getExportErrors(version?: string | 'v1', appName?: string): Observable<any> {
40-
if (!appName && version === 'v1') {
39+
getExportErrors(version?: string | 'v1'): Observable<any> {
40+
if (version === 'v1') {
4141
return this.apiService.get(`/v2/workspaces/${this.workspaceId}/errors/`, {is_resolved: false});
42-
} else if (appName === AppName.QBD_DIRECT) {
42+
} else if (version === AppName.QBD_DIRECT) {
4343
return this.apiService.get(`/workspaces/${this.workspaceId}/export_logs/errors/`, {is_resolved: false});
4444
}
4545

‎src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class QbdDirectDashboardComponent implements OnInit {
5252
[AccountingErrorType.CATEGORY_MAPPING]: null
5353
};
5454

55-
getExportErrors$: Observable<ErrorResponse> = this.dashboardService.getExportErrors(undefined, AppName.QBD_DIRECT);
55+
getExportErrors$: Observable<ErrorResponse> = this.dashboardService.getExportErrors(AppName.QBD_DIRECT);
5656

5757
getAccountingExportSummary$: Observable<AccountingExportSummary> = this.accountingExportService.getAccountingExportSummary(AppName.QBD_DIRECT);
5858

‎src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-mapping/qbd-direct-base-mapping/qbd-direct-base-mapping.component.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
[appName]="AppName.QBD_DIRECT"
99
[isCategoryMappingGeneric]="sourceField === FyleField.CATEGORY ? true : false"
1010
[displayName]="displayName"
11+
[detailAccountType] = "detailAccountType"
1112
[isMultiLineOption]="sourceField === FyleField.CATEGORY && brandingConfig.brandId !== 'co' ? true : false">
1213
</app-generic-mapping-v2>

‎src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-mapping/qbd-direct-base-mapping/qbd-direct-base-mapping.component.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ export class QbdDirectBaseMappingComponent implements OnInit {
5252

5353
chartOfAccounts: string[];
5454

55+
detailAccountType: string[] | undefined;
56+
5557
constructor(
5658
private route: ActivatedRoute,
5759
private mappingService: MappingService,
@@ -72,6 +74,7 @@ export class QbdDirectBaseMappingComponent implements OnInit {
7274
}
7375

7476
destinationOptionsWatcher(detailAccountType?: string[]): void {
77+
this.detailAccountType = detailAccountType;
7578
this.mappingService.getPaginatedDestinationAttributes(this.destinationField, undefined, this.displayName, '', detailAccountType).subscribe((responses) => {
7679
this.destinationOptions = responses.results as QbdDirectDestinationAttribute[];
7780
this.isLoading = false;

‎src/app/integrations/qbd-direct/qbd-direct-onboarding/qbd-direct-onboarding-landing/qbd-direct-onboarding-landing.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<div>
22
<div>
3-
<app-landing-page-header [buttonText]="'Start'" [iconPath]="'assets/logos/qbo.png'" [appName]="'QuickBooks Desktop - Direct Integration'" [appDescription]="brandingContent.contentText" [isConnectionInProgress]="isQbdConnectionInProgress" [isLoading]="false" [isIntegrationConnected]="false" [redirectLink]="redirectLink" (connectIntegration)="connectQbdDirect()" [logoStyleClasses]="'tw-p-16-px'"></app-landing-page-header>
3+
<app-landing-page-header [buttonText]="'Start'" [iconPath]="'assets/logos/qbo.png'" [appName]="'QuickBooks Desktop '" [appDescription]="brandingContent.contentText" [isConnectionInProgress]="isQbdConnectionInProgress" [isLoading]="false" [isIntegrationConnected]="false" [redirectLink]="redirectLink" (connectIntegration)="connectQbdDirect()" [logoStyleClasses]="'tw-p-16-px'"></app-landing-page-header>
44
</div>
55
<div>
6-
<app-landing-page-body [headlineText]="brandingContent.guideHeaderText" [headerText]="'A quick guide to help you set up your Fyle-QuickBooks Desktop integration.'" [embedVideo]="embedVideoLink" [embedImage]="'assets/co/coQBOLanding.svg'" [svgPath]="'assets/flow-charts/' + brandingConfig.brandId +'-qbd-direct-flow-chart.svg'" [appName]="appName" [redirectLink]="redirectLink"></app-landing-page-body>
6+
<app-landing-page-body [headlineText]="brandingContent.guideHeaderText" [headerText]="'A quick guide to help you set up your Fyle-QuickBooks Desktop integration.'" [embedVideo]="embedVideoLink" [embedImage]="'assets/co/coQBOLanding.svg'" [svgPath]="'assets/flow-charts/' + brandingConfig.brandId +'-qbd-direct-flow-chart.svg'" [appName]="appName"></app-landing-page-body>
77
</div>
88
</div>

0 commit comments

Comments
 (0)