-
Notifications
You must be signed in to change notification settings - Fork 83
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Requisition Management / Order Approval functionality (#326)
* requisition-management sub project * checkout with order approval additions * manage budgets for B2B users in organization-management * My Account overview widgets (budget, requisition, approval) * introduce Angular CDK Table for requisition listing with mobile card view BREAKING CHANGE: Required ICM Version 7.10.26.2-LTS Co-authored-by: Silke Grueber <SGrueber@intershop.com> Co-authored-by: Susanne Schneider <s.schneider@intershop.de> Co-authored-by: Francisco Brito <brito@evident.nl> Co-authored-by: Danilo Hoffmann <d.hoffmann@intershop.de> Co-authored-by: MKless <mkless@intershop.de>
- Loading branch information
1 parent
a53de1a
commit eee665f
Showing
209 changed files
with
7,168 additions
and
421 deletions.
There are no files selected for viewing
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
27 changes: 27 additions & 0 deletions
27
e2e/cypress/integration/pages/organizationmanagement/user-edit-budget.page.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,27 @@ | ||
import { fillFormField } from '../../framework'; | ||
|
||
declare interface B2BUserBudgetForm { | ||
budget: number; | ||
orderSpentLimit: number; | ||
budgetPeriod: string; | ||
} | ||
|
||
export class UserEditBudgetPage { | ||
readonly tag = 'ish-user-edit-budget-page'; | ||
|
||
private submitButton = () => cy.get('[data-testing-id="edit-budget-submit"]'); | ||
|
||
fillForm(content: B2BUserBudgetForm) { | ||
Object.keys(content) | ||
.filter(key => content[key] !== undefined) | ||
.forEach((key: keyof B2BUserBudgetForm) => { | ||
fillFormField(this.tag, key, content[key]); | ||
}); | ||
|
||
return this; | ||
} | ||
|
||
submit() { | ||
this.submitButton().click(); | ||
} | ||
} |
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
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
23 changes: 23 additions & 0 deletions
23
...cts/organization-management/src/app/components/budget-widget/budget-widget.component.html
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,23 @@ | ||
<ish-error-message [error]="error$ | async"></ish-error-message> | ||
<ish-info-box heading="account.requisitions.widget.budget_title" class="infobox-wrapper" cssClass="infobox-widget"> | ||
<div class="loading-container"> | ||
<div *ngIf="!(budgetLoading$ | async); else loading"> | ||
<div class="row"> | ||
<div class="col-xs-12 col-md-8"> | ||
<ish-user-budget progressBarClass="background-inverse" [budget]="userBudget$ | async"></ish-user-budget> | ||
</div> | ||
</div> | ||
<div *ishIsAuthorizedTo="'APP_B2B_MANAGE_USERS'" class="row"> | ||
<div class="col"> | ||
<a routerLink="/account/organization/users"> | ||
{{ 'account.requisitions.widget.manage_budgets' | translate }} | ||
</a> | ||
</div> | ||
</div> | ||
</div> | ||
|
||
<ng-template #loading> | ||
<ish-loading></ish-loading> | ||
</ng-template> | ||
</div> | ||
</ish-info-box> |
Oops, something went wrong.