spree_frontend 4.2.0.rc1 → 4.2.0

data/app/helpers/spree/addresses_helper.rb

@@ -10,7 +10,7 @@ module Spree
           method_name = I18n.t("activerecord.attributes.spree/address.#{method}")
           required = Spree.t(:required)
           form.text_field(method,
-                          class: [is_required ? 'required' : nil, 'spree-flat-input'].compact,
+                          class: ['spree-flat-input'].compact,
                           required: is_required,
                           placeholder: is_required ? "#{method_name} #{required}" : method_name,
                           aria: { label: method_name }) +
@@ -27,7 +27,7 @@ module Spree
       method_name = Spree.t(:zipcode)
       required = Spree.t(:required)
       form.text_field(:zipcode,
-                      class: [is_required ? 'required' : nil, 'spree-flat-input'].compact,
+                      class: ['spree-flat-input'].compact,
                       required: is_required,
                       placeholder: is_required ? "#{method_name} #{required}" : method_name,
                       aria: { label: Spree.t(:zipcode) }) +
@@ -41,14 +41,14 @@ module Spree
       country ||= Spree::Country.find(Spree::Config[:default_country_id])
       have_states = country.states.any?
       state_elements = [
-        form.collection_select(:state_id, country.states.order(:name),
+        form.collection_select(:state_id, checkout_zone_applicable_states_for(country).sort_by(&:name),
                               :id, :name,
                                { prompt: Spree.t(:state) },
-                               class: [have_states ? 'required' : 'hidden', 'spree-flat-select'].compact,
+                               class: ['spree-flat-select'].compact,
                                aria: { label: Spree.t(:state) },
                                disabled: !have_states) +
           form.text_field(:state_name,
-                          class: [!have_states ? 'required' : 'hidden', 'spree-flat-input'].compact,
+                          class: ['spree-flat-input'].compact,
                           aria: { label: Spree.t(:state) },
                           disabled: have_states,
                           placeholder: Spree.t(:state) + " #{Spree.t(:required)}") +
@@ -60,14 +60,25 @@ module Spree
                     class: [!have_states ? 'hidden' : nil, 'position-absolute spree-flat-select-arrow'].compact)
       ].join.tr('"', "'").delete("\n")
 
-      content_tag(:noscript, form.text_field(:state_name, class: 'required')) +
+      content_tag(:noscript, form.text_field(:state_name)) +
         javascript_tag("document.write(\"<span class='d-block position-relative'>#{state_elements.html_safe}</span>\");")
     end
 
     def user_available_addresses
-      return unless try_spree_current_user
+      @user_available_addresses ||= begin
+        return [] unless try_spree_current_user
 
-      try_spree_current_user.addresses.where(country: available_countries)
+        states = current_store.countries_available_for_checkout.each_with_object([]) do |country, memo|
+          memo << current_store.states_available_for_checkout(country)
+        end.flatten
+
+        try_spree_current_user.addresses.
+          where(country_id: states.pluck(:country_id).uniq)
+      end
+    end
+
+    def checkout_zone_applicable_states_for(country)
+      current_store.states_available_for_checkout(country)
     end
   end
 end

data/app/helpers/spree/cache_helper.rb

@@ -0,0 +1,7 @@
+module Spree
+  module CacheHelper
+    def http_cache_enabled?
+      @http_cache_enabled ||= Spree::Frontend::Config[:http_cache_enabled]
+    end
+  end
+end

data/app/helpers/spree/frontend_helper.rb

@@ -7,26 +7,6 @@ module Spree
       @body_class
     end
 
-    def store_country_iso(store)
-      store ||= current_store
-      return unless store
-      return unless store.default_country
-
-      store.default_country.iso.downcase
-    end
-
-    def stores
-      @stores ||= Spree::Store.includes(:default_country)
-    end
-
-    def store_currency_symbol(store)
-      store ||= current_store
-      return unless store
-      return unless store.default_currency
-
-      ::Money::Currency.find(store.default_currency).symbol
-    end
-
     def spree_breadcrumbs(taxon, _separator = '', product = nil)
       return '' if current_page?('/') || taxon.nil?
 
@@ -248,7 +228,7 @@ module Spree
     end
 
     def price_filter_values
-      [
+      @price_filter_values ||= [
         "#{I18n.t('activerecord.attributes.spree/product.less_than')} #{formatted_price(50)}",
         "#{formatted_price(50)} - #{formatted_price(100)}",
         "#{formatted_price(101)} - #{formatted_price(150)}",
@@ -274,12 +254,12 @@ module Spree
     end
 
     def available_option_types_cache_key
-      @available_option_types_cache_key ||= Spree::OptionType.maximum(:updated_at)&.utc&.to_i
+      @available_option_types_cache_key ||= Spree::OptionType.filterable.maximum(:updated_at)&.utc&.to_i
     end
 
     def available_option_types
       @available_option_types ||= Rails.cache.fetch("available-option-types/#{available_option_types_cache_key}") do
-        Spree::OptionType.includes(:option_values).to_a
+        Spree::OptionType.includes(:option_values).filterable.to_a
       end
       @available_option_types
     end
@@ -295,7 +275,17 @@ module Spree
     end
 
     def checkout_available_payment_methods
-      @order.available_payment_methods(current_store)
+      @checkout_available_payment_methods ||= @order.available_payment_methods(current_store)
+    end
+
+    def color_option_type_name
+      @color_option_type_name ||= Spree::OptionType.color&.name
+    end
+
+    def country_flag_icon(country_iso_code = nil)
+      return if country_iso_code.blank?
+
+      content_tag :span, nil, class: "flag-icon flag-icon-#{country_iso_code.downcase}"
     end
 
     private
@@ -314,7 +304,9 @@ module Spree
       end
     end
 
-    def checkout_edit_link(step = 'address')
+    def checkout_edit_link(step = 'address', order = @order)
+      return if order.complete?
+
       classes = 'align-text-bottom checkout-confirm-delivery-informations-link'
 
       link_to spree.checkout_state_path(step), class: classes, method: :get do

data/app/helpers/spree/navigation_helper.rb

@@ -3,7 +3,7 @@ require 'digest'
 module Spree
   module NavigationHelper
     def 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/models/spree/frontend_configuration.rb

@@ -1,7 +1,8 @@
 module Spree
   class FrontendConfiguration < Preferences::Configuration
     preference :coupon_codes_enabled, :boolean, default: true # Determines if we show coupon code form at cart and checkout
-    preference :locale, :string, default: Rails.application.config.i18n.default_locale
+    preference :http_cache_enabled, :boolean, default: true
+    preference :locale, :string, default: nil
     preference :products_filters, :array, default: %w(keywords price sort_by)
     preference :additional_filters_partials, :array, default: %w()
     preference :remember_me_enabled, :boolean, default: true

data/app/views/kaminari/twitter-bootstrap-4/_first_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.first? %>
   <li class="first page-item">
     <%= link_to_unless current_page.first?, inline_svg_tag('pagination-double-arrow-right.svg', size: '13px*16px', class: 'spree-icon-arrow-left'), url, remote: remote, class: 'page-link', 'aria-label': 'First page' %>

data/app/views/kaminari/twitter-bootstrap-4/_gap.html.erb

@@ -3,8 +3,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <li class="page gap disabled page-item d-none d-lg-flex">
   <a href="#" onclick="return false;" class="page-link">
     <%= raw(t 'views.pagination.truncate') %>

data/app/views/kaminari/twitter-bootstrap-4/_last_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.last? %>
   <li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %>
     <%= link_to_unless current_page.last?, inline_svg_tag('pagination-double-arrow-right.svg', size: '13px*16px'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>

data/app/views/kaminari/twitter-bootstrap-4/_next_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.last? %>
   <li class="next_page page-item">
     <%= link_to_unless current_page.last?, inline_svg_tag('pagination-arrow-right.svg', size: '13px*16px'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>

data/app/views/kaminari/twitter-bootstrap-4/_page.html.erb

@@ -5,8 +5,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <li class="page<%= ' active' if page.current? %> page-item">
   <%= link_to page,
     url,

data/app/views/kaminari/twitter-bootstrap-4/_paginator.html.erb

@@ -4,8 +4,8 @@
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
-    paginator:     the paginator that renders the pagination tags inside
--%>
+    paginator:     the paginator that renders the pagination tags inside -%>
+
 <% pagination_class ||= '' %>
 
 <%= paginator.render do %>

data/app/views/kaminari/twitter-bootstrap-4/_prev_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.first? %>
   <li class="prev page-item">
     <%= link_to_unless current_page.first?, inline_svg_tag('pagination-arrow-right.svg', size: '13px*16px', class: 'spree-icon-arrow-left'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>

data/app/views/spree/address/_form.html.erb

@@ -1,54 +1,54 @@
 <% address_id = address_type.chars.first %>
 
-<div class="inner" data-hook=<%="#{address_type}_inner" %>>
-  <div class="form-group" id=<%="#{address_id}firstname" %>>
+<div class="inner" data-hook='<%= "#{address_type}_inner" %>'>
+  <div class="form-group" id='<%= "#{address_id}firstname" %>'>
     <%= form.label :firstname do %>
       <%= Spree.t(:first_name) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :firstname, class: 'form-control', required: true %>
   </div>
-  <div class="form-group" id=<%="#{address_id}lastname" %>>
+  <div class="form-group" id='<%= "#{address_id}lastname" %>'>
     <%= form.label :lastname do %>
       <%= Spree.t(:last_name) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :lastname, class: 'form-control', required: true %>
   </div>
   <% if Spree::Config[:company] %>
-    <div class="form-group" id=<%="#{address_id}company" %>>
+    <div class="form-group" id='<%= "#{address_id}company" %>'>
       <%= form.label :company, Spree.t(:company) %>
       <%= form.text_field :company, class: 'form-control' %>
     </div>
   <% end %>
-  <div class="form-group" id=<%="#{address_id}address1" %>>
+  <div class="form-group" id='<%= "#{address_id}address1" %>'>
     <%= form.label :address1 do %>
       <%= Spree.t(:street_address) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :address1, class: 'form-control required' %>
   </div>
-  <div class="form-group" id=<%="#{address_id}address2" %>>
+  <div class="form-group" id='<%= "#{address_id}address2" %>'>
     <%= form.label :address2, Spree.t(:street_address_2) %>
     <%= form.text_field :address2, class: 'form-control' %>
   </div>
-  <div class="form-group" id=<%="#{address_id}city" %>>
+  <div class="form-group" id='<%= "#{address_id}city" %>'>
     <%= form.label :city do %>
       <%= Spree.t(:city) %><abbr class="required" title="required">*</abbr>
     <% end %>
     <%= form.text_field :city, class: 'form-control', required: true %>
   </div>
-  <div class="form-group" id=<%="#{address_id}country" %>>
+  <div class="form-group" id='<%= "#{address_id}country" %>'>
     <%= form.label :country_id do %>
       <%= Spree.t(:country) %><abbr class="required" title="required">*</abbr>
     <% end %>
-    <span id=<%="#{address_id}country-selection" %>>
+    <span id='<%= "#{address_id}country-selection" %>'>
       <%= form.collection_select :country_id, available_countries, :id, :name, {}, { class: 'form-control', required: true } %>
     </span>
   </div>
 
   <% if Spree::Config[:address_requires_state] %>
-    <div class="form-group" id=<%="#{address_id}state" %>>
+    <div class="form-group" id='<%= "#{address_id}state" %>'>
       <% have_states = !address.country.states.empty? %>
       <%= form.label :state do %>
-        <%= Spree.t(:state) %><abbr class='required' title="required" id=<%="#{address_id}state-required"%>>*</abbr>
+        <%= Spree.t(:state) %><abbr class='required' title="required" id='<%= "#{address_id}state-required" %>'>*</abbr>
       <% end %>
 
       <%== state_elements = [
@@ -62,28 +62,27 @@
                             class: !have_states ? 'form-control' : 'form-control hidden',
                             required: !have_states,
                             disabled: have_states)
-         ].join.gsub('"', "'").gsub("\n", "")
-      %>
+         ].join.gsub('"', "'").gsub("\n", "") %>
     </div>
       <noscript>
         <%= form.text_field :state_name, class: 'form-control', required: true %>
       </noscript>
   <% end %>
 
-  <div class="form-group" id=<%="#{address_id}zipcode" %>>
+  <div class="form-group" id='<%= "#{address_id}zipcode" %>'>
     <%= form.label :zipcode do %>
       <%= Spree.t(:zip) %><% if address.require_zipcode? %><abbr class="required" title="required">*</abbr><% end %>
     <% end %>
     <%= form.text_field :zipcode, class: 'form-control', required: address.require_zipcode? %>
   </div>
-  <div class="form-group" id=<%="#{address_id}phone" %>>
+  <div class="form-group" id='<%= "#{address_id}phone" %>'>
     <%= form.label :phone do %>
       <%= Spree.t(:phone) %><% if address.require_phone? %><abbr class="required" title="required">*</abbr><% end %>
     <% end %>
     <%= form.phone_field :phone, class: 'form-control', required: address.require_phone? %>
   </div>
   <% if Spree::Config[:alternative_shipping_phone] %>
-    <div class="form-group" id=<%="#{address_id}altphone" %>>
+    <div class="form-group" id='<%= "#{address_id}altphone" %>'>
       <%= form.label :alternative_phone, Spree.t(:alternative_phone) %>
       <%= form.phone_field :alternative_phone, class: 'form-control' %>
     </div>

data/app/views/spree/addresses/_form.html.erb

@@ -6,7 +6,7 @@
       <div id="<%= "#{address_id}country-selection" %>" class="d-block position-relative has-float-label">
         <%= address_form.collection_select :country_id, available_countries, :id, :name,
                                            { prompt: Spree.t(:country).upcase },
-                                           { class: 'required form-control spree-flat-select',
+                                           { class: 'form-control spree-flat-select',
                                              aria: { label: Spree.t(:country) } } %>
         <%= image_tag 'arrow.svg', class: 'position-absolute spree-flat-select-arrow' %>
         <%= address_form.label(Spree.t(:country), Spree.t(:country).upcase, class:'text-uppercase') %>

data/app/views/spree/addresses/edit.html.erb

@@ -11,8 +11,8 @@
     address_name: 'address',
     address_form: f,
     address_type: 'shipping',
-    address: @address
-  %>
+    address: @address %>
+
   <%= f.submit Spree.t(:update), class: 'btn btn-primary btn-block spree-btn mb-5' %>
   <% end %>
 </div>

data/app/views/spree/addresses/new.html.erb

@@ -10,8 +10,8 @@
       address_name: 'address',
       address_form: f,
       address_type: 'shipping',
-      address: @address
-    %>
+      address: @address %>
+
     <%= f.submit t(:save, scope: :address_book), class: 'btn btn-primary btn-block spree-btn mb-5' %>
   <% end %>
 </div>