From 59d94716e580e9603d74476f156753993f888c46 Mon Sep 17 00:00:00 2001 From: Mykola Dronov <130665807+bc-dronov@users.noreply.github.com> Date: Wed, 29 Nov 2023 15:31:28 +0100 Subject: [PATCH 1/9] feat(payment): PAYPAL-3064 changed default paypal checkout color (#2405) --- CHANGELOG.md | 1 + config.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2ea897af6..587eae2cb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Replace Twitter logo with X logo within social sharing and social link components [#2387](https://github.com/bigcommerce/cornerstone/pull/2387) - Added nvm config [#2389](https://github.com/bigcommerce/cornerstone/pull/2389) - Displaying the Hidden cart_order_source Input Field on PDP page [#2392](https://github.com/bigcommerce/cornerstone/pull/2392) +- Changed default PayPal checkout button color [#2405](https://github.com/bigcommerce/cornerstone/pull/2405) ## 6.12.0 (07-06-2023) - sync package lock file [#2373](https://github.com/bigcommerce/cornerstone/pull/2373) diff --git a/config.json b/config.json index 923371fc55..e89a3fd444 100644 --- a/config.json +++ b/config.json @@ -331,7 +331,7 @@ "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-paypal-checkout-payment-color": "black", "paymentbuttons-paylater-checkout-payment-color": "gold", "paymentbuttons-venmo-checkout-payment-color": "blue", "paymentbuttons-paypal-checkout-payment-label": "checkout", From 0840f0f4fe6b5b48c733cbef9db5c29334c1eac5 Mon Sep 17 00:00:00 2001 From: Mykola Dronov <130665807+bc-dronov@users.noreply.github.com> Date: Fri, 1 Dec 2023 13:40:21 +0100 Subject: [PATCH 2/9] feat(payment): PAYPAL-3064 changed default paypal button size (#2406) --- CHANGELOG.md | 1 + config.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 587eae2cb1..f3040d044e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added nvm config [#2389](https://github.com/bigcommerce/cornerstone/pull/2389) - Displaying the Hidden cart_order_source Input Field on PDP page [#2392](https://github.com/bigcommerce/cornerstone/pull/2392) - Changed default PayPal checkout button color [#2405](https://github.com/bigcommerce/cornerstone/pull/2405) +- Changed default PayPal checkout button size [#2406](https://github.com/bigcommerce/cornerstone/pull/2406) ## 6.12.0 (07-06-2023) - sync package lock file [#2373](https://github.com/bigcommerce/cornerstone/pull/2373) diff --git a/config.json b/config.json index e89a3fd444..f757a5d4bc 100644 --- a/config.json +++ b/config.json @@ -338,7 +338,7 @@ "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-checkout-payment-size": "large", "paymentbuttons-paypal-color": "gold", "paymentbuttons-paypal-shape": "rect", "paymentbuttons-paypal-label": "checkout", From 99a7a421bd2700f4eac106f90ef0dd9b494c4661 Mon Sep 17 00:00:00 2001 From: Yevhenii Buliuk <82589781+bc-yevhenii-buliuk@users.noreply.github.com> Date: Tue, 5 Dec 2023 21:46:17 +0200 Subject: [PATCH 3/9] fix(storefront): BCTHEME-1646 Top Global Region Image Widget overlaps the mobile menu (#2402) --- CHANGELOG.md | 7 ++++--- assets/scss/components/stencil/navPages/_navPages.scss | 1 - 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3040d044e..81dceb014d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Display fees on cart page [#2376](https://github.com/bigcommerce/cornerstone/pull/2376) - Replace Twitter logo with X logo within social sharing and social link components [#2387](https://github.com/bigcommerce/cornerstone/pull/2387) - Added nvm config [#2389](https://github.com/bigcommerce/cornerstone/pull/2389) -- Displaying the Hidden cart_order_source Input Field on PDP page [#2392](https://github.com/bigcommerce/cornerstone/pull/2392) -- Changed default PayPal checkout button color [#2405](https://github.com/bigcommerce/cornerstone/pull/2405) -- Changed default PayPal checkout button size [#2406](https://github.com/bigcommerce/cornerstone/pull/2406) +- Displaying the Hidden cart_order_source Input Field on PDP page [#2392](https://github.com/bigcommerce/cornerstone/pull/2392) +- Top Global Region Image Widget overlaps the mobile menu [#2402](https://github.com/bigcommerce/cornerstone/pull/2402) +- Changed default PayPal checkout button color [#2405](https://github.com/bigcommerce/cornerstone/pull/2405) +- Changed default PayPal checkout button size [#2406](https://github.com/bigcommerce/cornerstone/pull/2406) ## 6.12.0 (07-06-2023) - sync package lock file [#2373](https://github.com/bigcommerce/cornerstone/pull/2373) diff --git a/assets/scss/components/stencil/navPages/_navPages.scss b/assets/scss/components/stencil/navPages/_navPages.scss index eec555a232..4eaab36357 100644 --- a/assets/scss/components/stencil/navPages/_navPages.scss +++ b/assets/scss/components/stencil/navPages/_navPages.scss @@ -56,7 +56,6 @@ &.is-open { display: block; padding-top: $header-height; - z-index: 0; } } From e35b2085b41e6b37ffd6ed3ade7d677eb09ac6ae Mon Sep 17 00:00:00 2001 From: bc-vlad-dlogush <83779098+bc-vlad-dlogush@users.noreply.github.com> Date: Wed, 6 Dec 2023 11:36:32 +0200 Subject: [PATCH 4/9] fix(storefront): BCTHEME-1748 Check lang helpers usage and existence of key in translation file (#2403) Co-authored-by: Vlad Dlogush <31504758+VladDlogush@users.noreply.github.com> --- CHANGELOG.md | 1 + lang/en-CA.json | 5 ----- lang/fr-CA.json | 5 ----- 3 files changed, 1 insertion(+), 10 deletions(-) delete mode 100644 lang/en-CA.json delete mode 100644 lang/fr-CA.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 81dceb014d..064c6f0eec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ 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 +- Check lang helpers usage and existence of key in translation file [#2403](https://github.com/bigcommerce/cornerstone/pull/2403) - Display fees on cart page [#2376](https://github.com/bigcommerce/cornerstone/pull/2376) - Replace Twitter logo with X logo within social sharing and social link components [#2387](https://github.com/bigcommerce/cornerstone/pull/2387) - Added nvm config [#2389](https://github.com/bigcommerce/cornerstone/pull/2389) diff --git a/lang/en-CA.json b/lang/en-CA.json deleted file mode 100644 index 20aa218fe7..0000000000 --- a/lang/en-CA.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "header": { - "welcome_back": "Good day, {name}" - } -} diff --git a/lang/fr-CA.json b/lang/fr-CA.json deleted file mode 100644 index f41bcd8ac2..0000000000 --- a/lang/fr-CA.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "header": { - "welcome_back": "Bonjour, {name}" - } -} From 89db4390cf2a6f564f321eda7fcbbd8687a6bef3 Mon Sep 17 00:00:00 2001 From: Nikita Puzanenko Date: Fri, 15 Dec 2023 05:16:58 -0600 Subject: [PATCH 5/9] fix(storefront): PSE-868 Pagebuilder menu items are in the wrong case (#2407) --- CHANGELOG.md | 1 + schemaTranslations.json | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 064c6f0eec..89bdd896fd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Top Global Region Image Widget overlaps the mobile menu [#2402](https://github.com/bigcommerce/cornerstone/pull/2402) - Changed default PayPal checkout button color [#2405](https://github.com/bigcommerce/cornerstone/pull/2405) - Changed default PayPal checkout button size [#2406](https://github.com/bigcommerce/cornerstone/pull/2406) +- Change case of Page builder menu item text [#2407](https://github.com/bigcommerce/cornerstone/pull/2407) ## 6.12.0 (07-06-2023) - sync package lock file [#2373](https://github.com/bigcommerce/cornerstone/pull/2373) diff --git a/schemaTranslations.json b/schemaTranslations.json index 83b049b340..2f3d478983 100644 --- a/schemaTranslations.json +++ b/schemaTranslations.json @@ -1296,7 +1296,7 @@ "pl": "Granica pola aktywna" }, "i18n.HeaderAndFooter": { - "default": "Header & Footer", + "default": "Header and footer", "fr": "En-tête et pied de page", "it": "Intestazione e piè di pagina", "zh": "页眉和页脚", @@ -2214,7 +2214,7 @@ "pl": "Mała" }, "i18n.HomePage": { - "default": "Home Page", + "default": "Homepage", "fr": "Page d'accueil", "it": "Homepage", "zh": "主页", @@ -3546,7 +3546,7 @@ "pl": "Standard" }, "i18n.ButtonsAndIcons": { - "default": "Buttons & Icons", + "default": "Buttons and icons", "fr": "Boutons et icônes", "it": "Pulsanti e icone", "zh": "按钮与图标", @@ -3924,7 +3924,7 @@ "pl": "Pole wyboru i ikona radia" }, "i18n.CheckoutPage": { - "default": "Checkout Page", + "default": "Checkout page", "fr": "Page de paiement", "it": "Pagina di checkout", "zh": "结账台页面", @@ -4734,7 +4734,7 @@ "pl": "Kolor tekstu tostów" }, "i18n.PaymentButtons": { - "default": "Payment Buttons", + "default": "Payment buttons", "fr": "Boutons de paiement", "it": "Pulsanti di pagamento", "zh": "付款按钮", @@ -5508,7 +5508,7 @@ "pl": "Brak" }, "i18n.PaymentBanners": { - "default": "Payment Banners", + "default": "Payment banners", "fr": "Bannières de paiement", "it": "Banner di pagamento", "zh": "付款横幅", From 32b097134d11e699346e33f94d458e0681f0910f Mon Sep 17 00:00:00 2001 From: Yevhenii Buliuk <82589781+bc-yevhenii-buliuk@users.noreply.github.com> Date: Fri, 15 Dec 2023 13:44:59 +0200 Subject: [PATCH 6/9] fix(storefront): BCTHEME-1626 Please Select a file popup forces shopper to re-upload file if the option type is File Upload and is set to required (#2409) --- CHANGELOG.md | 1 + templates/components/cart/modals/configure-product.html | 6 +++--- templates/components/products/options/input-file.html | 9 +++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89bdd896fd..60349d53d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Replace Twitter logo with X logo within social sharing and social link components [#2387](https://github.com/bigcommerce/cornerstone/pull/2387) - Added nvm config [#2389](https://github.com/bigcommerce/cornerstone/pull/2389) - Displaying the Hidden cart_order_source Input Field on PDP page [#2392](https://github.com/bigcommerce/cornerstone/pull/2392) +- 'Please Select a file' popup forces shopper to re-upload file if the option type is 'File Upload' and is set to required [#2409](https://github.com/bigcommerce/cornerstone/pull/2409) - Top Global Region Image Widget overlaps the mobile menu [#2402](https://github.com/bigcommerce/cornerstone/pull/2402) - Changed default PayPal checkout button color [#2405](https://github.com/bigcommerce/cornerstone/pull/2405) - Changed default PayPal checkout button size [#2406](https://github.com/bigcommerce/cornerstone/pull/2406) diff --git a/templates/components/cart/modals/configure-product.html b/templates/components/cart/modals/configure-product.html index 6a416a89e4..c829970523 100644 --- a/templates/components/cart/modals/configure-product.html +++ b/templates/components/cart/modals/configure-product.html @@ -1,7 +1,7 @@
-

{{lang 'cart.reconfigure_product' name=product_name}} diff --git a/templates/components/products/options/input-file.html b/templates/components/products/options/input-file.html index a35a2e81bf..12f9dab4a5 100644 --- a/templates/components/products/options/input-file.html +++ b/templates/components/products/options/input-file.html @@ -5,7 +5,13 @@ {{> components/common/requireness-msg}} - + {{#if original_name}} {{{lang 'products.file_option_set' url=file_url name=original_name}}} @@ -19,5 +25,4 @@ {{lang 'products.filetypes'}} {{file_types}} {{/if}}

-

From 88d37a9cb8d91f0f9dd12861186393fe0fd7f0fa Mon Sep 17 00:00:00 2001 From: Daniel Philip Johnson Date: Fri, 15 Dec 2023 15:28:10 +0000 Subject: [PATCH 7/9] chore: correct typo in default it appears deafault (#2410) * chore: correct typo in default it appears deafault Change banner--deafault-backgroundColor to banner--default-backgroundColor Changed inside config and alert.scss where it is being used * chore: update draft changelog --- CHANGELOG.md | 2 ++ assets/scss/components/foundation/alerts/_alerts.scss | 2 +- config.json | 6 +++--- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 60349d53d7..ca2ebbc535 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Changed default PayPal checkout button color [#2405](https://github.com/bigcommerce/cornerstone/pull/2405) - Changed default PayPal checkout button size [#2406](https://github.com/bigcommerce/cornerstone/pull/2406) - Change case of Page builder menu item text [#2407](https://github.com/bigcommerce/cornerstone/pull/2407) +- Corrected typo with the word default previously deafault in config.json [#2410](https://github.com/bigcommerce/cornerstone/pull/2410) + ## 6.12.0 (07-06-2023) - sync package lock file [#2373](https://github.com/bigcommerce/cornerstone/pull/2373) diff --git a/assets/scss/components/foundation/alerts/_alerts.scss b/assets/scss/components/foundation/alerts/_alerts.scss index 4278b420f2..c598d452bf 100644 --- a/assets/scss/components/foundation/alerts/_alerts.scss +++ b/assets/scss/components/foundation/alerts/_alerts.scss @@ -14,7 +14,7 @@ } .alertBox--info { - background-color: stencilColor("banner--deafault-backgroundColor"); + background-color: stencilColor("banner--default-backgroundColor"); color: stencilColor("alert-color-alt"); .alertBox-close { diff --git a/config.json b/config.json index f757a5d4bc..52b1a12f8d 100644 --- a/config.json +++ b/config.json @@ -149,7 +149,7 @@ "color-greyLight": "#999999", "color-greyLighter": "#cccccc", "color-greyLightest": "#e5e5e5", - "banner--deafault-backgroundColor": "#707070", + "banner--default-backgroundColor": "#707070", "button--default-color": "#666666", "button--default-colorHover": "#333333", "button--default-colorActive": "#000000", @@ -474,7 +474,7 @@ "color-greyLight": "#757575", "color-greyLighter": "#666666", "color-greyLightest": "#444444", - "banner--deafault-backgroundColor": "#b7b4b4", + "banner--default-backgroundColor": "#b7b4b4", "button--default-color": "#cccccc", "button--default-colorHover": "#ffffff", "button--default-colorActive": "#ffffff", @@ -684,7 +684,7 @@ "color-greyLight": "#a5a5a5", "color-greyLighter": "#dfdfdf", "color-greyLightest": "#e8e8e8", - "banner--deafault-backgroundColor": "#7D644A", + "banner--default-backgroundColor": "#7D644A", "button--default-color": "#74685c", "button--default-colorHover": "#4f3f2f", "button--default-colorActive": "#917052", From 278a7aa61f1c475df2a988418c09054b343066b9 Mon Sep 17 00:00:00 2001 From: Nikita Puzanenko Date: Tue, 19 Dec 2023 05:27:13 -0600 Subject: [PATCH 8/9] feat(storefront): PSE-805 Add autocomplete to common input fields (#2397) Co-authored-by: Volodymyr Krasnoshapka <88093058+BC-krasnoshapka@users.noreply.github.com> --- CHANGELOG.md | 2 +- templates/components/account/edit-account.html | 8 ++++---- templates/components/cart/shipping-estimator.html | 2 +- templates/components/common/subscription-form.html | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ca2ebbc535..0e60c73fa6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Changed default PayPal checkout button size [#2406](https://github.com/bigcommerce/cornerstone/pull/2406) - Change case of Page builder menu item text [#2407](https://github.com/bigcommerce/cornerstone/pull/2407) - Corrected typo with the word default previously deafault in config.json [#2410](https://github.com/bigcommerce/cornerstone/pull/2410) - +- Adding autocomplete to common input fields [2397](https://github.com/bigcommerce/cornerstone/pull/2397) ## 6.12.0 (07-06-2023) - sync package lock file [#2373](https://github.com/bigcommerce/cornerstone/pull/2373) diff --git a/templates/components/account/edit-account.html b/templates/components/account/edit-account.html index 19fc9d06dd..ce560ab78a 100644 --- a/templates/components/account/edit-account.html +++ b/templates/components/account/edit-account.html @@ -10,26 +10,26 @@ {{lang 'account.settings.first_name' }} {{lang 'common.required' }} - +
- +
- +
- +
{{#each forms.edit_account.fields}} {{{dynamicComponent 'components/common/forms'}}} diff --git a/templates/components/cart/shipping-estimator.html b/templates/components/cart/shipping-estimator.html index e1b98c2f27..e1e9655b2f 100644 --- a/templates/components/cart/shipping-estimator.html +++ b/templates/components/cart/shipping-estimator.html @@ -65,7 +65,7 @@
- +
diff --git a/templates/components/common/subscription-form.html b/templates/components/common/subscription-form.html index 27b8149bdf..555d9d6201 100644 --- a/templates/components/common/subscription-form.html +++ b/templates/components/common/subscription-form.html @@ -17,6 +17,7 @@

{{lang 'newsletter.subscribe'}}

placeholder="{{lang 'newsletter.email_placeholder'}}" aria-describedby="alertBox-message-text" aria-required="true" + autocomplete="email" required > Date: Tue, 26 Dec 2023 14:51:15 +0200 Subject: [PATCH 9/9] feat(storefront): BCTHEME-1750 Update Shop By Price Widget (#2408) --- CHANGELOG.md | 1 + assets/js/theme/category.js | 16 +++++-- assets/js/theme/common/faceted-search.js | 14 ++++++- .../stencil/facetedSearch/_facetedSearch.scss | 4 ++ assets/scss/layouts/sidebar/_block.scss | 6 +++ .../components/category/shop-by-price.html | 37 ++++------------ templates/components/category/sidebar.html | 2 +- .../faceted-search/facets/range.html | 42 +------------------ .../components/faceted-search/range-form.html | 41 ++++++++++++++++++ 9 files changed, 87 insertions(+), 76 deletions(-) create mode 100644 templates/components/faceted-search/range-form.html diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e60c73fa6..82b4fe243d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Replace Twitter logo with X logo within social sharing and social link components [#2387](https://github.com/bigcommerce/cornerstone/pull/2387) - Added nvm config [#2389](https://github.com/bigcommerce/cornerstone/pull/2389) - Displaying the Hidden cart_order_source Input Field on PDP page [#2392](https://github.com/bigcommerce/cornerstone/pull/2392) +- Update Shop By Price Widget [#2408](https://github.com/bigcommerce/cornerstone/pull/2408) - 'Please Select a file' popup forces shopper to re-upload file if the option type is 'File Upload' and is set to required [#2409](https://github.com/bigcommerce/cornerstone/pull/2409) - Top Global Region Image Widget overlaps the mobile menu [#2402](https://github.com/bigcommerce/cornerstone/pull/2402) - Changed default PayPal checkout button color [#2405](https://github.com/bigcommerce/cornerstone/pull/2405) diff --git a/assets/js/theme/category.js b/assets/js/theme/category.js index aa3e5fcbd9..b3b30cb69c 100644 --- a/assets/js/theme/category.js +++ b/assets/js/theme/category.js @@ -36,11 +36,21 @@ export default class Category extends CatalogPage { compareProducts(this.context); - if ($('#facetedSearch').length > 0) { - this.initFacetedSearch(); - } else { + this.initFacetedSearch(); + + if (!$('#facetedSearch').length) { this.onSortBySubmit = this.onSortBySubmit.bind(this); hooks.on('sortBy-submitted', this.onSortBySubmit); + + // Refresh range view when shop-by-price enabled + const urlParams = new URLSearchParams(window.location.search); + + if (urlParams.has('search_query')) { + $('.reset-filters').show(); + } + + $('input[name="price_min"]').attr('value', urlParams.get('price_min')); + $('input[name="price_max"]').attr('value', urlParams.get('price_max')); } $('a.reset-btn').on('click', () => this.setLiveRegionsAttributes($('span.reset-message'), 'status', 'polite')); diff --git a/assets/js/theme/common/faceted-search.js b/assets/js/theme/common/faceted-search.js index 48b51505db..a94adda37f 100644 --- a/assets/js/theme/common/faceted-search.js +++ b/assets/js/theme/common/faceted-search.js @@ -17,8 +17,8 @@ const defaultOptions = { priceRangeErrorSelector: '#facet-range-form .form-inlineMessage', priceRangeFieldsetSelector: '#facet-range-form .form-fieldset', priceRangeFormSelector: '#facet-range-form', - priceRangeMaxPriceSelector: '#facet-range-form [name=max_price]', - priceRangeMinPriceSelector: '#facet-range-form [name=min_price]', + priceRangeMaxPriceSelector: $('#facetedSearch').length ? '#facet-range-form [name=max_price]' : '#facet-range-form [name=price_max]', + priceRangeMinPriceSelector: $('#facetedSearch').length ? '#facet-range-form [name=min_price]' : '#facet-range-form [name=price_min]', showMoreToggleSelector: '#facetedSearch .accordion-content .toggleLink', facetedSearchFilterItems: '#facetedSearch-filterItems .form-input', modal: modalFactory('#modal')[0], @@ -131,6 +131,16 @@ class FacetedSearch { // Refresh view with new content this.refreshView(content); + + // Refresh range view when shop-by-price enabled + const urlParams = new URLSearchParams(window.location.search); + + if (urlParams.has('search_query')) { + $('.reset-filters').show(); + } + + $('input[name="price_min"]').attr('value', urlParams.get('price_min')); + $('input[name="price_max"]').attr('value', urlParams.get('price_max')); }); } diff --git a/assets/scss/components/stencil/facetedSearch/_facetedSearch.scss b/assets/scss/components/stencil/facetedSearch/_facetedSearch.scss index 3ed11b24c4..8b1d32969c 100644 --- a/assets/scss/components/stencil/facetedSearch/_facetedSearch.scss +++ b/assets/scss/components/stencil/facetedSearch/_facetedSearch.scss @@ -122,3 +122,7 @@ font-weight: bold; } } + +.reset-filters { + display: none; +} diff --git a/assets/scss/layouts/sidebar/_block.scss b/assets/scss/layouts/sidebar/_block.scss index dfe601e22c..62e1352b8a 100644 --- a/assets/scss/layouts/sidebar/_block.scss +++ b/assets/scss/layouts/sidebar/_block.scss @@ -18,4 +18,10 @@ font-size: remCalc(15px); margin-top: 0; text-transform: inherit; + + &.heading-price { + @media (min-width: $screen-medium) { + margin-top: -(remCalc(12px)); + } + } } diff --git a/templates/components/category/shop-by-price.html b/templates/components/category/shop-by-price.html index d1122b67f4..b913072680 100644 --- a/templates/components/category/shop-by-price.html +++ b/templates/components/category/shop-by-price.html @@ -1,33 +1,12 @@ -{{#and theme_settings.shop_by_price_visibility shop_by_price}} +{{#and theme_settings.shop_by_price_visibility category.shop_by_price}}
-

{{lang 'category.shop_by_price'}}

- + {{> components/faceted-search/range-form shop_by_price=theme_settings.shop_by_price_visibility}} + +
+ {{lang 'category.reset'}} + {{lang 'category.filter_reset_announcement'}} +
{{/and}} diff --git a/templates/components/category/sidebar.html b/templates/components/category/sidebar.html index 17b01fcc45..7f7d9d803b 100644 --- a/templates/components/category/sidebar.html +++ b/templates/components/category/sidebar.html @@ -15,6 +15,6 @@

{{category.name}}

{{#if category.faceted_search_enabled}} {{> components/faceted-search/index category}} {{else}} - {{> components/category/shop-by-price shop_by_price=category.shop_by_price category_url=category.url}} + {{> components/category/shop-by-price}} {{/if}} diff --git a/templates/components/faceted-search/facets/range.html b/templates/components/faceted-search/facets/range.html index 6fd95bc3d6..4603de546e 100644 --- a/templates/components/faceted-search/facets/range.html +++ b/templates/components/faceted-search/facets/range.html @@ -2,46 +2,6 @@ {{> components/faceted-search/faceted-search-navigation}}
-
- - {{#if this.sort}} - - {{/if}} -
-
-
- -
- -
- -
- -
- -
-
- -
-
-
+ {{> components/faceted-search/range-form}}
diff --git a/templates/components/faceted-search/range-form.html b/templates/components/faceted-search/range-form.html new file mode 100644 index 0000000000..a522ac1b2a --- /dev/null +++ b/templates/components/faceted-search/range-form.html @@ -0,0 +1,41 @@ +
+ + {{#if this.sort}} + + {{/if}} +
+
+
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+