Merge branch 'develop' into fix/catalog-filter

apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.store.ts

@@ -271,7 +271,7 @@ export class PurchasingOptionsModalStore extends ComponentStore<PurchasingOption
 
   readonly setAvailableOptions = this.updater((state, availableOptions: PurchasingOptions[]) => {
     let option;
-    if (availableOptions?.length === 1) {
+    if (availableOptions?.length === 1 && availableOptions[0] === 'download') {
       option = availableOptions[0];
     }
 

apps/page/customer/src/lib/customer-details/customer-order-details/customer-order-details.component.html

@@ -2,7 +2,7 @@
   <ng-container *ngIf="order$ | async; let order">
     <div class="header">
       <div class="row title">
-        <span *ngIf="order.buyer?.organisation; else notB2b"
+        <span *ngIf="order.buyer?.organisation?.name; else notB2b"
           >{{ order.buyer?.organisation?.name }}
           <ng-container *ngIf="!!order.buyer?.lastName || !!order.buyer?.firstName"
             >- {{ order.buyer?.lastName }} {{ order.buyer?.firstName }}</ng-container

apps/page/customer/src/lib/customer-details/customer-order-details/order-item-card/customer-order-item-card.component.html

@@ -1,3 +1,7 @@
+<div class="tags">
+  <img class="tag preorder" src="/assets/images/tag_icon_preorder.svg" alt="Vorbesteller" />
+</div>
+
 <div class="row">
   <div class="picture">
     <img src="{{ imageUrl | async }}" alt="book" class="thumbnail" />
@@ -76,6 +80,24 @@
         <span>{{ order.paymentType | paymentType }}</span>
       </div>
 
+      <ng-container
+        *ngIf="
+          orderItem.features.orderType === 'Versand' ||
+          orderItem.features.orderType === 'B2B-Versand' ||
+          orderItem.features.orderType === 'DIG-Versand'
+        "
+      >
+        <div class="row">
+          <span class="label">Rechnungsadresse</span>
+          <span>{{ order.billing?.data | address }}</span>
+        </div>
+
+        <div class="row">
+          <span class="label">Lieferadresse</span>
+          <span>{{ order.shipping?.data | address }}</span>
+        </div>
+      </ng-container>
+
       <div class="row" *ngIf="ssc">
         <span class="label">Meldenummer</span>
         <span>{{ ssc }}</span>

apps/page/customer/src/lib/customer-details/customer-order-details/order-item-card/customer-order-item-card.component.scss

@@ -1,5 +1,13 @@
 :host {
-  @apply mx-10 block my-5;
+  @apply mx-10 block my-5 relative;
+}
+
+.tags {
+  @apply absolute -top-6 right-0;
+
+  .tag {
+    @apply p-0 shadow-none w-10 h-auto;
+  }
 }
 
 .picture {
@@ -13,6 +21,10 @@
 .row {
   @apply flex flex-row w-full;
   line-height: 25px;
+
+  span {
+    max-width: 560px;
+  }
 }
 
 .name {

apps/page/customer/src/lib/customer-details/customer-order-details/order-item-card/customer-order-item-card.component.ts

@@ -15,6 +15,10 @@ export class CustomerOrderItemCardComponent implements OnInit {
   @Input()
   orderItem: OrderItemDTO;
 
+  get getIsPreOrder() {
+    return this.orderItem?.subsetItems[0]?.data?.ssc === '015';
+  }
+
   imageUrl: Observable<string>;
 
   expand: boolean;

apps/page/task-calendar/src/lib/page-task-calendar.component.html

@@ -9,11 +9,11 @@
   <div class="switch-group">
     <a class="calendar-switch" [routerLink]="['./calendar']" routerLinkActive="active">
       <ui-icon icon="calendar" size="16px"></ui-icon>
-      <span>Kalender</span>
+      <span>Kalenderansicht</span>
     </a>
     <a class="calendar-switch" [routerLink]="['./tasks']" routerLinkActive="active">
       <ui-icon icon="tasks" size="16px"></ui-icon>
-      <span>Tätigkeiten</span>
+      <span>Listenansicht</span>
     </a>
   </div>
   <router-outlet></router-outlet>

apps/sales/src/app/modules/remission/components/remission-list-card/remission-list-card.component.scss

@@ -168,7 +168,7 @@
       }
 
       .department {
-        @apply text-right;
+        @apply text-right text-cadet;
       }
 
       .delete-product {