Skip to content

Commit 1a8fa49

Browse files
committed
fix: QBD fixes post testing (#1108)
* fix: QBD fixes post testing * fix
1 parent b8e33e0 commit 1a8fa49

File tree

10 files changed

+20
-16
lines changed

10 files changed

+20
-16
lines changed

src/app/core/models/db/expense-group.model.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export type ExpenseGroupParam = {
3232
limit: number;
3333
offset: number;
3434
tasklog__status?: string;
35-
status__in?: string;
35+
status__in?: string | string[];
3636
exported_at__gte?: string;
3737
exported_at__lte?: string;
3838
state?: string;

src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-onboarding.model.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,39 +26,39 @@ export class QbdDirectOnboardingModel {
2626
completed: false,
2727
step: this.brandingContent.preRequisite.stepName,
2828
icon: 'arrow-tail-up-medium',
29-
route: '/integrations/qbo/onboarding/pre_requisite',
29+
route: '/integrations/qbd_direct/onboarding/pre_requisite',
3030
styleClasses: ['step-name-pre-requisite--text']
3131
},
3232
{
3333
active: false,
3434
completed: false,
3535
step: this.brandingContent.connector.stepName,
3636
icon: 'link-vertical-medium',
37-
route: '/integrations/qbo/onboarding/connector',
37+
route: '/integrations/qbd_direct/onboarding/connector',
3838
styleClasses: ['step-name-connector--text !tw-left-[-70px]']
3939
},
4040
{
4141
active: false,
4242
completed: false,
4343
step: this.brandingContent.exportSetting.stepName,
4444
icon: 'arrow-tail-up-medium',
45-
route: '/integrations/qbo/onboarding/export_settings',
45+
route: '/integrations/qbd_direct/onboarding/export_settings',
4646
styleClasses: ['step-name-export--text']
4747
},
4848
{
4949
active: false,
5050
completed: false,
5151
step: this.brandingContent.importSetting.stepName,
5252
icon: 'arrow-tail-down-medium',
53-
route: '/integrations/qbo/onboarding/import_settings',
53+
route: '/integrations/qbd_direct/onboarding/import_settings',
5454
styleClasses: ['step-name-export--text']
5555
},
5656
{
5757
active: false,
5858
completed: false,
5959
step: this.brandingContent.advancedSettings.stepName,
6060
icon: 'gear-medium',
61-
route: '/integrations/qbo/onboarding/advanced_settings',
61+
route: '/integrations/qbd_direct/onboarding/advanced_settings',
6262
styleClasses: ['step-name-advanced--text']
6363
}
6464
];

src/app/core/services/common/accounting-export.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export class AccountingExportService {
7373

7474
if (appName === AppName.QBD_DIRECT) {
7575
if (apiParams.status__in?.includes(AccountingExportStatus.FAILED)) {
76-
apiParams.status__in = AccountingExportStatus.ERROR;
76+
apiParams.status__in = [AccountingExportStatus.ERROR, AccountingExportStatus.FATAL];
7777
}
7878
delete apiParams.type__in;
7979
return this.apiService.get(`/workspaces/${this.workspaceId}/export_logs/`, apiParams);

src/app/core/services/common/export-log.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export class ExportLogService {
8686
return this.apiService.get(`/workspaces/${this.workspaceId}/fyle/expense_groups/v2/`, params);
8787
} else if (appName === AppName.QBD_DIRECT) {
8888
if (params.status__in?.includes(AccountingExportStatus.FAILED)) {
89-
params.status__in = AccountingExportStatus.ERROR;
89+
params.status__in = [AccountingExportStatus.ERROR, AccountingExportStatus.FATAL];
9090
}
9191

9292
return this.apiService.get(`/workspaces/${this.workspaceId}/export_logs/`, params);

src/app/core/services/qbd-direct/qbd-direct-core/qbd-direct-helper.service.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export class QbdDirectHelperService {
2020
return this.apiService.post(`/workspaces/${this.workspaceService.getWorkspaceId()}/qbd/import_attributes/`, {refresh});
2121
}
2222

23-
importAttribuites(refresh: boolean): void {
23+
importAttributes(refresh: boolean): void {
2424
this.workspaceService.importFyleAttributes(refresh).subscribe();
2525
this.importQBDAttributes(refresh).subscribe();
2626
this.toastService.displayToastMessage(ToastSeverity.SUCCESS, 'Syncing data dimensions from Quickbooks Desktop');

src/app/integrations/netsuite/netsuite-main/netsuite-main.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ export class NetsuiteMainComponent implements OnInit {
3333
private accountingExportService: AccountingExportService,
3434
private netsuiteHelperService: NetsuiteHelperService,
3535
private router: Router,
36-
private toastServeice: IntegrationsToastService
36+
private toastService: IntegrationsToastService
3737
) { }
3838

3939
refreshDimensions() {
4040
this.netsuiteHelperService.refreshNetsuiteDimensions().subscribe();
4141
this.netsuiteHelperService.refreshFyleDimensions().subscribe();
4242
this.accountingExportService.importExpensesFromFyle('v1').subscribe();
43-
this.toastServeice.displayToastMessage(ToastSeverity.SUCCESS, 'Syncing data dimensions from NetSuite');
43+
this.toastService.displayToastMessage(ToastSeverity.SUCCESS, 'Syncing data dimensions from NetSuite');
4444
}
4545

4646
private setupPage() {

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ import { Component, OnInit } from '@angular/core';
33
import { Router, RouterModule } from '@angular/router';
44
import { MenuItem } from 'primeng/api';
55
import { brandingContent, brandingFeatureConfig } from 'src/app/branding/branding-config';
6-
import { AppName } from 'src/app/core/models/enum/enum.model';
6+
import { AppName, ToastSeverity } from 'src/app/core/models/enum/enum.model';
7+
import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service';
78
import { WorkspaceService } from 'src/app/core/services/common/workspace.service';
9+
import { QbdDirectHelperService } from 'src/app/core/services/qbd-direct/qbd-direct-core/qbd-direct-helper.service';
810
import { SharedModule } from 'src/app/shared/shared.module';
911

1012
@Component({
@@ -32,7 +34,9 @@ export class QbdDirectMainComponent implements OnInit {
3234
readonly brandingFeatureConfig = brandingFeatureConfig;
3335

3436
constructor(
37+
private qbdDirectHelperService: QbdDirectHelperService,
3538
private router: Router,
39+
private toastService: IntegrationsToastService,
3640
private workspaceService: WorkspaceService
3741
) { }
3842

@@ -43,7 +47,7 @@ export class QbdDirectMainComponent implements OnInit {
4347
}
4448

4549
refreshDimensions() {
46-
this.workspaceService.importFyleAttributes(true).subscribe();
50+
this.qbdDirectHelperService.importAttributes(true);
4751
}
4852

4953
ngOnInit(): void {

src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-advanced-settings/qbd-direct-advanced-settings.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ export class QbdDirectAdvancedSettingsComponent implements OnInit {
144144
}
145145

146146
refreshDimensions() {
147-
this.qbdDirectHelperService.importAttribuites(true);
147+
this.qbdDirectHelperService.importAttributes(true);
148148
}
149149

150150
save() {

src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-export-settings/qbd-direct-export-settings.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ export class QbdDirectExportSettingsComponent implements OnInit{
195195
}
196196

197197
refreshDimensions() {
198-
this.qbdDirectHelperService.importAttribuites(true);
198+
this.qbdDirectHelperService.importAttributes(true);
199199
}
200200

201201
cccExportTypeWatcher(): void {

src/app/integrations/qbd-direct/qbd-direct-shared/qbd-direct-import-settings/qbd-direct-import-settings.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export class QbdDirectImportSettingsComponent implements OnInit {
133133
}
134134

135135
refreshDimensions() {
136-
this.qbdDirectHelperService.importAttribuites(true);
136+
this.qbdDirectHelperService.importAttributes(true);
137137
}
138138

139139
navigateToPreviousStep(): void {

0 commit comments

Comments
 (0)