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

Merged PR 1706: #4543 Styling Fix Checkout Review for multiple Destinations per OrderType

Browse Source 
#4543 Styling Fix Checkout Review for multiple Destinations per OrderType
This commit is contained in:
Nino Righi
2023-12-27 16:00:23 +00:00
committed by Margaretha Lucha
parent 250002f057
commit 9ad1256019
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/page/checkout/src/lib/checkout-review/checkout-review.component.html
View File

@@ -81,8 +81,11 @@
*ngIf="group?.orderType !== undefined && (item.features?.orderType === 'Abholung' || item.features?.orderType === 'Rücklage')" *ngIf="group?.orderType !== undefined && (item.features?.orderType === 'Abholung' || item.features?.orderType === 'Rücklage')"
> >
<ng-container *ngIf="item?.destination?.data?.targetBranch?.data; let targetBranch"> <ng-container *ngIf="item?.destination?.data?.targetBranch?.data; let targetBranch">
<ng-container *ngIf="i === 0 || targetBranch.id !== group.items[i - 1].destination?.data?.targetBranch?.data.id"> <ng-container *ngIf="i === 0 || checkIfMultipleDestinationsForOrderTypeExist(targetBranch, group, i)">
<div class="flex flex-row items-center px-5 pt-0 pb-[0.875rem] -mt-2 bg-[#F5F7FA]"> <div
class="flex flex-row items-center px-5 pt-0 pb-[0.875rem] -mt-2 bg-[#F5F7FA]"
[class.multiple-destinations]="checkIfMultipleDestinationsForOrderTypeExist(targetBranch, group, i)"
>
<span class="branch-name">{{ targetBranch?.name }} | {{ targetBranch | branchAddress }}</span> <span class="branch-name">{{ targetBranch?.name }} | {{ targetBranch | branchAddress }}</span>
</div> </div>
<hr /> <hr />

4
apps/page/checkout/src/lib/checkout-review/checkout-review.component.scss
View File

@@ -105,6 +105,10 @@ h1 {
} }
} }
.multiple-destinations {
@apply py-[0.875rem] mt-0;
}
.icon-order-type { .icon-order-type {
@apply text-black mr-2; @apply text-black mr-2;
} }

6
apps/page/checkout/src/lib/checkout-review/checkout-review.component.ts
View File

@@ -14,7 +14,7 @@ import { Router } from '@angular/router';
import { ApplicationService } from '@core/application'; import { ApplicationService } from '@core/application';
import { DomainAvailabilityService } from '@domain/availability'; import { DomainAvailabilityService } from '@domain/availability';
import { DomainCheckoutService } from '@domain/checkout'; import { DomainCheckoutService } from '@domain/checkout';
import { AvailabilityDTO, DestinationDTO, ShoppingCartItemDTO } from '@swagger/checkout'; import { AvailabilityDTO, BranchDTO, DestinationDTO, ShoppingCartItemDTO } from '@swagger/checkout';
import { UiMessageModalComponent, UiModalService } from '@ui/modal'; import { UiMessageModalComponent, UiModalService } from '@ui/modal';
import { PrintModalData, PrintModalComponent } from '@modal/printer'; import { PrintModalData, PrintModalComponent } from '@modal/printer';
import { delay, first, map, switchMap, takeUntil, tap } from 'rxjs/operators'; import { delay, first, map, switchMap, takeUntil, tap } from 'rxjs/operators';
@@ -254,6 +254,10 @@ export class CheckoutReviewComponent implements OnInit, OnDestroy, AfterViewInit
}); });
} }
checkIfMultipleDestinationsForOrderTypeExist(targetBranch: BranchDTO, group: { items: ShoppingCartItemDTO[] }, i: number) {
return i === 0 ? false : targetBranch.id !== group.items[i - 1].destination?.data?.targetBranch?.data.id;
}
async refreshAvailabilities() { async refreshAvailabilities() {
this.checkingOla$.next(true); this.checkingOla$.next(true);