spree_frontend 4.2.5 → 4.3.0.rc1

data/app/helpers/spree/navigation_helper.rb

@@ -3,22 +3,46 @@ require 'digest'
 module Spree
   module NavigationHelper
     def spree_navigation_data
-      @spree_navigation_data ||= SpreeStorefrontConfig.dig(I18n.locale, :navigation) || SpreeStorefrontConfig.dig(current_store.code, :navigation) || SpreeStorefrontConfig.dig(:default, :navigation) || []
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        NavigationHelper#spree_navigation_data is deprecated and will be removed in Spree 5.0.
+        Please migrate to the new navigation cms system.
+      DEPRECATION
+
+      @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
+    rescue StandardError
       []
     end
 
     def spree_nav_cache_key(section = 'header')
+      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        NavigationHelper#spree_nav_cache_key is deprecated and will be removed in Spree 5.0.
+        Please migrate to the new navigation cms system.
+      DEPRECATION
+
       @spree_nav_cache_key = begin
-        keys = base_cache_key + [current_store, spree_navigation_data_cache_key, Spree::Config[:logo], stores&.cache_key, section]
+        keys = base_cache_key + [current_store, spree_navigation_data_cache_key, Spree::Config[:logo], stores&.cache_key_with_version, section]
         Digest::MD5.hexdigest(keys.join('-'))
       end
     end
 
+    def spree_menu_cache_key(section = 'header')
+      keys = base_cache_key + [
+        current_store.cache_key_with_version,
+        spree_menu(section)&.cache_key_with_version,
+        stores&.maximum(:updated_at),
+        section
+      ]
+      Digest::MD5.hexdigest(keys.join('-'))
+    end
+
     def main_nav_image(image_path, title = '')
-      image_url = asset_path(asset_exists?(image_path) ? image_path : 'noimage/plp.png')
+      image_url = asset_path(asset_exists?(image_path) ? image_path : 'noimage/plp.svg')
 
       lazy_image(
         src: image_url,
@@ -28,11 +52,56 @@ module Spree
       )
     end
 
+    def spree_menu(location = 'header')
+      method_name = "for_#{location}"
+
+      if available_menus.respond_to?(method_name) && Spree::Menu::MENU_LOCATIONS_PARAMETERIZED.include?(location)
+        available_menus.send(method_name, I18n.locale) || current_store.default_menu(location)
+      end
+    end
+
+    def spree_localized_link(item)
+      return if item.link.nil?
+
+      output_locale = if locale_param
+                        "/#{I18n.locale}"
+                      end
+
+      if Spree::MenuItem::DYNAMIC_RESOURCE_TYPE.include? item.linked_resource_type
+        output_locale.to_s + item.link
+      elsif item.linked_resource_type == 'Home Page'
+        "/#{locale_param}"
+      else
+        item.link
+      end
+    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
 
+    def spree_nav_link_tag(item, opts = {}, &block)
+      if item.new_window
+        target = opts[:target] || '_blank'
+        rel = opts[:rel] || 'noopener noreferrer'
+      end
+
+      active_class = if request && current_page?(spree_localized_link(item))
+                       "active #{opts[:class]}"
+                     else
+                       opts[:class]
+                     end
+
+      link_opts = { target: target, rel: rel, class: active_class, id: opts[:id], data: opts[:data], aria: opts[:aria] }
+
+      if block_given?
+        link_to spree_localized_link(item), link_opts, &block
+      else
+        link_to item.name, spree_localized_link(item), link_opts
+      end
+    end
+
     private
 
     def spree_navigation_data_cache_key

data/app/helpers/spree/products_filters_helper.rb

@@ -0,0 +1,168 @@
+module Spree
+  module ProductsFiltersHelper
+    PRICE_FILTER_NAME = 'price'.freeze
+
+    FILTER_LINK_CSS_CLASSES = 'd-inline-block text-uppercase py-1 px-2 m-1 plp-overlay-card-item'.freeze
+    ACTIVE_FILTER_LINK_CSS_CLASSES = 'plp-overlay-card-item--selected'.freeze
+
+    CLEAR_ALL_FILTERS_LINK_CSS_CLASSES = 'btn spree-btn btn-outline-primary w-100 mb-4'.freeze
+
+    def price_filters
+      @price_filters ||= [
+        filters_less_than_price_range(50),
+        filters_price_range(50, 100),
+        filters_price_range(101, 150),
+        filters_price_range(151, 200),
+        filters_price_range(201, 300),
+        filters_more_than_price_range(300)
+      ]
+    end
+
+    def min_price_filter_input(**html_options)
+      price_filter_input(
+        name: :min_price,
+        value: filters_price_range_from_param.min_price.to_i,
+        placeholder: "#{currency_symbol(current_currency)} #{Spree.t(:min)}",
+        **html_options
+      )
+    end
+
+    def max_price_filter_input(**html_options)
+      price_filter_input(
+        name: :max_price,
+        value: filters_price_range_from_param.max_price.to_i,
+        placeholder: "#{currency_symbol(current_currency)} #{Spree.t(:max)}",
+        **html_options
+      )
+    end
+
+    def price_filter_input(name:, value:, placeholder:, **html_options)
+      price_value = value&.zero? ? '' : value
+      style_class = "spree-flat-input #{html_options[:class]}"
+
+      number_field_tag(
+        name, price_value,
+        id: name,
+        class: style_class,
+        min: 0, step: 1, placeholder: placeholder,
+        **html_options.except(:class)
+      )
+    end
+
+    def option_value_filter_link(option_value, permitted_params, opts = {})
+      id = option_value.id
+      ot_downcase_name = option_value.option_type.filter_param
+      selected_option_values = params[ot_downcase_name]&.split(',')&.map(&:to_i) || []
+      is_selected = selected_option_values.include?(id)
+      option_value_param = (is_selected ? selected_option_values - [id] : selected_option_values + [id]).join(',')
+      new_params = permitted_params.merge(ot_downcase_name => option_value_param, menu_open: 1)
+
+      link_to new_params, data: { params: new_params, id: id, filter_name: ot_downcase_name, multiselect: true } do
+        # TODO: refactor this
+        if color_option_type_name.present? && color_option_type_name.downcase == ot_downcase_name
+          content_tag :span, class: 'd-inline-block mb-1' do
+            render partial: 'spree/shared/color_select', locals: {
+              color: option_value.presentation,
+              selected: is_selected
+            }
+          end
+        else
+          filter_content_tag(option_value.name, opts.merge(is_selected: is_selected))
+        end
+      end
+    end
+
+    def property_value_filter_link(property, value, permitted_params, opts = {})
+      id = value.first
+      name = value.last
+
+      selected_properties = params.dig(:properties, property.filter_param)&.split(',') || []
+      is_selected = selected_properties.include?(id)
+      property_values = (is_selected ? selected_properties - [id] : selected_properties + [id])
+      url = permitted_params.merge(properties: { property.filter_param => property_values }, menu_open: 1)
+      filter_name = "properties[#{property.filter_param}]"
+      new_params = permitted_params.merge(filter_name => property_values, menu_open: 1)
+
+      base_filter_link(url, name, opts.merge(params: new_params, is_selected: is_selected, filter_name: filter_name, id: id, multiselect: true))
+    end
+
+    def price_filter_link(price_range, permitted_params, opts = {})
+      is_selected = params[:price] == price_range.to_param
+      price_param = is_selected ? '' : price_range.to_param
+      url = permitted_params.merge(price: price_param, menu_open: 1)
+
+      opts[:is_selected] ||= is_selected
+
+      content_tag :div do
+        base_filter_link(url, price_range, opts.merge(is_selected: is_selected, filter_name: PRICE_FILTER_NAME, id: price_param))
+      end
+    end
+
+    def product_filters_present?(permitted_params)
+      properties = permitted_params.fetch(:properties, {}).to_unsafe_h
+      flatten_params = permitted_params.to_h.merge(properties)
+
+      flatten_params.any? { |name, value| product_filter_present?(name, value) }
+    end
+
+    def clear_all_filters_link(permitted_params, opts = {})
+      opts[:css_class] ||= CLEAR_ALL_FILTERS_LINK_CSS_CLASSES
+      sort_by_param = permitted_params.slice(:sort_by)
+
+      link_to Spree.t('plp.clear_all'), sort_by_param, class: opts[:css_class], data: { params: sort_by_param }
+    end
+
+    private
+
+    def product_filter_present?(filter_param, filter_value)
+      filter_param.in?(product_filters_params) && filter_value.present?
+    end
+
+    def product_filters_params
+      options_filter_params = OptionType.filterable.map(&:filter_param)
+      properties_filter_params = Property.filterable.pluck(:filter_param)
+
+      options_filter_params + properties_filter_params + [PRICE_FILTER_NAME]
+    end
+
+    def base_filter_link(url, label, opts = {})
+      opts[:params] ||= url
+
+      link_to url, data: { filter_name: opts[:filter_name], id: opts[:id], params: opts[:params], multiselect: opts[:multiselect] } do
+        filter_content_tag(label, opts)
+      end
+    end
+
+    def filter_content_tag(label, opts = {})
+      opts[:css_class]        ||= FILTER_LINK_CSS_CLASSES
+      opts[:css_active_class] ||= ACTIVE_FILTER_LINK_CSS_CLASSES
+
+      content_tag :div, class: "#{opts[:css_class]} #{opts[:css_active_class] if opts[:is_selected]}" do
+        label.to_s
+      end
+    end
+
+    def filters_price_range_from_param
+      Filters::PriceRangePresenter.from_param(params[:price].to_s, currency: current_currency)
+    end
+
+    def filters_price_range(min_amount, max_amount)
+      Filters::PriceRangePresenter.new(
+        min_price: filters_price(min_amount),
+        max_price: filters_price(max_amount)
+      )
+    end
+
+    def filters_less_than_price_range(amount)
+      Filters::QuantifiedPriceRangePresenter.new(price: filters_price(amount), quantifier: :less_than)
+    end
+
+    def filters_more_than_price_range(amount)
+      Filters::QuantifiedPriceRangePresenter.new(price: filters_price(amount), quantifier: :more_than)
+    end
+
+    def filters_price(amount)
+      Filters::PricePresenter.new(amount: amount, currency: current_currency)
+    end
+  end
+end

data/app/helpers/spree/store_helper.rb

@@ -1,5 +1,7 @@
 module Spree
   module StoreHelper
+    include LocaleHelper
+
     def store_country_iso(store = nil)
       store ||= current_store if defined?(current_store)
 
@@ -22,7 +24,7 @@ module Spree
       return unless store
       return store.name if store.default_locale.blank?
 
-      Spree.t('i18n.this_file_language', locale: store.default_locale)
+      locale_full_name(store.default_locale)
     end
 
     def should_render_store_chooser?

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

@@ -54,7 +54,7 @@
               address_name: address_name,
               address_form: address_form,
               address_type: address_type,
-              address: Spree::Address.default,
+              address: Spree::Address.new(country: current_store.default_country),
               form: form
             } %>
           </div>

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

@@ -5,5 +5,6 @@
     <%= credit_card_icon(card.cc_type) %>
     <span>****<%= card.last_digits %>,&nbsp</span>
     <span><%= card.name %></span>
+    <%= button_tag Spree.t(:remove), type: 'button', class: 'btn text-left d-block p-0 js-remove-credit-card', data: { id: card.id } %>
   </label>
 </div>

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

@@ -0,0 +1,16 @@
+<% if @cms_page %>
+  <% if simple_page?(@cms_page) %>
+  <div class="container">
+    <div class="row my-5">
+      <div class="col-12">
+        <%= @cms_page.content.html_safe %>
+      </div>
+    </div>
+  </div>
+  <% else %>
+      <% @cms_page.cms_sections.each do |section| %>
+        <%= build_section(section) %>
+      <% end %>
+  <% end %>
+<% end %>
+<%= render "spree/shared/cms/pages/edit_mode", edit_mode: @edit_mode %>

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

@@ -1,121 +1,22 @@
-<% @body_id = 'home' %>
-
-<div class="homepage-hero-image mb-3 position-relative">
-  <img class="lazyload hero-image position-absolute"
-    data-src="<%= asset_path('homepage/main_banner.jpg') %>"
-    data-srcset="<%= image_source_set('homepage/main_banner') %>"
-    alt="Summer Collection">
-
-  <div class="hero-content">
-    <div class="homepage-hero-image-text mb-2 mx-auto pb-3 pb-md-4">
-      Summer Collection
-    </div>
-    <div>
-      <%= link_to 'SHOP NOW', spree.products_path, class: 'btn btn-primary spree-btn px-5' %>
+<% if @homepage %>
+    <% @homepage.cms_sections.each do |section| %>
+      <%= build_section(section) %>
+    <% end %>
+<% else %>
+  <div id="missingHomepage" class="container my-5">
+    <div class="row my-5">
+      <div class="col-12">
+        <figure class="logo mx-auto missing-homepage-logo-container">
+          <%= logo %>
+        </figure>
+      </div>
+      <div class="col-12 mb-5 text-center">
+        <h1 class="mb-3"><%= Spree.t('we_will_be_back') %></h1>
+        <h4 class="text-dark"><%= Spree.t('we_are_busy_updating', store_name: current_store.name) %></h4>
+        <h4 class="text-dark"><%= Spree.t('please_check_back_soon') %></h4>
+      </div>
     </div>
   </div>
-</div>
-
-<div class="container">
-  <div class="row">
-    <div class="col-6">
-
-      <%= link_to spree.nested_taxons_path('men'), class: "homepage-taxon-box mb-3" do %>
-        <img class="w-100 lazyload"
-          data-src="<%= asset_path('homepage/category_banner_upper.jpg') %>"
-          data-srcset="<%= image_source_set('homepage/category_banner_upper') %>"
-          alt="Men">
-
-        <div class="homepage-taxon-box-text">
-          <h3>Men</h3>
-        </div>
-      <% end %>
-
-      <%= link_to spree.nested_taxons_path('sportswear'), class: "homepage-taxon-box" do %>
-        <img class="w-100 lazyload"
-          data-src="<%= asset_path('homepage/category_banner_lower.jpg') %>"
-          data-srcset="<%= image_source_set('homepage/category_banner_lower') %>"
-          alt="Sportswear">
+<% end %>
 
-        <div class="homepage-taxon-box-text" role="img" aria-label="Sportswear">
-          <h3>Sportswear</h3>
-        </div>
-      <% end %>
-
-    </div>
-
-    <div class="col-6 d-flex flex-column">
-
-      <%= link_to spree.nested_taxons_path('women'), class: "homepage-taxon-box flex-grow-1" do %>
-        <img class="w-100 lazyload"
-          data-src="<%= asset_path('homepage/big_category_banner.jpg') %>"
-          data-srcset="<%= image_source_set('homepage/big_category_banner') %>"
-          alt="Women">
-
-        <div class="homepage-taxon-box-text">
-          <h3>Women</h3>
-        </div>
-      <% end %>
-
-    </div>
-  </div>
-</div>
-
-<div data-product-carousel data-product-carousel-taxon-id='bestsellers' class="my-3"></div>
-
-<div class="homepage-fashion-trends-box mb-3">
-  <div class="text-center">
-    <div class="homepage-fashion-trends-box-summer-text mb-1">Summer 2021</div>
-    <div class="homepage-fashion-trends-box-fashion-trends-text mb-2">FASHION TRENDS</div>
-    <div class="homepage-fashion-trends-box-description-text text-center mb-3">
-      Want to rock this season’s hottest trend in style? These are the top fashion from Summer 2020 Fashion Weeks that are coming our way this season.
-    </div>
-    <%= link_to 'READ MORE', spree.nested_taxons_path('trending'), class: 'btn px-5 spree-btn btn-outline-primary' %>
-  </div>
-</div>
-
-<div data-product-carousel data-product-carousel-taxon-id='trending' class="mb-3"></div>
-
-<div class="container">
-  <div class="row">
-    <div class="col-12 col-lg-6">
-      <%= link_to spree.nested_taxons_path('streetstyle') do %>
-        <div class="homepage-bottom-box text-center mb-3">
-          <img class="w-100 lazyload"
-            data-src="<%= asset_path('homepage/promo_banner_left.jpg') %>"
-            data-srcset="<%= image_source_set('homepage/promo_banner_left') %>"
-            alt="NEW COLLECTION">
-
-          <div class="homepage-bottom-box-inner" role="img" aria-label="New Collection">
-            <div class="homepage-bottom-box-inner-small-text">
-              New Collection
-            </div>
-            <div class="homepage-bottom-box-inner-big-text">
-              Streetstyle
-            </div>
-          </div>
-        </div>
-      <% end %>
-    </div>
-
-    <div class="col-12 col-lg-6">
-      <%= link_to spree.nested_taxons_path('summer-sale') do %>
-        <div class="homepage-bottom-box text-center mb-3">
-          <img class="w-100 lazyload"
-            data-src="<%= asset_path('homepage/promo_banner_right.jpg') %>"
-            data-srcset="<%= image_source_set('homepage/promo_banner_right') %>"
-            alt="Summer Sale">
-
-          <div class="homepage-bottom-box-inner">
-            <div class="homepage-bottom-box-inner-small-text">
-              Summer Sale
-            </div>
-            <div class="homepage-bottom-box-inner-big-text">
-              Up To 60%
-            </div>
-          </div>
-        </div>
-      <% end %>
-    </div>
-  </div>
-</div>
+<%= render "spree/shared/cms/pages/edit_mode", edit_mode: @edit_mode %>