sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-31 09:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

#1323 Styling Hindernismeldung

Browse Source
This commit is contained in:
Andreas Schickinger
2021-01-25 14:40:46 +01:00
parent 4c1f2c226a
commit 8dcd92d87a
2 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.html
View File

@@ -127,47 +127,59 @@
<span class="can-add-hint" *ngIf="!canAddItem"
>Leider können wir den Service mit den bereits ausgewählten Services im Warenkorb nicht kombinieren.</span
>
<span class="book-format">
<lib-icon class="order-book-icon" width="18px" height="18px" name="Icon_{{ book.product.format }}" alt="book-icon"></lib-icon>
{{ book.product.formatDetail }}
</span>
<span class="price">{{ selectedPrice | bookPrice }} {{ currency }}</span>
<div class="product-details">
<div class="product-column">
<span>
<lib-icon
class="order-book-icon"
width="18px"
height="18px"
name="Icon_{{ book.product.format }}"
alt="book-icon"
></lib-icon>
{{ book.product.formatDetail }}
</span>
<span
class="order-details-delivery-info"
*ngIf="
deliveryType === 'Donwload' ||
deliveryType === 'Rücklage' ||
deliveryType === 'Versand' ||
!currentDeliveryDate ||
deliveryType === 'Abholung' ||
!currentPickUpDate
"
></span>
<span class="order-details-delivery-info" *ngIf="deliveryType === deliveryOptions.delivery && currentDeliveryDate"
>Versanddatum {{ currentDeliveryDate }}</span
>
<span class="order-details-delivery-info" *ngIf="deliveryType === deliveryOptions.deliveryB2b"
>Versanddatum {{ b2bDeliveryDate | date: 'dd.MM.yy' }}</span
>
<span class="price">{{ selectedPrice | bookPrice }} {{ currency }}</span>
<span class="order-details-delivery-info" *ngIf="deliveryType === 'Abholung' && currentPickUpDate"
>Abholung ab {{ currentPickUpDate }}</span
>
<span
class="order-details-delivery-info"
*ngIf="
deliveryType === 'Donwload' ||
deliveryType === 'Rücklage' ||
deliveryType === 'Versand' ||
!currentDeliveryDate ||
deliveryType === 'Abholung' ||
!currentPickUpDate
"
></span>
<span class="order-details-delivery-info" *ngIf="deliveryType === deliveryOptions.delivery && currentDeliveryDate"
>Versanddatum {{ currentDeliveryDate }}</span
>
<span class="order-details-delivery-info" *ngIf="deliveryType === deliveryOptions.deliveryB2b"
>Versanddatum {{ b2bDeliveryDate | date: 'dd.MM.yy' }}</span
>
<span class="order-details-delivery-info" *ngIf="deliveryType === 'Abholung' && currentPickUpDate"
>Abholung ab {{ currentPickUpDate }}</span
>
</div>
<div class="product-column">
<app-delete-dropdown
[selected]="currentNumberOfItems"
[options]="possibleItems"
(valueChanges)="setNumberOfItems($event)"
(delete)="deleteProduct()"
(switch)="switchSteps(true)"
[ddload]="true"
[notUpdatable]="isDownload"
#deleteDropdown
></app-delete-dropdown>
</div>
</div>
</div>
<!-- TODO: populate here with delivery info like DHL I Lieferung 18.01.-->
<app-delete-dropdown
[selected]="currentNumberOfItems"
[options]="possibleItems"
(valueChanges)="setNumberOfItems($event)"
(delete)="deleteProduct()"
(switch)="switchSteps(true)"
[ddload]="true"
[notUpdatable]="isDownload"
#deleteDropdown
></app-delete-dropdown>
</div>
<div class="secondary-info">
<div class="errors">

17
apps/sales/src/app/modules/product/components/product-checkout/product-checkout.component.scss
View File

@@ -239,15 +239,22 @@
font-weight: bold;
}
.product-details {
display: flex;
flex-direction: row;
justify-content: space-between;
margin-top: 25px;
}
.product-column {
display: flex;
flex-direction: column;
}
.book-title {
font-size: 16px;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
}
.book-format {
margin-top: 25px;
}
.can-add-hint {