Skip to content

Commit f33a4a0

Browse files
fix: business central beta (#1087)
* fix: remove export link column from export logs * fix: show a 'Beta' badge for business central in landing (#1090) * fix: show a 'Beta' badge for business central in landing * fix: add orgs to hide the 'Beta' badge from * fix: text changes in business central configuration (#1089) * fix: export settings content changes * fix: hide spend date help message for group by expenses * fix: update import settings sublabels
1 parent ebd88de commit f33a4a0

File tree

6 files changed

+32
-9
lines changed

6 files changed

+32
-9
lines changed

src/app/integrations/business-central/business-central-shared/business-central-export-settings/business-central-export-settings.component.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<app-configuration-select-field
7474
[form]="exportSettingForm"
7575
[isFieldMandatory]="false"
76-
[label]="'How should Employees in ' + brandingConfig.brandName + ' be mapped to Employees in Dynamics 365 Business Central ?'"
76+
[label]="'How should Employees in ' + brandingConfig.brandName + ' be mapped to Vendors in Dynamics 365 Business Central ?'"
7777
[subLabel]="'Automatically map the employees in ' + brandingConfig.brandName + ' to their corresponding records in Dynamics 365 Business Central based on a unique parameter'"
7878
[placeholder]="'Select representation'"
7979
[options]="employeeMapOptions"
@@ -122,7 +122,7 @@
122122
[isFieldMandatory]="true"
123123
[mandatoryErrorListName]="'expense state'"
124124
[label]="'At which state should the expenses be ready to export from ' + brandingConfig.brandName + '?'"
125-
[subLabel]="'You can export expenses either when they\'re awaiting payment after approval (Payment processing) or when the payment has been settled (Paid).'"
125+
[subLabel]="'You can export expenses either when they\'re awaiting payment after approval (Payment processing) or when the payment has been settled (Closed).'"
126126
[options]="reimbursableExpenseState"
127127
[iconPath]="'list'"
128128
[placeholder]="'Select export state'"
@@ -252,7 +252,7 @@
252252
[isFieldMandatory]="true"
253253
[mandatoryErrorListName]="'expense state'"
254254
[label]="'At which state should the expenses be ready to export from ' + brandingConfig.brandName + '?'"
255-
[subLabel]="'You can export expenses either when they\'re awaiting payment after approval (Payment processing) or when the payment has been settled (Paid).'"
255+
[subLabel]="'You can export expenses either when they\'re awaiting payment after approval (Approved) or when the payment has been settled (Closed).'"
256256
[options]="cccExpenseState"
257257
[iconPath]="'list'"
258258
[placeholder]="'Select export state'"

src/app/integrations/business-central/business-central-shared/business-central-import-settings/business-central-import-settings.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<app-configuration-toggle-field
1717
[form]="importSettingForm"
1818
[label]="'Import the Chart of Accounts as Categories in ' + brandingConfig.brandName "
19-
[subLabel]="'Imported account will be available as Categories in ' + brandingConfig.brandName "
19+
[subLabel]="'Imported accounts will appear in a dropdown under the \'Category\' field in ' + brandingConfig.brandName + ', enabling employees to use these values for coding their expenses. '"
2020
[formControllerName]="'importCategories'"
2121
[isSectionHeader]="false"
2222
[iconPath]="'arrow-tail-down'">
@@ -26,7 +26,7 @@
2626
<app-configuration-toggle-field
2727
[form]="importSettingForm"
2828
[label]="'Import Vendor as Merchant in ' + brandingConfig.brandName "
29-
[subLabel]="'Imported Vendor will be available as Merchants in ' + brandingConfig.brandName "
29+
[subLabel]="'Imported vendors will appear in a dropdown under the \'Merchant\' field in ' + brandingConfig.brandName + ', enabling employees to use these values for coding their expenses.'"
3030
[formControllerName]="'importVendorAsMerchant'"
3131
[isSectionHeader]="false"
3232
[iconPath]="'arrow-tail-down'">

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,9 @@
7171
</div>
7272
<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)">
7373
<img src="assets/logos/BusinessCentral-logo.svg" class="tw-mt-[-20px]" width="50px" height="60px" />
74-
<span class="landing--accounting-app-name">
74+
<span class="landing--accounting-app-name tw-gap-2 tw-px-4 tw-flex tw-items-center">
7575
Dynamics 365 Business Central
76+
<app-badge *ngIf="!orgsToHideBusinessCentralBetaBadge.includes(org.fyle_org_id)" [theme]="ThemeOption.DARK" text="Beta"></app-badge>
7677
</span>
7778
</div>
7879
</div>

src/app/integrations/landing/landing.component.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,28 @@ export class LandingComponent implements OnInit {
8282
'orOiAVGiOnrh'
8383
];
8484

85+
readonly orgsToHideBusinessCentralBetaBadge = [
86+
'oryfqquWUbFs',
87+
'orWFZxhzXoUt',
88+
'orieBe3QsGDn',
89+
'orAevABamvVY',
90+
'orfmXPsa3AJY',
91+
'orT6KrlvEYeg',
92+
'orcga0J6iyks',
93+
'orBdtxeIkuX5',
94+
'orEc2MUSD9vG',
95+
'orOZjlaycN3l',
96+
'orsxsebzGTJi',
97+
'orBQ50NEdy9S',
98+
'orKTGVGrPbO1',
99+
'orWpX5yhnBbx',
100+
'orIxlG5yySoz',
101+
'orvNsxoSNCGP',
102+
'orvysp2iDQKH',
103+
'orRuH2BEKRnW',
104+
'orfiqr2KayJy'
105+
];
106+
85107
readonly ThemeOption = ThemeOption;
86108

87109
constructor(

src/app/shared/components/configuration/configuration-select-field/configuration-select-field.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ <h5 *ngIf="formControllerName === 'cccExportType' && brandingConfig.brandId ===
9999
<div *ngIf="!showExportPreview && isDisabled && isDisableTextRequired" class="sub-text tw-text-pretty">
100100
<span>Auto-selected based on your export module</span>
101101
</div>
102-
<div *ngIf="brandingConfig.brandId !== 'co' && form.controls[formControllerName].value==='spent_at' && isOnboarding && form.get('cccExportType')?.value" class="sub-text">
102+
<div *ngIf="brandingConfig.brandId !== 'co' && form.controls[formControllerName].value==='spent_at' && isOnboarding && form.get('cccExportType')?.value && form.get('cccExportGroup')?.value === 'REPORT'" class="sub-text">
103103
<span>Using the Spend Date may lead to multiple single line<br>item entries.</span>
104104
</div>
105105
</div>

src/app/shared/components/export-log/export-log-table/export-log-table.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<th *ngIf="isExportLogTable && brandingFeatureConfig.featureFlags.exportLog.expenseType">{{brandingContent.tableHeaders.expenseType}}</th>
77
<th>Reference ID</th>
88
<th *ngIf="!isDashboardFailed">{{brandingContent.tableHeaders.exportedAs}}</th>
9-
<th *ngIf="!isDashboardFailed && appName !== AppName.SAGE300 && appName !== AppName.QBD_DIRECT">Link to {{appName}}</th>
9+
<th *ngIf="!isDashboardFailed && appName !== AppName.SAGE300 && appName !== AppName.QBD_DIRECT && appName !== AppName.BUSINESS_CENTRAL">Link to {{appName}}</th>
1010
<th class="tw-min-w-120-px" *ngIf="isDashboardFailed">Link to {{ brandingConfig.brandName }}</th>
1111
</tr>
1212
</ng-template>
@@ -40,7 +40,7 @@
4040
{{brandingConfig.brandId === 'co' ? (rowData.exportedAs | snakeCaseToSpaceCase | sentenceCase) : (rowData.exportedAs | snakeCaseToSpaceCase | titlecase)}}
4141
</span>
4242
</td>
43-
<td *ngIf="!isDashboardFailed && appName !== AppName.SAGE300 && appName !== AppName.QBD_DIRECT">
43+
<td *ngIf="!isDashboardFailed && appName !== AppName.SAGE300 && appName !== AppName.QBD_DIRECT && appName !== AppName.BUSINESS_CENTRAL">
4444
<div>
4545
<button (click)="openUrl(rowData.integrationUrl)" [pTooltip]="brandingConfig.brandId === 'co' ? 'Open in new tab' : 'Open in New Tab'" tooltipPosition="top">
4646
<app-svg-icon [styleClasses]="'tw-pt-5-px'" [svgSource]="'open-in-new-tab-standard'" [width]="'24px'" [height]="'24px'"></app-svg-icon>

0 commit comments

Comments
 (0)