Merge branch 'hotfix/4947-Kundenbestellungen-Namen-Vertauscht'

Merged PR 1830: #4947 Fix Lastname and Firstname position in order-edit pages
Merge branch 'hotfix/5022-Bezahlte-undunbezahlte-Ware-auf-der-seben-AHF-nummer'
2025-12-31 09:37:15 +01:00 · 2025-04-10 11:58:27 +02:00 · 2025-04-10 11:52:45 +02:00 · 2025-04-09 12:34:59 +02:00 · 2025-04-08 18:21:47 +02:00 · 2025-04-01 16:17:15 +02:00
7 changed files with 271 additions and 88 deletions
--- a/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.selectors.ts
+++ b/apps/isa-app/src/page/pickup-shelf/store/pickup-shelf-details.selectors.ts
@@ -10,13 +10,17 @@ export const selectOrderItemsRaw = (s: PickupShelfDetailsState) => s.orderItems;

 export const selectFetchingOrderItems = (s: PickupShelfDetailsState) => s.fetchingOrderItems;

-export const selectDisplayedOrderItemProcessingStatus = (s: PickupShelfDetailsState) => s.displayedOrderItemProcessingStatus;
+export const selectDisplayedOrderItemProcessingStatus = (s: PickupShelfDetailsState) =>
+  s.displayedOrderItemProcessingStatus;

-export const selectDisplayedCompartmentCode = (s: PickupShelfDetailsState) => s.displayedCompartmentCode;
+export const selectDisplayedCompartmentCode = (s: PickupShelfDetailsState) =>
+  s.displayedCompartmentCode;

-export const selectDisplayedCompartmentInfo = (s: PickupShelfDetailsState) => s.displayedCompartmentInfo;
+export const selectDisplayedCompartmentInfo = (s: PickupShelfDetailsState) =>
+  s.displayedCompartmentInfo;

-export const selectDisplayedOrderItemSubsetId = (s: PickupShelfDetailsState) => s.displayedOrderItemSubsetId;
+export const selectDisplayedOrderItemSubsetId = (s: PickupShelfDetailsState) =>
+  s.displayedOrderItemSubsetId;

 export const selectOrderItems = (s: PickupShelfDetailsState): DBHOrderItemListItemDTO[] => {
  let items = selectOrderItemsRaw(s);
@@ -86,13 +90,17 @@ export const selectFetchPartial = (s: PickupShelfDetailsState) => !!s.fetchParti

 export const selectFetchReceipts = (s: PickupShelfDetailsState) => !!s.fetchingReceipts;

-export const selectSelectedOrderItemIds = (s: PickupShelfDetailsState) => s.selectedOrderItemIds ?? [];
+export const selectSelectedOrderItemIds = (s: PickupShelfDetailsState) =>
+  s.selectedOrderItemIds ?? [];

-export const selectPreviousSelectedOrderItemSubsetId = (s: PickupShelfDetailsState) => s.previousSelectedOrderItemSubsetId;
+export const selectPreviousSelectedOrderItemSubsetId = (s: PickupShelfDetailsState) =>
+  s.previousSelectedOrderItemSubsetId;

-export const selectOrderItemSubsetLoading = (s: PickupShelfDetailsState) => s.orderItemSubsetLoading;
+export const selectOrderItemSubsetLoading = (s: PickupShelfDetailsState) =>
+  s.orderItemSubsetLoading;

-export const selectDisableHeaderStatusDropdown = (s: PickupShelfDetailsState) => s.disableHeaderStatusDropdown;
+export const selectDisableHeaderStatusDropdown = (s: PickupShelfDetailsState) =>
+  s.disableHeaderStatusDropdown;

 export const selectedOrderItems = (s: PickupShelfDetailsState) => {
  const selectedOrderItemIds = selectSelectedOrderItemIds(s);
@@ -119,10 +127,28 @@ export const selectSelectedOrderItemQuantity = (s: PickupShelfDetailsState) => {
  return numMap;
 };

-export const selectSelectedCompartmentInfo = (s: PickupShelfDetailsState) => s.selectedCompartmentInfo;
+export const selectSelectedCompartmentInfo = (s: PickupShelfDetailsState) =>
+  s.selectedCompartmentInfo;

 export const selectLatestCompartmentCodeAndInfoForOrder = (s: PickupShelfDetailsState) => {
-  const coverItems = selectCoverOrderItems(s);
+  let coverItems = selectCoverOrderItems(s);
+
+  const orderItems = selectedOrderItems(s);
+
+  /**
+   * Ticket #5022 - AHF // Bezahlte und unbezahlte Ware werden auf dieselbe AHF-Nummer gebucht (Abholfach)
+   * Fall 1: Wenn alle ausgewählte Order Items Bezahlt sind, darf man diese nur auf die AHF-Nummer buchen, die auch Bezahlt ist.
+   * Fall 2: Wenn keines der ausgewählte Order Items Bezahlt sind, darf man nur auf die AHF-Nummer buchen, die auch nicht Bezahlt ist.
+   */
+  const hasFeaturePaid = orderItems?.every((item) => item.features?.paid === 'Bezahlt');
+  const hasSourceKulturPass = orderItems?.every(
+    (item) => item.features?.orderSource === 'KulturPass',
+  );
+  if (hasFeaturePaid || hasSourceKulturPass) {
+    coverItems = coverItems?.filter(
+      (item) => item.features?.paid === 'Bezahlt' || item.features?.orderSource === 'KulturPass',
+    );
+  }

  // Ticket #4397 - Sortieren und Filtern der angezeigten CoverItems nach latestCompartmentCode und Info
  const coverItem = coverItems
@@ -146,13 +172,18 @@ export const selectLatestCompartmentCodeAndInfoForOrder = (s: PickupShelfDetails
    ?.sort((a, b) => new Date(b.readyForPickUp).getTime() - new Date(a.readyForPickUp).getTime())
    ?.find((_) => true);

-  return { latestCompartmentCode: coverItem?.compartmentCode, latestCompartmentInfo: coverItem?.compartmentInfo };
+  return {
+    latestCompartmentCode: coverItem?.compartmentCode,
+    latestCompartmentInfo: coverItem?.compartmentInfo,
+  };
 };

-export const selectFetchingOrderItemSubsetTasks = (orderItemSubsetId: number) => (s: PickupShelfDetailsState) =>
+export const selectFetchingOrderItemSubsetTasks =
+  (orderItemSubsetId: number) => (s: PickupShelfDetailsState) =>
    s.fetchingOrderItemSubsetTasks?.[orderItemSubsetId] ?? false;

-export const selectOrderItemSubsetTasks = (orderItemSubsetId: number) => (s: PickupShelfDetailsState) =>
+export const selectOrderItemSubsetTasks =
+  (orderItemSubsetId: number) => (s: PickupShelfDetailsState) =>
    s.orderItemSubsetTasks?.[orderItemSubsetId] ?? [];

 export const selectNotifications = (orderItemSubsetId: number) => (s: PickupShelfDetailsState) => {
@@ -169,7 +200,8 @@ export const selectNotifications = (orderItemSubsetId: number) => (s: PickupShel
    );
 };

-export const selectLatestNotificationDatesFor = (orderItemSubsetId: number, keys: string[]) => (s: PickupShelfDetailsState) => {
+export const selectLatestNotificationDatesFor =
+  (orderItemSubsetId: number, keys: string[]) => (s: PickupShelfDetailsState) => {
    const notifications = selectNotifications(orderItemSubsetId)(s);
    let dates: Array<{ type: string; dates: Date[] }> = [];

@@ -188,15 +220,21 @@ export const selectLatestNotificationDatesFor = (orderItemSubsetId: number, keys
      }
    }
    return dates;
-};
+  };

-export const selectLatestEmailNotificationDates = (orderItemSubsetId: number) => (s: PickupShelfDetailsState) => {
-  return selectLatestNotificationDatesFor(orderItemSubsetId, ['NOTIFICATION_EMAIL', 'REMINDER_EMAIL', 'ORDERCONFIRMATION_EMAIL'])(s);
-};
+export const selectLatestEmailNotificationDates =
+  (orderItemSubsetId: number) => (s: PickupShelfDetailsState) => {
+    return selectLatestNotificationDatesFor(orderItemSubsetId, [
+      'NOTIFICATION_EMAIL',
+      'REMINDER_EMAIL',
+      'ORDERCONFIRMATION_EMAIL',
+    ])(s);
+  };

-export const selectLatestSmsNotificationDate2 = (orderItemSubsetId: number) => (s: PickupShelfDetailsState) => {
+export const selectLatestSmsNotificationDate2 =
+  (orderItemSubsetId: number) => (s: PickupShelfDetailsState) => {
    return selectLatestNotificationDatesFor(orderItemSubsetId, ['NOTIFICATION_SMS'])(s);
-};
+  };

 export const selectCanSelectAction = (s: PickupShelfDetailsState) => {
  const items = selectOrderItems(s);
@@ -228,7 +266,10 @@ export const selectAddToPreviousCompartmentAction = (s: PickupShelfDetailsState)
  const latestCompartmentInfos = selectLatestCompartmentCodeAndInfoForOrder(s);
  const firstItem = items?.find((_) => true);

-  if ([16, 8192].includes(firstItem?.processingStatus) && latestCompartmentInfos?.latestCompartmentCode) {
+  if (
+    [16, 8192].includes(firstItem?.processingStatus) &&
+    latestCompartmentInfos?.latestCompartmentCode
+  ) {
    // Zubuchen von Bezahlte und unbezahlte Bestellungen nicht möglich
    // Zubuchen bei Pay&Collect nur innerhalb der gleichen Bestellung möglich

@@ -273,7 +314,8 @@ export const selectCustomerNumber = (s: PickupShelfDetailsState) => {
  return order?.buyer?.buyerNumber;
 };

-export const selectFetchingCoverOrderItems = (s: PickupShelfDetailsState) => s.fetchingCoverOrderItems ?? false;
+export const selectFetchingCoverOrderItems = (s: PickupShelfDetailsState) =>
+  s.fetchingCoverOrderItems ?? false;

 export const selectCoverOrderItems = (s: PickupShelfDetailsState) => {
  const coverItems = s.coverOrderItems ?? [];
--- a/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-edit/goods-in-out-order-edit.component.html
+++ b/apps/isa-app/src/shared/components/goods-in-out/goods-in-out-order-edit/goods-in-out-order-edit.component.html
@@ -1,20 +1,38 @@
 <form *ngIf="control" [formGroup]="control" (submit)="submit()">
  <div class="header">
    {{ items[0]?.organisation }}
-    <ng-container *ngIf="!!items[0]?.organisation && (!!items[0]?.firstName || !!items[0]?.lastName)"> - </ng-container>
+    <ng-container
+      *ngIf="
+        !!items[0]?.organisation &&
+        (!!items[0]?.firstName || !!items[0]?.lastName)
+      "
+      >-</ng-container
+    >
    {{ items[0]?.lastName }}
    {{ items[0]?.firstName }}
  </div>

-  <ui-form-control label="Vorgang-ID" variant="inline" statusLabel="Nicht Änderbar">
+  <ui-form-control
+    label="Vorgang-ID"
+    variant="inline"
+    statusLabel="Nicht Änderbar"
+  >
    <input uiInput formControlName="orderNumber" />
  </ui-form-control>

-  <ui-form-control label="Bestelldatum" variant="inline" statusLabel="Nicht Änderbar">
+  <ui-form-control
+    label="Bestelldatum"
+    variant="inline"
+    statusLabel="Nicht Änderbar"
+  >
    <input uiInput formControlName="orderDate" />
  </ui-form-control>

-  <ui-form-control label="Bestellkanal" variant="inline" statusLabel="Nicht Änderbar">
+  <ui-form-control
+    label="Bestellkanal"
+    variant="inline"
+    statusLabel="Nicht Änderbar"
+  >
    <input uiInput formControlName="clientChannel" />
  </ui-form-control>

@@ -25,40 +43,81 @@
    formGroupName="notificationChannel"
  ></shared-notification-channel-control>

-  <ui-form-control label="Kundennummer" variant="inline" statusLabel="Nicht Änderbar">
+  <ui-form-control
+    label="Kundennummer"
+    variant="inline"
+    statusLabel="Nicht Änderbar"
+  >
    <input uiInput formControlName="buyerNumber" />
  </ui-form-control>

  <ng-container *ngIf="showNameFields">
-    <ui-form-control label="Name" variant="inline" [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'">
-      <input uiInput formControlName="firstName" />
-    </ui-form-control>
-
-    <ui-form-control label="Vorname" variant="inline" [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'">
+    <ui-form-control
+      label="Name"
+      variant="inline"
+      [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'"
+    >
      <input uiInput formControlName="lastName" />
    </ui-form-control>

-    <ui-form-control *ngIf="isB2B" label="Firmenname" variant="inline" [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'">
+    <ui-form-control
+      label="Vorname"
+      variant="inline"
+      [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'"
+    >
+      <input uiInput formControlName="firstName" />
+    </ui-form-control>
+
+    <ui-form-control
+      *ngIf="isB2B"
+      label="Firmenname"
+      variant="inline"
+      [statusLabel]="canEditNameFields ? '' : 'Nicht Änderbar'"
+    >
      <input uiInput formControlName="organisation" />
    </ui-form-control>
  </ng-container>

  <div formArrayName="items">
-    <div *ngFor="let item of itemsControl.controls; index as i" [formGroupName]="i">
+    <div
+      *ngFor="let item of itemsControl.controls; index as i"
+      [formGroupName]="i"
+    >
      <div class="item-header-wrapper">
        <div class="item-header">
-          <img class="cover" *ngIf="item.value?.ean | productImage; let productImage" [src]="productImage" [alt]="item.value?.name" />
+          <img
+            class="cover"
+            *ngIf="item.value?.ean | productImage; let productImage"
+            [src]="productImage"
+            [alt]="item.value?.name"
+          />
          <span class="title">{{ item.value?.name }}</span>
        </div>

-        <button class="cta-expand" type="button" (click)="expanded[i] = !expanded[i]">
-          <ui-icon icon="arrow_head" size="16px" [rotate]="expanded[i] ? '90deg' : '270deg'"> </ui-icon>
+        <button
+          class="cta-expand"
+          type="button"
+          (click)="expanded[i] = !expanded[i]"
+        >
+          <ui-icon
+            icon="arrow_head"
+            size="16px"
+            [rotate]="expanded[i] ? '90deg' : '270deg'"
+          ></ui-icon>
        </button>
      </div>

      <ng-container *ngIf="expanded[i]">
-        <ui-form-control label="Abholfachnummer" [clearable]="true" variant="inline">
-          <input pattern="^\d{3,4}_\d{4}_\d{1,5}$" uiInput formControlName="compartmentCode" />
+        <ui-form-control
+          label="Abholfachnummer"
+          [clearable]="true"
+          variant="inline"
+        >
+          <input
+            pattern="^\d{3,4}_\d{4}_\d{1,5}$"
+            uiInput
+            formControlName="compartmentCode"
+          />
        </ui-form-control>

        <shared-goods-in-out-order-details-tags
@@ -66,7 +125,11 @@
          formControlName="compartmentInfo"
        ></shared-goods-in-out-order-details-tags>

-        <ui-form-control label="Status" variant="inline" statusLabel="Nicht Änderbar">
+        <ui-form-control
+          label="Status"
+          variant="inline"
+          statusLabel="Nicht Änderbar"
+        >
          <input uiInput formControlName="processingStatus" />
        </ui-form-control>

@@ -82,19 +145,37 @@
          </ng-container>
          <ng-container *ngSwitchCase="16777216"> </ng-container>
          <ng-container *ngSwitchDefault>
-            <ui-form-control class="datepicker" label="Geändert" variant="inline">
+            <ui-form-control
+              class="datepicker"
+              label="Geändert"
+              variant="inline"
+            >
              <input uiInput formControlName="processingStatusDate" />
            </ui-form-control>
          </ng-container>
        </div>

        <ng-template #vslLieferdatum>
-          <ui-form-control class="datepicker" label="vsl. Lieferdatum" variant="inline">
-            <button class="date-btn" type="button" [uiOverlayTrigger]="uiDatepicker" #datepicker="uiOverlayTrigger">
+          <ui-form-control
+            class="datepicker"
+            label="vsl. Lieferdatum"
+            variant="inline"
+          >
+            <button
+              class="date-btn"
+              type="button"
+              [uiOverlayTrigger]="uiDatepicker"
+              #datepicker="uiOverlayTrigger"
+            >
              <strong>
                {{ items[i]?.estimatedShippingDate | date: 'dd.MM.yy' }}
              </strong>
-              <ui-icon icon="arrow_head" class="dp-button-icon" size="12px" [rotate]="datepicker.opened ? '270deg' : '90deg'"> </ui-icon>
+              <ui-icon
+                icon="arrow_head"
+                class="dp-button-icon"
+                size="12px"
+                [rotate]="datepicker.opened ? '270deg' : '90deg'"
+              ></ui-icon>
            </button>
            <ui-datepicker
              formControlName="estimatedShippingDate"
@@ -105,14 +186,20 @@
              [disabledDaysOfWeek]="[0]"
              [selected]="items[i]?.estimatedShippingDate"
              saveLabel="Übernehmen"
-              (save)="changeEstimatedDeliveryDate($event, items[i]); uiDatepicker.close()"
-            >
-            </ui-datepicker>
+              (save)="
+                changeEstimatedDeliveryDate($event, items[i]);
+                uiDatepicker.close()
+              "
+            ></ui-datepicker>
          </ui-form-control>
        </ng-template>

        <ng-template #abholfrist>
-          <ui-form-control class="datepicker" label="Abholfrist" variant="inline">
+          <ui-form-control
+            class="datepicker"
+            label="Abholfrist"
+            variant="inline"
+          >
            <button
              [uiOverlayTrigger]="deadlineDatepicker"
              #deadlineDatepickerTrigger="uiOverlayTrigger"
@@ -123,7 +210,11 @@
              <strong>
                {{ items[i]?.pickUpDeadline | date: 'dd.MM.yy' }}
              </strong>
-              <ui-icon [rotate]="deadlineDatepickerTrigger.opened ? '270deg' : '90deg'" class="dp-button-icon" icon="arrow_head"></ui-icon>
+              <ui-icon
+                [rotate]="deadlineDatepickerTrigger.opened ? '270deg' : '90deg'"
+                class="dp-button-icon"
+                icon="arrow_head"
+              ></ui-icon>
            </button>
            <ui-datepicker
              formControlName="pickUpDeadline"
@@ -134,34 +225,66 @@
              [disabledDaysOfWeek]="[0]"
              [selected]="items[i]?.pickUpDeadline"
              saveLabel="Übernehmen"
-              (save)="changePickupDeadline($event, items[i]); deadlineDatepicker.close()"
-            >
-            </ui-datepicker>
+              (save)="
+                changePickupDeadline($event, items[i]);
+                deadlineDatepicker.close()
+              "
+            ></ui-datepicker>
          </ui-form-control>
        </ng-template>

-        <ui-form-control label="Menge" variant="inline" statusLabel="Nicht Änderbar">
+        <ui-form-control
+          label="Menge"
+          variant="inline"
+          statusLabel="Nicht Änderbar"
+        >
          <input uiInput formControlName="quantity" />
        </ui-form-control>

-        <ui-form-control class="price" label="Preis" [clearable]="true" [suffix]="item.value?.currency" variant="inline" requiredMark=" *">
+        <ui-form-control
+          class="price"
+          label="Preis"
+          [clearable]="true"
+          [suffix]="item.value?.currency"
+          variant="inline"
+          requiredMark=" *"
+        >
          <input uiInput formControlName="price" />
        </ui-form-control>

-        <ui-form-control label="ISBN/EAN" [clearable]="true" variant="inline" requiredMark=" *">
+        <ui-form-control
+          label="ISBN/EAN"
+          [clearable]="true"
+          variant="inline"
+          requiredMark=" *"
+        >
          <input uiInput formControlName="ean" />
        </ui-form-control>

-        <ui-form-control label="Zielfiliale" variant="inline" statusLabel="Nicht Änderbar">
+        <ui-form-control
+          label="Zielfiliale"
+          variant="inline"
+          statusLabel="Nicht Änderbar"
+        >
          <input uiInput formControlName="targetBranch" />
        </ui-form-control>

-        <ui-form-control label="Lieferant" variant="inline" statusLabel="Nicht Änderbar">
+        <ui-form-control
+          label="Lieferant"
+          variant="inline"
+          statusLabel="Nicht Änderbar"
+        >
          <input uiInput formControlName="supplier" />
        </ui-form-control>

        <div class="ssc-wrapper">
-          <ui-form-control class="ssc" label="Meldenummer" [clearable]="true" variant="inline" requiredMark=" *">
+          <ui-form-control
+            class="ssc"
+            label="Meldenummer"
+            [clearable]="true"
+            variant="inline"
+            requiredMark=" *"
+          >
            <input class="ssc-input" uiInput formControlName="ssc" />
          </ui-form-control>
          <input class="ssc-text" uiInput formControlName="sscText" />
@@ -176,11 +299,21 @@

        <ui-form-control label="MwSt" variant="inline">
          <ui-select formControlName="vat">
-            <ui-select-option *ngFor="let vat of vats$ | async" [label]="vat.name + '%'" [value]="vat.vatType"></ui-select-option>
+            <ui-select-option
+              *ngFor="let vat of vats$ | async"
+              [label]="vat.name + '%'"
+              [value]="vat.vatType"
+            ></ui-select-option>
          </ui-select>
        </ui-form-control>

-        <ui-form-control class="special-comment" label="Anmerkung" [clearable]="true" (cleared)="clearSpecialComment(i)" variant="inline">
+        <ui-form-control
+          class="special-comment"
+          label="Anmerkung"
+          [clearable]="true"
+          (cleared)="clearSpecialComment(i)"
+          variant="inline"
+        >
          <textarea
            matInput
            cdkTextareaAutosize
@@ -197,7 +330,15 @@
    </div>
  </div>
  <div class="actions">
-    <button class="cta-close" (click)="navigation.emit({})" type="button">Abbrechen</button>
-    <button class="cta-save" [disabled]="control.invalid || control.disabled" type="submit">Speichern</button>
+    <button class="cta-close" (click)="navigation.emit({})" type="button">
+      Abbrechen
+    </button>
+    <button
+      class="cta-save"
+      [disabled]="control.invalid || control.disabled"
+      type="submit"
+    >
+      Speichern
+    </button>
  </div>
 </form>
--- a/helmvalues/client.Feature.yaml
+++ b/helmvalues/client.Feature.yaml
@@ -1,11 +1,11 @@
-fullnameOverride: isa-ui-feature
+fullnameOverride: isa-ui-feature-v%MAJOR%
 image:
  harborRepo: isa/ui
  tag: %BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION%

 ingress:
  enabled: true
-  path: /
+  path: /isa-ui/v%MAJOR%
  hosts:
    - isa-%LOWERENVIRONMENT%.kubernetes.paragon-systems.de

--- a/helmvalues/client.Integration.yaml
+++ b/helmvalues/client.Integration.yaml
@@ -1,11 +1,11 @@
-fullnameOverride: isa-ui
+fullnameOverride: isa-ui-v%MAJOR%
 image:
  harborRepo: isa/ui
  tag: %BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION%

 ingress:
  enabled: true
-  path: /
+  path: /isa-ui/v%MAJOR%
  hosts:
    - isa-%LOWERENVIRONMENT%.kubernetes.paragon-systems.de

--- a/helmvalues/client.Production.yaml
+++ b/helmvalues/client.Production.yaml
@@ -1,4 +1,4 @@
-fullnameOverride: isa-ui
+fullnameOverride: isa-ui-v%MAJOR%
 image:
  harborRepo: isa/ui
  tag: %BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION%
@@ -7,7 +7,7 @@ replicaCount: 2

 ingress:
  enabled: true
-  path: /
+  path: /isa-ui/v%MAJOR%
  hosts:
    - isa.kubernetes.paragon-systems.de
    - isa-%LOWERENVIRONMENT%.kubernetes.paragon-systems.de
--- a/helmvalues/client.Staging.yaml
+++ b/helmvalues/client.Staging.yaml
@@ -1,4 +1,4 @@
-fullnameOverride: isa-ui
+fullnameOverride: isa-ui-v%MAJOR%
 image:
  harborRepo: isa/ui
  tag: %BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION%
@@ -7,7 +7,7 @@ replicaCount: 2

 ingress:
  enabled: true
-  path: /
+  path: /isa-ui/v%MAJOR%
  hosts:
    - isa-%LOWERENVIRONMENT%.kubernetes.paragon-systems.de

--- a/helmvalues/client.Test.yaml
+++ b/helmvalues/client.Test.yaml
@@ -1,11 +1,11 @@
-fullnameOverride: isa-ui
+fullnameOverride: isa-ui-v%MAJOR%
 image:
  harborRepo: isa/ui
  tag: %BUILD_BUILDNUMBER%-%BUILD_SOURCEVERSION%

 ingress:
  enabled: true
-  path: /
+  path: /isa-ui/v%MAJOR%
  hosts:
    - isa-%LOWERENVIRONMENT%.kubernetes.paragon-systems.de
Author	SHA1	Message	Date
Nino	206586035d	Merge branch 'hotfix/4947-Kundenbestellungen-Namen-Vertauscht'	2025-04-10 11:58:27 +02:00
Nino Righi	67d8902423	Merged PR 1830: #4947 Fix Lastname and Firstname position in order-edit pages	2025-04-10 11:52:45 +02:00
Lorenz Hilpert	6a7d509aa4	Merge branch 'hotfix/5022-Bezahlte-undunbezahlte-Ware-auf-der-seben-AHF-nummer'	2025-04-09 12:34:59 +02:00
Lorenz Hilpert	59ad7710d9	Refactor selectLatestCompartmentCodeAndInfoForOrder to enforce booking rules for paid and unpaid items	2025-04-08 18:21:47 +02:00
Lorenz Hilpert	921edf8066	#5022 Hotfix selectors in pickup-shelf-details to improve readability and consistency	2025-04-01 16:17:15 +02:00
Michael Auer	0ac34740bb	Merge branch 'hotfix/traefik-ingressroute-with-path'	2025-03-11 18:05:31 +01:00
Michael Auer	591824196b	Cherry-Pick: PR 1824: ISA-Frontend - Expliziter Pfad für Traefik IngressRoute (cherry picked from commit `c9b2762bbc`)	2025-02-28 11:15:20 +01:00