Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Added mobile Currency / Locale switcher UI
Damian Legawiec44a80086d614
diff --git a/frontend/app/assets/javascripts/spree/frontend/currency.js b/frontend/app/assets/javascripts/spree/frontend/currency.jsindex 51224b158b..34ca3da2f8 100644--- a/frontend/app/assets/javascripts/spree/frontend/currency.js+++ b/frontend/app/assets/javascripts/spree/frontend/currency.js@@ -4,9 +4,7 @@ Spree.ready(function ($) {if (currencySelect.length) {currencySelect.on('change', function () {currencySelect.attr('disabled')- var selectedCurrency = currencySelect.val()-- window.location = Spree.routes.set_currency(selectedCurrency)+ window.location = Spree.routes.set_currency(this.value)})}})diff --git a/frontend/app/assets/javascripts/spree/frontend/locale.js b/frontend/app/assets/javascripts/spree/frontend/locale.jsindex 4ddc81ecde..a6dd5da8e6 100644--- a/frontend/app/assets/javascripts/spree/frontend/locale.js+++ b/frontend/app/assets/javascripts/spree/frontend/locale.js@@ -4,9 +4,7 @@ Spree.ready(function ($) {if (localeSelect.length) {localeSelect.on('change', function () {localeSelect.attr('disabled')- var selectedLocale = localeSelect.val()-- window.location = Spree.routes.set_locale(selectedLocale)+ window.location = Spree.routes.set_locale(this.value)})}})diff --git a/frontend/app/assets/stylesheets/spree/frontend/application.scss b/frontend/app/assets/stylesheets/spree/frontend/application.scssindex 77243fb178..e2a874d692 100644--- a/frontend/app/assets/stylesheets/spree/frontend/application.scss+++ b/frontend/app/assets/stylesheets/spree/frontend/application.scss@@ -32,7 +32,6 @@@import "spree/frontend/views/spree/errors/not_found";@import "spree/frontend/views/spree/shared/carousel/thumbnails";@import "spree/frontend/views/spree/shared/carousel/single";-@import "spree/frontend/views/spree/shared/change_store";@import "spree/frontend/views/spree/home/index";@import "spree/frontend/views/spree/user_passwords/user_passwords";@import "spree/frontend/views/spree/user_sessions/new";diff --git a/frontend/app/views/spree/shared/_currency_dropdown.html.erb b/frontend/app/views/spree/shared/_currency_dropdown.html.erbindex 0fd52e274c..a897e1d2f6 100644--- a/frontend/app/views/spree/shared/_currency_dropdown.html.erb+++ b/frontend/app/views/spree/shared/_currency_dropdown.html.erb@@ -6,7 +6,7 @@</label><%= select_tag(:switch_to_currency,options_for_select(supported_currency_options, current_currency),- class: 'form-control') %>+ class: 'custom-select w-100') %><noscript><%= submit_tag %></noscript></div><% end %>diff --git a/frontend/app/views/spree/shared/_internationalization_options.html.erb b/frontend/app/views/spree/shared/_internationalization_options.html.erbindex f70e3c74dc..de18320ef8 100644--- a/frontend/app/views/spree/shared/_internationalization_options.html.erb+++ b/frontend/app/views/spree/shared/_internationalization_options.html.erb@@ -1,43 +1,31 @@-<% globe_icon = icon(name: 'global',+<% if (defined?(should_render_store_chooser?) && should_render_store_chooser?) || (defined?(should_render_internationalization_dropdown?) && should_render_internationalization_dropdown?) %>+ <li class="d-none d-xl-block internationalization-options">+ <div class="dropdown navbar-right-dropdown">+ <button id="internationalization-button-desktop" type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle" aria-label="<%= Spree.t(:internationalization) %>">+ <%= icon(name: 'global',classes: 'd-none d-xl-inline-block',width: 41,height: 36) %>-<% arrow_icon = icon(name: 'arrow-down',+ <%= icon(name: 'arrow-down',classes: 'd-inline-block d-xl-none',width: 15,height: 15) %>--<% if defined?(should_render_store_chooser?) && should_render_store_chooser? %>- <li class="d-none d-xl-block change-store">- <div class="dropdown navbar-right-dropdown">- <button id="stores-button" type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle" aria-label="<%= Spree.t('nav_bar.change_country') %>">- <%= globe_icon %>- <%= arrow_icon %></button>- <div id="stores_list" class="dropdown-menu dropdown-menu-right text-right">- <% stores.each do |store| %>- <div class="pl-3 d-flex justify-content-between align-items-center <%= 'active' if store.id == current_store.id %>">- <span class="flag-icon flag-icon-<%= store_country_iso(store) %>"></span>- <%= link_to "#{store_locale_name(store)} (#{store_currency_symbol(store)})", store.formatted_url, class: 'dropdown-item text-uppercase' %>- </div>+ <div id="internationalization-options-desktop" class="dropdown-menu dropdown-menu-right text-left">+ <% if (defined?(should_render_store_chooser?) && should_render_store_chooser?) %>+ <% stores.each do |store| %>+ <div class="pl-3 d-flex justify-content-between align-items-center stores-list">+ <%= country_flag_icon(store_country_iso(store)) %>+ <%= store_link(store, class: "dropdown-item text-uppercase #{'font-weight-bold' if current_store == store}") %>+ </div>+ <% end %>+ <% else %>+ <%= render 'spree/shared/locale_dropdown' %>+ <div class="dropdown-divider"></div>+ <%= render 'spree/shared/currency_dropdown' %><% end %></div></div></li>-<% elsif defined?(should_render_internationalization_dropdown?) && should_render_internationalization_dropdown? %>- <li class="d-none d-xl-block change-store">- <div class="dropdown navbar-right-dropdown">- <button id="internationalization-button" type="button" data-toggle="dropdown" class="navbar-right-dropdown-toggle" aria-label="<%= Spree.t(:internationalization) %>">- <%= globe_icon %>- <%= arrow_icon %>- </button>-- <div id="internationalization-options" class="dropdown-menu dropdown-menu-right text-left">- <%= render 'spree/shared/locale_dropdown' %>- <div class="dropdown-divider"></div>- <%= render 'spree/shared/currency_dropdown' %>- </div>- </div>- </li><% end %>diff --git a/frontend/app/views/spree/shared/_locale_dropdown.html.erb b/frontend/app/views/spree/shared/_locale_dropdown.html.erbindex e4ccb8f189..ceb0c66c23 100644--- a/frontend/app/views/spree/shared/_locale_dropdown.html.erb+++ b/frontend/app/views/spree/shared/_locale_dropdown.html.erb@@ -6,7 +6,7 @@</label><%= select_tag(:switch_to_locale,options_for_select(supported_locales_options, I18n.locale),- class: 'form-control') %>+ class: 'custom-select w-100') %><noscript><%= submit_tag %></noscript></div><% end %>diff --git a/frontend/app/views/spree/shared/_mobile_change_store.html.erb b/frontend/app/views/spree/shared/_mobile_change_store.html.erbdeleted file mode 100644index c726548399..0000000000--- a/frontend/app/views/spree/shared/_mobile_change_store.html.erb+++ /dev/null@@ -1,30 +0,0 @@-<% if stores.size > 1 %>- <li class="d-flex justify-content-between align-items-center mobile-navigation-list-item">- <span class="w-75"><%= Spree.t('nav_bar.change_country') %></span>- <a class="w-25 text-right mobile-navigation-category-link" data-category="countries" href="#" aria-label="<%= Spree.t('nav_bar.change_country') %>">- <%= icon(name: 'arrow-right',- classes: 'd-sm-none spree-icon-arrow spree-icon-arrow-right',- width: 16,- height: 16) %>- <%= icon(name: 'arrow-right',- classes: 'd-none d-sm-inline spree-icon-arrow spree-icon-arrow-right',- width: 14,- height: 27) %>- </a>-- <ul class="list-unstyled position-absolute mobile-navigation-sublist" data-category="countries">- <li class="text-center font-weight-bold mobile-navigation-sublist-header">- <%= Spree.t('nav_bar.change_country') %>- </li>- <% stores.each do |store| %>- <li class="d-flex justify-content-between align-items-center mobile-navigation-list-item">- <span class="flag-icon flag-icon-<%= store_country_iso(store) %>"></span>- <%= link_to "//#{store.url}", class: 'dropdown-item text-uppercase d-flex' do %>- <span><%= store.default_country&.name %></span>- <span class="text-right w-100"><%= store_currency_symbol(store) %></span>- <% end %>- </li>- <% end %>- </ul>- </li>-<% end %>diff --git a/frontend/app/views/spree/shared/_mobile_internationalization_options.html.erb b/frontend/app/views/spree/shared/_mobile_internationalization_options.html.erbnew file mode 100644index 0000000000..2f8c66a6fc--- /dev/null+++ b/frontend/app/views/spree/shared/_mobile_internationalization_options.html.erb@@ -0,0 +1,37 @@+<% if (defined?(should_render_store_chooser?) && should_render_store_chooser?) || (defined?(should_render_internationalization_dropdown?) && should_render_internationalization_dropdown?) %>+ <% link_title = "#{Spree.t(:choose_currency)} / #{Spree.t('i18n.language')}" %>++ <li class="d-flex justify-content-between align-items-center mobile-navigation-list-item">+ <span class="w-75"><%= link_title %></span>+ <a class="w-25 text-right mobile-navigation-category-link" data-category="internationalization" href="#" aria-label="<%= link_title %>">+ <%= icon(name: 'arrow-right',+ classes: 'd-sm-none spree-icon-arrow spree-icon-arrow-right',+ width: 16,+ height: 16) %>+ <%= icon(name: 'arrow-right',+ classes: 'd-none d-sm-inline spree-icon-arrow spree-icon-arrow-right',+ width: 14,+ height: 27) %>+ </a>++ <ul class="list-unstyled position-absolute mobile-navigation-sublist" data-category="internationalization">+ <li class="text-center font-weight-bold mobile-navigation-sublist-header">+ <%= Spree.t(:internationalization) %>+ </li>+ <% if (defined?(should_render_store_chooser?) && should_render_store_chooser?) %>+ <% stores.each do |store| %>+ <li class="d-flex justify-content-between align-items-center mobile-navigation-list-item">+ <%= country_flag_icon(store_country_iso(store)) %>+ <%= store_link(store, class: "dropdown-item text-uppercase d-flex #{'font-weight-bold' if current_store == store}") %>+ </li>+ <% end %>+ <% else %>+ <div class="mt-4 pt-4">+ <%= render 'spree/shared/locale_dropdown' %>+ <div class="dropdown-divider mt-4 pb-4"></div>+ <%= render 'spree/shared/currency_dropdown' %>+ </div>+ <% end %>+ </ul>+ </li>+<% end %>diff --git a/frontend/app/views/spree/shared/_mobile_navigation.html.erb b/frontend/app/views/spree/shared/_mobile_navigation.html.erbindex f98266e94c..5acf3d23ed 100644--- a/frontend/app/views/spree/shared/_mobile_navigation.html.erb+++ b/frontend/app/views/spree/shared/_mobile_navigation.html.erb@@ -7,11 +7,8 @@width: 26,height: 26) %></button>- <figure class="logo header-spree-fluid-logo" data-hook>- <%= logo %>- </figure><div id="top-nav-bar-mobile" class="m-0 p-0 header-spree-fluid-secondary-navigation" data-hook>- <button id="mobile-navigation-close-button" aria-label="<%= Spree.t('nav_bar.close_menu') %>">+ <button id="mobile-navigation-close-button" aria-label="<%= Spree.t(:close) %>"><%= icon(name: 'close',classes: 'd-inline',width: 26,@@ -44,7 +41,7 @@<% end %></li><% end %>- <%= render partial: 'spree/shared/mobile_change_store' %>+ <%= render partial: 'spree/shared/mobile_internationalization_options' %></ul></div><% end %>diff --git a/frontend/spec/features/cart_spec.rb b/frontend/spec/features/cart_spec.rbindex 3a02d7555b..b024681911 100644--- a/frontend/spec/features/cart_spec.rb+++ b/frontend/spec/features/cart_spec.rb@@ -131,12 +131,10 @@ describe 'Cart', type: :feature, inaccessible: true, js: true doit 'will change order currency and recalulate prices' doexpect(page).to have_text '$19.99'- find('#header #internationalization-button').click- select 'EUR', from: 'switch_to_currency'+ switch_to_currency('EUR')expect(page).to have_text '€16.00'expect(order.reload.currency).to eq('EUR')- find('#header #internationalization-button').click- select 'GBP', from: 'switch_to_currency'+ switch_to_currency('GBP')expect(page).to have_text '£23.00'expect(order.reload.currency).to eq('GBP')enddiff --git a/frontend/spec/features/locale_spec.rb b/frontend/spec/features/locale_spec.rbindex 42ea56f633..f7c3e8d460 100644--- a/frontend/spec/features/locale_spec.rb+++ b/frontend/spec/features/locale_spec.rb@@ -102,8 +102,7 @@ describe 'setting locale', type: :feature dobefore dostore.update(default_locale: 'en', supported_locales: 'en,fr')visit spree.cart_path- find('#header #internationalization-button').click- select 'Français (FR)', from: 'Language'+ switch_to_locale('Français (FR)')endit_behaves_like 'translates cart page'diff --git a/frontend/spec/features/main_nav_bar_spec.rb b/frontend/spec/features/main_nav_bar_spec.rbindex 284ed4203c..8039a7108a 100644--- a/frontend/spec/features/main_nav_bar_spec.rb+++ b/frontend/spec/features/main_nav_bar_spec.rb@@ -3,12 +3,8 @@ require 'spec_helper'describe 'Main navigation bar', type: :feature dodescribe 'change store' doshared_examples 'change store not available' do- it 'does not show currency selector button' do- expect(page).not_to have_button(id: 'stores-button')- end-it 'does not render stores list' do- expect(page).not_to have_selector('div#stores_list')+ expect(page).not_to have_selector('div.stores-list')endend@@ -41,12 +37,12 @@ describe 'Main navigation bar', type: :feature dolet(:second_url) { second_store.formatted_url }it 'shows currency selector button' do- within('.change-store') { expect(page).to have_button(id: 'stores-button') }+ within('.internationalization-options') { expect(page).to have_button(id: 'internationalization-button-desktop') }endit 'currency selector button shows a links list to currencies' do- within('.change-store') { expect(page).to have_link(first_link_name, href: first_url) }- within('.change-store') { expect(page).to have_link(second_link_name, href: second_url) }+ within('.internationalization-options') { expect(page).to have_link(first_link_name, href: first_url) }+ within('.internationalization-options') { expect(page).to have_link(second_link_name, href: second_url) }endendenddiff --git a/frontend/spec/features/product_prices_spec.rb b/frontend/spec/features/product_prices_spec.rbindex ba220ef1a2..c187eadce5 100644--- a/frontend/spec/features/product_prices_spec.rb+++ b/frontend/spec/features/product_prices_spec.rb@@ -14,15 +14,13 @@ describe 'Product with prices in multiple currencies', type: :feature, js: trueit 'can switch by currency', :js dovisit spree.product_path(product)expect(page).to have_text '$19.99'- find('#header #internationalization-button').click- select 'EUR', from: 'switch_to_currency'+ switch_to_currency('EUR')expect(page).to have_text '€16.00'- find('#header #internationalization-button').click- select 'GBP', from: 'switch_to_currency'+ switch_to_currency('GBP')expect(page).to have_text '£23.00'visit spree.products_pathexpect(page).to have_text '£23.00'- find('#header #internationalization-button').click+ open_i18n_menuexpect(page).to have_select('switch_to_currency', selected: 'GBP')endenddiff --git a/frontend/spec/support/internationalization.rb b/frontend/spec/support/internationalization.rbnew file mode 100644index 0000000000..6223c3c7cd--- /dev/null+++ b/frontend/spec/support/internationalization.rb@@ -0,0 +1,13 @@+def open_i18n_menu+ find('#header #internationalization-button-desktop').click+end++def switch_to_currency(currency)+ open_i18n_menu+ select currency, from: 'switch_to_currency'+end++def switch_to_locale(locale)+ open_i18n_menu+ select locale, from: 'Language'+end