Skip to content

Commit d3c722a

Browse files
authored
fix: intacct css fix (#1015)
* fix: intacct css fix * QBO auto create vendor condition and content fix
1 parent 82fd9d5 commit d3c722a

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

src/app/branding/c1-contents-config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ export const c1Contents = {
288288
advancedSettings: {
289289
stepName: 'Advanced settings',
290290
contentText: 'Customize the integration based on your accounting requirements. ',
291-
autoCreateVendorsLabel: 'Auto-create vendors',
291+
autoCreateVendorsLabel: 'Auto-create employee as vendor',
292292
paymentSyncLabel: 'Auto sync payment status for reimbursable expenses',
293293
customizationSubLabel: 'you can choose what data points need to be exported and what shouldn\'t be.',
294294
autoCreateMerchantsAsVendorsLabel: 'Auto-create merchants as vendors',

src/app/branding/fyle-contents-config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ export const fyleContents = {
288288
advancedSettings: {
289289
stepName: 'Advanced Settings',
290290
contentText: 'In this section, you can customize the integration based on your accounting requirements. ',
291-
autoCreateVendorsLabel: 'Auto-Create Vendors',
291+
autoCreateVendorsLabel: 'Auto-create employee as vendor',
292292
paymentSyncLabel: 'Auto Sync payment status for reimbursable expenses',
293293
customizationSubLabel: 'You can choose what data points need to be exported and what shouldn\'t be.',
294294
autoCreateMerchantsAsVendorsLabel: 'Auto-create Merchants as Vendors',

src/app/integrations/intacct/intacct-shared/intacct-advanced-settings/intacct-advanced-settings.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
[subLabel]="'When matching ' + getEmployeeField() +' record is not found for an employee in ' + brandingConfig.brandName + ', the integration will auto-create a new record in Sage Intacct.'"
8484
[formControllerName]="'autoCreateEmployeeVendor'"></app-configuration-toggle-field>
8585
</div>
86-
<div *ngIf="isAutoCreateMerchantsFieldVisible() && brandingFeatureConfig.featureFlags.advancedSettings.autoCreateMerchants">
86+
<div *ngIf="isAutoCreateMerchantsFieldVisible() && brandingFeatureConfig.featureFlags.advancedSettings.autoCreateMerchants" class="tw-mt-16-px tw-bg-white tw-border tw-border-solid tw-border-separator tw-rounded-12-px">
8787
<app-configuration-toggle-field
8888
[form]="advancedSettingsForm"
8989
[label]="brandingContent.intacct.configuration.advancedSettings.autoCreateMerchantsAsVendorsLabel"

src/app/integrations/qbo/qbo-shared/qbo-advanced-settings/qbo-advanced-settings.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ export class QboAdvancedSettingsComponent implements OnInit {
155155
}
156156

157157
isAutoCreateVendorsFieldVisible(): boolean {
158-
return this.workspaceGeneralSettings.employee_field_mapping === EmployeeFieldMapping.VENDOR && this.workspaceGeneralSettings.auto_map_employees !== null && this.workspaceGeneralSettings.auto_map_employees !== AutoMapEmployeeOptions.EMPLOYEE_CODE;
158+
return this.workspaceGeneralSettings.employee_field_mapping === EmployeeFieldMapping.VENDOR && this.workspaceGeneralSettings.auto_map_employees !== null && this.workspaceGeneralSettings.auto_map_employees !== AutoMapEmployeeOptions.EMPLOYEE_CODE && (this.workspaceGeneralSettings.reimbursable_expenses_object === QBOReimbursableExpensesObject.BILL || this.workspaceGeneralSettings.reimbursable_expenses_object === QBOReimbursableExpensesObject.EXPENSE);
159159
}
160160

161161
isPaymentSyncFieldVisible(): boolean {

src/styles.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ p {
324324
}
325325

326326
.p-dropdown-panel .p-dropdown-items .p-dropdown-item:not(.p-highlight).p-focus {
327-
@apply tw-text-slightly-normal-text-color tw-bg-white tw-rounded-none tw-min-h-dropdown-option-height tw-flex tw-items-center tw-py-8-px tw-pl-14-px tw-text-14-px #{!important};
327+
@apply tw-text-slightly-normal-text-color tw-bg-white tw-rounded-none tw-min-h-dropdown-option-height tw-flex tw-items-center tw-py-8-px tw-px-12-px tw-text-14-px #{!important};
328328
}
329329

330330
.p-dropdown-panel .p-dropdown-items .p-dropdown-item:hover, .p-dropdown-panel .p-dropdown-items .p-dropdown-item:not(.p-highlight).p-focus:hover{

0 commit comments

Comments
 (0)