From 7688c1020481fa4b083fab6368daa25a530ba9cf Mon Sep 17 00:00:00 2001 From: Viswas Haridas <37623357+JustARatherRidiculouslyLongUsername@users.noreply.github.com> Date: Mon, 3 Feb 2025 21:34:46 +0530 Subject: [PATCH 1/2] fix: `/landing_v2` - P2 changes (#1173) * fix: reorder tiles to alphabetical order * fix: logo size + font size fixes (#1171) * fix: logo size + font size fixes * fix: beta badge positioning (#1172) --- .../landing-v2/landing-v2.component.html | 140 +++++++++--------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/src/app/integrations/landing-v2/landing-v2.component.html b/src/app/integrations/landing-v2/landing-v2.component.html index b98c63d0c..103422d23 100644 --- a/src/app/integrations/landing-v2/landing-v2.component.html +++ b/src/app/integrations/landing-v2/landing-v2.component.html @@ -38,6 +38,25 @@

+
+
+ + @if (isAppConnected('BUSINESS_CENTRAL')) { + + } @else { + + } +
+ +
+ Dynamics 365 Business Central +
Accounting
+
+ + +
@@ -59,30 +78,11 @@

-
-
- - @if (isAppConnected('INTACCT')) { - - } @else { - - } -
-
- - Sage Intacct - - - Accounting - -
-
-
+
- @if (isAppConnected('QBO')) { + @if (isAppConnected('QBD')) { } @else { @@ -90,37 +90,36 @@

- QuickBooks Online + QuickBooks Desktop (IIF) Accounting
-
+ +
- - @if (isAppConnected('XERO')) { + + @if (isAppConnected('QBD_DIRECT')) { } @else { }
-
- - Xero - - - Accounting - -
+ +
+ QuickBooks Desktop (Web Connector) +
Accounting
+
+
-
+
- @if (isAppConnected('QBD')) { + @if (isAppConnected('QBO')) { } @else { @@ -128,68 +127,69 @@

- QuickBooks Desktop (IIF) + QuickBooks Online Accounting
- -
+
- - @if (isAppConnected('QBD_DIRECT')) { + + @if (isAppConnected('SAGE300')) { } @else { }
- +
- QuickBooks Desktop (Web Connector) + Sage 300 CRE
Accounting
+
-
+
- - @if (isAppConnected('SAGE300')) { + + @if (isAppConnected('INTACCT')) { } @else { }
- -
- Sage 300 CRE -
Accounting
-
- - +
+ + Sage Intacct + + + Accounting + +
-
+
- - @if (isAppConnected('BUSINESS_CENTRAL')) { + + @if (isAppConnected('XERO')) { } @else { }
- -
- Dynamics 365 Business Central -
Accounting
-
- - +
+ + Xero + + + Accounting + +
From 8d5a7f2b27fabaf4c35b6d91a1b3bb16b9c96b97 Mon Sep 17 00:00:00 2001 From: Dhaarani <55541808+DhaaraniCIT@users.noreply.github.com> Date: Wed, 5 Feb 2025 15:51:26 +0530 Subject: [PATCH 2/2] feat: qbd direct servey and info box in dashboard (#1175) * qbd direct servey and info box in dashboard * adding padding --- run.sh | 1 + scripts/setup_env.js | 1 + .../qbd-direct-dashboard/qbd-direct-dashboard.component.ts | 6 ++++++ .../dashboard-export-section.component.html | 5 +++++ .../dashboard-export-section.component.ts | 2 ++ 5 files changed, 15 insertions(+) diff --git a/run.sh b/run.sh index 420b082c8..23d3365a0 100644 --- a/run.sh +++ b/run.sh @@ -38,6 +38,7 @@ do sed -i $SED_EXTRA_ARGS "s?{{REFINER_INTACCT_ONBOARDING_DONE_SURVEY_ID}}?${REFINER_INTACCT_ONBOARDING_DONE_SURVEY_ID}?g" $f; sed -i $SED_EXTRA_ARGS "s?{{REFINER_QBD_ONBOARDING_DONE_SURVEY_ID}}?${REFINER_QBD_ONBOARDING_DONE_SURVEY_ID}?g" $f; sed -i $SED_EXTRA_ARGS "s?{{REFINER_INTACCT_EXPORT_DONE_SURVEY_ID}}?${REFINER_INTACCT_EXPORT_DONE_SURVEY_ID}?g" $f; + sed -i $SED_EXTRA_ARGS "s?{{REFINER_QBD_EXPORT_DONE_SURVEY_ID}}?${REFINER_QBD_EXPORT_DONE_SURVEY_ID}?g" $f; sed -i $SED_EXTRA_ARGS "s?{{BUSINESS_CENTRAL_OAUTH_REDIRECT_URI}}?${BUSINESS_CENTRAL_OAUTH_REDIRECT_URI}?g" $f; sed -i $SED_EXTRA_ARGS "s?{{BUSINESS_CENTRAL_OAUTH_CLIENT_ID}}?${BUSINESS_CENTRAL_OAUTH_CLIENT_ID}?g" $f; sed -i $SED_EXTRA_ARGS "s?{{XERO_OAUTH_CLIENT_ID}}?${XERO_OAUTH_CLIENT_ID}?g" $f; diff --git a/scripts/setup_env.js b/scripts/setup_env.js index 730b337de..1963fc0c1 100644 --- a/scripts/setup_env.js +++ b/scripts/setup_env.js @@ -41,6 +41,7 @@ const environment = { }, qbd: { 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}}'}`, + 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}}'}`, } }, }; diff --git a/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts b/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts index e1c414482..dc9b7d197 100644 --- a/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts +++ b/src/app/integrations/qbd-direct/qbd-direct-main/qbd-direct-dashboard/qbd-direct-dashboard.component.ts @@ -130,6 +130,12 @@ export class QbdDirectDashboardComponent implements OnInit { this.isExportInProgress = false; this.exportProgressPercentage = 0; this.processedCount = 0; + + if (this.failedExpenseGroupCount === 0) { + this.refinerService.triggerSurvey( + AppName.QBD_DIRECT, environment.refiner_survey.qbd.export_done_survery_id, RefinerSurveyType.EXPORT_DONE + ); + } }); } }); diff --git a/src/app/shared/components/dashboard/dashboard-export-section/dashboard-export-section.component.html b/src/app/shared/components/dashboard/dashboard-export-section/dashboard-export-section.component.html index b310ffc4d..0955beb87 100644 --- a/src/app/shared/components/dashboard/dashboard-export-section/dashboard-export-section.component.html +++ b/src/app/shared/components/dashboard/dashboard-export-section/dashboard-export-section.component.html @@ -48,6 +48,11 @@
{{ exportableAccountingExportIds.length }} new expense{{(exportableAccountin
+
+ + +
diff --git a/src/app/shared/components/dashboard/dashboard-export-section/dashboard-export-section.component.ts b/src/app/shared/components/dashboard/dashboard-export-section/dashboard-export-section.component.ts index 3857a277f..a758e8a7a 100644 --- a/src/app/shared/components/dashboard/dashboard-export-section/dashboard-export-section.component.ts +++ b/src/app/shared/components/dashboard/dashboard-export-section/dashboard-export-section.component.ts @@ -44,6 +44,8 @@ export class DashboardExportSectionComponent implements OnInit { importStates: string; + AppName = AppName; + constructor() { } triggerExport() {