Merge branch 'develop' into fix-percentage

SAP · Oct 15, 2024 · e5b637c · e5b637c
2 parents 20866ca + 4f60be3
commit e5b637c
Show file tree

Hide file tree

Showing 12 changed files with 523 additions and 460 deletions.
diff --git a/feature-libs/cart/base/assets/translations/en/cart.json b/feature-libs/cart/base/assets/translations/en/cart.json
@@ -34,6 +34,7 @@
     "coupon": "Have a coupon?",
     "coupon_other": "Coupon codes",
     "couponLabel": "Enter a promo code here",
+    "addCoupon": "Add a coupon",
     "apply": "Apply",
     "placeholder": "Promo code",
     "applyVoucherSuccess": "{{voucherCode}} has been applied.",

diff --git a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html
@@ -12,8 +12,8 @@
     </ng-container>
 
     <form (ngSubmit)="applyVoucher()" [formGroup]="couponForm">
-      <label class="cx-cart-coupon-title">
-        {{ 'voucher.coupon' | cxTranslate }}
+      <label id="card-coupon-input-label" class="cx-cart-coupon-title">
+        {{ 'voucher.addCoupon' | cxTranslate }}
         <!-- TODO: (CXSPA-7479) Remove feature flags next major -->
         <ng-container
           *cxFeature="
@@ -37,7 +37,7 @@
           "
         >
           <input
-            [attr.aria-label]="'voucher.couponLabel' | cxTranslate"
+            [attr.aria-labelledby]="'card-coupon-input-label'"
             type="text"
             class="form-control input-coupon-code"
             formControlName="couponCode"
@@ -62,7 +62,7 @@
         >
           <!-- TODO: (CXSPA-7479) Remove feature flags next major -->
           <input
-            [attr.aria-label]="'voucher.couponLabel' | cxTranslate"
+            [attr.aria-labelledby]="'card-coupon-input-label'"
             required="true"
             type="text"
             class="form-control input-coupon-code"

diff --git a/feature-libs/pickup-in-store/components/presentational/store/store.component.html b/feature-libs/pickup-in-store/components/presentational/store/store.component.html
@@ -7,6 +7,7 @@
         <div>
           <button
             (click)="toggleOpenHours()"
+            [attr.aria-expanded]="openHoursOpen"
             class="cx-store-opening-hours-toggle"
           >
             {{ 'store.viewHours' | cxTranslate }}