Skip to content

Commit

Permalink
fix: QBD fixes post testing (#1108)
Browse files Browse the repository at this point in the history
* fix: QBD fixes post testing

* fix
  • Loading branch information
ashwin1111 committed Dec 11, 2024
1 parent b8e33e0 commit 1a8fa49
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 16 deletions.
2 changes: 1 addition & 1 deletion src/app/core/models/db/expense-group.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export type ExpenseGroupParam = {
limit: number;
offset: number;
tasklog__status?: string;
status__in?: string;
status__in?: string | string[];
exported_at__gte?: string;
exported_at__lte?: string;
state?: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,39 +26,39 @@ export class QbdDirectOnboardingModel {
completed: false,
step: this.brandingContent.preRequisite.stepName,
icon: 'arrow-tail-up-medium',
route: '/integrations/qbo/onboarding/pre_requisite',
route: '/integrations/qbd_direct/onboarding/pre_requisite',
styleClasses: ['step-name-pre-requisite--text']
},
{
active: false,
completed: false,
step: this.brandingContent.connector.stepName,
icon: 'link-vertical-medium',
route: '/integrations/qbo/onboarding/connector',
route: '/integrations/qbd_direct/onboarding/connector',
styleClasses: ['step-name-connector--text !tw-left-[-70px]']
},
{
active: false,
completed: false,
step: this.brandingContent.exportSetting.stepName,
icon: 'arrow-tail-up-medium',
route: '/integrations/qbo/onboarding/export_settings',
route: '/integrations/qbd_direct/onboarding/export_settings',
styleClasses: ['step-name-export--text']
},
{
active: false,
completed: false,
step: this.brandingContent.importSetting.stepName,
icon: 'arrow-tail-down-medium',
route: '/integrations/qbo/onboarding/import_settings',
route: '/integrations/qbd_direct/onboarding/import_settings',
styleClasses: ['step-name-export--text']
},
{
active: false,
completed: false,
step: this.brandingContent.advancedSettings.stepName,
icon: 'gear-medium',
route: '/integrations/qbo/onboarding/advanced_settings',
route: '/integrations/qbd_direct/onboarding/advanced_settings',
styleClasses: ['step-name-advanced--text']
}
];
Expand Down
2 changes: 1 addition & 1 deletion src/app/core/services/common/accounting-export.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export class AccountingExportService {

if (appName === AppName.QBD_DIRECT) {
if (apiParams.status__in?.includes(AccountingExportStatus.FAILED)) {
apiParams.status__in = AccountingExportStatus.ERROR;
apiParams.status__in = [AccountingExportStatus.ERROR, AccountingExportStatus.FATAL];
}
delete apiParams.type__in;
return this.apiService.get(`/workspaces/${this.workspaceId}/export_logs/`, apiParams);
Expand Down
2 changes: 1 addition & 1 deletion src/app/core/services/common/export-log.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class ExportLogService {
return this.apiService.get(`/workspaces/${this.workspaceId}/fyle/expense_groups/v2/`, params);
} else if (appName === AppName.QBD_DIRECT) {
if (params.status__in?.includes(AccountingExportStatus.FAILED)) {
params.status__in = AccountingExportStatus.ERROR;
params.status__in = [AccountingExportStatus.ERROR, AccountingExportStatus.FATAL];
}

return this.apiService.get(`/workspaces/${this.workspaceId}/export_logs/`, params);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export class QbdDirectHelperService {
return this.apiService.post(`/workspaces/${this.workspaceService.getWorkspaceId()}/qbd/import_attributes/`, {refresh});
}

importAttribuites(refresh: boolean): void {
importAttributes(refresh: boolean): void {
this.workspaceService.importFyleAttributes(refresh).subscribe();
this.importQBDAttributes(refresh).subscribe();
this.toastService.displayToastMessage(ToastSeverity.SUCCESS, 'Syncing data dimensions from Quickbooks Desktop');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ export class NetsuiteMainComponent implements OnInit {
private accountingExportService: AccountingExportService,
private netsuiteHelperService: NetsuiteHelperService,
private router: Router,
private toastServeice: IntegrationsToastService
private toastService: IntegrationsToastService
) { }

refreshDimensions() {
this.netsuiteHelperService.refreshNetsuiteDimensions().subscribe();
this.netsuiteHelperService.refreshFyleDimensions().subscribe();
this.accountingExportService.importExpensesFromFyle('v1').subscribe();
this.toastServeice.displayToastMessage(ToastSeverity.SUCCESS, 'Syncing data dimensions from NetSuite');
this.toastService.displayToastMessage(ToastSeverity.SUCCESS, 'Syncing data dimensions from NetSuite');
}

private setupPage() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@ import { Component, OnInit } from '@angular/core';
import { Router, RouterModule } from '@angular/router';
import { MenuItem } from 'primeng/api';
import { brandingContent, brandingFeatureConfig } from 'src/app/branding/branding-config';
import { AppName } from 'src/app/core/models/enum/enum.model';
import { AppName, ToastSeverity } from 'src/app/core/models/enum/enum.model';
import { IntegrationsToastService } from 'src/app/core/services/common/integrations-toast.service';
import { WorkspaceService } from 'src/app/core/services/common/workspace.service';
import { QbdDirectHelperService } from 'src/app/core/services/qbd-direct/qbd-direct-core/qbd-direct-helper.service';
import { SharedModule } from 'src/app/shared/shared.module';

@Component({
Expand Down Expand Up @@ -32,7 +34,9 @@ export class QbdDirectMainComponent implements OnInit {
readonly brandingFeatureConfig = brandingFeatureConfig;

constructor(
private qbdDirectHelperService: QbdDirectHelperService,
private router: Router,
private toastService: IntegrationsToastService,
private workspaceService: WorkspaceService
) { }

Expand All @@ -43,7 +47,7 @@ export class QbdDirectMainComponent implements OnInit {
}

refreshDimensions() {
this.workspaceService.importFyleAttributes(true).subscribe();
this.qbdDirectHelperService.importAttributes(true);
}

ngOnInit(): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export class QbdDirectAdvancedSettingsComponent implements OnInit {
}

refreshDimensions() {
this.qbdDirectHelperService.importAttribuites(true);
this.qbdDirectHelperService.importAttributes(true);
}

save() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ export class QbdDirectExportSettingsComponent implements OnInit{
}

refreshDimensions() {
this.qbdDirectHelperService.importAttribuites(true);
this.qbdDirectHelperService.importAttributes(true);
}

cccExportTypeWatcher(): void {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export class QbdDirectImportSettingsComponent implements OnInit {
}

refreshDimensions() {
this.qbdDirectHelperService.importAttribuites(true);
this.qbdDirectHelperService.importAttributes(true);
}

navigateToPreviousStep(): void {
Expand Down

0 comments on commit 1a8fa49

Please sign in to comment.