remove Credit Card Expense Account dropdown from the dialog box (#154)

fylein · Jul 24, 2023 · 741f518 · 741f518
1 parent 1b3864c
commit 741f518
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 30 deletions.
diff --git a/...ttings/category-mappings/category-mappings-dialog/category-mappings-dialog.component.html b/...ttings/category-mappings/category-mappings-dialog/category-mappings-dialog.component.html
@@ -70,25 +70,6 @@ <h2 mat-dialog-title>
           Please enter a valid value
         </mat-error>
       </mat-form-field>
-
-      <div class="mat-body-strong" *ngIf="showSeparateCCCField()">
-        <strong class="mappings-dialog--label">
-          Credit Card Expense Account
-        </strong>
-      </div>
-      <mat-form-field class="mappings-dialog--field" appearance="outline" *ngIf="showSeparateCCCField()">
-        <input type="text" formControlName="sageIntacctAccount" placeholder="Choose Sage Intacct account" matInput
-          [matAutocomplete]="siAc" [errorStateMatcher]="matcher">
-        <mat-autocomplete #siAc="matAutocomplete" [displayWith]="mappingDisplay">
-          <mat-option *ngFor="let option of sageIntacctAccountOptions" [value]="option">
-            {{option.value}}
-          </mat-option>
-        </mat-autocomplete>
-        <mat-error class="mappings-dialog--error" *ngIf="form.controls.sageIntacctAccount.hasError('forbiddenOption')">
-          Please enter a valid value
-        </mat-error>
-      </mat-form-field>
-
     </div>
   </form>
 </mat-dialog-content>

diff --git a/...settings/category-mappings/category-mappings-dialog/category-mappings-dialog.component.ts b/...settings/category-mappings/category-mappings-dialog/category-mappings-dialog.component.ts
@@ -149,7 +149,7 @@ export class CategoryMappingsDialogComponent implements OnInit {
       attributes.push('EXPENSE_TYPE');
     }
 
-    if (that.configuration.reimbursable_expenses_object !== 'EXPENSE_REPORT' || (that.showSeparateCCCField() && that.configuration.corporate_credit_card_expenses_object !== 'EXPENSE_REPORT')) {
+    if (that.configuration.reimbursable_expenses_object && that.configuration.corporate_credit_card_expenses_object !== 'EXPENSE_REPORT') {
       attributes.push('ACCOUNT');
     }
     return attributes;
@@ -191,15 +191,6 @@ export class CategoryMappingsDialogComponent implements OnInit {
     });
   }
 
-  showSeparateCCCField() {
-    const that = this;
-    const settings = that.configuration;
-    if (settings.corporate_credit_card_expenses_object && settings.corporate_credit_card_expenses_object !== 'EXPENSE_REPORT' && !(settings.reimbursable_expenses_object === 'BILL' || settings.reimbursable_expenses_object === 'JOURNAL_ENTRY' )) {
-      return true;
-    }
-
-    return false;
-  }
 
   ngOnInit() {
     const that = this;

diff --git a/...cct-configurations/expense-field-configuration/expense-field-configuration.component.html b/...cct-configurations/expense-field-configuration/expense-field-configuration.component.html
@@ -24,7 +24,7 @@
   </div>
 
   <div class="expense-fields--border expense-fields--form">
-    
+
     <div class="expense-fields--form">
       <div class="expense-fields--heading">Select Type Field Mapping</div>
     </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ @@
       </div>
       <div class="expense-fields--border expense-fields--form">
         <div class="expense-fields--form">
           <div class="expense-fields--heading">Select Type Field Mapping</div>
         </div>
@@ Expand Down @@