Merge branch 'master' into BCTHEME-1198

bigcommerce · Jan 23, 2023 · 0db5d4c · 0db5d4c
2 parents a34966c + 5f023e5
commit 0db5d4c
Show file tree

Hide file tree

Showing 78 changed files with 3,065 additions and 5,334 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,12 +5,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Draft
+- Add remote_api_scripts into cart/preview template to let GA3 snippet to fire the Product Added event, when clicking Add to cart button on Product detail page and rendering the response in popup. [#2281](https://github.com/bigcommerce/cornerstone/pull/2281)
 - Stored XSS within Wishlist creation.[#2289](https://github.com/bigcommerce/cornerstone/issues/2289)
 - Set "Show quick payment buttons" setting to true by default [#2283]https://github.com/bigcommerce/cornerstone/pull/2283
 - Fixed en-CA translation warning in terminal. [#2278][https://github.com/bigcommerce/cornerstone/pull/2278]
 - Added manual captcha to Contact Us form for additional spam protection. [#2290](https://github.com/bigcommerce/cornerstone/pull/2290)
 - Fixed PDP not respecting "quantity box" display settings. [#2291](https://github.com/bigcommerce/cornerstone/pull/2291)
 - Fixed product panels with scrolling/arrows prevent contextual menu on mobile devices [#2310](https://github.com/bigcommerce/cornerstone/pull/2310)
+- Added integrarion of storefront-account-payments lib [#2288][https://github.com/bigcommerce/cornerstone/pull/2288]
+- Bump Stencil utils to 6.13.0 [#2300][https://github.com/bigcommerce/cornerstone/pull/2300]
+- Removed non-working functionality from schema.json [#2301][https://github.com/bigcommerce/cornerstone/pull/2301]
+- Refactored `hide_price_from_guests` logic around `show_cart_action` use [#2304](https://github.com/bigcommerce/cornerstone/pull/2304)
+- Removed all Google AMP template files [#2308](https://github.com/bigcommerce/cornerstone/pull/2308)
 
 ## 6.7.0 (11-03-2022)
 - Fixed escaping on created store account confirm message. [#2265]https://github.com/bigcommerce/cornerstone/pull/2265
@@ -23,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix the issue with getting product details data if the product details form is valid on page load [#2271](https://github.com/bigcommerce/cornerstone/pull/2271)
 - Delay validation on account signup, message form, and account edit page [#2274](https://github.com/bigcommerce/cornerstone/pull/2274)
 - Update key render-blocking resources to be preloaded via HTTP headers/Early Hints [#2261](https://github.com/bigcommerce/cornerstone/pull/2261)
+- Fix styles for wallet buttons on PDP [#2285](https://github.com/bigcommerce/cornerstone/pull/2285)
 
 ## 6.6.1 (09-14-2022)
 

diff --git a/assets/js/theme/account.js b/assets/js/theme/account.js
@@ -32,6 +32,7 @@ export default class Account extends PageManager {
         const $paymentMethodForm = classifyForm('form[data-payment-method-form]');
         const $reorderForm = classifyForm('[data-account-reorder-form]');
         const $invoiceButton = $('[data-print-invoice]');
+        const $bigCommerce = window.BigCommerce;
 
         compareProducts(this.context);
 
@@ -82,6 +83,31 @@ export default class Account extends PageManager {
             this.initReorderForm($reorderForm);
         }
 
+        if ($bigCommerce && $bigCommerce.accountPayments) {
+            window.BigCommerce.accountPayments({
+                widgetStyles: {
+                    base: {
+                        color: '#666666',
+                        cursor: 'pointer',
+                        display: 'block',
+                        fontSize: '1rem',
+                        lineHeight: '1.5',
+                        marginBottom: '0.5rem',
+                    },
+                    error: {
+                        color: 'red',
+                    },
+                    placeholder: {
+                        color: '#d8d8d8',
+                    },
+                    validated: {
+                        color: 'green',
+                    },
+                },
+                countries: this.context.countries,
+            });
+        }
+
         this.bindDeleteAddress();
         this.bindDeletePaymentMethod();
     }

diff --git a/assets/scss/components/stencil/applePay/_applePay.scss b/assets/scss/components/stencil/applePay/_applePay.scss
@@ -31,7 +31,8 @@
         float: right;
     }
 
-    .previewCartCheckout .apple-pay-checkout-button {
+    .previewCartCheckout .apple-pay-checkout-button,
+    .productView-options .apple-pay-checkout-button {
         display: inline-block;
         float: none;
     }

diff --git a/assets/scss/components/stencil/productView/_productView.scss b/assets/scss/components/stencil/productView/_productView.scss
@@ -367,9 +367,20 @@
     .add-to-cart-wallet-buttons {
         margin-top: spacing("half");
 
-        button {
+        div[data-smart-button-container-id] {
+            line-height: 0;
+            margin-top: 6px;
+
+            button,
+            div {
+                width: 100%;
+            }
+        }
+
+        button.show-more-button {
             color: stencilColor("color-textSecondary");
             display: block;
+            margin-top: spacing("quarter");
             padding: spacing("quarter") 0;
             text-align: center;
             text-decoration: underline;

diff --git a/assets/scss/components/vendor/slick/_slick.scss b/assets/scss/components/vendor/slick/_slick.scss
@@ -179,7 +179,7 @@ div.slick-slider {
 // -----------------------------------------------------------------------------
 .slick-slide .card-image,
 .slick-slide .heroCarousel-image {
-	-webkit-touch-callout: default;
+    -webkit-touch-callout: default;
 }
 
 //

diff --git a/config.json b/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Cornerstone",
-  "version": "6.7.0",
+  "version": "6.8.0-rc.2",
   "template_engine": "handlebars_v4",
   "meta": {
     "price": 0,
@@ -30,7 +30,6 @@
       "persistent_cart",
       "one_page_check_out",
       "product_videos",
-      "google_amp",
       "customized_checkout",
       "enhanced_ecommerce",
       "csrf_protection",
@@ -329,7 +328,6 @@
     "paymentbuttons-paypal-accelerated-content-color": "white",
     "paymentbuttons-paypal-accelerated-content-label": "checkout",
     "paymentbuttons-paypal-accelerated-border-color": "black",
-    "paymentbuttons-paypal-layout": "vertical",
     "paymentbuttons-paypal-color": "gold",
     "paymentbuttons-paypal-shape": "rect",
     "paymentbuttons-paypal-label": "checkout",

diff --git a/grunt/svgstore.js b/grunt/svgstore.js
@@ -8,7 +8,6 @@ module.exports = {
     default: {
         files: {
             './assets/img/icon-sprite.svg': ['./assets/icons/**/*.svg'],
-            './templates/components/amp/common/icon-defs.html': ['./assets/icons/**/*.svg'],
         },
     },
 };