From 965f2d5f1ea38e31d933688b4930e2de3fe1b31d Mon Sep 17 00:00:00 2001
From: Sherwin Varghese <sherwinvarghese11@gmail.com>
Date: Wed, 9 Aug 2023 10:59:47 +0530
Subject: [PATCH] CXINT-1850: Adopting review comments from core team

---
 .../checkout-review-submit.component.html     |  4 +-
 .../checkout-delivery-mode.component.html     | 17 ++++----
 .../checkout-review-submit.component.html     |  4 +-
 .../order-overview.component.html             | 39 ++++++++++++-------
 .../requested-delivery-date-root.module.ts    |  2 +-
 .../date-picker/date-picker.component.html    |  1 -
 6 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.html b/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.html
index 17b225d110e..ade77552529 100644
--- a/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.html
+++ b/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.html
@@ -131,7 +131,7 @@ <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"
@@ -139,7 +139,7 @@ <h2 class="cx-review-title d-none d-lg-block d-xl-block">
         >
         </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
diff --git a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html
index 2d34371b47a..e16d6be3480 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html
+++ b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.html
@@ -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>
 
diff --git a/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.html b/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.html
index 63192b374ee..af9615ad854 100644
--- a/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.html
+++ b/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.html
@@ -58,7 +58,7 @@ <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"
@@ -66,7 +66,7 @@ <h2 class="cx-review-title d-none d-lg-block d-xl-block">
         >
         </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
diff --git a/feature-libs/order/components/order-details/order-overview/order-overview.component.html b/feature-libs/order/components/order-details/order-overview/order-overview.component.html
index 7188c623156..4d850012f8c 100644
--- a/feature-libs/order/components/order-details/order-overview/order-overview.component.html
+++ b/feature-libs/order/components/order-details/order-overview/order-overview.component.html
@@ -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>
 
@@ -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>
 
@@ -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>
diff --git a/feature-libs/requested-delivery-date/root/requested-delivery-date-root.module.ts b/feature-libs/requested-delivery-date/root/requested-delivery-date-root.module.ts
index f5f252ee80c..47fbc3bef9d 100644
--- a/feature-libs/requested-delivery-date/root/requested-delivery-date-root.module.ts
+++ b/feature-libs/requested-delivery-date/root/requested-delivery-date-root.module.ts
@@ -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,
     }),
diff --git a/projects/storefrontlib/shared/components/form/date-picker/date-picker.component.html b/projects/storefrontlib/shared/components/form/date-picker/date-picker.component.html
index 523e8fd73b0..3f03d978bc9 100644
--- a/projects/storefrontlib/shared/components/form/date-picker/date-picker.component.html
+++ b/projects/storefrontlib/shared/components/form/date-picker/date-picker.component.html
@@ -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"