sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-28 22:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 1102: #2643 DIG Lieferzeitfenster Kaufoptionen

Browse Source 
#2643 DIG Lieferzeitfenster Kaufoptionen

Related work items: #2643
This commit is contained in:
Andreas Schickinger
2022-03-15 10:12:22 +00:00
committed by Lorenz Hilpert
parent 5e9b3b56d4
commit 8f7448a095
6 changed files with 32 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/page/checkout/src/lib/checkout-summary/checkout-summary.component.html
View File

@@ -82,14 +82,14 @@
<ng-container *ngSwitchCase="['Versand', 'B2B-Versand', 'DIG-Versand'].indexOf(order?.features?.orderType) > -1">
<span class="supplier">{{ (order?.subsetItems)[0].supplierLabel }}</span>
<span class="separator">|</span>
<ng-container *ngIf="(order?.subsetItems)[0]?.estimatedShippingDate; else estimatedDelivery">
<span class="order-type">Versanddatum {{ (order?.subsetItems)[0]?.estimatedShippingDate | date }}</span>
</ng-container>
<ng-template #estimatedDelivery>
<ng-container *ngIf="(order?.subsetItems)[0]?.estimatedDelivery; else estimatedShippingDate">
<span class="order-type"
>Zustellung zwischen {{ ((order?.subsetItems)[0]?.estimatedDelivery?.start | date: 'EEE, dd.MM')?.replace('.', '') }} und
{{ ((order?.subsetItems)[0]?.estimatedDelivery?.stop | date: 'EEE, dd.MM')?.replace('.', '') }}</span
>
</ng-container>
<ng-template #estimatedShippingDate>
<span class="order-type">Versanddatum {{ (order?.subsetItems)[0]?.estimatedShippingDate | date }}</span>
</ng-template>
</ng-container>
<ng-container *ngSwitchDefault>

8
apps/page/checkout/src/lib/modals/purchasing-options-list-modal/purchasing-options-list-item/purchasing-options-list-item.component.html
View File

@@ -87,12 +87,12 @@
<div *ngIf="!!(deliveryDigAvailabilities$ | async); else b2b">
<ui-icon class="truck" icon="truck" size="30px"></ui-icon>
<ng-container *ngIf="deliveryDigAvailabilities$ | async; let deliveryDigAvailabilities">
<ng-container *ngIf="deliveryDigAvailabilities?.estimatedShippingDate; else estimatedDelivery">
{{ deliveryDigAvailabilities.estimatedShippingDate | date: 'dd. MMMM yyyy' }}
</ng-container>
<ng-template #estimatedDelivery>
<ng-container *ngIf="deliveryDigAvailabilities?.estimatedDelivery; else estimatedShippingDate">
{{ (deliveryDigAvailabilities?.estimatedDelivery?.start | date: 'EEE, dd.MM')?.replace('.', '') }} -
{{ (deliveryDigAvailabilities?.estimatedDelivery?.stop | date: 'EEE, dd.MM')?.replace('.', '') }}
</ng-container>
<ng-template #estimatedShippingDate>
{{ deliveryDigAvailabilities.estimatedShippingDate | date: 'dd. MMMM yyyy' }}
</ng-template>
</ng-container>
</div>

2
apps/page/checkout/src/lib/modals/purchasing-options-list-modal/purchasing-options-list-item/purchasing-options-list-item.component.scss
View File

@@ -117,7 +117,7 @@
}
.item-availability {
@apply flex flex-row items-center mt-4;
@apply flex flex-row items-center mt-4 whitespace-nowrap;
grid-area: item-availability;
.fetching {

20
apps/page/checkout/src/lib/modals/purchasing-options-modal/delivery-option/delivery-option.component.html
View File

@@ -20,17 +20,17 @@
</div>
<div class="grow"></div>
<span class="delivery">Versandkostenfrei</span>
<span *ngIf="availability?.estimatedShippingDate; let estimatedShippingDate; else: estimatedDelivery" class="date"
>Versanddatum <strong>{{ estimatedShippingDate | date }}</strong></span
>
<ng-template #estimatedDelivery>
<span class="date"
>Zustellung zwischen <br />
<strong
>{{ (availability?.estimatedDelivery?.start | date: 'EEE, dd.MM')?.replace('.', '') }} und
{{ (availability?.estimatedDelivery?.stop | date: 'EEE, dd.MM')?.replace('.', '') }}</strong
></span
<span *ngIf="availability?.estimatedDelivery; else estimatedShippingDate" class="date">
Zustellung zwischen <br />
<strong
>{{ (availability?.estimatedDelivery?.start | date: 'EEE, dd.MM')?.replace('.', '') }} und
{{ (availability?.estimatedDelivery?.stop | date: 'EEE, dd.MM')?.replace('.', '') }}</strong
>
</span>
<ng-template #estimatedShippingDate>
<span class="date">
Versanddatum <strong>{{ estimatedShippingDate | date }}</strong>
</span>
</ng-template>
<div>
<button [disabled]="availability.price?.value?.value < 0" type="button" class="select-option" (click)="select()">

20
apps/page/checkout/src/lib/modals/purchasing-options-modal/dig-delivery-option/dig-delivery-option.component.html
View File

@@ -18,17 +18,17 @@
</div>
<div class="grow"></div>
<span class="delivery">Versandkostenfrei</span>
<span *ngIf="availability?.estimatedShippingDate; let estimatedShippingDate; else: estimatedDelivery" class="date"
>Versanddatum <strong>{{ estimatedShippingDate | date: 'shortDate' }}</strong></span
>
<ng-template #estimatedDelivery>
<span class="date"
>Zustellung zwischen <br />
<strong
>{{ (availability?.estimatedDelivery?.start | date: 'EEE, dd.MM')?.replace('.', '') }} und
{{ (availability?.estimatedDelivery?.stop | date: 'EEE, dd.MM')?.replace('.', '') }}</strong
></span
<span *ngIf="availability?.estimatedDelivery; else estimatedShippingDate" class="date">
Zustellung zwischen <br />
<strong
>{{ (availability?.estimatedDelivery?.start | date: 'EEE, dd.MM')?.replace('.', '') }} und
{{ (availability?.estimatedDelivery?.stop | date: 'EEE, dd.MM')?.replace('.', '') }}</strong
>
</span>
<ng-template #estimatedShippingDate>
<span class="date">
Versanddatum <strong>{{ estimatedShippingDate | date }}</strong>
</span>
</ng-template>
<div>

8
apps/page/checkout/src/lib/modals/purchasing-options-modal/purchasing-options-modal.component.html
View File

@@ -49,13 +49,11 @@
</ng-container>
<ng-container *ngIf="showDeliveryInfo$ | async">
<ng-container *ngIf="getAvailability(option) | async; let availability">
<ng-container *ngIf="availability?.estimatedShippingDate; else estimatedDelivery">
Versanddatum {{ availability?.estimatedShippingDate | date: 'shortDate' }}
</ng-container>
<ng-template #estimatedDelivery>
<ng-container *ngIf="availability?.estimatedDelivery; else estimatedShippingDate">
Zustellung zwischen {{ (availability?.estimatedDelivery?.start | date: 'EEE, dd.MM')?.replace('.', '') }} und
{{ (availability?.estimatedDelivery?.stop | date: 'EEE, dd.MM')?.replace('.', '') }}
</ng-template>
</ng-container>
<ng-template #estimatedShippingDate> Versanddatum {{ availability?.estimatedShippingDate | date: 'shortDate' }} </ng-template>
</ng-container>
</ng-container>
</div>