-
Notifications
You must be signed in to change notification settings - Fork 15
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: remove weekend spend key from expenses (#3154)
- Loading branch information
1 parent
26cc972
commit 05c43ef
Showing
35 changed files
with
192 additions
and
193 deletions.
There are no files selected for viewing
4 changes: 4 additions & 0 deletions
4
src/app/core/enums/platform/v1/expense-transaction-status.enum.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| export enum ExpenseTransactionStatus { | ||
| PENDING = 'PENDING', | ||
| POSTED = 'POSTED', | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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: '[email protected]', | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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: '[email protected]', | ||
|
|
@@ -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: '[email protected]', | ||
|
|
@@ -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, | ||
| }, | ||
| ], | ||
| }); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
src/app/core/mock-data/platform/v1/expense-employee.model.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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' | 'code' | 'display_name' | 'sub_department' | 'name'>; | ||
| department_id: string; | ||
| // eslint-disable-next-line @typescript-eslint/no-explicit-any | ||
| flattened_custom_field: Record<string, any>; | ||
| has_accepted_invite: boolean; | ||
| id: string; | ||
| is_enabled: boolean; | ||
| joined_at?: Date; | ||
| mobile?: string; | ||
| level: Pick<Level, 'id' | 'name' | 'band'>; | ||
| location: string; | ||
| org_id: string; | ||
| org_name: string; | ||
| title: string; | ||
| user: User; | ||
| user_id: string; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/app/core/models/platform/v1/accounting-export-summary.model.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| export interface AccountingExportSummary { | ||
| state: string; | ||
| error_type: string; | ||
| url: string; | ||
| tpa_id: string; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
src/app/core/models/platform/v1/expense-missing-mandatory-fields.model.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| export interface ExpenseMissingMandatoryFields { | ||
| expense_field_ids: number[]; | ||
| amount: boolean; | ||
| currency: boolean; | ||
| receipt: boolean; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| import { ReportApprovals } from '../report-approvals.model'; | ||
| import { ReportState } from './report.model'; | ||
|
|
||
| export interface ExpenseReport { | ||
| 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; | ||
| } |
11 changes: 11 additions & 0 deletions
11
src/app/core/models/platform/v1/expense-rule-data.model.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| import { NameValuePair } from '../../name-value-pair.model'; | ||
|
|
||
| export interface ExpenseRuleData { | ||
| merchant: string; | ||
| is_billable: boolean; | ||
| purpose: string; | ||
| category_id: number; | ||
| project_id: number; | ||
| cost_center_id: number; | ||
| custom_fields: NameValuePair[]; | ||
| } |
Oops, something went wrong.