From 05c43ef73b1aa520db5769f4aac4d55e4708a12b Mon Sep 17 00:00:00 2001 From: Aastha Bist Date: Tue, 30 Jul 2024 23:13:26 +0530 Subject: [PATCH] fix: remove weekend spend key from expenses (#3154) --- .../v1/expense-transaction-status.enum.ts | 4 + src/app/core/mock-data/cc-transaction.data.ts | 4 +- ...orporate-card-transaction-response.data.ts | 10 +- .../mock-data/matchedCCTransaction.data.ts | 6 +- .../platform/v1/expense-employee.model.ts | 26 ++++ .../mock-data/platform/v1/expense.data.ts | 21 +--- src/app/core/mock-data/transaction.data.ts | 5 +- .../mock-data/transformed-expense.data.ts | 7 +- .../models/matchedCCCTransaction.model.ts | 4 +- .../v1/accounting-export-summary.model.ts | 6 + .../platform/v1/cc-transaction.model.ts | 4 +- .../expense-missing-mandatory-fields.model.ts | 6 + .../platform/v1/expense-report.model.ts | 17 +++ .../platform/v1/expense-rule-data.model.ts | 11 ++ .../core/models/platform/v1/expense.model.ts | 117 ++---------------- ...tched-corpporate-card-transaction.model.ts | 22 ++++ .../models/platform/v1/policy-checks.model.ts | 8 ++ .../models/platform/v1/violation.model.ts | 4 + src/app/core/models/v1/transaction.model.ts | 4 +- .../v1/spender/expenses.service.spec.ts | 12 +- .../platform/v1/spender/expenses.service.ts | 3 +- .../add-edit-expense-6.spec.ts | 6 +- .../add-edit-expense/add-edit-expense.page.ts | 7 +- .../fyle/dashboard/tasks/tasks.component.ts | 4 +- .../my-create-report.page.spec.ts | 5 +- .../my-create-report/my-create-report.page.ts | 5 +- .../my-view-report.page.spec.ts | 4 +- .../my-view-report/my-view-report.page.ts | 5 +- .../view-expense/view-expense.page.spec.ts | 7 +- .../fyle/view-expense/view-expense.page.ts | 5 +- ...saction-status-info-popover.component.html | 2 +- ...tion-status-info-popover.component.spec.ts | 10 +- ...ansaction-status-info-popover.component.ts | 8 +- .../transaction-status.component.spec.ts | 6 +- .../transaction-status.component.ts | 10 +- 35 files changed, 192 insertions(+), 193 deletions(-) create mode 100644 src/app/core/enums/platform/v1/expense-transaction-status.enum.ts create mode 100644 src/app/core/mock-data/platform/v1/expense-employee.model.ts create mode 100644 src/app/core/models/platform/v1/accounting-export-summary.model.ts create mode 100644 src/app/core/models/platform/v1/expense-missing-mandatory-fields.model.ts create mode 100644 src/app/core/models/platform/v1/expense-report.model.ts create mode 100644 src/app/core/models/platform/v1/expense-rule-data.model.ts create mode 100644 src/app/core/models/platform/v1/matched-corpporate-card-transaction.model.ts create mode 100644 src/app/core/models/platform/v1/policy-checks.model.ts create mode 100644 src/app/core/models/platform/v1/violation.model.ts diff --git a/src/app/core/enums/platform/v1/expense-transaction-status.enum.ts b/src/app/core/enums/platform/v1/expense-transaction-status.enum.ts new file mode 100644 index 0000000000..d5a2de37d9 --- /dev/null +++ b/src/app/core/enums/platform/v1/expense-transaction-status.enum.ts @@ -0,0 +1,4 @@ +export enum ExpenseTransactionStatus { + PENDING = 'PENDING', + POSTED = 'POSTED', +} diff --git a/src/app/core/mock-data/cc-transaction.data.ts b/src/app/core/mock-data/cc-transaction.data.ts index c25375604d..eecaebdb8a 100644 --- a/src/app/core/mock-data/cc-transaction.data.ts +++ b/src/app/core/mock-data/cc-transaction.data.ts @@ -1,7 +1,7 @@ import deepFreeze from 'deep-freeze-strict'; import { corporateCardTransaction } from '../models/platform/v1/cc-transaction.model'; -import { TransactionStatus } from '../models/platform/v1/expense.model'; +import { ExpenseTransactionStatus } from '../enums/platform/v1/expense-transaction-status.enum'; export const ccTransactionData: corporateCardTransaction = deepFreeze({ amount: 260.37, @@ -97,7 +97,7 @@ export const ccTransactionData: corporateCardTransaction = deepFreeze({ post_date: null, spent_at: '2018-07-04T00:00:00+00:00', statement_id: 'stmt2K9aLunGU4', - transaction_status: TransactionStatus.PENDING, + transaction_status: ExpenseTransactionStatus.PENDING, updated_at: '2024-02-13T03:10:49.432028+00:00', user: { email: 'devendra.r@fyle.in', diff --git a/src/app/core/mock-data/corporate-card-transaction-response.data.ts b/src/app/core/mock-data/corporate-card-transaction-response.data.ts index 6934e905c3..9327a49841 100644 --- a/src/app/core/mock-data/corporate-card-transaction-response.data.ts +++ b/src/app/core/mock-data/corporate-card-transaction-response.data.ts @@ -1,7 +1,7 @@ import deepFreeze from 'deep-freeze-strict'; import { CorporateCardTransactionRes } from '../models/platform/v1/corporate-card-transaction-res.model'; -import { TransactionStatus } from '../models/platform/v1/expense.model'; +import { ExpenseTransactionStatus } from '../enums/platform/v1/expense-transaction-status.enum'; export const ccTransactionResponseData: CorporateCardTransactionRes = deepFreeze({ data: [ @@ -212,7 +212,7 @@ export const unmatchCCCExpenseResponseData: CorporateCardTransactionRes = deepFr post_date: null, spent_at: '2018-07-04T00:00:00+00:00', statement_id: 'stmt2K9aLunGU4', - transaction_status: TransactionStatus.PENDING, + transaction_status: ExpenseTransactionStatus.PENDING, updated_at: '2024-02-13T03:10:49.432028+00:00', user: { email: 'devendra.r@fyle.in', @@ -267,7 +267,7 @@ export const matchCCCExpenseResponseData: CorporateCardTransactionRes = deepFree post_date: null, spent_at: '2018-07-04T00:00:00+00:00', statement_id: 'stmt2K9aLunGU4', - transaction_status: TransactionStatus.PENDING, + transaction_status: ExpenseTransactionStatus.PENDING, updated_at: '2024-02-13T03:10:48.454767+00:00', user: { email: 'devendra.r@fyle.in', @@ -367,7 +367,7 @@ export const ccTransactionResponseData3: CorporateCardTransactionRes = deepFreez id: 'usvMoPfCC9Xw', }, user_id: 'usvMoPfCC9Xw', - transaction_status: TransactionStatus.POSTED, + transaction_status: ExpenseTransactionStatus.POSTED, }, { amount: 205.21, @@ -455,7 +455,7 @@ export const ccTransactionResponseData3: CorporateCardTransactionRes = deepFreez id: 'usvMoPfCC9Xw', }, user_id: 'usvMoPfCC9Xw', - transaction_status: TransactionStatus.PENDING, + transaction_status: ExpenseTransactionStatus.PENDING, }, ], }); diff --git a/src/app/core/mock-data/matchedCCTransaction.data.ts b/src/app/core/mock-data/matchedCCTransaction.data.ts index 40178aa6c0..ad87d4ef95 100644 --- a/src/app/core/mock-data/matchedCCTransaction.data.ts +++ b/src/app/core/mock-data/matchedCCTransaction.data.ts @@ -1,7 +1,7 @@ import deepFreeze from 'deep-freeze-strict'; import { MatchedCCCTransaction } from '../models/matchedCCCTransaction.model'; -import { TransactionStatus } from '../models/platform/v1/expense.model'; +import { ExpenseTransactionStatus } from '../enums/platform/v1/expense-transaction-status.enum'; export const matchedCCTransactionData: Partial = deepFreeze({ id: 'btxnSte7sVQCM8', @@ -15,7 +15,7 @@ export const matchedCCTransactionData: Partial = deepFree corporate_credit_card_account_number: '7620', orig_amount: null, orig_currency: null, - status: TransactionStatus.PENDING, + status: ExpenseTransactionStatus.PENDING, displayObject: 'Jul 3, 2018 - test description260.37', }); @@ -31,7 +31,7 @@ export const matchedCCTransactionData2: Partial = deepFre corporate_credit_card_account_number: '9891', orig_amount: null, orig_currency: null, - status: TransactionStatus.PENDING, + status: ExpenseTransactionStatus.PENDING, displayObject: 'Jun 6, 2018 - test description205.21', }); diff --git a/src/app/core/mock-data/platform/v1/expense-employee.model.ts b/src/app/core/mock-data/platform/v1/expense-employee.model.ts new file mode 100644 index 0000000000..6e2f33da73 --- /dev/null +++ b/src/app/core/mock-data/platform/v1/expense-employee.model.ts @@ -0,0 +1,26 @@ +import { NameValuePair } from 'src/app/core/models/name-value-pair.model'; +import { Department } from 'src/app/core/models/platform/v1/department.model'; +import { Level } from 'src/app/core/models/platform/v1/level.model'; +import { User } from 'src/app/core/models/platform/v1/user.model'; + +export interface ExpenseEmployee { + business_unit: string; + code: string; + custom_fields: NameValuePair[]; + department: Pick; + department_id: string; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + flattened_custom_field: Record; + has_accepted_invite: boolean; + id: string; + is_enabled: boolean; + joined_at?: Date; + mobile?: string; + level: Pick; + location: string; + org_id: string; + org_name: string; + title: string; + user: User; + user_id: string; +} diff --git a/src/app/core/mock-data/platform/v1/expense.data.ts b/src/app/core/mock-data/platform/v1/expense.data.ts index 92edeabe44..0a887f39bb 100644 --- a/src/app/core/mock-data/platform/v1/expense.data.ts +++ b/src/app/core/mock-data/platform/v1/expense.data.ts @@ -7,10 +7,11 @@ import { MileageUnitEnum } from 'src/app/core/models/platform/platform-mileage-r import { ReportState } from 'src/app/core/models/platform/v1/report.model'; import { ApprovalState } from 'src/app/core/models/platform/report-approvals.model'; import { AccountType } from 'src/app/core/models/platform/v1/account.model'; -import { Expense, TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; +import { Expense } from 'src/app/core/models/platform/v1/expense.model'; import { FileType } from 'src/app/core/models/platform/v1/file.model'; import { CustomFieldTypes } from 'src/app/core/enums/platform/v1/custom-fields-type.enum'; import { CommuteDeduction } from 'src/app/core/enums/commute-deduction.enum'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; export const expenseData: Expense = deepFreeze({ accounting_export_summary: {}, @@ -119,7 +120,6 @@ export const expenseData: Expense = deepFreeze({ is_reimbursable: false, is_split: false, is_verified: true, - is_weekend_spend: false, last_exported_at: null, last_settled_at: null, last_verified_at: new Date('2023-10-31T18:15:25.494224+00:00'), @@ -143,7 +143,7 @@ export const expenseData: Expense = deepFreeze({ merchant: 'Merchant1', posted_at: null, spent_at: new Date('2023-10-15T00:00:00+00:00'), - status: TransactionStatus?.PENDING, + status: ExpenseTransactionStatus?.PENDING, }, ], merchant: null, @@ -532,7 +532,6 @@ export const mileageExpense: Expense = deepFreeze({ is_reimbursable: true, is_split: false, is_verified: false, - is_weekend_spend: false, last_exported_at: null, last_settled_at: null, last_verified_at: null, @@ -889,7 +888,6 @@ export const perDiemExpense: Expense = deepFreeze({ is_reimbursable: true, is_split: false, is_verified: false, - is_weekend_spend: false, last_exported_at: null, last_settled_at: null, last_verified_at: null, @@ -1022,6 +1020,7 @@ export const criticalPolicyViolatedExpense: Expense = deepFreeze({ policy_amount: 0.00009, }); +// eslint-disable-next-line custom-rules/prefer-semantic-extension-name type Category = Pick; const mileageCategory: Category = deepFreeze({ @@ -1292,7 +1291,6 @@ export const apiExpenses1: Expense[] = deepFreeze([ is_reimbursable: true, is_split: true, is_verified: false, - is_weekend_spend: false, last_exported_at: null, last_settled_at: null, last_verified_at: null, @@ -1646,7 +1644,6 @@ export const apiExpenses1: Expense[] = deepFreeze([ is_reimbursable: true, is_split: true, is_verified: false, - is_weekend_spend: false, last_exported_at: null, last_settled_at: null, last_verified_at: null, @@ -1861,7 +1858,6 @@ export const splitExpensesData: Expense[] = deepFreeze([ is_reimbursable: false, is_split: true, is_verified: false, - is_weekend_spend: false, last_exported_at: null, last_settled_at: null, last_verified_at: null, @@ -2006,7 +2002,6 @@ export const splitExpensesData: Expense[] = deepFreeze([ is_reimbursable: false, is_split: true, is_verified: false, - is_weekend_spend: false, last_exported_at: null, last_settled_at: null, last_verified_at: null, @@ -2156,7 +2151,6 @@ export const apiExpenses3: Expense[] = deepFreeze([ is_reimbursable: false, is_split: true, is_verified: false, - is_weekend_spend: false, last_exported_at: null, last_settled_at: null, last_verified_at: null, @@ -2301,7 +2295,6 @@ export const apiExpenses3: Expense[] = deepFreeze([ is_reimbursable: false, is_split: true, is_verified: false, - is_weekend_spend: false, last_exported_at: null, last_settled_at: null, last_verified_at: null, @@ -2461,7 +2454,6 @@ export const platformExpenseData: Expense = deepFreeze({ is_reimbursable: true, is_split: false, is_verified: false, - is_weekend_spend: false, last_exported_at: null, last_settled_at: null, last_verified_at: null, @@ -2640,7 +2632,6 @@ export const platformExpenseDataWithSubCategory: Expense = deepFreeze({ is_reimbursable: true, is_split: false, is_verified: false, - is_weekend_spend: false, last_exported_at: null, last_settled_at: null, last_verified_at: null, @@ -2881,7 +2872,6 @@ export const platformExpenseWithExtractedData: Expense = deepFreeze({ is_reimbursable: true, is_split: false, is_verified: false, - is_weekend_spend: false, last_exported_at: null, last_settled_at: null, last_verified_at: null, @@ -3044,7 +3034,6 @@ export const platformExpenseWithMatchCCC: Expense = deepFreeze({ is_reimbursable: false, is_split: false, is_verified: null, - is_weekend_spend: false, last_exported_at: null, last_settled_at: null, last_verified_at: null, @@ -3068,7 +3057,7 @@ export const platformExpenseWithMatchCCC: Expense = deepFreeze({ merchant: 'test description', posted_at: null, spent_at: new Date('2018-07-03T18:30:00.000Z'), - status: TransactionStatus.PENDING, + status: ExpenseTransactionStatus.PENDING, }, ], merchant: 'test description', diff --git a/src/app/core/mock-data/transaction.data.ts b/src/app/core/mock-data/transaction.data.ts index 1d449b97e7..a9e14eeb2b 100644 --- a/src/app/core/mock-data/transaction.data.ts +++ b/src/app/core/mock-data/transaction.data.ts @@ -1,9 +1,8 @@ import deepFreeze from 'deep-freeze-strict'; - -import { TransactionStatus } from '../models/platform/v1/expense.model'; import { Transaction } from '../models/v1/transaction.model'; import { optionsData15, optionsData33 } from './merge-expenses-options-data.data'; import { expectedTxnCustomProperties, txnCustomPropertiesData } from './txn-custom-properties.data'; +import { ExpenseTransactionStatus } from '../enums/platform/v1/expense-transaction-status.enum'; export const txnList: Transaction[] = deepFreeze([ { @@ -4130,7 +4129,7 @@ export const editUnflattenedTransactionWithMatchCCCPlatform: Partial = deepFreeze({ tx: { @@ -390,7 +389,7 @@ export const transformedExpenseWithMatchCCCData: Partial corporate_credit_card_account_number: '7620', orig_amount: null, orig_currency: null, - status: TransactionStatus.PENDING, + status: ExpenseTransactionStatus.PENDING, }, ], source_account_id: 'acc7F6bwRa52p', @@ -435,7 +434,7 @@ export const transformedExpenseWithMatchCCCData3: Partial; distance: number; distance_unit: MileageUnitEnum; - employee: Employee; + employee: ExpenseEmployee; employee_id: string; ended_at: Date; expense_rule_data: ExpenseRuleData; @@ -64,7 +67,6 @@ export interface Expense { is_reimbursable: boolean; is_split: boolean; is_verified: boolean; - is_weekend_spend: boolean; last_settled_at: Date; last_verified_at: Date; locations: Location[]; @@ -76,7 +78,7 @@ export interface Expense { mileage_is_round_trip: boolean; mileage_rate: Partial; mileage_rate_id: number; - missing_mandatory_fields: MissingMandatoryFields; + missing_mandatory_fields: ExpenseMissingMandatoryFields; org_id: string; per_diem_num_days: number; per_diem_rate: Pick; @@ -86,7 +88,7 @@ export interface Expense { project_id: number; project: Pick; purpose: string; - report: Report; + report: ExpenseReport; report_id: string; seq_num: string; source: string; @@ -114,102 +116,3 @@ export interface Expense { commute_details?: CommuteDetails; commute_details_id?: number; } - -export interface Employee { - business_unit: string; - code: string; - custom_fields: NameValuePair[]; - department: Pick; - department_id: string; - // eslint-disable-next-line @typescript-eslint/no-explicit-any - flattened_custom_field: Record; - has_accepted_invite: boolean; - id: string; - is_enabled: boolean; - joined_at?: Date; - mobile?: string; - level: Pick; - location: string; - org_id: string; - org_name: string; - title: string; - user: User; - user_id: string; -} - -export interface MatchedCorporateCardTransaction { - id: string; - corporate_card_id: string; - corporate_card_number: string; - masked_corporate_card_number: string; - corporate_card_user_full_name: string; - bank_name: string; - amount: number; - currency: string; - spent_at: Date; - posted_at: Date; - description: string; - foreign_currency: string; - status: TransactionStatus; - foreign_amount: number; - merchant: string; - category: string; - matched_by: string; - corporate_card_nickname?: string; -} - -export enum TransactionStatus { - PENDING = 'PENDING', - POSTED = 'POSTED', -} - -export interface PolicyChecks { - are_approvers_added: boolean; - is_amount_limit_applied: boolean; - is_flagged_ever: boolean; - violations: Violation[]; -} - -export interface Violation { - policy_rule_description: string; - policy_rule_id: string; -} - -export interface Report { - amount: number; - approvals: ReportApprovals[]; - id: string; - last_approved_at: Date; - last_paid_at: Date; - last_submitted_at: Date; - seq_num: string; - state: ReportState; - last_verified_at: Date; - reimbursement_id: string; - reimbursement_seq_num: string; - title: string; -} - -export interface ExpenseRuleData { - merchant: string; - is_billable: boolean; - purpose: string; - category_id: number; - project_id: number; - cost_center_id: number; - custom_fields: NameValuePair[]; -} - -export interface MissingMandatoryFields { - expense_field_ids: number[]; - amount: boolean; - currency: boolean; - receipt: boolean; -} - -export interface AccountingExportSummary { - state: string; - error_type: string; - url: string; - tpa_id: string; -} diff --git a/src/app/core/models/platform/v1/matched-corpporate-card-transaction.model.ts b/src/app/core/models/platform/v1/matched-corpporate-card-transaction.model.ts new file mode 100644 index 0000000000..19b4fbd704 --- /dev/null +++ b/src/app/core/models/platform/v1/matched-corpporate-card-transaction.model.ts @@ -0,0 +1,22 @@ +import { ExpenseTransactionStatus } from '../../../enums/platform/v1/expense-transaction-status.enum'; + +export interface MatchedCorporateCardTransaction { + id: string; + corporate_card_id: string; + corporate_card_number: string; + masked_corporate_card_number: string; + corporate_card_user_full_name: string; + bank_name: string; + amount: number; + currency: string; + spent_at: Date; + posted_at: Date; + description: string; + foreign_currency: string; + status: ExpenseTransactionStatus; + foreign_amount: number; + merchant: string; + category: string; + matched_by: string; + corporate_card_nickname?: string; +} diff --git a/src/app/core/models/platform/v1/policy-checks.model.ts b/src/app/core/models/platform/v1/policy-checks.model.ts new file mode 100644 index 0000000000..f981b625b5 --- /dev/null +++ b/src/app/core/models/platform/v1/policy-checks.model.ts @@ -0,0 +1,8 @@ +import { Violation } from './violation.model'; + +export interface PolicyChecks { + are_approvers_added: boolean; + is_amount_limit_applied: boolean; + is_flagged_ever: boolean; + violations: Violation[]; +} diff --git a/src/app/core/models/platform/v1/violation.model.ts b/src/app/core/models/platform/v1/violation.model.ts new file mode 100644 index 0000000000..9c7a75c86c --- /dev/null +++ b/src/app/core/models/platform/v1/violation.model.ts @@ -0,0 +1,4 @@ +export interface Violation { + policy_rule_description: string; + policy_rule_id: string; +} diff --git a/src/app/core/models/v1/transaction.model.ts b/src/app/core/models/v1/transaction.model.ts index 811e4ae312..ba9c1efd6e 100644 --- a/src/app/core/models/v1/transaction.model.ts +++ b/src/app/core/models/v1/transaction.model.ts @@ -1,5 +1,5 @@ +import { ExpenseTransactionStatus } from '../../enums/platform/v1/expense-transaction-status.enum'; import { Destination } from '../destination.model'; -import { TransactionStatus } from '../platform/v1/expense.model'; import { TxnCustomProperties } from '../txn-custom-properties.model'; export interface Transaction { @@ -133,7 +133,7 @@ export interface Transaction { displayObject?: string; orig_amount: number; orig_currency: string; - status: TransactionStatus; + status: ExpenseTransactionStatus; corporate_card_nickname?: string; }[]; } diff --git a/src/app/core/services/platform/v1/spender/expenses.service.spec.ts b/src/app/core/services/platform/v1/spender/expenses.service.spec.ts index 43b0bfea1c..ecfd88822b 100644 --- a/src/app/core/services/platform/v1/spender/expenses.service.spec.ts +++ b/src/app/core/services/platform/v1/spender/expenses.service.spec.ts @@ -28,7 +28,7 @@ import { ccTransactionResponseData3, } from 'src/app/core/mock-data/corporate-card-transaction-response.data'; import { cloneDeep } from 'lodash'; -import { TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; describe('ExpensesService', () => { let service: ExpensesService; @@ -94,7 +94,7 @@ describe('ExpensesService', () => { spenderService.get.and.returnValue(of({ data: [mockExpenseData] })); const mockCCTransactionRes = cloneDeep(ccTransactionResponseData); - mockCCTransactionRes.data[0].transaction_status = TransactionStatus.PENDING; + mockCCTransactionRes.data[0].transaction_status = ExpenseTransactionStatus.PENDING; corporateCreditCardExpenseService.getMatchedTransactionById.and.returnValue(of(mockCCTransactionRes)); const expenseId = 'txOJVaaPxo9O'; @@ -112,7 +112,7 @@ describe('ExpensesService', () => { expect(response).toEqual(mockExpenseData); - expect(response.matched_corporate_card_transactions[0].status).toEqual(TransactionStatus.PENDING); + expect(response.matched_corporate_card_transactions[0].status).toEqual(ExpenseTransactionStatus.PENDING); done(); }); @@ -182,9 +182,9 @@ describe('ExpensesService', () => { }, }); - expect(response[0].matched_corporate_card_transactions[0].status).toEqual(TransactionStatus.POSTED); - expect(response[1].matched_corporate_card_transactions[0].status).toEqual(TransactionStatus.PENDING); - expect(response[2].matched_corporate_card_transactions[0].status).toEqual(TransactionStatus.PENDING); + expect(response[0].matched_corporate_card_transactions[0].status).toEqual(ExpenseTransactionStatus.POSTED); + expect(response[1].matched_corporate_card_transactions[0].status).toEqual(ExpenseTransactionStatus.PENDING); + expect(response[2].matched_corporate_card_transactions[0].status).toEqual(ExpenseTransactionStatus.PENDING); done(); }); diff --git a/src/app/core/services/platform/v1/spender/expenses.service.ts b/src/app/core/services/platform/v1/spender/expenses.service.ts index 58baf21a23..f860507fba 100644 --- a/src/app/core/services/platform/v1/spender/expenses.service.ts +++ b/src/app/core/services/platform/v1/spender/expenses.service.ts @@ -2,7 +2,7 @@ import { Inject, Injectable } from '@angular/core'; import { Observable, concatMap, map, of, range, reduce, switchMap } from 'rxjs'; import { SpenderService } from '../spender/spender.service'; import { PlatformApiResponse } from 'src/app/core/models/platform/platform-api-response.model'; -import { Expense, MatchedCorporateCardTransaction } from 'src/app/core/models/platform/v1/expense.model'; +import { Expense } from 'src/app/core/models/platform/v1/expense.model'; import { ExpensesQueryParams } from 'src/app/core/models/platform/v1/expenses-query-params.model'; import { PAGINATION_SIZE } from 'src/app/constants'; import { CacheBuster, Cacheable } from 'ts-cacheable'; @@ -18,6 +18,7 @@ import { SplitExpenseMissingFields } from 'src/app/core/models/platform/v1/split import { expensesCacheBuster$ } from 'src/app/core/cache-buster/expense-cache-buster'; import { CorporateCreditCardExpenseService } from '../../../corporate-credit-card-expense.service'; import { corporateCardTransaction } from 'src/app/core/models/platform/v1/cc-transaction.model'; +import { MatchedCorporateCardTransaction } from 'src/app/core/models/platform/v1/matched-corpporate-card-transaction.model'; @Injectable({ providedIn: 'root', diff --git a/src/app/fyle/add-edit-expense/add-edit-expense-6.spec.ts b/src/app/fyle/add-edit-expense/add-edit-expense-6.spec.ts index 6692aae883..891b4489ce 100644 --- a/src/app/fyle/add-edit-expense/add-edit-expense-6.spec.ts +++ b/src/app/fyle/add-edit-expense/add-edit-expense-6.spec.ts @@ -73,7 +73,6 @@ import { } from 'src/app/core/test-data/accounts.service.spec.data'; import { expectedProjectsResponse } from 'src/app/core/test-data/projects.spec.data'; import { AddEditExpensePage } from './add-edit-expense.page'; -import { TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; import { TransactionStatusInfoPopoverComponent } from 'src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component'; import { ExpensesService } from 'src/app/core/services/platform/v1/spender/expenses.service'; import { AdvanceWalletsService } from 'src/app/core/services/platform/v1/spender/advance-wallets.service'; @@ -87,6 +86,7 @@ import { matchedCCTransactionData, matchedCCTransactionData2 } from 'src/app/cor import { ccTransactionData, ccTransactionData1 } from 'src/app/core/mock-data/cc-transaction.data'; import { ccTransactionResponseData } from 'src/app/core/mock-data/corporate-card-transaction-response.data'; import { cloneDeep } from 'lodash'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; export function TestCases6(getTestBed) { describe('AddEditExpensePage-6', () => { @@ -1210,14 +1210,14 @@ export function TestCases6(getTestBed) { const popoverSpy = jasmine.createSpyObj('HTMLIonPopoverElement', ['present']); popoverController.create.and.resolveTo(popoverSpy); - component.openTransactionStatusInfoModal(TransactionStatus.PENDING); + component.openTransactionStatusInfoModal(ExpenseTransactionStatus.PENDING); tick(); expect(popoverController.create).toHaveBeenCalledOnceWith({ component: TransactionStatusInfoPopoverComponent, componentProps: { - transactionStatus: TransactionStatus.PENDING, + transactionStatus: ExpenseTransactionStatus.PENDING, }, cssClass: 'fy-dialog-popover', }); diff --git a/src/app/fyle/add-edit-expense/add-edit-expense.page.ts b/src/app/fyle/add-edit-expense/add-edit-expense.page.ts index 7146681366..688d76bfe7 100644 --- a/src/app/fyle/add-edit-expense/add-edit-expense.page.ts +++ b/src/app/fyle/add-edit-expense/add-edit-expense.page.ts @@ -128,7 +128,7 @@ import { TrackingService } from '../../core/services/tracking.service'; import { CameraOptionsPopupComponent } from './camera-options-popup/camera-options-popup.component'; import { SuggestedDuplicatesComponent } from './suggested-duplicates/suggested-duplicates.component'; import { InstaFyleImageData } from 'src/app/core/models/insta-fyle-image-data.model'; -import { Expense as PlatformExpense, TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; +import { Expense as PlatformExpense } from 'src/app/core/models/platform/v1/expense.model'; import { ExpensesService } from 'src/app/core/services/platform/v1/spender/expenses.service'; import { AdvanceWallet } from 'src/app/core/models/platform/v1/advance-wallet.model'; import { AdvanceWalletsService } from 'src/app/core/services/platform/v1/spender/advance-wallets.service'; @@ -137,6 +137,7 @@ import { CorporateCardTransactionRes } from 'src/app/core/models/platform/v1/cor import { corporateCardTransaction } from 'src/app/core/models/platform/v1/cc-transaction.model'; import { PlatformFileGenerateUrlsResponse } from 'src/app/core/models/platform/platform-file-generate-urls-response.model'; import { SpenderFileService } from 'src/app/core/services/platform/v1/spender/file.service'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; // eslint-disable-next-line type FormValue = { @@ -3163,7 +3164,7 @@ export class AddEditExpensePage implements OnInit { if ( config.pendingTxnRestrictionEnabled && config.platformExpense.matched_corporate_card_transactions?.length && - config.platformExpense.matched_corporate_card_transactions[0]?.status === TransactionStatus.PENDING + config.platformExpense.matched_corporate_card_transactions[0]?.status === ExpenseTransactionStatus.PENDING ) { this.pendingTransactionAllowedToReportAndSplit = false; } @@ -5149,7 +5150,7 @@ export class AddEditExpensePage implements OnInit { await sizeLimitExceededPopover.present(); } - async openTransactionStatusInfoModal(transactionStatus: TransactionStatus): Promise { + async openTransactionStatusInfoModal(transactionStatus: ExpenseTransactionStatus): Promise { const popover = await this.popoverController.create({ component: TransactionStatusInfoPopoverComponent, componentProps: { diff --git a/src/app/fyle/dashboard/tasks/tasks.component.ts b/src/app/fyle/dashboard/tasks/tasks.component.ts index 844e0cc42c..94be10e587 100644 --- a/src/app/fyle/dashboard/tasks/tasks.component.ts +++ b/src/app/fyle/dashboard/tasks/tasks.component.ts @@ -36,7 +36,7 @@ import { Report, ReportState } from 'src/app/core/models/platform/v1/report.mode import { AuthService } from '../../../core/services/auth.service'; import { OrgService } from 'src/app/core/services/org.service'; import { FyOptInComponent } from 'src/app/shared/components/fy-opt-in/fy-opt-in.component'; -import { TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; @Component({ selector: 'app-tasks', @@ -642,7 +642,7 @@ export class TasksComponent implements OnInit { expenses .filter((expense) => { if (filterPendingTxn && expense.matched_corporate_card_transaction_ids.length > 0) { - return expense.matched_corporate_card_transactions[0].status !== TransactionStatus.PENDING; + return expense.matched_corporate_card_transactions[0].status !== ExpenseTransactionStatus.PENDING; } else { return true; } diff --git a/src/app/fyle/my-create-report/my-create-report.page.spec.ts b/src/app/fyle/my-create-report/my-create-report.page.spec.ts index 04abb21c10..320477f526 100644 --- a/src/app/fyle/my-create-report/my-create-report.page.spec.ts +++ b/src/app/fyle/my-create-report/my-create-report.page.spec.ts @@ -16,7 +16,6 @@ import { readyToReportExpensesData, readyToReportExpensesData2, } from 'src/app/core/mock-data/platform/v1/expense.data'; -import { reportUnflattenedData } from 'src/app/core/mock-data/report-v1.data'; import { CurrencyService } from 'src/app/core/services/currency.service'; import { LoaderService } from 'src/app/core/services/loader.service'; import { RefinerService } from 'src/app/core/services/refiner.service'; @@ -32,7 +31,7 @@ import { OrgSettingsService } from 'src/app/core/services/org-settings.service'; import { orgSettingsPendingRestrictions, orgSettingsRes } from 'src/app/core/mock-data/org-settings.data'; import { SpenderReportsService } from 'src/app/core/services/platform/v1/spender/reports.service'; import { expectedReportsSinglePage } from '../../core/mock-data/platform-report.data'; -import { TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; describe('MyCreateReportPage', () => { let component: MyCreateReportPage; @@ -448,7 +447,7 @@ describe('MyCreateReportPage', () => { transactionService.getAllExpenses.and.returnValue(of(cloneDeep(selectedExpenses))); const mockSelectedExpense = cloneDeep(readyToReportExpensesData); mockSelectedExpense[0].matched_corporate_card_transaction_ids = []; - mockSelectedExpense[1].matched_corporate_card_transactions[0].status = TransactionStatus.PENDING; + mockSelectedExpense[1].matched_corporate_card_transactions[0].status = ExpenseTransactionStatus.PENDING; expensesService.getAllExpenses.and.returnValue(of(mockSelectedExpense)); orgSettingsService.get.and.returnValue(of(orgSettingsPendingRestrictions)); spyOn(component, 'getReportTitle').and.returnValue(null); diff --git a/src/app/fyle/my-create-report/my-create-report.page.ts b/src/app/fyle/my-create-report/my-create-report.page.ts index aa2ffa7fbd..660376cf75 100644 --- a/src/app/fyle/my-create-report/my-create-report.page.ts +++ b/src/app/fyle/my-create-report/my-create-report.page.ts @@ -11,11 +11,12 @@ import { ReportService } from 'src/app/core/services/report.service'; import { TransactionService } from 'src/app/core/services/transaction.service'; import { StorageService } from '../../core/services/storage.service'; import { TrackingService } from '../../core/services/tracking.service'; -import { Expense as PlatformExpense, TransactionStatus } from '../../core/models/platform/v1/expense.model'; +import { Expense as PlatformExpense } from '../../core/models/platform/v1/expense.model'; import { ExpensesService } from 'src/app/core/services/platform/v1/spender/expenses.service'; import { OrgSettingsService } from 'src/app/core/services/org-settings.service'; import { SpenderReportsService } from 'src/app/core/services/platform/v1/spender/reports.service'; import { Report } from '../../core/models/platform/v1/report.model'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; @Component({ selector: 'app-my-create-report', templateUrl: './my-create-report.page.html', @@ -241,7 +242,7 @@ export class MyCreateReportPage implements OnInit { if (filterPendingTxn) { return expenses.filter((expense) => { if (filterPendingTxn && expense.matched_corporate_card_transaction_ids.length > 0) { - return expense.matched_corporate_card_transactions[0].status !== TransactionStatus.PENDING; + return expense.matched_corporate_card_transactions[0].status !== ExpenseTransactionStatus.PENDING; } else { return true; } diff --git a/src/app/fyle/my-view-report/my-view-report.page.spec.ts b/src/app/fyle/my-view-report/my-view-report.page.spec.ts index 1084c5cf73..e5eac193d4 100644 --- a/src/app/fyle/my-view-report/my-view-report.page.spec.ts +++ b/src/app/fyle/my-view-report/my-view-report.page.spec.ts @@ -65,7 +65,7 @@ import { ShareReportComponent } from './share-report/share-report.component'; import { EditReportNamePopoverComponent } from './edit-report-name-popover/edit-report-name-popover.component'; import { SpenderReportsService } from 'src/app/core/services/platform/v1/spender/reports.service'; import { orgSettingsPendingRestrictions } from 'src/app/core/mock-data/org-settings.data'; -import { TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; describe('MyViewReportPage', () => { let component: MyViewReportPage; @@ -488,7 +488,7 @@ describe('MyViewReportPage', () => { mockExpenseData2.matched_corporate_card_transaction_ids = []; const mockExpenseData3 = cloneDeep(expenseData); mockExpenseData3.matched_corporate_card_transaction_ids = ['txcSFe6efB6R']; - mockExpenseData3.matched_corporate_card_transactions[0].status = TransactionStatus.PENDING; + mockExpenseData3.matched_corporate_card_transactions[0].status = ExpenseTransactionStatus.PENDING; expensesService.getAllExpenses.and.returnValue(of([expenseData, mockExpenseData2, mockExpenseData3])); orgSettingsService.get.and.returnValue(of(orgSettingsPendingRestrictions)); fixture.detectChanges(); diff --git a/src/app/fyle/my-view-report/my-view-report.page.ts b/src/app/fyle/my-view-report/my-view-report.page.ts index 3c272a0c5e..e15fc6dfdf 100644 --- a/src/app/fyle/my-view-report/my-view-report.page.ts +++ b/src/app/fyle/my-view-report/my-view-report.page.ts @@ -20,7 +20,7 @@ import { StatusService } from 'src/app/core/services/status.service'; import { ExtendedStatus } from 'src/app/core/models/extended_status.model'; import { cloneDeep } from 'lodash'; import { RefinerService } from 'src/app/core/services/refiner.service'; -import { Expense, TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; +import { Expense } from 'src/app/core/models/platform/v1/expense.model'; import { ExpenseView } from 'src/app/core/models/expense-view.enum'; import { OrgSettingsService } from 'src/app/core/services/org-settings.service'; import { ReportPageSegment } from 'src/app/core/enums/report-page-segment.enum'; @@ -37,6 +37,7 @@ import { Report, ReportState } from 'src/app/core/models/platform/v1/report.mode import { ReportPermissions } from 'src/app/core/models/report-permissions.model'; import { ExtendedComment } from 'src/app/core/models/platform/v1/extended-comment.model'; import { Comment } from 'src/app/core/models/platform/v1/comment.model'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; @Component({ selector: 'app-my-view-report', @@ -293,7 +294,7 @@ export class MyViewReportPage { if (filterPendingTxn) { return expenses.filter((expense) => { if (filterPendingTxn && expense.matched_corporate_card_transaction_ids.length > 0) { - return expense.matched_corporate_card_transactions[0].status !== TransactionStatus.PENDING; + return expense.matched_corporate_card_transactions[0].status !== ExpenseTransactionStatus.PENDING; } else { return true; } diff --git a/src/app/fyle/view-expense/view-expense.page.spec.ts b/src/app/fyle/view-expense/view-expense.page.spec.ts index d4dddc0a90..5be6eaf745 100644 --- a/src/app/fyle/view-expense/view-expense.page.spec.ts +++ b/src/app/fyle/view-expense/view-expense.page.spec.ts @@ -42,7 +42,7 @@ import { txnStatusData } from 'src/app/core/mock-data/transaction-status.data'; import { ExpensesService as ApproverExpensesService } from 'src/app/core/services/platform/v1/approver/expenses.service'; import { ExpensesService as SpenderExpensesService } from 'src/app/core/services/platform/v1/spender/expenses.service'; import { expenseData } from 'src/app/core/mock-data/platform/v1/expense.data'; -import { Expense, TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; +import { Expense } from 'src/app/core/models/platform/v1/expense.model'; import { AccountType } from 'src/app/core/models/platform/v1/account.model'; import { ExpenseState } from 'src/app/core/models/expense-state.enum'; import { TransactionStatusInfoPopoverComponent } from 'src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component'; @@ -57,6 +57,7 @@ import { expectedReportsSinglePageSubmitted, paidReportData, } from 'src/app/core/mock-data/platform-report.data'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; describe('ViewExpensePage', () => { let component: ViewExpensePage; @@ -1063,14 +1064,14 @@ describe('ViewExpensePage', () => { const popoverSpy = jasmine.createSpyObj('HTMLIonPopoverElement', ['present']); popoverController.create.and.resolveTo(popoverSpy); - component.openTransactionStatusInfoModal(TransactionStatus.PENDING); + component.openTransactionStatusInfoModal(ExpenseTransactionStatus.PENDING); tick(); expect(popoverController.create).toHaveBeenCalledOnceWith({ component: TransactionStatusInfoPopoverComponent, componentProps: { - transactionStatus: TransactionStatus.PENDING, + transactionStatus: ExpenseTransactionStatus.PENDING, }, cssClass: 'fy-dialog-popover', }); diff --git a/src/app/fyle/view-expense/view-expense.page.ts b/src/app/fyle/view-expense/view-expense.page.ts index 29804b8c5c..464451fc7f 100644 --- a/src/app/fyle/view-expense/view-expense.page.ts +++ b/src/app/fyle/view-expense/view-expense.page.ts @@ -29,7 +29,7 @@ import { OrgSettings } from 'src/app/core/models/org-settings.model'; import { FileObject } from 'src/app/core/models/file-obj.model'; import { ExpensesService as ApproverExpensesService } from 'src/app/core/services/platform/v1/approver/expenses.service'; import { ExpensesService as SpenderExpensesService } from 'src/app/core/services/platform/v1/spender/expenses.service'; -import { Expense, TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; +import { Expense } from 'src/app/core/models/platform/v1/expense.model'; import { AccountType } from 'src/app/core/models/platform/v1/account.model'; import { ExpenseState } from 'src/app/core/models/expense-state.enum'; import { TransactionStatusInfoPopoverComponent } from 'src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component'; @@ -37,6 +37,7 @@ import { SpenderFileService } from 'src/app/core/services/platform/v1/spender/fi import { ApproverFileService } from 'src/app/core/services/platform/v1/approver/file.service'; import { PlatformFileGenerateUrlsResponse } from 'src/app/core/models/platform/platform-file-generate-urls-response.model'; import { ApproverReportsService } from 'src/app/core/services/platform/v1/approver/reports.service'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; @Component({ selector: 'app-view-expense', @@ -504,7 +505,7 @@ export class ViewExpensePage { }); } - async openTransactionStatusInfoModal(transactionStatus: TransactionStatus): Promise { + async openTransactionStatusInfoModal(transactionStatus: ExpenseTransactionStatus): Promise { const popover = await this.popoverController.create({ component: TransactionStatusInfoPopoverComponent, componentProps: { diff --git a/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.html b/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.html index 2f89148a50..f3cb9e864d 100644 --- a/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.html +++ b/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.html @@ -18,7 +18,7 @@
- Your transaction status is Pending until your bank processes the transaction. diff --git a/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.spec.ts b/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.spec.ts index 1f52ad5520..84bb1566c2 100644 --- a/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.spec.ts +++ b/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.spec.ts @@ -3,7 +3,7 @@ import { IonicModule, PopoverController } from '@ionic/angular'; import { TransactionStatusInfoPopoverComponent } from './transaction-status-info-popover.component'; import { getElementBySelector } from 'src/app/core/dom-helpers'; -import { TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; describe('TransactionStatusInfoComponent', () => { let component: TransactionStatusInfoPopoverComponent; @@ -46,7 +46,7 @@ describe('TransactionStatusInfoComponent', () => { describe('template', () => { describe('title', () => { it('should display the correct title when transaction status is PENDING', () => { - component.transactionStatus = TransactionStatus.PENDING; + component.transactionStatus = ExpenseTransactionStatus.PENDING; fixture.detectChanges(); @@ -55,7 +55,7 @@ describe('TransactionStatusInfoComponent', () => { }); it('should display the correct title when transaction status is POSTED', () => { - component.transactionStatus = TransactionStatus.POSTED; + component.transactionStatus = ExpenseTransactionStatus.POSTED; fixture.detectChanges(); @@ -66,7 +66,7 @@ describe('TransactionStatusInfoComponent', () => { describe('content', () => { it('should display the correct content when transaction status is PENDING', () => { - component.transactionStatus = TransactionStatus.PENDING; + component.transactionStatus = ExpenseTransactionStatus.PENDING; fixture.detectChanges(); @@ -77,7 +77,7 @@ describe('TransactionStatusInfoComponent', () => { }); it('should display the correct content when transaction status is POSTED', () => { - component.transactionStatus = TransactionStatus.POSTED; + component.transactionStatus = ExpenseTransactionStatus.POSTED; fixture.detectChanges(); diff --git a/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.ts b/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.ts index bd1226e36e..6aad2ee22d 100644 --- a/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.ts +++ b/src/app/shared/components/transaction-status-info-popover/transaction-status-info-popover.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core'; import { PopoverController } from '@ionic/angular'; -import { TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; @Component({ selector: 'app-transaction-status-info-popover', @@ -8,12 +8,12 @@ import { TransactionStatus } from 'src/app/core/models/platform/v1/expense.model styleUrls: ['./transaction-status-info-popover.component.scss'], }) export class TransactionStatusInfoPopoverComponent { - @Input() transactionStatus: TransactionStatus; + @Input() transactionStatus: ExpenseTransactionStatus; constructor(private popoverController: PopoverController) {} - get TransactionStatus(): typeof TransactionStatus { - return TransactionStatus; + get TransactionStatus(): typeof ExpenseTransactionStatus { + return ExpenseTransactionStatus; } closePopover(): void { diff --git a/src/app/shared/components/transaction-status/transaction-status.component.spec.ts b/src/app/shared/components/transaction-status/transaction-status.component.spec.ts index 8a3ba00171..f7eb9f0c18 100644 --- a/src/app/shared/components/transaction-status/transaction-status.component.spec.ts +++ b/src/app/shared/components/transaction-status/transaction-status.component.spec.ts @@ -2,8 +2,8 @@ import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; import { TransactionStatusComponent } from './transaction-status.component'; -import { TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; import { getElementBySelector } from 'src/app/core/dom-helpers'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; describe('TransactionStatusComponent', () => { let component: TransactionStatusComponent; @@ -35,7 +35,7 @@ describe('TransactionStatusComponent', () => { describe('template', () => { it('should display the transaction status value properly when pending', () => { - component.transactionStatus = TransactionStatus.PENDING; + component.transactionStatus = ExpenseTransactionStatus.PENDING; fixture.detectChanges(); @@ -44,7 +44,7 @@ describe('TransactionStatusComponent', () => { }); it('should display the transaction status value properly when posted', () => { - component.transactionStatus = TransactionStatus.POSTED; + component.transactionStatus = ExpenseTransactionStatus.POSTED; fixture.detectChanges(); diff --git a/src/app/shared/components/transaction-status/transaction-status.component.ts b/src/app/shared/components/transaction-status/transaction-status.component.ts index 87d7c31617..fd20b3de10 100644 --- a/src/app/shared/components/transaction-status/transaction-status.component.ts +++ b/src/app/shared/components/transaction-status/transaction-status.component.ts @@ -1,5 +1,5 @@ import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { TransactionStatus } from 'src/app/core/models/platform/v1/expense.model'; +import { ExpenseTransactionStatus } from 'src/app/core/enums/platform/v1/expense-transaction-status.enum'; @Component({ selector: 'app-transaction-status', @@ -7,11 +7,11 @@ import { TransactionStatus } from 'src/app/core/models/platform/v1/expense.model styleUrls: ['./transaction-status.component.scss'], }) export class TransactionStatusComponent { - @Input() transactionStatus: TransactionStatus; + @Input() transactionStatus: ExpenseTransactionStatus; - @Output() statusClick: EventEmitter = new EventEmitter(); + @Output() statusClick: EventEmitter = new EventEmitter(); - get TransactionStatus(): typeof TransactionStatus { - return TransactionStatus; + get TransactionStatus(): typeof ExpenseTransactionStatus { + return ExpenseTransactionStatus; } }