spree_frontend 4.2.0.rc5 → 4.2.0

data/app/helpers/spree/navigation_helper.rb

@@ -3,7 +3,7 @@ require 'digest'
 module Spree
   module NavigationHelper
     def spree_navigation_data
-      @spree_navigation_data ||= SpreeStorefrontConfig.dig(current_store.code, :navigation) || SpreeStorefrontConfig.dig(:default, :navigation) || []
+      @spree_navigation_data ||= SpreeStorefrontConfig.dig(I18n.locale, :navigation) || SpreeStorefrontConfig.dig(current_store.code, :navigation) || SpreeStorefrontConfig.dig(:default, :navigation) || []
     # safeguard for older Spree installs that don't have spree_navigation initializer
     # or spree.yml file present
     rescue
@@ -28,6 +28,11 @@ module Spree
       )
     end
 
+    def should_render_internationalization_dropdown?
+      (defined?(should_render_locale_dropdown?) && should_render_locale_dropdown?) ||
+        (defined?(should_render_currency_dropdown?) && should_render_currency_dropdown?)
+    end
+
     private
 
     def spree_navigation_data_cache_key

data/app/helpers/spree/store_helper.rb

@@ -0,0 +1,39 @@
+module Spree
+  module StoreHelper
+    def store_country_iso(store = nil)
+      store ||= current_store if defined?(current_store)
+
+      store&.default_country&.iso&.downcase
+    end
+
+    def stores
+      @stores ||= Spree::Store.includes(:default_country).order(:id)
+    end
+
+    def store_currency_symbol(store = nil)
+      store ||= current_store  if defined?(current_store)
+      return unless store&.default_currency
+
+      ::Money::Currency.find(store.default_currency).symbol
+    end
+
+    def store_locale_name(store = nil)
+      store ||= current_store if defined?(current_store)
+      return unless store
+      return store.name if store.default_locale.blank?
+
+      Spree.t('i18n.this_file_language', locale: store.default_locale)
+    end
+
+    def should_render_store_chooser?
+      Spree::Config.show_store_selector && stores.size > 1
+    end
+
+    def store_link(store = nil, html_opts = {})
+      store ||= current_store if defined?(current_store)
+      return unless store
+
+      link_to "#{store_locale_name(store)} (#{store_currency_symbol(store)})", store.formatted_url, **html_opts
+    end
+  end
+end

data/app/helpers/spree/taxons_helper.rb

@@ -5,7 +5,7 @@ module Spree
     # to show the most popular products for a particular taxon (that is an exercise left to the developer.)
     def taxon_preview(taxon, max = 4)
       ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-        TaxonsHelper is deprecated and will be removed in Spree 4.2.
+        TaxonsHelper is deprecated and will be removed in Spree 5.0.
         Please remove any `helper 'spree/taxons'` from your controllers.
       DEPRECATION
       products = taxon.active_products.distinct.select('spree_products.*, spree_products_taxons.position').limit(max)

data/app/views/spree/checkout/_address.html.erb

@@ -1,5 +1,3 @@
-<% @addresses = try_spree_current_user ? user_available_addresses : [] %>
-
 <% if !try_spree_current_user || try_spree_current_user.email.blank? %>
   <div class="row">
     <div class="col-12 mb-4">
@@ -28,10 +26,10 @@
             <%= label_tag :order_use_billing, Spree.t(:use_billing_address), class: 'spree-checkbox-label' %>
           </div>
         <% end %>
-        <% if @addresses.present? %>
+        <% if user_available_addresses.present? %>
         <div class="select_address mb-5">
           <div class="form-group col">
-            <% @addresses.each_with_index do |address, idx| %>
+            <% user_available_addresses.each_with_index do |address, idx| %>
             <div class="row mb-3" id="<%= [address_type, dom_id(address)].join('_') %>">
               <label class="form-check-label spree-radio-label col-8">
                 <%= form.radio_button "#{address_name}_id", address.id, checked: (address.id == try_spree_current_user["#{address_name}_id"] || idx == 0) %>

data/app/views/spree/locale/index.html.erb

@@ -0,0 +1 @@
+<%= render 'spree/shared/locale_dropdown' %>

data/app/views/spree/orders/_line_item.html.erb

@@ -3,7 +3,7 @@
 <%= order_form.fields_for :line_items, line_item do |item_form| %>
   <div class="d-table-row shopping-cart-item">
     <div class="d-table-cell shopping-cart-item-image" data-hook="cart_item_image">
-      <%= link_to product_image(variant), variant.product %>
+      <%= link_to product_image(variant), spree.product_path(variant.product) %>
     </div>
     <div class="d-table-cell shopping-cart-item-description" data-hook="cart_item_description">
       <h2 class="item-title"><%= link_to line_item.name, spree.product_path(variant.product) %></h2>

data/app/views/spree/products/_color_option_type.html.erb

@@ -9,7 +9,7 @@
         <li>
           <%= label_tag "variant_option_value_id_#{option_type[:id]}_#{option_value[:id]}",
             class: "m-1 m-sm-2 m-md-1 color-select-label",
-            title: option_value[:name],
+            title: option_value[:name]&.humanize,
             data: { toggle: "tooltip", placement: "bottom" } do %>
 
             <%= radio_button_tag "variant_option_value_id_#{option_type[:id]}",

data/app/views/spree/shared/_currency_dropdown.html.erb

@@ -0,0 +1,13 @@
+<% if defined?(should_render_currency_dropdown?) && should_render_currency_dropdown? %>
+  <%= form_tag spree.set_currency_path, method: :get, class: 'px-4 py-3 w-100', id: 'currency-select' do %>
+    <div class="form-group">
+      <label for="switch_to_currency" class="dropdown-header text-center">
+        <%= Spree.t(:choose_currency) %>
+      </label>
+      <%= select_tag(:switch_to_currency,
+        options_for_select(supported_currency_options, current_currency),
+        class: 'custom-select w-100') %>
+      <noscript><%= submit_tag %></noscript>
+    </div>
+  <% end %>
+<% end %>

data/app/views/spree/shared/_footer.html.erb

@@ -68,7 +68,7 @@
               <%= Spree.t('nav_bar.my_account') %>
             </div>
             <div class="pt-2">
-              <%= link_to Spree.t('nav_bar.my_orders'), spree.account_path(anchor: "account-my-orders") %>
+              <%= link_to Spree.t(:my_orders).upcase, spree.account_path(anchor: "account-my-orders") %>
             </div>
           </div>
         <% end %>

data/app/views/spree/shared/_head.html.erb

@@ -8,5 +8,9 @@
 <%= stylesheet_link_tag 'spree/frontend/all', media: 'screen', 'data-turbolinks-track': 'reload' %>
 <%= csrf_meta_tags %>
 <%= render 'spree/shared/paths' %>
+<script>
+  var SPREE_LOCALE = '<%= I18n.locale %>'
+  var SPREE_CURRENCY = '<%= current_currency %>'
+</script>
 <%= javascript_include_tag 'spree/frontend/all', defer: true, 'data-turbolinks-track': 'reload' %>
 <%= yield :head %>

data/app/views/spree/shared/_internationalization_options.html.erb

@@ -0,0 +1,31 @@
+<% 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) %>
+        <%= icon(name: 'arrow-down',
+                classes: 'd-inline-block d-xl-none',
+                width: 15,
+                height: 15) %>
+      </button>
+
+      <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>
+<% end %>

data/app/views/spree/shared/_line_item.html.erb

@@ -1,9 +1,9 @@
 <div class="checkout-confirm-order-details-line-items-line-item w-100 d-table-row">
   <div class="checkout-confirm-order-details-line-items-line-item-name d-table-cell align-middle py-3 py-sm-4">
     <div class="d-flex align-items-lg-center">
-      <%= link_to product_image(line_item.variant), line_item.product %>
+      <%= link_to product_image(line_item.variant), spree.product_path(line_item.product) %>
       <div class="d-flex flex-column mt-2 mt-lg-0">
-        <div><%= link_to line_item.name, line_item.product %></div>
+        <div><%= link_to line_item.name, spree.product_path(line_item.product) %></div>
         <ul class="checkout-confirm-order-details-line-items-line-item-name-options text-uppercase list-unstyled mb-0">
           <% line_item.variant.option_values.sort { |ov| ov.option_type.position }.each do |ov| %>
           <li>

data/app/views/spree/shared/_link_to_account.html.erb

@@ -1,8 +1,8 @@
 <% if try_spree_current_user %>
-  <%= link_to Spree.t('nav_bar.my_account'), spree.account_path, class: 'dropdown-item' if spree.respond_to?(:account_path) %>
-  <%= link_to Spree.t('nav_bar.admin_panel'), spree.admin_orders_path, class: 'dropdown-item text-uppercase' if try_spree_current_user.has_spree_role?(:admin) %>
-  <%= link_to Spree.t('nav_bar.log_out'), spree_logout_path, class: 'dropdown-item', method: :get if defined?(spree_logout_path) %>
+  <%= link_to Spree.t(:my_account).upcase, spree.account_path, class: 'dropdown-item' if spree.respond_to?(:account_path) %>
+  <%= link_to Spree.t('nav_bar.admin_panel'), spree.admin_orders_path(locale: nil), class: 'dropdown-item text-uppercase' if try_spree_current_user.has_spree_role?(:admin) %>
+  <%= link_to Spree.t(:logout).upcase, spree_logout_path, class: 'dropdown-item', method: :get if defined?(spree_logout_path) %>
 <% else %>
-  <%= link_to Spree.t('nav_bar.log_in'), spree_login_path, class: 'dropdown-item' if defined?(spree_login_path) %>
-  <%= link_to Spree.t('nav_bar.sign_up'), spree_signup_path, class: 'dropdown-item' if defined?(spree_signup_path) %>
+  <%= link_to Spree.t(:login).upcase, spree_login_path, class: 'dropdown-item' if defined?(spree_login_path) %>
+  <%= link_to Spree.t(:sign_up).upcase, spree_signup_path, class: 'dropdown-item' if defined?(spree_signup_path) %>
 <% end %>

data/app/views/spree/shared/_locale_dropdown.html.erb

@@ -0,0 +1,13 @@
+<% if should_render_locale_dropdown? %>
+  <%= form_tag spree.set_locale_path, method: :get, class: 'px-4 py-3 w-100', id: 'locale-select' do %>
+    <div class="form-group">
+      <label for="switch_to_locale" class="dropdown-header text-center">
+        <%= Spree.t('i18n.language') %>
+      </label>
+      <%= select_tag(:switch_to_locale,
+        options_for_select(supported_locales_options, I18n.locale),
+        class: 'custom-select w-100') %>
+      <noscript><%= submit_tag %></noscript>
+    </div>
+  <% end %>
+<% end %>

data/app/views/spree/shared/_login.html.erb

@@ -25,7 +25,7 @@
       </div>
     <% end %>
 
-    <%= f.submit Spree.t(:log_in), class: 'btn btn-primary btn-block spree-btn mt-2' %>
+    <%= f.submit Spree.t(:login), class: 'btn btn-primary btn-block spree-btn mt-2' %>
   <% end %>
 
   <% if spree.respond_to?(:recover_password_path) %>

data/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 %>

data/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 %>

data/app/views/spree/shared/_nav_bar.html.erb

@@ -31,5 +31,5 @@
   <li id="link-to-cart">
     <%= render 'spree/shared/cart', class: 'd-inline-block cart-icon', size: 36, item_count: 0 %>
   </li>
-  <%= render partial: 'spree/shared/change_store' %>
+  <%= render partial: 'spree/shared/internationalization_options' %>
 </ul>

data/app/views/spree/shared/_order_details.html.erb

@@ -75,11 +75,11 @@
           <div class="checkout-confirm-order-details-line-items-line-item-name d-table-cell align-middle py-3 py-sm-4">
             <div class="d-flex align-items-lg-center">
               <div class="checkout-confirm-order-details-line-items-line-item-name-image" data-hook="order_item_image">
-                <%= link_to product_image(item.variant), item.product %>
+                <%= link_to product_image(item.variant), spree.product_path(item.product) %>
               </div>
               <div class="d-flex flex-column mt-2 mt-lg-0" data-hook="order_item_description">
                 <div data-hook="order_item_name">
-                  <%= link_to item.name, item.product, class: 'checkout-confirm-order-details-line-items-line-item-name-link' %>
+                  <%= link_to item.name, spree.product_path(item.product), class: 'checkout-confirm-order-details-line-items-line-item-name-link' %>
                 </div>
                 <% unless item.variant.is_master? %>
                   <ul class="checkout-confirm-order-details-line-items-line-item-name-options text-uppercase list-unstyled mb-0">

data/app/views/spree/users/show.html.erb

@@ -57,7 +57,7 @@
         <tbody>
           <% @orders.each do |order| %>
             <tr>
-              <td class="account-page-order-number"><%= link_to order.number, order_url(order), class: "text-primary" %></td>
+              <td class="account-page-order-number"><%= link_to order.number, spree.order_path(order), class: "text-primary" %></td>
               <td class="account-page-order-date"><%= l order.completed_at.to_date %></td>
               <td class="account-page-order-status"><%= Spree.t("order_state.#{order.state}").titleize %></td>
               <td class="account-page-order-payment-state"><%= Spree.t("payment_states.#{order.payment_state}").titleize if order.payment_state %></td>

data/config/routes.rb

@@ -1,39 +1,36 @@
 Spree::Core::Engine.add_routes do
-  root to: 'home#index'
+  scope '(:locale)', locale: /#{Spree.available_locales.join('|')}/, defaults: { locale: nil } do
+    root to: 'home#index'
 
-  resources :products, only: [:index, :show]
+    resources :products, only: [:index, :show]
+    get '/products/:id/related', to: 'products#related'
+    # route globbing for pretty nested taxon and product paths
+    get '/t/*id', to: 'taxons#show', as: :nested_taxons
+    get '/product_carousel/:id', to: 'taxons#product_carousel'
 
-  get '/locale/set', to: 'locale#set'
+    # non-restful checkout stuff
+    patch '/checkout/update/:state', to: 'checkout#update', as: :update_checkout
+    get '/checkout/:state', to: 'checkout#edit', as: :checkout_state
+    get '/checkout', to: 'checkout#edit', as: :checkout
 
-  # non-restful checkout stuff
-  patch '/checkout/update/:state', to: 'checkout#update', as: :update_checkout
-  get '/checkout/:state', to: 'checkout#edit', as: :checkout_state
-  get '/checkout', to: 'checkout#edit', as: :checkout
+    resources :orders, except: [:index, :new, :create, :destroy]
 
-  get '/orders/populate', to: 'orders#populate_redirect'
+    resources :addresses, except: [:show]
 
-  resources :orders, except: [:index, :new, :create, :destroy] do
-    post :populate, on: :collection
-  end
-
-  resources :addresses, except: [:show]
-
-  get '/cart', to: 'orders#edit', as: :cart
-  patch '/cart', to: 'orders#update', as: :update_cart
-  put '/cart/empty', to: 'orders#empty', as: :empty_cart
+    get '/cart', to: 'orders#edit', as: :cart
+    patch '/cart', to: 'orders#update', as: :update_cart
+    put '/cart/empty', to: 'orders#empty', as: :empty_cart
 
-  # route globbing for pretty nested taxon and product paths
-  get '/t/*id', to: 'taxons#show', as: :nested_taxons
-  get '/product_carousel/:id', to: 'taxons#product_carousel'
+    get '/content/cvv', to: 'content#cvv', as: :cvv
+    get '/content/test', to: 'content#test'
+    get '/cart_link', to: 'store#cart_link', as: :cart_link
+    get '/account_link', to: 'store#account_link', as: :account_link
 
-  get '/content/cvv', to: 'content#cvv', as: :cvv
-  get '/content/test', to: 'content#test'
-  get '/cart_link', to: 'store#cart_link', as: :cart_link
-  get '/account_link', to: 'store#account_link', as: :account_link
+    get '/locales', to: 'locale#index', as: :locales
+    get '/locale/set', to: 'locale#set', as: :set_locale
+    get '/currency/set', to: 'currency#set', as: :set_currency
 
-  get '/api_tokens', to: 'store#api_tokens'
-  post '/ensure_cart', to: 'store#ensure_cart'
-  get '/products/:id/related', to: 'products#related'
-
-  get '/currency/set', to: 'currency#set', defaults: { format: :json }, as: :set_currency
+    get '/api_tokens', to: 'store#api_tokens'
+    post '/ensure_cart', to: 'store#ensure_cart'
+  end
 end

data/lib/generators/spree/frontend/copy_storefront/copy_storefront_generator.rb

@@ -1,24 +1,18 @@
 module Spree
   module Frontend
     class CopyStorefrontGenerator < Rails::Generators::Base
-      desc 'Copies storefront from spree frontend to your application'
+      desc 'Copies all storefront views and stylesheets from spree frontend to your application'
 
       def self.source_paths
         [
           File.expand_path('../../../../../app', __dir__),
-          File.expand_path('../../../../../app/assets/images', __dir__),
           File.expand_path('../../../../../app/assets/stylesheets/spree/frontend', __dir__),
-          File.expand_path('../../../../../app/assets/stylesheets/spree/frontend/variables', __dir__)
         ]
       end
 
       def copy_storefront
         directory 'views', './app/views'
-        directory 'noimage', './app/assets/images/noimage'
-        directory 'homepage', './app/assets/images/homepage'
-        directory 'meganav', './app/assets/images/meganav'
         template 'application.scss', './app/assets/stylesheets/spree/frontend/application.scss'
-        template 'variables.scss', './app/assets/stylesheets/spree/frontend/variables/variables.scss'
       end
     end
   end

data/lib/generators/spree/frontend/install/install_generator.rb

@@ -0,0 +1,34 @@
+module Spree
+  module Frontend
+    module Generators
+      class InstallGenerator < Rails::Generators::Base
+        desc 'Copies storefront configuration files for easy customization'
+
+        def self.source_paths
+          [
+            File.expand_path('templates', __dir__),
+            File.expand_path('../templates', "../#{__FILE__}"),
+            File.expand_path('../templates', "../../#{__FILE__}"),
+            File.expand_path('../../../../../app/views/spree', __dir__),
+            File.expand_path('../../../../../app/assets/images', __dir__),
+            File.expand_path('../../../../../app/assets/stylesheets/spree/frontend/variables', __dir__)
+          ]
+        end
+
+        def install
+          # main navigation configuration
+          template 'config/initializers/spree_storefront.rb', 'config/initializers/spree_storefront.rb'
+          template 'config/spree_storefront.yml', 'config/spree_storefront.yml'
+          # static images
+          directory 'noimage', './app/assets/images/noimage'
+          directory 'homepage', './app/assets/images/homepage'
+          directory 'meganav', './app/assets/images/meganav'
+          # SCSS theming
+          template 'variables.scss', './app/assets/stylesheets/spree/frontend/variables/variables.scss'
+          # home page template
+          directory 'home', './app/views/spree/home'
+        end
+      end
+    end
+  end
+end