Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Added Condition for restricting pending txns #2789

Merged
merged 27 commits into from
Mar 6, 2024
Merged

Conversation

howdysuraj
Copy link
Contributor

@howdysuraj howdysuraj commented Feb 28, 2024

Description

Added Change for toast message and dialog in my expenses list v2

Remove add more expenses from create new report as it is not working from day 0, refer this thread for discussion around this : https://fylein.slack.com/archives/C017C400V37/p1709031202418129

Clickup

https://app.clickup.com/t/86cuqqvvp

UI Preview

https://www.loom.com/share/0139577e6f7d4b308d8b2bafd5473e9e?sid=f132021b-eb38-4b11-b48a-af41f976d7d0

Screenshot 2024-02-29 at 11 04 50 AM

@github-actions github-actions bot added the size/M Medium PR label Feb 28, 2024
Copy link

PR description must contain a link to a clickup

Copy link

PR description must contain a link to a clickup

Copy link

PR description must contain a link to a clickup

Copy link

PR description must contain a link to a clickup

Copy link

PR description must contain a link to a clickup

Copy link

PR description must contain a link to a clickup

@github-actions github-actions bot added size/L Large PR and removed size/M Medium PR labels Feb 28, 2024
Copy link

PR description must contain a link to a clickup

Copy link

PR description must contain a link to a clickup

@@ -19,6 +19,11 @@ import { DateService } from '../../../date.service';
export class ExpensesService {
constructor(private dateService: DateService) {}

//TODO : ADD CONDITION BASED ON ORG SETTING
restrictPendingTransactionsEnabled(): boolean {
return false;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lets not merge these PRs till we get the org settings

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure, thanks

@@ -27,6 +32,15 @@ export class ExpensesService {
return typeof expense.policy_amount === 'number' && expense.policy_amount < 0.0001;
}

isExpenseInPendingState(expense: Expense): boolean {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doesExpenseHavePendingCardTransaction

@github-actions github-actions bot added size/XL Extra Large PR and removed size/L Large PR labels Mar 5, 2024
Copy link

github-actions bot commented Mar 6, 2024

Unit Test Coverage % values
Statements 95.41% ( 18811 / 19714 )
Branches 90.35% ( 9726 / 10764 )
Functions 94.01% ( 5675 / 6036 )
Lines 95.43% ( 17940 / 18799 )

@howdysuraj howdysuraj merged commit 10fff69 into master Mar 6, 2024
4 of 5 checks passed
@@ -61,13 +61,6 @@
>
</app-expense-card>
</div>

<div class="create-new-report--add-more-container" (click)="closeEvent()">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is expected

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/XL Extra Large PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants