Skip to content

Commit

Permalink
CXINT-1850: Adopting review comments from core team
Browse files Browse the repository at this point in the history
  • Loading branch information
SherwinVarghese committed Aug 9, 2023
1 parent 6e92c0f commit 965f2d5
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 28 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -131,15 +131,15 @@ <h2 class="cx-review-title d-none d-lg-block d-xl-block">
<!-- DELIVERY MODE SECTION -->
<ng-template #deliveryMode>
<div class="cx-review-summary-card cx-review-card-shipping">
<!-- TODO:(CXINT-1850) for next major release remove feature level -->
<!-- TODO:(CXINT-2309) for next major release remove feature level -->
<ng-container *cxFeatureLevel="'!6.4'">
<cx-card
*ngIf="deliveryMode$ | async as deliveryMode"
[content]="getDeliveryModeCard(deliveryMode) | async"
>
</cx-card>
</ng-container>
<!-- TODO:(CXINT-1850) for next major release remove feature level -->
<!-- TODO:(CXINT-2309) for next major release remove feature level -->
<ng-container *cxFeatureLevel="'6.4'">
<div>
<cx-card
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,16 @@ <h2 class="cx-checkout-title d-none d-lg-block d-xl-block">
</label>
</div>
</div>
<ng-template
[cxOutlet]="CartOutlets.DELIVERY_MODE"
[cxOutletContext]="{
item: activeCartFacade.getActive() | async
}"
>
</ng-template>
<!-- TODO:(CXINT-2309) for next major release remove feature level -->
<ng-container *cxFeatureLevel="'6.4'">
<ng-template
[cxOutlet]="CartOutlets.DELIVERY_MODE"
[cxOutletContext]="{
item: activeCartFacade.getActive() | async
}"
>
</ng-template>
</ng-container>
</div>
</ng-container>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ <h2 class="cx-review-title d-none d-lg-block d-xl-block">
<!-- DELIVERY MODE SECTION -->
<ng-template #deliveryMode>
<div class="cx-review-summary-card cx-review-card-shipping">
<!-- TODO:(CXINT-1850) for next major release remove feature level -->
<!-- TODO:(CXINT-2309) for next major release remove feature level -->
<ng-container *cxFeatureLevel="'!6.4'">
<cx-card
*ngIf="deliveryMode$ | async as deliveryMode"
[content]="getDeliveryModeCard(deliveryMode) | async"
>
</cx-card>
</ng-container>
<!-- TODO:(CXINT-1850) for next major release remove feature level -->
<!-- TODO:(CXINT-2309) for next major release remove feature level -->
<ng-container *cxFeatureLevel="'6.4'">
<div>
<cx-card
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,14 @@
"
></cx-card>

<ng-template
[cxOutlet]="cartOutlets.ORDER_OVERVIEW"
[cxOutletContext]="{ item: order, readonly: true }"
>
</ng-template>
<!-- TODO:(CXINT-2309) for next major release remove feature level -->
<ng-container *cxFeatureLevel="'6.4'">
<ng-template
[cxOutlet]="cartOutlets.ORDER_OVERVIEW"
[cxOutletContext]="{ item: order, readonly: true }"
>
</ng-template>
</ng-container>
</div>
</ng-container>

Expand All @@ -63,11 +66,14 @@
[content]="getOrderStatusCardContent(order.statusDisplay) | async"
></cx-card>

<ng-template
[cxOutlet]="cartOutlets.ORDER_OVERVIEW"
[cxOutletContext]="{ item: order, readonly: true }"
>
</ng-template>
<!-- TODO:(CXINT-2309) for next major release remove feature level -->
<ng-container *cxFeatureLevel="'6.4'">
<ng-template
[cxOutlet]="cartOutlets.ORDER_OVERVIEW"
[cxOutletContext]="{ item: order, readonly: true }"
>
</ng-template>
</ng-container>
</div>
</ng-template>

Expand Down Expand Up @@ -166,11 +172,14 @@
[content]="getOrderStatusCardContent(order.statusDisplay) | async"
></cx-card>

<ng-template
[cxOutlet]="cartOutlets.ORDER_OVERVIEW"
[cxOutletContext]="{ item: order, readonly: true }"
>
</ng-template>
<!-- TODO:(CXINT-2309) for next major release remove feature level -->
<ng-container *cxFeatureLevel="'6.4'">
<ng-template
[cxOutlet]="cartOutlets.ORDER_OVERVIEW"
[cxOutletContext]="{ item: order, readonly: true }"
>
</ng-template>
</ng-container>
</div>
<cx-order-detail-billing></cx-order-detail-billing>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export function defaultRequestedDeliveryDateComponentsConfig(): CmsConfig {
@NgModule({
providers: [
provideOutlet({
id: CartOutlets.DELIVERY_MODE, //CartOutlets.ORDER_SUMMARY
id: CartOutlets.DELIVERY_MODE,
position: OutletPosition.AFTER,
component: DeliveryModeDatePickerComponent,
}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
[formControl]="control"
[attr.min]="min"
[attr.max]="max"
[value]="control?.value"
[attr.required]="required === false ? undefined : required"
(change)="change()"
[placeholder]="placeholder"
Expand Down

0 comments on commit 965f2d5

Please sign in to comment.