Merge branch 'master' into BCTHEME-982

Author: bc-yevhenii-buliuk

CHANGELOG.md

@@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Draft
 - Search results containing % symbol result in errored page. [#2205](https://github.com/bigcommerce/cornerstone/issues/2205)
+- Remove translations for adminBar component [#2196](https://github.com/bigcommerce/cornerstone/issues/2196)
+- Remove adminBar. [#2191](https://github.com/bigcommerce/cornerstone/issues/2191)
+- When price list price is set for currency, the cart does not respect product's price.[#2190](https://github.com/bigcommerce/cornerstone/issues/2190)
 
 ## 6.3.0 (03-11-2022)
 - Update blog component to use H1 tags on posts [#2179](https://github.com/bigcommerce/cornerstone/issues/2179)

assets/js/theme/common/product-details.js

@@ -11,6 +11,7 @@ import forms from '../common/models/forms';
 import { normalizeFormData } from './utils/api';
 import { isBrowserIE, convertIntoArray } from './utils/ie-helpers';
 import bannerUtils from './utils/banner-utils';
+import currencySelector from '../global/currency-selector';
 
 export default class ProductDetails extends ProductDetailsBase {
     constructor($scope, context, productAttributesData = {}) {
@@ -399,6 +400,7 @@ export default class ProductDetails extends ProductDetailsBase {
 
         // Add item to cart
         utils.api.cart.itemAdd(normalizeFormData(new FormData(form)), (err, response) => {
+            currencySelector(response.data.cart_id);
             const errorMessage = err || response.data.error;
 
             $addToCartBtn

assets/js/theme/global.js

@@ -11,16 +11,13 @@ import foundation from './global/foundation';
 import quickView from './global/quick-view';
 import cartPreview from './global/cart-preview';
 import privacyCookieNotification from './global/cookieNotification';
-import adminBar from './global/adminBar';
 import carousel from './common/carousel';
 import loadingProgressBar from './global/loading-progress-bar';
 import svgInjector from './global/svg-injector';
 
 export default class Global extends PageManager {
     onReady() {
-        const {
-            channelId, cartId, productId, categoryId, secureBaseUrl, maintenanceModeSettings, adminBarLanguage,
-        } = this.context;
+        const { cartId, secureBaseUrl } = this.context;
         cartPreview(secureBaseUrl, cartId);
         quickSearch();
         currencySelector(cartId);
@@ -30,7 +27,6 @@ export default class Global extends PageManager {
         menu();
         mobileMenuToggle();
         privacyCookieNotification();
-        adminBar(secureBaseUrl, channelId, maintenanceModeSettings, JSON.parse(adminBarLanguage), productId, categoryId);
         loadingProgressBar();
         svgInjector();
     }

assets/js/theme/global/adminBar.js

@@ -1,7 +1,17 @@
 import swal from './sweet-alert';
 import utils from '@bigcommerce/stencil-utils';
 
+let currencySelectorCalled = false;
+
 export default function (cartId) {
+    if (!cartId) return;
+
+    if (!currencySelectorCalled) {
+        currencySelectorCalled = true;
+    } else {
+        return;
+    }
+
     function changeCurrency(url, currencyCode) {
         $.ajax({
             url,
@@ -21,9 +31,6 @@ export default function (cartId) {
 
     $('[data-cart-currency-switch-url]').on('click', event => {
         const currencySessionSwitcher = event.target.href;
-        if (!cartId) {
-            return;
-        }
         event.preventDefault();
         utils.api.cart.getCart({ cartId }, (err, response) => {
             if (err || response === undefined) {

assets/js/theme/global/currency-selector.js

@@ -162,9 +162,6 @@
 // Preview Cart
 @import "stencil/previewCart/component";
 
-// Maintenance Notice
-@import "stencil/adminBar/component";
-
 // Cookie Warning
 @import "stencil/cookie/component";