fix: intacct css fix (#1015)

* fix: intacct css fix * QBO auto create vendor condition and content fix
fylein · Oct 11, 2024 · d3c722a · d3c722a
1 parent 82fd9d5
commit d3c722a
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/src/app/branding/c1-contents-config.ts b/src/app/branding/c1-contents-config.ts
@@ -288,7 +288,7 @@ export const c1Contents = {
         advancedSettings: {
             stepName: 'Advanced settings',
             contentText: 'Customize the integration based on your accounting requirements. ',
-            autoCreateVendorsLabel: 'Auto-create vendors',
+            autoCreateVendorsLabel: 'Auto-create employee as vendor',
             paymentSyncLabel: 'Auto sync payment status for reimbursable expenses',
             customizationSubLabel: 'you can choose what data points need to be exported and what shouldn\'t be.',
             autoCreateMerchantsAsVendorsLabel: 'Auto-create merchants as vendors',

diff --git a/src/app/branding/fyle-contents-config.ts b/src/app/branding/fyle-contents-config.ts
@@ -288,7 +288,7 @@ export const fyleContents = {
         advancedSettings: {
             stepName: 'Advanced Settings',
             contentText: 'In this section, you can customize the integration based on your accounting requirements. ',
-            autoCreateVendorsLabel: 'Auto-Create Vendors',
+            autoCreateVendorsLabel: 'Auto-create employee as vendor',
             paymentSyncLabel: 'Auto Sync payment status for reimbursable expenses',
             customizationSubLabel: 'You can choose what data points need to be exported and what shouldn\'t be.',
             autoCreateMerchantsAsVendorsLabel: 'Auto-create Merchants as Vendors',

diff --git a/...intacct/intacct-shared/intacct-advanced-settings/intacct-advanced-settings.component.html b/...intacct/intacct-shared/intacct-advanced-settings/intacct-advanced-settings.component.html
@@ -83,7 +83,7 @@
                 [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.'"
                 [formControllerName]="'autoCreateEmployeeVendor'"></app-configuration-toggle-field>
             </div>
-            <div *ngIf="isAutoCreateMerchantsFieldVisible() && brandingFeatureConfig.featureFlags.advancedSettings.autoCreateMerchants">
+            <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">
             <app-configuration-toggle-field
                 [form]="advancedSettingsForm"
                 [label]="brandingContent.intacct.configuration.advancedSettings.autoCreateMerchantsAsVendorsLabel"

diff --git a/src/app/integrations/qbo/qbo-shared/qbo-advanced-settings/qbo-advanced-settings.component.ts b/src/app/integrations/qbo/qbo-shared/qbo-advanced-settings/qbo-advanced-settings.component.ts
@@ -155,7 +155,7 @@ export class QboAdvancedSettingsComponent implements OnInit {
   }
 
   isAutoCreateVendorsFieldVisible(): boolean {
-    return this.workspaceGeneralSettings.employee_field_mapping === EmployeeFieldMapping.VENDOR && this.workspaceGeneralSettings.auto_map_employees !== null && this.workspaceGeneralSettings.auto_map_employees !== AutoMapEmployeeOptions.EMPLOYEE_CODE;
+    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);
   }
 
   isPaymentSyncFieldVisible(): boolean {

diff --git a/src/styles.scss b/src/styles.scss
@@ -324,7 +324,7 @@ p {
 }
 
 .p-dropdown-panel .p-dropdown-items .p-dropdown-item:not(.p-highlight).p-focus {
-    @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};
+    @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};
 }
 
 .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{