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.

Sign up for GitHub

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: fixes for support of skip expense post import #1157

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

feat: fixes for support of skip expense post import #1157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a90e848
feat: fixes for support of skip expense post import
anishfyle Jan 21, 2025
de1e54a
qbo hide conditionally
anishfyle Jan 22, 2025
65d6f69
summary
anishfyle Jan 22, 2025
eba1200
failed expense count
anishfyle Jan 22, 2025
3fd611e
pr comments
anishfyle Jan 22, 2025
adb8e4d
Merge branch 'master' into fix-dashboard-skip-expense-post-import
anishfyle Jan 22, 2025
5cae704
lint fix
anishfyle Jan 23, 2025
a8a157a
Merge branch 'master' into fix-dashboard-skip-expense-post-import
anishfyle Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...hared/components/dashboard/dashboard-error-section/dashboard-error-section.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="tw-py-24-px" [ngClass]="{'tw-px-120-px': brandingConfig.brandId === 'fyle', 'tw-px-60-px': brandingConfig.brandId === 'co'}">
<div *ngIf="errors" class="tw-mt-24-px tw-rounded-8-px tw-bg-white tw-border-1-px tw-border-border-tertiary" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}">
<div *ngIf="errors && shouldShowErrorSection" class="tw-mt-24-px tw-rounded-8-px tw-bg-white tw-border-1-px tw-border-border-tertiary" [ngClass]="{'tw-shadow-app-card': brandingConfig.brandId === 'fyle', 'tw-shadow-shadow-level-1': brandingConfig.brandId === 'co'}">
<div class="tw-flex tw-justify-between tw-items-center tw-p-24-px">
<h4 class="tw-text-text-primary !tw-font-500 !tw-text-18-px">Errors</h4>
</div>
Expand Down
8 changes: 8 additions & 0 deletions .../shared/components/dashboard/dashboard-error-section/dashboard-error-section.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ export class DashboardErrorSectionComponent implements OnInit {

@Input() chartOfAccounts: string[];

@Input() exportableExpenseGroupIds: number[];

@Input() lastExportDetails: any;
anishfyle marked this conversation as resolved.
Show resolved Hide resolved

uiExposedAppName: string;

filteredMappings: ExtendedGenericMapping[];
Expand Down Expand Up @@ -113,6 +117,10 @@ export class DashboardErrorSectionComponent implements OnInit {
public windowService: WindowService
) { }

get shouldShowErrorSection(): boolean {
return !!(this.exportableExpenseGroupIds?.length && this.lastExportDetails);
}

getSourceType() {
return this.destinationFieldMap[this.sourceField];
}
Expand Down
Loading