Skip to content

Commit 0d20c5f

Browse files
author
anishfyle
committedFeb 6, 2025·
Merge branch 'master' into fix-dashboard-skip-expense-post-import
2 parents a8a157a + 8d5a7f2 commit 0d20c5f

File tree

6 files changed

+85
-70
lines changed

6 files changed

+85
-70
lines changed
 

‎run.sh

+1
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ do
3838
sed -i $SED_EXTRA_ARGS "s?{{REFINER_INTACCT_ONBOARDING_DONE_SURVEY_ID}}?${REFINER_INTACCT_ONBOARDING_DONE_SURVEY_ID}?g" $f;
3939
sed -i $SED_EXTRA_ARGS "s?{{REFINER_QBD_ONBOARDING_DONE_SURVEY_ID}}?${REFINER_QBD_ONBOARDING_DONE_SURVEY_ID}?g" $f;
4040
sed -i $SED_EXTRA_ARGS "s?{{REFINER_INTACCT_EXPORT_DONE_SURVEY_ID}}?${REFINER_INTACCT_EXPORT_DONE_SURVEY_ID}?g" $f;
41+
sed -i $SED_EXTRA_ARGS "s?{{REFINER_QBD_EXPORT_DONE_SURVEY_ID}}?${REFINER_QBD_EXPORT_DONE_SURVEY_ID}?g" $f;
4142
sed -i $SED_EXTRA_ARGS "s?{{BUSINESS_CENTRAL_OAUTH_REDIRECT_URI}}?${BUSINESS_CENTRAL_OAUTH_REDIRECT_URI}?g" $f;
4243
sed -i $SED_EXTRA_ARGS "s?{{BUSINESS_CENTRAL_OAUTH_CLIENT_ID}}?${BUSINESS_CENTRAL_OAUTH_CLIENT_ID}?g" $f;
4344
sed -i $SED_EXTRA_ARGS "s?{{XERO_OAUTH_CLIENT_ID}}?${XERO_OAUTH_CLIENT_ID}?g" $f;

‎scripts/setup_env.js

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ const environment = {
4141
},
4242
qbd: {
4343
onboarding_done_survery_id: `${process.env.REFINER_QBD_ONBOARDING_DONE_SURVEY_ID ? process.env.REFINER_QBD_ONBOARDING_DONE_SURVEY_ID : '{{REFINER_QBD_ONBOARDING_DONE_SURVEY_ID}}'}`,
44+
export_done_survery_id: `${process.env.REFINER_QBD_EXPORT_DONE_SURVEY_ID ? process.env.REFINER_QBD_EXPORT_DONE_SURVEY_ID : '{{REFINER_QBD_EXPORT_DONE_SURVEY_ID}}'}`,
4445
}
4546
},
4647
};

‎src/app/integrations/landing-v2/landing-v2.component.html

+70-70
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,25 @@ <h3 class="landing-v2--section-heading">
3838

3939
<div
4040
class="tw-grid tw-grid-cols-2 md:tw-grid-cols-3 lg:tw-grid-cols-4 xl:tw-grid-cols-5 tw-gap-4 tw-justify-items-stretch">
41+
<div *ngIf="isAppShown('BUSINESS_CENTRAL')" class="landing-v2--accounting-app"
42+
(click)="openInAppIntegration(InAppIntegration.BUSINESS_CENTRAL)">
43+
<div class="tw-flex tw-justify-between tw-items-center">
44+
<img src="assets/logos/BusinessCentral-logo.svg" />
45+
@if (isAppConnected('BUSINESS_CENTRAL')) {
46+
<app-badge text="Connected" [theme]="ThemeOption.SUCCESS"></app-badge>
47+
} @else {
48+
<button class="btn-connect">Connect</button>
49+
}
50+
</div>
51+
<span class="landing-v2--accounting-app-name tw-items-start tw-gap-[10px] !tw-text-12-px">
52+
<div>
53+
Dynamics 365 Business Central
54+
<div class="landing-v2--accounting-app-type">Accounting</div>
55+
</div>
56+
<app-badge *ngIf="!orgsToHideBusinessCentralBetaBadge.includes(org.fyle_org_id)"
57+
[theme]="ThemeOption.DARK" text="Beta"></app-badge>
58+
</span>
59+
</div>
4160
<div *ngIf="isAppShown('NETSUITE')">
4261
<div class="landing-v2--accounting-app"
4362
(click)="openAccountingIntegrationApp(AccountingIntegrationApp.NETSUITE)">
@@ -59,137 +78,118 @@ <h3 class="landing-v2--section-heading">
5978
</div>
6079
</div>
6180
</div>
62-
<div *ngIf="isAppShown('INTACCT')" class="landing-v2--accounting-app"
63-
(click)="openAccountingIntegrationApp(AccountingIntegrationApp.SAGE_INTACCT)">
64-
<div class="tw-flex tw-justify-between tw-items-center">
65-
<img src="assets/logos/intacct-logo-new.png" />
66-
@if (isAppConnected('INTACCT')) {
67-
<app-badge text="Connected" [theme]="ThemeOption.SUCCESS"></app-badge>
68-
} @else {
69-
<button class="btn-connect">Connect</button>
70-
}
71-
</div>
72-
<div>
73-
<span class="landing-v2--accounting-app-name">
74-
Sage Intacct
75-
</span>
76-
<span class="landing-v2--accounting-app-type">
77-
Accounting
78-
</span>
79-
</div>
80-
</div>
81-
<div *ngIf="isAppShown('QBO')" class="landing-v2--accounting-app"
82-
(click)="openAccountingIntegrationApp(AccountingIntegrationApp.QBO)">
81+
<div *ngIf="isAppShown('QBD')" class="landing-v2--accounting-app"
82+
(click)="openInAppIntegration(InAppIntegration.QBD)">
8383
<div class="tw-flex tw-justify-between tw-items-center">
8484
<img src="assets/logos/quickbooks-logo.png" class="!tw-h-[30.7px]" />
85-
@if (isAppConnected('QBO')) {
85+
@if (isAppConnected('QBD')) {
8686
<app-badge text="Connected" [theme]="ThemeOption.SUCCESS"></app-badge>
8787
} @else {
8888
<button class="btn-connect">Connect</button>
8989
}
9090
</div>
9191
<div>
9292
<span class="landing-v2--accounting-app-name">
93-
QuickBooks Online
93+
QuickBooks Desktop (IIF)
9494
</span>
9595
<span class="landing-v2--accounting-app-type">
9696
Accounting
9797
</span>
9898
</div>
9999
</div>
100-
<div *ngIf="isAppShown('XERO')" class="landing-v2--accounting-app"
101-
(click)="openAccountingIntegrationApp(AccountingIntegrationApp.XERO)">
100+
<!-- Direct -->
101+
<div *ngIf="isAppShown('QBD_DIRECT')" class="landing-v2--accounting-app"
102+
(click)="openInAppIntegration(InAppIntegration.QBD_DIRECT)">
102103
<div class="tw-flex tw-justify-between tw-items-center">
103-
<img src="assets/logos/xero-logo-new.png" />
104-
@if (isAppConnected('XERO')) {
104+
<img src="assets/logos/quickbooks-logo.png" class="!tw-h-[30.7px]" />
105+
@if (isAppConnected('QBD_DIRECT')) {
105106
<app-badge text="Connected" [theme]="ThemeOption.SUCCESS"></app-badge>
106107
} @else {
107108
<button class="btn-connect">Connect</button>
108109
}
109110
</div>
110-
<div>
111-
<span class="landing-v2--accounting-app-name">
112-
Xero
113-
</span>
114-
<span class="landing-v2--accounting-app-type">
115-
Accounting
116-
</span>
117-
</div>
111+
<span class="landing-v2--accounting-app-name tw-items-start tw-gap-4">
112+
<div>
113+
QuickBooks Desktop (Web Connector)
114+
<div class="landing-v2--accounting-app-type">Accounting</div>
115+
</div>
116+
</span>
118117
</div>
119-
<div *ngIf="isAppShown('QBD')" class="landing-v2--accounting-app"
120-
(click)="openInAppIntegration(InAppIntegration.QBD)">
118+
<div *ngIf="isAppShown('QBO')" class="landing-v2--accounting-app"
119+
(click)="openAccountingIntegrationApp(AccountingIntegrationApp.QBO)">
121120
<div class="tw-flex tw-justify-between tw-items-center">
122121
<img src="assets/logos/quickbooks-logo.png" class="!tw-h-[30.7px]" />
123-
@if (isAppConnected('QBD')) {
122+
@if (isAppConnected('QBO')) {
124123
<app-badge text="Connected" [theme]="ThemeOption.SUCCESS"></app-badge>
125124
} @else {
126125
<button class="btn-connect">Connect</button>
127126
}
128127
</div>
129128
<div>
130129
<span class="landing-v2--accounting-app-name">
131-
QuickBooks Desktop (IIF)
130+
QuickBooks Online
132131
</span>
133132
<span class="landing-v2--accounting-app-type">
134133
Accounting
135134
</span>
136135
</div>
137136
</div>
138-
<!-- Direct -->
139-
<div *ngIf="isAppShown('QBD_DIRECT')" class="landing-v2--accounting-app"
140-
(click)="openInAppIntegration(InAppIntegration.QBD_DIRECT)">
137+
<div *ngIf="isAppShown('SAGE300')" class="landing-v2--accounting-app"
138+
(click)="openInAppIntegration(InAppIntegration.SAGE300)">
141139
<div class="tw-flex tw-justify-between tw-items-center">
142-
<img src="assets/logos/quickbooks-logo.png" class="!tw-h-[30.7px]" />
143-
@if (isAppConnected('QBD_DIRECT')) {
140+
<img src="assets/logos/sage300-logo.png" class="tw-py-[5px]" />
141+
@if (isAppConnected('SAGE300')) {
144142
<app-badge text="Connected" [theme]="ThemeOption.SUCCESS"></app-badge>
145143
} @else {
146144
<button class="btn-connect">Connect</button>
147145
}
148146
</div>
149-
<span class="landing-v2--accounting-app-name tw-items-center tw-gap-4">
147+
<span class="landing-v2--accounting-app-name tw-items-start tw-gap-4">
150148
<div>
151-
QuickBooks Desktop (Web Connector)
149+
Sage 300 CRE
152150
<div class="landing-v2--accounting-app-type">Accounting</div>
153151
</div>
152+
<app-badge *ngIf="!orgsToHideSage300BetaBadge.includes(org.fyle_org_id)" [theme]="ThemeOption.DARK"
153+
text="Beta"></app-badge>
154154
</span>
155155
</div>
156-
<div *ngIf="isAppShown('SAGE300')" class="landing-v2--accounting-app"
157-
(click)="openInAppIntegration(InAppIntegration.SAGE300)">
156+
<div *ngIf="isAppShown('INTACCT')" class="landing-v2--accounting-app"
157+
(click)="openAccountingIntegrationApp(AccountingIntegrationApp.SAGE_INTACCT)">
158158
<div class="tw-flex tw-justify-between tw-items-center">
159-
<img src="assets/logos/sage300-logo.png" class="tw-py-[4px]" />
160-
@if (isAppConnected('SAGE300')) {
159+
<img src="assets/logos/intacct-logo-new.png" />
160+
@if (isAppConnected('INTACCT')) {
161161
<app-badge text="Connected" [theme]="ThemeOption.SUCCESS"></app-badge>
162162
} @else {
163163
<button class="btn-connect">Connect</button>
164164
}
165165
</div>
166-
<span class="landing-v2--accounting-app-name tw-items-center tw-gap-4">
167-
<div>
168-
Sage 300 CRE
169-
<div class="landing-v2--accounting-app-type">Accounting</div>
170-
</div>
171-
<app-badge *ngIf="!orgsToHideSage300BetaBadge.includes(org.fyle_org_id)" [theme]="ThemeOption.DARK"
172-
text="Beta"></app-badge>
173-
</span>
166+
<div>
167+
<span class="landing-v2--accounting-app-name">
168+
Sage Intacct
169+
</span>
170+
<span class="landing-v2--accounting-app-type">
171+
Accounting
172+
</span>
173+
</div>
174174
</div>
175-
<div *ngIf="isAppShown('BUSINESS_CENTRAL')" class="landing-v2--accounting-app"
176-
(click)="openInAppIntegration(InAppIntegration.BUSINESS_CENTRAL)">
175+
<div *ngIf="isAppShown('XERO')" class="landing-v2--accounting-app"
176+
(click)="openAccountingIntegrationApp(AccountingIntegrationApp.XERO)">
177177
<div class="tw-flex tw-justify-between tw-items-center">
178-
<img src="assets/logos/BusinessCentral-logo.svg" />
179-
@if (isAppConnected('BUSINESS_CENTRAL')) {
178+
<img src="assets/logos/xero-logo-new.png" />
179+
@if (isAppConnected('XERO')) {
180180
<app-badge text="Connected" [theme]="ThemeOption.SUCCESS"></app-badge>
181181
} @else {
182182
<button class="btn-connect">Connect</button>
183183
}
184184
</div>
185-
<span class="landing-v2--accounting-app-name tw-items-center tw-gap-4">
186-
<div>
187-
Dynamics 365 Business Central
188-
<div class="landing-v2--accounting-app-type">Accounting</div>
189-
</div>
190-
<app-badge *ngIf="!orgsToHideBusinessCentralBetaBadge.includes(org.fyle_org_id)"
191-
[theme]="ThemeOption.DARK" text="Beta"></app-badge>
192-
</span>
185+
<div>
186+
<span class="landing-v2--accounting-app-name">
187+
Xero
188+
</span>
189+
<span class="landing-v2--accounting-app-type">
190+
Accounting
191+
</span>
192+
</div>
193193
</div>
194194

195195
<div *ngIf="isAppShown('BAMBOO_HR')">

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

+6
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,12 @@ export class QbdDirectDashboardComponent implements OnInit {
130130
this.isExportInProgress = false;
131131
this.exportProgressPercentage = 0;
132132
this.processedCount = 0;
133+
134+
if (this.failedExpenseGroupCount === 0) {
135+
this.refinerService.triggerSurvey(
136+
AppName.QBD_DIRECT, environment.refiner_survey.qbd.export_done_survery_id, RefinerSurveyType.EXPORT_DONE
137+
);
138+
}
133139
});
134140
}
135141
});

‎src/app/shared/components/dashboard/dashboard-export-section/dashboard-export-section.component.html

+5
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,11 @@ <h5>{{ exportableAccountingExportIds.length }} new expense{{(exportableAccountin
4848
</div>
4949
</div>
5050
</div>
51+
<div *ngIf="appName === AppName.QBD_DIRECT && isExportInProgress" class="tw-pt-16-px">
52+
<app-configuration-info-label
53+
[infoText]="'Click \‘Update Selected\’ in QuickBooks Web Connector after exporting to sync your expenses immediately'">
54+
</app-configuration-info-label>
55+
</div>
5156
</div>
5257
<div *ngIf="isExportInProgress">
5358
<p-progressBar class="!tw-h-6-px" [value]="exportProgressPercentage" [showValue]='false' [mode]="loaderType"></p-progressBar>

‎src/app/shared/components/dashboard/dashboard-export-section/dashboard-export-section.component.ts

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ export class DashboardExportSectionComponent implements OnInit {
4444

4545
importStates: string;
4646

47+
AppName = AppName;
48+
4749
constructor() { }
4850

4951
triggerExport() {

0 commit comments

Comments
 (0)
Please sign in to comment.