git merge 6.12.0

TrellisCommerce · Feb 2, 2024 · 4289e04 · 4289e04
2 parents 995f638 + 6f5aa92
commit 4289e04
Show file tree

Hide file tree

Showing 63 changed files with 28,699 additions and 5,091 deletions.
diff --git a/.github/workflow-examples/automatic_deployment_production.yml b/.github/workflow-examples/automatic_deployment_production.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node: [14.x]
+        node: [16.x]
 
     steps:
     - name: Checkout code

diff --git a/.github/workflow-examples/poll_for_changed_configuration.yml b/.github/workflow-examples/poll_for_changed_configuration.yml
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        node: [14.x]
+        node: [16.x]
 
     steps:
     - name: Checkout code

diff --git a/.github/workflows/pull_request_review.yml b/.github/workflows/pull_request_review.yml
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        node: [14.x]
+        node: [16.x]
 
     steps:
     - name: Checkout code

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,30 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Draft
 
+## 6.12.0 (07-06-2023)
+
+- sync package lock file [#2373](https://github.com/bigcommerce/cornerstone/pull/2373)
+- Stored payment method name is not visible in Cornerstone Bold theme style [#2371](https://github.com/bigcommerce/cornerstone/pull/2371)
+- (sanitize product.description) in the theme results to ‘error length of description’ from Google indexing for lengthy product description [#2363](https://github.com/bigcommerce/cornerstone/pull/2363)
+- Added style configs to payment buttons [#2361](https://github.com/bigcommerce/cornerstone/pull/2361)
+- Bump Stencil utils to 6.15.1 [#2365][https://github.com/bigcommerce/cornerstone/pull/2365]
+- Write a Review on product page shows blank pop up on second click. [#2368][https://github.com/bigcommerce/cornerstone/pull/2368]
+- Added ACH payment method section to My Account -> Payment Methods page [#2362](https://github.com/bigcommerce/cornerstone/pull/2362)
+- Remove data_tag_enabled check from everywhere [#2369][https://github.com/bigcommerce/cornerstone/pull/2369]
+- Fix add product to cart on iphone x (iphone version 11) [#2370][https://github.com/bigcommerce/cornerstone/pull/2370]
+
+## 6.11.0 (05-24-2023)
+
+- Reverted fix for sold-out badge appearance [#2354](https://github.com/bigcommerce/cornerstone/pull/2354)
+- If the gift is a variant, the button "Change" shows in cart, and other variant are visible [#2349](https://github.com/bigcommerce/cornerstone/pull/2349)
+- Removes the URL encoding from the 'description' in the product rich snippet schema [#2350](https://github.com/bigcommerce/cornerstone/pull/2350)
+- Running Lighthouse npm script fails in terminal [#2345](https://github.com/bigcommerce/cornerstone/pull/2345)
+- Removed accelerated checkout integration [#2341](https://github.com/bigcommerce/cornerstone/pull/2341)
+- Added css classes for ApplePay Button [[#2344]](https://github.com/bigcommerce/cornerstone/pull/2344)
+- Added styling config for the Bolt smart payment button [[#2356]](https://github.com/bigcommerce/cornerstone/pull/2356)
+- Remove default whitespace from multiline input [#2355](https://github.com/bigcommerce/cornerstone/pull/2355)
+- Refresh page if no more item in the cart [#2360](https://github.com/bigcommerce/cornerstone/pull/2360)
+
 ## 6.10.0 (03-23-2023)
 
 - A bug with the display of the product quantity on the PDP [#2340](https://github.com/bigcommerce/cornerstone/pull/2340)

diff --git a/assets/img/payment-methods/ach.svg b/assets/img/payment-methods/ach.svg
diff --git a/assets/js/polyfills.js b/assets/js/polyfills.js
@@ -1,10 +1,7 @@
 import 'core-js/stable';
 import 'regenerator-runtime/runtime';
-import 'whatwg-fetch';
 import objectFitImages from 'object-fit-images';
 
-require('formdata-polyfill');
-
 document.addEventListener('DOMContentLoaded', () => {
   objectFitImages();
 });
diff --git a/assets/js/theme/cart.js b/assets/js/theme/cart.js
@@ -229,12 +229,17 @@ export default class Cart extends PageManager {
       this.$cartAdditionalCheckoutBtns.html(response.additionalCheckoutButtons);
 
       $cartPageTitle.replaceWith(response.pageTitle);
-      this.bindEvents();
-      this.$overlay.hide();
 
       const quantity =
         $('[data-cart-quantity]', this.$cartContent).data('cartQuantity') || 0;
 
+      if (!quantity) {
+        return window.location.reload();
+      }
+
+      this.bindEvents();
+      this.$overlay.hide();
+
       $('body').trigger('cart-quantity-update', quantity);
 
       $(`[data-cart-itemid='${this.$activeCartItemId}']`, this.$cartContent)

diff --git a/assets/js/theme/gift-certificate.js b/assets/js/theme/gift-certificate.js
@@ -1,10 +1,10 @@
-import { api } from '@bigcommerce/stencil-utils';
 import PageManager from './page-manager';
 import nod from './common/nod';
 import checkIsGiftCertValid from './common/gift-certificate-validator';
 import formModel from './common/models/forms';
 import { createTranslationDictionary } from './common/utils/translations-utils';
 import { announceInputErrorMessage } from './common/utils/form-utils';
+import { api } from '@bigcommerce/stencil-utils';
 import { defaultModal } from './global/modal';
 
 export default class GiftCertificate extends PageManager {
@@ -183,6 +183,31 @@ export default class GiftCertificate extends PageManager {
       }
     });
 
+    const createFrame = (container, html) => {
+      const frame = $('<iframe />')
+        .width('100%')
+        .attr('frameBorder', '0')
+        .appendTo(container)[0];
+
+      // Grab the frame's document object
+      const frameDoc = frame.contentWindow
+        ? frame.contentWindow.document
+        : frame.contentDocument;
+
+      frameDoc.open();
+      frameDoc.write(html);
+      frameDoc.close();
+
+      // Calculate max height for the iframe
+      const maxheight = Math.max($(window).height() - 300, 300);
+
+      // Auto adjust the iframe's height once its document is ready
+      $(frameDoc).ready(() => {
+        const height = Math.min(frameDoc.body.scrollHeight + 20, maxheight);
+        $(frame).height(height);
+      });
+    };
+
     $('#gift-certificate-preview').click((event) => {
       event.preventDefault();
 
@@ -204,7 +229,10 @@ export default class GiftCertificate extends PageManager {
           return modal.updateContent(this.context.previewError);
         }
 
-        modal.updateContent(content, { wrap: true });
+        modal.updateContent();
+
+        const container = $('#modal-content');
+        createFrame(container, content);
       });
     });
   }

diff --git a/assets/js/theme/global/modal.js b/assets/js/theme/global/modal.js
@@ -215,8 +215,6 @@ export class Modal {
 
   onModalClose() {
     $('body').removeClass(bodyActiveClass);
-
-    this.clearContent();
   }
 
   onModalClosed() {

diff --git a/assets/scss/components/stencil/applePay/_applePay.scss b/assets/scss/components/stencil/applePay/_applePay.scss
@@ -1,4 +1,6 @@
 .apple-pay-checkout-button {
+  background-color: $applePay-black;
+  background-image: -webkit-named-image(apple-pay-logo-white);
   background-position: 50% 50%;
   background-repeat: no-repeat;
   background-size: 100% 60%;
@@ -10,17 +12,17 @@
   min-width: 90px;
   padding: spacing('single');
   width: 160px;
-  @if stencilString('applePay-button') == 'white' {
-    background-color: $applePay-white;
-    background-image: -webkit-named-image(apple-pay-logo-black);
-  } @else if stencilString('applePay-button') == 'white-border' {
-    background-color: $applePay-white;
-    background-image: -webkit-named-image(apple-pay-logo-black);
-    border: 0.5px solid $applePay-black;
-  } @else {
-    background-color: $applePay-black;
-    background-image: -webkit-named-image(apple-pay-logo-white);
-  }
+}
+
+.apple-pay-checkout-button--white {
+  background-color: $applePay-white;
+  background-image: -webkit-named-image(apple-pay-logo-black);
+}
+
+.apple-pay-checkout-button--white-border {
+  background-color: $applePay-white;
+  background-image: -webkit-named-image(apple-pay-logo-black);
+  border: 0.5px solid $applePay-black;
 }
 
 .apple-pay-supported {

diff --git a/assets/scss/components/stencil/cart/_cart.scss b/assets/scss/components/stencil/cart/_cart.scss
@@ -529,13 +529,6 @@ $card-preview-zoom-bottom-offset: 6rem;
   }
 }
 
-.cart-acceleratedCheckoutButtons {
-  align-items: end;
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-}
-
 .cart-additionalCheckoutButtons {
   @extend %additionalCheckoutButtons;
 }
@@ -675,10 +668,6 @@ $card-preview-zoom-bottom-offset: 6rem;
   text-align: center;
 }
 
-.previewCart-acceleratedCheckoutButtons {
-  width: 100%;
-}
-
 .previewCart-additionalCheckoutButtons {
   @extend %additionalCheckoutButtons;
   padding-bottom: spacing('single');

diff --git a/assets/scss/components/stencil/paymentMethods/_paymentMethods.scss b/assets/scss/components/stencil/paymentMethods/_paymentMethods.scss
@@ -80,6 +80,7 @@
   }
 
   &-brand {
+    color: color('greys', 'dark');
     font-size: fontSize('smallest');
     font-weight: fontWeight('semibold');
 

diff --git a/assets/scss/components/stencil/previewCart/_previewCart.scss b/assets/scss/components/stencil/previewCart/_previewCart.scss
@@ -78,10 +78,6 @@
   margin-top: spacing('single');
 }
 
-.previewCartCheckout-acceleratedCheckoutButtons {
-  width: 100%;
-}
-
 .previewCartCheckout-additionalCheckoutButtons {
   p {
     float: none !important; // 1

diff --git a/config.json b/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Cornerstone",
-  "version": "6.10.0",
+  "version": "6.12.0",
   "template_engine": "handlebars_v4",
   "meta": {
     "price": 0,
@@ -322,16 +322,28 @@
     "pdp-non-sale-price-label": "",
     "pdp-retail-price-label": "",
     "pdp-custom-fields-tab-label": "",
-    "paymentbuttons-paypal-accelerated-checkout-color": "#444",
-    "paymentbuttons-paypal-accelerated-content-font-family": "Montserrat, Arial, Helvetica, sans-serif",
-    "paymentbuttons-paypal-accelerated-content-font-weight": "400",
-    "paymentbuttons-paypal-accelerated-content-color": "white",
-    "paymentbuttons-paypal-accelerated-content-label": "checkout",
-    "paymentbuttons-paypal-accelerated-border-color": "black",
+    "paymentbuttons-paypal-product-details-page-color": "gold",
+    "paymentbuttons-paylater-product-details-page-color": "gold",
+    "paymentbuttons-venmo-product-details-page-color": "blue",
+    "paymentbuttons-paypal-cart-page-add-cart-color": "gold",
+    "paymentbuttons-paylater-cart-page-add-cart-color": "gold",
+    "paymentbuttons-venmo-cart-page-add-cart-color": "blue",
+    "paymentbuttons-paypal-checkout-on-top-color": "gold",
+    "paymentbuttons-paylater-checkout-on-top-color": "gold",
+    "paymentbuttons-venmo-checkout-on-top-color": "blue",
+    "paymentbuttons-paypal-checkout-payment-color": "gold",
+    "paymentbuttons-paylater-checkout-payment-color": "gold",
+    "paymentbuttons-venmo-checkout-payment-color": "blue",
+    "paymentbuttons-paypal-checkout-payment-label": "checkout",
+    "paymentbuttons-paypal-checkout-on-top-payment-label": "checkout",
+    "paymentbuttons-paypal-cart-page-add-cart-label": "checkout",
+    "paymentbuttons-paypal-product-details-page-label": "checkout",
+    "paymentbuttons-paypal-checkout-payment-size": "medium",
     "paymentbuttons-paypal-color": "gold",
     "paymentbuttons-paypal-shape": "rect",
     "paymentbuttons-paypal-label": "checkout",
     "paymentbanners-homepage-color": "white",
+    "paymentbuttons-bolt-shape": "rect",
     "paymentbanners-homepage-ratio": "8x1",
     "paymentbanners-cartpage-text-color": "black",
     "paymentbanners-cartpage-logo-position": "left",

diff --git a/lang/da.json b/lang/da.json
@@ -388,6 +388,7 @@
         "payment_methods": {
             "heading": "Betalingsmetoder",
             "payment_method": "Betalingsmetode",
+            "bank_account": "Bankkonto",
             "billing_address": "Faktureringsadresse",
             "card_ending_in": "slutter på {last_four}",
             "card_expiry": "{month}/{year}",
@@ -409,6 +410,7 @@
                 "unionpay": "Union Pay",
                 "visa": "Visa"
             },
+            "ach": "ACH",
             "paypal": "PayPal",
             "billing_address_labels": {
                 "address_line_1": "Adresselinje 1",

diff --git a/lang/de.json b/lang/de.json
@@ -388,6 +388,7 @@
         "payment_methods": {
             "heading": "Zahlungsmethoden",
             "payment_method": "Zahlungsmethode",
+            "bank_account": "Bankkonto",
             "billing_address": "Rechnungsadresse",
             "card_ending_in": "endet auf {last_four}",
             "card_expiry": "{month}/{year}",
@@ -409,6 +410,7 @@
                 "unionpay": "Union Pay",
                 "visa": "Visa"
             },
+            "ach": "ACH",
             "paypal": "PayPal",
             "billing_address_labels": {
                 "address_line_1": "Adresszeile 1",

diff --git a/lang/en.json b/lang/en.json
@@ -388,6 +388,7 @@
         "payment_methods": {
             "heading": "Payment Methods",
             "payment_method": "Payment method",
+            "bank_account": "Bank account",
             "billing_address": "Billing address",
             "card_ending_in": "ending in {last_four}",
             "card_expiry": "{month}/{year}",
@@ -409,6 +410,7 @@
                 "unionpay": "Union Pay",
                 "visa": "Visa"
             },
+            "ach": "ACH",
             "paypal": "PayPal",
             "billing_address_labels": {
               "address_line_1": "Address Line 1",

diff --git a/lang/es-419.json b/lang/es-419.json
@@ -388,6 +388,7 @@
         "payment_methods": {
             "heading": "Métodos de pago",
             "payment_method": "Método de pago",
+            "bank_account": "Cuenta bancaria",
             "billing_address": "Dirección de facturación",
             "card_ending_in": "terminado en {last_four}",
             "card_expiry": "{month}/{year}",
@@ -409,6 +410,7 @@
                 "unionpay": "Union Pay",
                 "visa": "Visa"
             },
+            "ach": "ACH",
             "paypal": "PayPal",
             "billing_address_labels": {
                 "address_line_1": "Línea de dirección 1",

diff --git a/lang/es-AR.json b/lang/es-AR.json
@@ -388,6 +388,7 @@
         "payment_methods": {
             "heading": "Métodos de pago",
             "payment_method": "Método de pago",
+            "bank_account": "Cuenta bancaria",
             "billing_address": "Dirección de facturación",
             "card_ending_in": "terminado en {last_four}",
             "card_expiry": "{month}/{year}",
@@ -409,6 +410,7 @@
                 "unionpay": "Union Pay",
                 "visa": "Visa"
             },
+            "ach": "ACH",
             "paypal": "PayPal",
             "billing_address_labels": {
                 "address_line_1": "Línea de dirección 1",

diff --git a/lang/es-CL.json b/lang/es-CL.json
@@ -388,6 +388,7 @@
         "payment_methods": {
             "heading": "Métodos de pago",
             "payment_method": "Método de pago",
+            "bank_account": "Cuenta bancaria",
             "billing_address": "Dirección de facturación",
             "card_ending_in": "terminado en {last_four}",
             "card_expiry": "{month}/{year}",
@@ -409,6 +410,7 @@
                 "unionpay": "Union Pay",
                 "visa": "Visa"
             },
+            "ach": "ACH",
             "paypal": "PayPal",
             "billing_address_labels": {
                 "address_line_1": "Línea de dirección 1",

diff --git a/lang/es-CO.json b/lang/es-CO.json
@@ -388,6 +388,7 @@
         "payment_methods": {
             "heading": "Métodos de pago",
             "payment_method": "Método de pago",
+            "bank_account": "Cuenta bancaria",
             "billing_address": "Dirección de facturación",
             "card_ending_in": "terminado en {last_four}",
             "card_expiry": "{month}/{year}",
@@ -409,6 +410,7 @@
                 "unionpay": "Union Pay",
                 "visa": "Visa"
             },
+            "ach": "ACH",
             "paypal": "PayPal",
             "billing_address_labels": {
                 "address_line_1": "Línea de dirección 1",