fix: issues after ux review

intershop · Dec 10, 2024 · 8181e21 · 8181e21
1 parent b4bfac0
commit 8181e21
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 23 deletions.
diff --git a/...cts/organization-management/src/app/components/budget-widget/budget-widget.component.html b/...cts/organization-management/src/app/components/budget-widget/budget-widget.component.html
@@ -1,22 +1,20 @@
 <ish-error-message [error]="error$ | async" />
 <ish-info-box class="infobox-wrapper" cssClass="infobox-widget">
   <div class="d-flex align-items-start">
-    <h3 class="pr-2 mb-0">{{ 'account.requisitions.widget.budget_title' | translate }}</h3>
+    <h3 class="pr-2">{{ 'account.requisitions.widget.budget_title' | translate }}</h3>
     <ish-budget-info />
   </div>
   <div class="loading-container">
-    <div *ngIf="(budgetLoading$ | async) !== true; else loading">
-      <div class="row">
-        <div class="col-12">
-          <ish-user-budget progressBarClass="background-inverse" [budget]="userBudget$ | async" />
-        </div>
+    <div *ngIf="(budgetLoading$ | async) !== true; else loading" class="row">
+      <div class="col-12">
+        <ish-user-budget progressBarClass="background-inverse" [budget]="userBudget$ | async" />
       </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 *ishIsAuthorizedTo="'APP_B2B_MANAGE_USERS'" class="row">
+      <div class="col">
+        <a routerLink="/account/organization/users">
+          {{ 'account.requisitions.widget.manage_budgets' | translate }}
+        </a>
       </div>
     </div>
 

diff --git a/projects/organization-management/src/app/models/user-budget/user-budget.model.ts b/projects/organization-management/src/app/models/user-budget/user-budget.model.ts
@@ -1,9 +1,10 @@
-import { Price } from 'ish-core/models/price/price.model';
+import { Price, PriceType } from 'ish-core/models/price/price.model';
 
 export interface UserBudget {
   budget: Price;
   budgetPeriod: string;
   orderSpentLimit: Price;
+  budgetPriceType?: PriceType;
   remainingBudget?: Price;
   spentBudget?: Price;
 }
diff --git a/...-management/src/app/pages/organization-settings/organization-settings-page.component.html b/...-management/src/app/pages/organization-settings/organization-settings-page.component.html
@@ -45,7 +45,7 @@ <h3>{{ 'account.organization.org_settings.preferences.subtitle' | translate }}</
         [form]="budgetTypeForm"
         [fields]="fields"
         [model]="model"
-        (click)="budgetTypeChangeConfirmationDialog.show()"
+        (modelChange)="openConfirmationDialog(budgetTypeChangeConfirmationDialog)"
       />
     </form>
   </div>

diff --git a/...on-management/src/app/pages/organization-settings/organization-settings-page.component.ts b/...on-management/src/app/pages/organization-settings/organization-settings-page.component.ts
@@ -8,6 +8,7 @@ import { AccountFacade } from 'ish-core/facades/account.facade';
 import { Customer } from 'ish-core/models/customer/customer.model';
 import { PriceType } from 'ish-core/models/price/price.model';
 import { whenTruthy } from 'ish-core/utils/operators';
+import { ModalDialogComponent } from 'ish-shared/components/common/modal-dialog/modal-dialog.component';
 import { markAsDirtyRecursive } from 'ish-shared/forms/utils/form-utils';
 
 /**
@@ -59,11 +60,15 @@ export class OrganizationSettingsPageComponent implements OnInit {
     this.model = pick(this.customer, 'budgetPriceType');
   }
 
+  openConfirmationDialog(budgetTypeChangeConfirmationDialog: ModalDialogComponent<string>) {
+    if (this.model.budgetPriceType !== this.initialBudgetPriceType) {
+      budgetTypeChangeConfirmationDialog.show();
+    }
+  }
+
   resetValue() {
     if (this.initialBudgetPriceType !== this.budgetTypeForm.get('budgetPriceType').value) {
-      this.budgetTypeForm
-        .get('budgetPriceType')
-        .reset({ value: this.initialBudgetPriceType, disabled: false }, { emitEvent: false });
+      this.budgetTypeForm.get('budgetPriceType').reset({ value: this.initialBudgetPriceType, disabled: false });
     }
   }
 

diff --git a/...s/requisition-detail/requisition-buyer-approval/requisition-buyer-approval.component.html b/...s/requisition-detail/requisition-buyer-approval/requisition-buyer-approval.component.html
@@ -1,7 +1,7 @@
 <div *ngIf="requisition?.userBudget" class="row">
   <ish-info-box class="infobox-wrapper col-12">
     <div class="d-flex align-items-start">
-      <h3 class="mt-1 pr-2">
+      <h3 class="pr-2">
         {{ 'approval.detailspage.buyer_budget.heading' | translate }}
       </h3>
       <ish-lazy-budget-info />

diff --git a/...ges/requisition-detail/requisition-buyer-approval/requisition-buyer-approval.component.ts b/...ges/requisition-detail/requisition-buyer-approval/requisition-buyer-approval.component.ts
@@ -30,7 +30,10 @@ export class RequisitionBuyerApprovalComponent implements OnChanges {
     if (this.requisition) {
       this.orderTotal = {
         type: 'Money',
-        value: this.requisition.totals.total.gross,
+        value:
+          this.requisition?.userBudget?.budgetPriceType === 'gross'
+            ? this.requisition?.totals?.total?.gross
+            : this.requisition?.totals?.total?.net,
         currency: this.requisition.totals.total.currency,
       };
 

diff --git a/...n-detail/requisition-cost-center-approval/requisition-cost-center-approval.component.html b/...n-detail/requisition-cost-center-approval/requisition-cost-center-approval.component.html
@@ -2,7 +2,7 @@
   <div *ngIf="costCenter?.costCenterOwner.email === (userEmail$ | async)" class="row">
     <ish-info-box class="infobox-wrapper col-12">
       <div class="d-flex align-items-start">
-        <h3 class="mt-1 pr-2">
+        <h3 class="pr-2">
           {{ 'approval.detailspage.costcenter.approval.heading' | translate }}
         </h3>
         <ish-lazy-budget-info />

diff --git a/...ion-detail/requisition-cost-center-approval/requisition-cost-center-approval.component.ts b/...ion-detail/requisition-cost-center-approval/requisition-cost-center-approval.component.ts
@@ -41,7 +41,10 @@ export class RequisitionCostCenterApprovalComponent implements OnInit, OnChanges
 
     this.orderTotal = {
       type: 'Money',
-      value: this.requisition?.totals?.total?.gross,
+      value:
+        this.requisition?.userBudget?.budgetPriceType === 'gross'
+          ? this.requisition?.totals?.total?.gross
+          : this.requisition?.totals?.total?.net,
       currency: this.requisition?.totals?.total?.currency,
     };
 

diff --git a/src/app/shared/formly/types/radio-group-field/radio-group-field.component.html b/src/app/shared/formly/types/radio-group-field/radio-group-field.component.html
@@ -4,11 +4,11 @@
       type="radio"
       [formControl]="formControl"
       [value]="opt.value"
-      [id]="opt.value"
+      [id]="id + '_' + opt.value"
       class="form-check-input"
       [ngClass]="props.inputClass"
       [attr.data-testing-id]="'radio-' + opt.label"
     />
-    <label class="form-check-label pr-3" [attr.for]="id">{{ opt.label }}</label>
+    <label class="form-check-label pr-3" [attr.for]="id + '_' + opt.value">{{ opt.label }}</label>
   </ng-container>
 </ng-container>