diff --git a/libs/oms/data-access/src/lib/services/open-reward-tasks.service.ts b/libs/oms/data-access/src/lib/services/open-reward-tasks.service.ts
index 9fe7bddc1..e08e378c7 100644
--- a/libs/oms/data-access/src/lib/services/open-reward-tasks.service.ts
+++ b/libs/oms/data-access/src/lib/services/open-reward-tasks.service.ts
@@ -7,7 +7,6 @@ import {
import { ResponseArgsError, takeUntilAborted } from '@isa/common/data-access';
import { logger } from '@isa/core/logging';
import { firstValueFrom } from 'rxjs';
-import { Cache, CacheTimeToLive, InFlight } from '@isa/common/decorators';
/**
* Service for fetching open reward distribution tasks (Prämienausgabe) from the OMS API.
@@ -45,6 +44,7 @@ export class OpenRewardTasksService {
filter: {
orderitemprocessingstatus: '16', // InPreparation(16) and ReadyForPickup(128)
praemie: '1-', // Reward items only
+ supplier_id: '16',
},
orderBy: [],
};
diff --git a/libs/shared/delivery/src/lib/order-destination/order-destination.component.html b/libs/shared/delivery/src/lib/order-destination/order-destination.component.html
index 8e1a62599..cdfcebfd3 100644
--- a/libs/shared/delivery/src/lib/order-destination/order-destination.component.html
+++ b/libs/shared/delivery/src/lib/order-destination/order-destination.component.html
@@ -18,10 +18,13 @@
role="region"
aria-label="Destination information">
@if (name() || address()) {
- {{ name() }} |
-
+ {{ name() }}
+ @if (address()) {
+ |
+
+ }
} @else if (estimatedDelivery()) {
@if (estimatedDelivery()!.stop) {
diff --git a/libs/shared/delivery/src/lib/order-destination/order-destination.component.ts b/libs/shared/delivery/src/lib/order-destination/order-destination.component.ts
index 90664543c..127aef5ad 100644
--- a/libs/shared/delivery/src/lib/order-destination/order-destination.component.ts
+++ b/libs/shared/delivery/src/lib/order-destination/order-destination.component.ts
@@ -6,10 +6,11 @@ import {
isaDeliveryVersand,
isaDeliveryRuecklage2,
isaDeliveryRuecklage1,
+ isaDeliveryDownload,
} from '@isa/icons';
import { InlineAddressComponent } from '@isa/shared/address';
import { logger } from '@isa/core/logging';
-import { OrderType, OrderTypeFeature } from '@isa/common/data-access';
+import { OrderTypeFeature } from '@isa/common/data-access';
export type Address = {
apartment?: string;
@@ -52,6 +53,7 @@ export type EstimatedDelivery = {
isaDeliveryVersand,
isaDeliveryRuecklage2,
isaDeliveryRuecklage1,
+ isaDeliveryDownload,
}),
],
})
@@ -83,11 +85,20 @@ export class OrderDestinationComponent {
return 'isaDeliveryRuecklage1';
}
+ if (OrderTypeFeature.Download === orderType) {
+ return 'isaDeliveryDownload';
+ }
+
return 'isaDeliveryVersand';
});
name = computed(() => {
const orderType = this.orderType();
+
+ if (OrderTypeFeature.Download === orderType) {
+ return 'Hugendubel Digital';
+ }
+
if (
OrderTypeFeature.Delivery === orderType ||
OrderTypeFeature.B2BShipping === orderType ||
@@ -104,6 +115,10 @@ export class OrderDestinationComponent {
address = computed(() => {
const orderType = this.orderType();
+ if (OrderTypeFeature.Download === orderType) {
+ return undefined;
+ }
+
if (
OrderTypeFeature.Delivery === orderType ||
OrderTypeFeature.B2BShipping === orderType ||