Skip to content

Commit

Permalink
Merge branch 'master' into move-emp-settings-to-export-settings
Browse files Browse the repository at this point in the history
  • Loading branch information
@anishfyle
anishfyle committed Dec 19, 2024
2 parents ff7e00d + 7e8db09 commit fc0c373
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 54 deletions.
91 changes: 43 additions & 48 deletions src/app/integrations/landing/landing.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,66 +32,61 @@
Integrate your Expense Management account with the following accounting software.
</p>

<div class="tw-flex">
<div class="tw-flex tw-flex-wrap tw-gap-5">
<div *ngIf="exposeApps.NETSUITE">
<div class="landing--accounting-app tw-mr-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.NETSUITE)">
<img src="assets/logos/netsuite-logo.png" width="120px" height="60px" />
<span class="landing--accounting-app-name">
<div class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.NETSUITE)">
<img src="assets/logos/netsuite-logo.png" class="tw-mt-[-16px]" width="120px" height="60px" />
<span class="landing--accounting-app-name !tw-pt-18-px">
NetSuite
</span>
</div>
<!-- IIF -->
<div *ngIf="!(exposeApps.QBD_DIRECT && org.allow_qbd_direct_integration) && exposeApps.QBD" class="landing--accounting-app tw-mr-20-px tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.QBD)">
<img src="assets/logos/quickbooks-logo.png" class="tw-mt-[-20px]" width="120px" height="60px" />
<span class="landing--accounting-app-name">
QuickBooks Desktop
</span>
</div>
<!-- Direct -->
<div *ngIf="exposeApps.QBD_DIRECT && org.allow_qbd_direct_integration" class="landing--accounting-app tw-mr-20-px tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.QBD_DIRECT)">
<img src="assets/logos/quickbooks-logo.png" class="tw-mt-[-20px]" width="120px" height="60px" />
<span class="landing--accounting-app-name tw-gap-2 tw-px-4 tw-flex tw-items-center">
QuickBooks Desktop
<app-badge [theme]="ThemeOption.DARK" text="Beta"></app-badge>
</span>
</div>
</div>
<div>
<div *ngIf="exposeApps.INTACCT" class="landing--accounting-app tw-mr-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.SAGE_INTACCT)">
<img src="assets/logos/intacct-logo.png" width="120px" height="60px" />
<span class="landing--accounting-app-name">
Sage Intacct
</span>
</div>
<div *ngIf="exposeApps.SAGE300" class="landing--accounting-app tw-mr-20-px tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.SAGE300)">
<img src="assets/logos/sage300-logo.svg" width="110px" height="60px" />
<span class="landing--accounting-app-name tw-gap-2">
Sage 300 CRE
<app-badge *ngIf="!orgsToHideSage300BetaBadge.includes(org.fyle_org_id)" [theme]="ThemeOption.DARK" text="Beta"></app-badge>
</span>
</div>
<div *ngIf="exposeApps.INTACCT" class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.SAGE_INTACCT)">
<img src="assets/logos/intacct-logo.png" class="tw-mt-[-16px]" width="120px" height="60px" />
<span class="landing--accounting-app-name !tw-pt-8-px">
Sage Intacct
</span>
</div>
<div>
<div *ngIf="exposeApps.QBO" class="landing--accounting-app tw-mr-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.QBO)">
<img class="tw-mt-10-px" src="assets/logos/quickbooks-logo.png" width="120px" />
<span class="landing--accounting-app-name !tw-pt-30-px">
QuickBooks Online
</span>
</div>
<div *ngIf="exposeApps.BUSINESS_CENTRAL && org.allow_dynamics" class="landing--accounting-app tw-mr-20-px tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.BUSINESS_CENTRAL)">
<img src="assets/logos/BusinessCentral-logo.svg" class="tw-mt-[-20px]" width="50px" height="60px" />
<span class="landing--accounting-app-name tw-gap-2 tw-px-4 tw-flex tw-items-center">
Dynamics 365 Business Central
<app-badge *ngIf="!orgsToHideBusinessCentralBetaBadge.includes(org.fyle_org_id)" [theme]="ThemeOption.DARK" text="Beta"></app-badge>
</span>
</div>
<div *ngIf="exposeApps.QBO" class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.QBO)">
<img class="tw-mt-10-px" src="assets/logos/quickbooks-logo.png" width="120px" />
<span class="landing--accounting-app-name">
QuickBooks Online
</span>
</div>
<div *ngIf="exposeApps.XERO" class="landing--accounting-app" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.XERO)">
<div *ngIf="exposeApps.XERO" class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openAccountingIntegrationApp(AccountingIntegrationApp.XERO)">
<img src="assets/logos/xero-logo.png" class="tw-mt-[-20px]" width="65px" height="60px" />
<span class="landing--accounting-app-name">
Xero
</span>
</div>
<div *ngIf="exposeApps.QBD" class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.QBD)">
<img src="assets/logos/quickbooks-logo.png" width="120px" height="60px" />
<span class="landing--accounting-app-name">
QuickBooks Desktop (IIF)
</span>
</div>
<!-- Direct -->
<div *ngIf="exposeApps.QBD_DIRECT && org.allow_qbd_direct_integration" class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.QBD_DIRECT)">
<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]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.SAGE300)">
<img src="assets/logos/sage300-logo.svg" width="110px" height="60px" />
<span class="landing--accounting-app-name tw-gap-2">
Sage 300 CRE
<app-badge *ngIf="!orgsToHideSage300BetaBadge.includes(org.fyle_org_id)" [theme]="ThemeOption.DARK" text="Beta"></app-badge>
</span>
</div>
<div *ngIf="exposeApps.BUSINESS_CENTRAL && org.allow_dynamics" class="landing--accounting-app tw-mt-20-px" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}" (click)="openInAppIntegration(InAppIntegration.BUSINESS_CENTRAL)">
<img src="assets/logos/BusinessCentral-logo.svg" class="tw-mt-[-20px]" width="50px" height="60px" />
<span class="landing--accounting-app-name tw-gap-2 tw-px-4 tw-flex tw-items-center">
Dynamics 365 Business Central
<app-badge *ngIf="!orgsToHideBusinessCentralBetaBadge.includes(org.fyle_org_id)" [theme]="ThemeOption.DARK" text="Beta"></app-badge>
</span>
</div>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/app/integrations/landing/landing.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export class LandingComponent implements OnInit {

readonly brandingConfig = brandingConfig;

readonly isINCluster = this.storageService.get('cluster-domain').includes('in1');
readonly isINCluster = this.storageService.get('cluster-domain')?.includes('in1');

readonly exposeApps = !this.isINCluster ? exposeAppConfig[brandingConfig.brandId][brandingConfig.envId] : exposeAppConfig[brandingConfig.brandId]['production-1-in'];

Expand Down
2 changes: 1 addition & 1 deletion ...t-onboarding/qbd-direct-onboarding-connector/qbd-direct-onboarding-connector.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export class QbdDirectOnboardingConnectorComponent implements OnInit {

xmlFileContent: string;

isCompanyPathInvalid: boolean;
isCompanyPathInvalid: boolean = false;

password: string;

Expand Down
6 changes: 3 additions & 3 deletions ...direct/qbd-direct-shared/qbd-direct-download-file/qbd-direct-download-file.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ <h4 class="tw-text-16-px tw-pb-4-px tw-font-500 tw-text-text-tertiary">Enter com
required
#downloadFilePathField="ngModel"
[ngClass]="{
'error-box': (downloadFilePathField.invalid && downloadFilePathField.touched) || !isCompanyPathInvalid
'error-box': (downloadFilePathField.invalid && downloadFilePathField.touched) || isCompanyPathInvalid
}">
<div *ngIf="(downloadFilePathField.invalid && downloadFilePathField.touched) || !isCompanyPathInvalid" class="tw-text-alert-toast tw-pt-2-px">
<small *ngIf="downloadFilePathField.errors?.required || !isCompanyPathInvalid" class="tw-flex">
<div *ngIf="(downloadFilePathField.invalid && downloadFilePathField.touched) || isCompanyPathInvalid" class="tw-text-alert-toast tw-pt-2-px">
<small *ngIf="downloadFilePathField.errors?.required || isCompanyPathInvalid" class="tw-flex">
<app-svg-icon [svgSource]="'info-circle-fill'" [isTextColorAllowed]="true" [width]="'16px'" [height]="'16px'" [styleClasses]="'tw-text-form-error-help-text-color'"></app-svg-icon>
Enter a valid company file path.</small>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ...p/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</button>
<button *ngIf="!isIntegrationConnected && (appName === AppName.QBD || appName === AppName.NETSUITE || appName === AppName.INTACCT || appName === AppName.SAGE300 || appName === AppName.BUSINESS_CENTRAL || appName.includes('QuickBooks Desktop '))" pButton type="button" class="p-button-raised" (click)="connect()">
{{buttonText}}
<app-svg-icon *ngIf="(appName === AppName.QBD || appName.includes('QuickBooks Desktop ')) && brandingFeatureConfig.isIconsInsideButtonAllowed" [svgSource]="'arrow-tail-right-medium'" [width]="'18px'" [height]="'18px'" [styleClasses]="'tw-pl-10-px tw-pt-2-px !tw-text-12-px'"></app-svg-icon>
<app-svg-icon *ngIf="(appName === AppName.QBD || appName.includes('QuickBooks Desktop ')) && brandingFeatureConfig.isIconsInsideButtonAllowed && !isConnectionInProgress" [svgSource]="'arrow-tail-right-medium'" [width]="'18px'" [height]="'18px'" [styleClasses]="'tw-pl-10-px tw-pt-2-px !tw-text-12-px'"></app-svg-icon>
<app-loader class="tw-ml-10-px" *ngIf="isConnectionInProgress" [styleClass]="'spinner-16-white tw-top-2-px'"></app-loader>
</button>
<iframe *ngIf="iframeSourceUrl && (appName === AppName.TRAVELPERK)" scrolling="no" [src]="iframeSourceUrl" class="tw-mt-40-px tw-w-270-px tw-h-84-px"></iframe>
Expand Down

0 comments on commit fc0c373

Please sign in to comment.