Merge branch 'master' into branding-css

Author: DhaaraniCIT

run.sh

@@ -36,6 +36,7 @@ do
     sed -i $SED_EXTRA_ARGS "s?{{TRAVELPERK_CLIENT_ID}}?${TRAVELPERK_CLIENT_ID}?g" $f;
     sed -i $SED_EXTRA_ARGS "s?{{REFINER_PROJECT_ID}}?${REFINER_PROJECT_ID}?g" $f;
     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?{{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;

scripts/setup_env.js

@@ -38,6 +38,9 @@ const environment = {
     intacct: {
       onboarding_done_survery_id: `${process.env.REFINER_INTACCT_ONBOARDING_DONE_SURVEY_ID ? process.env.REFINER_INTACCT_ONBOARDING_DONE_SURVEY_ID : '{{REFINER_INTACCT_ONBOARDING_DONE_SURVEY_ID}}'}`,
       export_done_survery_id: `${process.env.REFINER_INTACCT_EXPORT_DONE_SURVEY_ID ? process.env.REFINER_INTACCT_EXPORT_DONE_SURVEY_ID : '{{REFINER_INTACCT_EXPORT_DONE_SURVEY_ID}}'}`,
+    },
+    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}}'}`,
     }
   },
 };

src/app/integrations/intacct/intacct-shared/intacct-import-settings/intacct-import-settings.component.scss

@@ -49,7 +49,7 @@
 
   .container {
       display: flex;
-      justify-content: center;
+      justify-content: start;
   }
 
   .sub-text {

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

@@ -151,7 +151,6 @@ <h3 class="landing-v2--section-heading">
                         QuickBooks Desktop (Web Connector)
                         <div class="landing-v2--accounting-app-type">Accounting</div>
                     </div>
-                    <app-badge [theme]="ThemeOption.DARK" text="Beta"></app-badge>
                 </span>
             </div>
             <div *ngIf="isAppShown('SAGE300')" class="landing-v2--accounting-app"

src/app/integrations/landing/landing.component.html

@@ -70,7 +70,6 @@
                     <img src="assets/logos/quickbooks-logo.png" width="120px" height="60px" />
                     <span class="landing--accounting-app-name tw-gap-2 tw-px-4 tw-flex tw-items-center">
                         QuickBooks Desktop (Web Connector)
-                        <app-badge [theme]="ThemeOption.DARK" text="Beta"></app-badge>
                     </span>
                 </div>
                 <div *ngIf="exposeApps.SAGE300" class="landing--accounting-app tw-mt-20-px" [ngClass]="brandingStyle.common.mainComponentShadow" (click)="openInAppIntegration(InAppIntegration.SAGE300)">

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

@@ -7,15 +7,17 @@ import { brandingConfig } from 'src/app/branding/c1-contents-config';
 import { AccountingExportSummary, AccountingExportSummaryModel } from 'src/app/core/models/db/accounting-export-summary.model';
 import { DestinationFieldMap, DashboardModel } from 'src/app/core/models/db/dashboard.model';
 import { AccountingGroupedErrors, AccountingGroupedErrorStat, ErrorResponse } from 'src/app/core/models/db/error.model';
-import { AppName, AccountingErrorType, ReimbursableImportState, CCCImportState, AppUrl, TaskLogState, ClickEvent, TrackingApp } from 'src/app/core/models/enum/enum.model';
+import { AppName, AccountingErrorType, ReimbursableImportState, CCCImportState, AppUrl, TaskLogState, ClickEvent, TrackingApp, RefinerSurveyType } from 'src/app/core/models/enum/enum.model';
 import { QbdDirectTaskResponse, QbdDirectTaskLog } from 'src/app/core/models/qbd-direct/db/qbd-direct-task-log.model';
 import { QbdDirectImportSettingModel } from 'src/app/core/models/qbd-direct/qbd-direct-configuration/qbd-direct-import-settings.model';
 import { AccountingExportService } from 'src/app/core/services/common/accounting-export.service';
 import { DashboardService } from 'src/app/core/services/common/dashboard.service';
+import { RefinerService } from 'src/app/core/services/integration/refiner.service';
 import { TrackingService } from 'src/app/core/services/integration/tracking.service';
 import { QbdDirectExportSettingsService } from 'src/app/core/services/qbd-direct/qbd-direct-configuration/qbd-direct-export-settings.service';
 import { QbdDirectImportSettingsService } from 'src/app/core/services/qbd-direct/qbd-direct-configuration/qbd-direct-import-settings.service';
 import { SharedModule } from 'src/app/shared/shared.module';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-qbd-direct-dashboard',
@@ -86,7 +88,8 @@ export class QbdDirectDashboardComponent implements OnInit {
     private dashboardService: DashboardService,
     private QbdDirectExportSettingsService: QbdDirectExportSettingsService,
     private trackingService: TrackingService,
-    private importSettingService: QbdDirectImportSettingsService
+    private importSettingService: QbdDirectImportSettingsService,
+    private refinerService: RefinerService
   ) { }
 
   export() {

src/app/integrations/qbd-direct/qbd-direct-onboarding/qbd-direct-onboarding-done/qbd-direct-onboarding-done.component.ts

@@ -1,7 +1,10 @@
 import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
+import { AppName, RefinerSurveyType } from 'src/app/core/models/enum/enum.model';
+import { RefinerService } from 'src/app/core/services/integration/refiner.service';
 import { SharedModule } from 'src/app/shared/shared.module';
+import { environment } from 'src/environments/environment';
 
 @Component({
   selector: 'app-qbd-direct-onboarding-done',
@@ -13,11 +16,15 @@ import { SharedModule } from 'src/app/shared/shared.module';
 export class QbdDirectOnboardingDoneComponent {
 
   constructor(
-    private router: Router
+    private router: Router,
+    private refinerService: RefinerService
   ) { }
 
   navigateToDashboard(): void {
     this.router.navigate([`/integrations/qbd_direct/main/dashboard`]);
+    this.refinerService.triggerSurvey(
+      AppName.QBD_DIRECT, environment.refiner_survey.qbd.onboarding_done_survery_id, RefinerSurveyType.ONBOARDING_DONE
+    );
   }
 
 }