#5036 Return Details Display Data Adjustments

libs/oms/data-access/src/lib/index.ts

@@ -1,6 +1,10 @@
+export * from './errors';
 export * from './models';
 export * from './return-details.service';
 export * from './return-details.store';
+export * from './return-process-questions';
 export * from './return-process.service';
 export * from './return-process.store';
+export * from './return-search.service';
+export * from './return-search.store';
 export * from './schemas';

libs/oms/feature/return-details/src/lib/return-details-data/return-details-data.component.html

@@ -1,8 +1,10 @@
 <ui-item-row-data>
   <ui-item-row-data-row>
-    <ui-item-row-data-label>Email:</ui-item-row-data-label>
+    <ui-item-row-data-label>Belegdatum:</ui-item-row-data-label>
     <ui-item-row-data-value>
-      <span>{{ communicationDetails().email }}</span>
+      <span>{{
+        (receipt().printedDate | date: 'dd.MM.yyyy | hh:mm') + ' Uhr'
+      }}</span>
     </ui-item-row-data-value>
   </ui-item-row-data-row>
   <ui-item-row-data-row>

libs/oms/feature/return-details/src/lib/return-details-data/return-details-data.component.ts

@@ -1,5 +1,6 @@
-import { ChangeDetectionStrategy, Component, computed, input } from '@angular/core';
-import { Buyer, Receipt } from '@isa/oms/data-access';
+import { DatePipe } from '@angular/common';
+import { ChangeDetectionStrategy, Component, input } from '@angular/core';
+import { Receipt } from '@isa/oms/data-access';
 import { ReceiptTypeTranslationPipe } from '@isa/oms/utils/translation';
 import { ItemRowDataImports } from '@isa/ui/item-rows';
 @Component({
@@ -7,18 +8,8 @@ import { ItemRowDataImports } from '@isa/ui/item-rows';
   templateUrl: './return-details-data.component.html',
   styleUrls: ['./return-details-data.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  imports: [ItemRowDataImports, ReceiptTypeTranslationPipe],
+  imports: [ItemRowDataImports, ReceiptTypeTranslationPipe, DatePipe],
 })
 export class ReturnDetailsDataComponent {
   receipt = input.required<Receipt>();
-
-  buyer = computed<Buyer>(() => {
-    const receipt = this.receipt();
-    return receipt.buyer;
-  });
-
-  communicationDetails = computed(() => {
-    const buyer = this.buyer();
-    return buyer.communicationDetails;
-  });
 }

libs/oms/feature/return-details/src/lib/return-details-order-group-data/return-details-order-group-data.component.html

@@ -2,7 +2,7 @@
   <ui-item-row-data-row>
     <ui-item-row-data-label>Belegdatum:</ui-item-row-data-label>
     <ui-item-row-data-value>
-      {{ receipt().printedDate | date }}
+      {{ (receipt().printedDate | date: 'dd.MM.yyyy | hh:mm') + ' Uhr' }}
     </ui-item-row-data-value>
   </ui-item-row-data-row>
   <ui-item-row-data-row>
@@ -12,7 +12,7 @@
     </ui-item-row-data-value>
   </ui-item-row-data-row>
   <ui-item-row-data-row>
-    <ui-item-row-data-label>Vorgangs-ID:</ui-item-row-data-label>
+    <ui-item-row-data-label>Vorgang-ID:</ui-item-row-data-label>
     <ui-item-row-data-value>
       {{ receipt().order?.data?.orderNumber }}
     </ui-item-row-data-value>
@@ -20,7 +20,9 @@
   <ui-item-row-data-row>
     <ui-item-row-data-label>Bestelldatum:</ui-item-row-data-label>
     <ui-item-row-data-value>
-      {{ receipt().order?.data?.orderDate | date }}
+      {{
+        (receipt().order?.data?.orderDate | date: 'dd.MM.yyyy | hh:mm') + ' Uhr'
+      }}
     </ui-item-row-data-value>
   </ui-item-row-data-row>
   @if (receipt().buyer?.address; as address) {

libs/oms/feature/return-details/src/lib/return-details-order-group/return-details-order-group.component.html

@@ -1,9 +1,23 @@
 <ui-toolbar size="small" class="justify-self-stretch">
-  <div class="isa-text-body-2-bold text-isa-neutral-900">{{ items().length }} Artikel</div>
+  <div class="isa-text-body-2-bold text-isa-neutral-900">
+    {{ items().length }} Artikel
+  </div>
+  <div class="isa-text-body-2-bold text-isa-neutral-900">
+    {{ receipt().printedDate | date }}
+  </div>
+  <div class="isa-text-body-2-regular text-isa-neutral-900">
+    {{ receipt().receiptNumber }}
+  </div>
   <div class="flex-grow"></div>
 
   @if (selectableItems().length) {
-    <button type="button" uiTextButton color="strong" size="small" (click)="selectOrUnselectAll()">
+    <button
+      type="button"
+      uiTextButton
+      color="strong"
+      size="small"
+      (click)="selectOrUnselectAll()"
+    >
       @if (allSelected()) {
         Alles abwählen
       } @else {

libs/oms/feature/return-details/src/lib/return-details-order-group/return-details-order-group.component.ts

@@ -1,5 +1,12 @@
-import { ChangeDetectionStrategy, Component, computed, input, model } from '@angular/core';
-import { ReceiptItem } from '@isa/oms/data-access';
+import { DatePipe } from '@angular/common';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  computed,
+  input,
+  model,
+} from '@angular/core';
+import { Receipt, ReceiptItem } from '@isa/oms/data-access';
 import { TextButtonComponent } from '@isa/ui/buttons';
 import { ToolbarComponent } from '@isa/ui/toolbar';
 
@@ -9,9 +16,10 @@ import { ToolbarComponent } from '@isa/ui/toolbar';
   styleUrls: ['./return-details-order-group.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
   standalone: true,
-  imports: [ToolbarComponent, TextButtonComponent],
+  imports: [ToolbarComponent, TextButtonComponent, DatePipe],
 })
 export class ReturnDetailsOrderGroupComponent {
+  receipt = input.required<Receipt>();
   items = input.required<ReceiptItem[]>();
 
   selectedItems = model<ReceiptItem[]>([]);

libs/oms/feature/return-details/src/lib/return-details.component.html

@@ -24,8 +24,12 @@
 </div>
 
 @if (receipt) {
-  <div class="flex flex-col items-start justify-stretch gap-6 rounded-2xl bg-isa-white px-4 py-6">
-    <oms-feature-return-details-header [buyer]="receipt.buyer"></oms-feature-return-details-header>
+  <div
+    class="flex flex-col items-start justify-stretch gap-6 rounded-2xl bg-isa-white px-4 py-6"
+  >
+    <oms-feature-return-details-header
+      [buyer]="receipt.buyer"
+    ></oms-feature-return-details-header>
 
     @if (showMore()) {
       <oms-feature-return-details-order-group-data
@@ -43,7 +47,9 @@
         Weniger anzeigen
       </button>
     } @else {
-      <oms-feature-return-details-data [receipt]="receipt"></oms-feature-return-details-data>
+      <oms-feature-return-details-data
+        [receipt]="receipt"
+      ></oms-feature-return-details-data>
       <button
         class="-ml-3"
         uiTextButton
@@ -58,6 +64,7 @@
     }
     <div></div>
     <oms-feature-return-details-order-group
+      [receipt]="receipt"
       [items]="receiptItems()"
       [(selectedItems)]="selectedItems"
     ></oms-feature-return-details-order-group>