mirror of
https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend
synced 2025-12-31 09:37:15 +01:00
Merged PR 2013: 🐛 fix(order-destination): display 'Hugendubel Digital' for download destinat...
🐛 fix(order-destination): display 'Hugendubel Digital' for download destinations Fixes #5453 - Add handling for Download order type in name() computed signal to return 'Hugendubel Digital' - Add handling for Download order type in address() computed signal to return undefined - Update template to conditionally show pipe separator and address only when address exists - Add isaDeliveryDownload icon for download order type - Remove unused OrderType import Related work items: #5453
This commit is contained in:
committed by
Nino Righi
parent
3bc6d47c31
commit
b0afc80a26
@@ -18,10 +18,13 @@
|
|||||||
role="region"
|
role="region"
|
||||||
aria-label="Destination information">
|
aria-label="Destination information">
|
||||||
@if (name() || address()) {
|
@if (name() || address()) {
|
||||||
<span data-what="recipient-name">{{ name() }}</span> |
|
<span data-what="recipient-name">{{ name() }}</span>
|
||||||
<shared-inline-address
|
@if (address()) {
|
||||||
[address]="address()"
|
|
|
||||||
data-what="destination-address"></shared-inline-address>
|
<shared-inline-address
|
||||||
|
[address]="address()"
|
||||||
|
data-what="destination-address"></shared-inline-address>
|
||||||
|
}
|
||||||
} @else if (estimatedDelivery()) {
|
} @else if (estimatedDelivery()) {
|
||||||
<span data-what="estimated-delivery">
|
<span data-what="estimated-delivery">
|
||||||
@if (estimatedDelivery()!.stop) {
|
@if (estimatedDelivery()!.stop) {
|
||||||
|
|||||||
@@ -6,10 +6,11 @@ import {
|
|||||||
isaDeliveryVersand,
|
isaDeliveryVersand,
|
||||||
isaDeliveryRuecklage2,
|
isaDeliveryRuecklage2,
|
||||||
isaDeliveryRuecklage1,
|
isaDeliveryRuecklage1,
|
||||||
|
isaDeliveryDownload,
|
||||||
} from '@isa/icons';
|
} from '@isa/icons';
|
||||||
import { InlineAddressComponent } from '@isa/shared/address';
|
import { InlineAddressComponent } from '@isa/shared/address';
|
||||||
import { logger } from '@isa/core/logging';
|
import { logger } from '@isa/core/logging';
|
||||||
import { OrderType, OrderTypeFeature } from '@isa/common/data-access';
|
import { OrderTypeFeature } from '@isa/common/data-access';
|
||||||
|
|
||||||
export type Address = {
|
export type Address = {
|
||||||
apartment?: string;
|
apartment?: string;
|
||||||
@@ -52,6 +53,7 @@ export type EstimatedDelivery = {
|
|||||||
isaDeliveryVersand,
|
isaDeliveryVersand,
|
||||||
isaDeliveryRuecklage2,
|
isaDeliveryRuecklage2,
|
||||||
isaDeliveryRuecklage1,
|
isaDeliveryRuecklage1,
|
||||||
|
isaDeliveryDownload,
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
})
|
})
|
||||||
@@ -83,11 +85,20 @@ export class OrderDestinationComponent {
|
|||||||
return 'isaDeliveryRuecklage1';
|
return 'isaDeliveryRuecklage1';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (OrderTypeFeature.Download === orderType) {
|
||||||
|
return 'isaDeliveryDownload';
|
||||||
|
}
|
||||||
|
|
||||||
return 'isaDeliveryVersand';
|
return 'isaDeliveryVersand';
|
||||||
});
|
});
|
||||||
|
|
||||||
name = computed(() => {
|
name = computed(() => {
|
||||||
const orderType = this.orderType();
|
const orderType = this.orderType();
|
||||||
|
|
||||||
|
if (OrderTypeFeature.Download === orderType) {
|
||||||
|
return 'Hugendubel Digital';
|
||||||
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
OrderTypeFeature.Delivery === orderType ||
|
OrderTypeFeature.Delivery === orderType ||
|
||||||
OrderTypeFeature.B2BShipping === orderType ||
|
OrderTypeFeature.B2BShipping === orderType ||
|
||||||
@@ -104,6 +115,10 @@ export class OrderDestinationComponent {
|
|||||||
address = computed(() => {
|
address = computed(() => {
|
||||||
const orderType = this.orderType();
|
const orderType = this.orderType();
|
||||||
|
|
||||||
|
if (OrderTypeFeature.Download === orderType) {
|
||||||
|
return undefined;
|
||||||
|
}
|
||||||
|
|
||||||
if (
|
if (
|
||||||
OrderTypeFeature.Delivery === orderType ||
|
OrderTypeFeature.Delivery === orderType ||
|
||||||
OrderTypeFeature.B2BShipping === orderType ||
|
OrderTypeFeature.B2BShipping === orderType ||
|
||||||
|
|||||||
Reference in New Issue
Block a user