spree_frontend 4.2.0.beta → 4.2.0.rc5

data/app/assets/stylesheets/spree/frontend/views/spree/checkout/edit.scss

@@ -160,8 +160,11 @@
       .nav-item {
         color: theme-color('info');
         font-weight: 600;
+        max-width: 70px;
+        text-align: center;
         @include media-breakpoint-up(sm) {
           font-weight: 500;
+          max-width: 100px;
         }
         a {
           color: inherit;
@@ -494,9 +497,6 @@
           font-size: font-px-to-rem(16px);
         }
       }
-      .delete-address-img {
-        color: $primary-color;
-      }
     }
 
     #checkout-summary {
@@ -508,7 +508,8 @@
         height: 100%;
         padding: 0;
         max-width: 380px;
-        align-self: flex-end;
+        margin-right: 0;
+        margin-left: auto;
       }
     }
 
@@ -517,3 +518,4 @@
     }
   }
 }
+

data/app/assets/stylesheets/spree/frontend/views/spree/orders/show.scss

@@ -261,6 +261,9 @@
   }
   #checkout-summary {
     margin-top: 30px;
+    @include media-breakpoint-down(sm) {
+      flex-basis: 100%;
+    }
     @include media-breakpoint-up(sm) {
       margin-top: 75px;
     }

data/app/assets/stylesheets/spree/frontend/views/spree/users/show.scss

@@ -62,12 +62,6 @@
           font-size: font-px-to-rem(18px);
         }
       }
-
-      .delete-address-img {
-        @include svg-sizes;
-        color: $primary-color;
-      }
-
       margin-top: 20px;
 
       @include media-breakpoint-up(lg) {

data/app/controllers/concerns/spree/checkout/address_book.rb

@@ -32,21 +32,23 @@ module Spree
       end
 
       def normalize_addresses
-        return unless params[:state] == 'address' && @order.bill_address_id && @order.ship_address_id
+        return unless params[:state] == 'address' && @order.bill_address_id
 
-        # ensure that there is no validation errors and addresses were saved
-        return unless @order.bill_address && @order.ship_address
+        if @order.checkout_steps.include?('delivery')
+          return unless @order.ship_address_id
+        end
 
         bill_address = @order.bill_address
         ship_address = @order.ship_address
+
+        if params[:save_user_address].present? && try_spree_current_user.present?
+          [bill_address, ship_address].each { |address| address&.update_attribute(:user_id, try_spree_current_user&.id) }
+        end
+
         if @order.bill_address_id != @order.ship_address_id && bill_address == ship_address
           @order.update_column(:bill_address_id, ship_address.id)
           bill_address.destroy
-        elsif params[:save_user_address]
-          bill_address.update_attribute(:user_id, try_spree_current_user&.id)
         end
-
-        ship_address.update_attribute(:user_id, try_spree_current_user&.id) if params[:save_user_address]
       end
     end
   end

data/app/controllers/spree/addresses_controller.rb

@@ -37,6 +37,7 @@ module Spree
       else
         new_address = @address.clone
         new_address.attributes = address_params
+        new_address.user_id = @address.user_id
         @address.update_attribute(:deleted_at, Time.current)
         if new_address.save
           flash[:notice] = Spree.t(:successfully_updated, scope: :address_book)

data/app/controllers/spree/currency_controller.rb

@@ -3,8 +3,8 @@ module Spree
     def set
       @currency = supported_currencies.find { |currency| currency.iso_code == params[:currency] }
       # Make sure that we update the current order, so the currency change is reflected.
-      current_order&.update_attributes!(currency: @currency.iso_code)
-      session[:currency] = params[:currency] if Spree::Config[:allow_currency_change]
+      current_order&.update(currency: @currency.iso_code)
+      session[:currency] = params[:currency] if Spree::Config[:show_store_selector]
       respond_to do |format|
         format.json { render json: !@currency.nil? }
         format.html do

data/app/controllers/spree/home_controller.rb

@@ -1,9 +1,13 @@
 module Spree
   class HomeController < Spree::StoreController
+    include Spree::CacheHelper
+
     respond_to :html
 
     def index
-      fresh_when etag: store_etag, last_modified: store_last_modified, public: true
+      if http_cache_enabled?
+        fresh_when etag: store_etag, last_modified: store_last_modified, public: true
+      end
     end
   end
 end

data/app/controllers/spree/products_controller.rb

@@ -2,6 +2,7 @@ module Spree
   class ProductsController < Spree::StoreController
     include Spree::ProductsHelper
     include Spree::FrontendHelper
+    include Spree::CacheHelper
 
     before_action :load_product, only: [:show, :related]
     before_action :load_taxon, only: :index
@@ -12,16 +13,9 @@ module Spree
       @searcher = build_searcher(params.merge(include_images: true, current_store_id: current_store.id))
       @products = @searcher.retrieve_products
 
-      last_modified = @products.maximum(:updated_at)&.utc if @products.respond_to?(:maximum)
-
-      etag = [
-        store_etag,
-        last_modified&.to_i,
-        available_option_types_cache_key,
-        filtering_params_cache_key
-      ]
-
-      fresh_when etag: etag, last_modified: last_modified, public: true
+      if http_cache_enabled?
+        fresh_when etag: etag_index, last_modified: last_modified_index, public: true
+      end
     end
 
     def show
@@ -29,7 +23,7 @@ module Spree
 
       @taxon = params[:taxon_id].present? ? Spree::Taxon.find(params[:taxon_id]) : @product.taxons.first
 
-      if stale?(etag: product_etag, last_modified: @product.updated_at.utc, public: true)
+      if !http_cache_enabled? || stale?(etag: etag_show, last_modified: last_modified_show, public: true)
         @product_summary = Spree::ProductSummaryPresenter.new(@product).call
         @product_properties = @product.product_properties.includes(:property)
         @product_price = @product.price_in(current_currency).amount
@@ -39,9 +33,7 @@ module Spree
     end
 
     def related
-      @related_products = related_products
-
-      if @related_products.any?
+      if product_relation_types.any?
         render template: 'spree/products/related', layout: false
       else
         head :no_content
@@ -96,7 +88,16 @@ module Spree
       end
     end
 
-    def product_etag
+    def etag_index
+      [
+        store_etag,
+        last_modified_index,
+        available_option_types_cache_key,
+        filtering_params_cache_key
+      ]
+    end
+
+    def etag_show
       [
         store_etag,
         @product,
@@ -105,5 +106,21 @@ module Spree
         @product.possible_promotions.maximum(:updated_at),
       ]
     end
+
+    alias product_etag etag_show
+
+    def last_modified_index
+      products_last_modified      = @products.maximum(:updated_at)&.utc if @products.respond_to?(:maximum)
+      current_store_last_modified = current_store.updated_at.utc
+
+      [products_last_modified, current_store_last_modified].compact.max
+    end
+
+    def last_modified_show
+      product_last_modified       = @product.updated_at.utc
+      current_store_last_modified = current_store.updated_at.utc
+
+      [product_last_modified, current_store_last_modified].compact.max
+    end
   end
 end

data/app/controllers/spree/store_controller.rb

@@ -4,14 +4,6 @@ module Spree
 
     skip_before_action :verify_authenticity_token, only: :ensure_cart, raise: false
 
-    def forbidden
-      render 'spree/shared/forbidden', layout: Spree::Config[:layout], status: 403
-    end
-
-    def unauthorized
-      render 'spree/shared/unauthorized', layout: Spree::Config[:layout], status: 401
-    end
-
     def account_link
       render partial: 'spree/shared/link_to_account'
       fresh_when(try_spree_current_user)
@@ -39,10 +31,6 @@ module Spree
       Spree::Frontend::Config[:locale]
     end
 
-    def store_locale
-      current_store.default_locale
-    end
-
     def store_etag
       [
         current_store,

data/app/controllers/spree/taxons_controller.rb

@@ -1,6 +1,7 @@
 module Spree
   class TaxonsController < Spree::StoreController
     include Spree::FrontendHelper
+    include Spree::CacheHelper
     helper 'spree/products'
 
     before_action :load_taxon
@@ -8,15 +9,15 @@ module Spree
     respond_to :html
 
     def show
-      if stale?(etag: etag, last_modified: last_modified, public: true)
+      if !http_cache_enabled? || stale?(etag: etag, last_modified: last_modified, public: true)
         load_products
       end
     end
 
     def product_carousel
-      if stale?(etag: carousel_etag, last_modified: last_modified, public: true)
+      if !http_cache_enabled? || stale?(etag: carousel_etag, last_modified: last_modified, public: true)
         load_products
-        if @products.any?
+        if @products.reload.any?
           render template: 'spree/taxons/product_carousel', layout: false
         else
           head :no_content

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,7 +60,7 @@ 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
 
@@ -69,5 +69,9 @@ module Spree
 
       try_spree_current_user.addresses.where(country: available_countries)
     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

@@ -16,7 +16,7 @@ module Spree
     end
 
     def stores
-      @stores ||= Spree::Store.includes(:default_country)
+      @stores ||= Spree::Store.includes(:default_country).order(:id)
     end
 
     def store_currency_symbol(store)
@@ -166,7 +166,13 @@ module Spree
 
     def plp_and_carousel_image(product, image_class = '')
       image = default_image_for_product_or_variant(product)
-      image_url = image&.plp_url || asset_path('noimage/plp.png')
+
+      image_url = if image.present?
+                    main_app.url_for(image.url('plp'))
+                  else
+                    asset_path('noimage/plp.png')
+                  end
+
       image_style = image&.style(:plp)
 
       lazy_image(
@@ -242,7 +248,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)}",
@@ -268,12 +274,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
@@ -289,7 +295,11 @@ 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
 
     private
@@ -308,7 +318,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(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

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') %>