spree_frontend 4.1.0 → 4.7.0

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

@@ -16,7 +16,7 @@
 .account-page {
   font-weight: 500;
   h3 {
-    color: theme-color('dark-text');
+    color: $font-color;
     margin: 33px 0;
     font-size: font-px-to-rem(32px);
 
@@ -36,11 +36,11 @@
   }
 
   thead {
-    border-bottom: 1px solid theme-color('borders');
+    border-bottom: 1px solid $global-border-style;
   }
 
   th {
-    color: theme-color('secondary');
+    color: theme-color("secondary");
     padding: 7.5px 0;
   }
 
@@ -50,7 +50,7 @@
   }
 
   &-user-info {
-    border-bottom: 1px solid theme-color('borders');
+    border-bottom: 1px solid $global-border-style;
 
     &-item {
       address {
@@ -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) {
@@ -77,7 +71,7 @@
       }
       &-title {
         @include item-title-font-size;
-        color: theme-color('dark-text');
+        color: $font-color;
         margin-top: 25px;
         font-weight: 500;
 
@@ -220,7 +214,7 @@
     order: 3;
     font-size: font-px-to-rem(16px);
     a {
-      color: theme-color('dark-text');
+      color: $font-color;
     }
     @include media-breakpoint-up(md) {
       font-size: font-px-to-rem(29px);
@@ -312,7 +306,7 @@
     }
 
     &-text-primary {
-      color: theme-color('primary');
+      color: theme-color("primary");
     }
 
     &-lead {

data/app/assets/stylesheets/spree/frontend.css

@@ -1,6 +1,5 @@
 /*
 * This is a manifest file that includes stylesheets for spree_frontend
- *= require spree/frontend/address_book
  *= require spree/frontend/application
  *= require_self
 */

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/concerns/spree/locale_urls.rb

@@ -0,0 +1,21 @@
+module Spree
+  module LocaleUrls
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :redirect_to_default_locale
+    end
+
+    private
+
+    def default_url_options
+      super.merge(locale: locale_param, currency: currency_param)
+    end
+
+    def redirect_to_default_locale
+      return if params[:locale].blank? || supported_locale?(params[:locale])
+
+      redirect_to url_for(request.parameters.merge(locale: nil))
+    end
+  end
+end

data/app/controllers/spree/addresses_controller.rb

@@ -4,17 +4,13 @@ module Spree
     helper Spree::AddressesHelper
     load_and_authorize_resource class: Spree::Address
 
-    def index
-      @addresses = try_spree_current_user.addresses
-    end
-
     def create
       @address = try_spree_current_user.addresses.build(address_params)
-      if @address.save
+      if create_service.call(user: try_spree_current_user, address_params: @address.attributes).success?
         flash[:notice] = I18n.t(:successfully_created, scope: :address_book)
         redirect_to spree.account_path
       else
-        render action: 'new'
+        render action: 'new', status: :unprocessable_entity
       end
     end
 
@@ -23,27 +19,15 @@ module Spree
     end
 
     def new
-      @address = Spree::Address.default
+      @address = Spree::Address.new(country: current_store.default_country, user: try_spree_current_user)
     end
 
     def update
-      if @address.editable?
-        if @address.update(address_params)
-          flash[:notice] = Spree.t(:successfully_updated, scope: :address_book)
-          redirect_back_or_default(addresses_path)
-        else
-          render :edit
-        end
+      if update_service.call(address: @address, address_params: address_params).success?
+        flash[:notice] = Spree.t(:successfully_updated, scope: :address_book)
+        redirect_back_or_default(addresses_path)
       else
-        new_address = @address.clone
-        new_address.attributes = address_params
-        @address.update_attribute(:deleted_at, Time.current)
-        if new_address.save
-          flash[:notice] = Spree.t(:successfully_updated, scope: :address_book)
-          redirect_back_or_default(addresses_path)
-        else
-          render :edit
-        end
+        render :edit, status: :unprocessable_entity
       end
     end
 
@@ -57,16 +41,15 @@ module Spree
     private
 
     def address_params
-      params[:address].permit(:address,
-                              :firstname,
-                              :lastname,
-                              :address1,
-                              :address2,
-                              :city,
-                              :state_id,
-                              :zipcode,
-                              :country_id,
-                              :phone)
+      params.require(:address).permit(permitted_address_attributes)
+    end
+
+    def create_service
+      Spree::Dependencies.address_create_service.constantize
+    end
+
+    def update_service
+      Spree::Dependencies.address_update_service.constantize
     end
   end
 end

data/app/controllers/spree/checkout_controller.rb

@@ -35,7 +35,7 @@ module Spree
         @order.temporary_address = !params[:save_user_address]
         unless @order.next
           flash[:error] = @order.errors.full_messages.join("\n")
-          redirect_to(checkout_state_path(@order.state)) && return
+          redirect_to(spree.checkout_state_path(@order.state)) && return
         end
 
         if @order.completed?
@@ -43,10 +43,10 @@ module Spree
           flash['order_completed'] = true
           redirect_to completion_route
         else
-          redirect_to checkout_state_path(@order.state)
+          redirect_to spree.checkout_state_path(@order.state)
         end
       else
-        render :edit
+        render :edit, status: :unprocessable_entity
       end
     end
 
@@ -77,7 +77,7 @@ module Spree
       if @order.state != correct_state && !skip_state_validation?
         flash.keep
         @order.update_column(:state, correct_state)
-        redirect_to checkout_state_path(@order.state)
+        redirect_to spree.checkout_state_path(@order.state)
       end
     end
 
@@ -108,7 +108,7 @@ module Spree
 
     def set_state_if_present
       if params[:state]
-        redirect_to checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
+        redirect_to spree.checkout_state_path(@order.state) if @order.can_go_to_state?(params[:state]) && !skip_state_validation?
         @order.state = params[:state]
       end
     end
@@ -129,8 +129,8 @@ module Spree
     end
 
     # Provides a route to redirect after order completion
-    def completion_route(custom_params = nil)
-      spree.order_path(@order, custom_params)
+    def completion_route(custom_params = {})
+      spree.order_path(@order, custom_params.merge(locale: locale_param))
     end
 
     def setup_for_current_state
@@ -141,8 +141,8 @@ module Spree
     def before_address
       # if the user has a default address, a callback takes care of setting
       # that; but if he doesn't, we need to build an empty one here
-      @order.bill_address ||= Address.build_default
-      @order.ship_address ||= Address.build_default if @order.checkout_steps.include?('delivery')
+      @order.bill_address ||= Address.new(country: current_store.default_country, user: try_spree_current_user)
+      @order.ship_address ||= Address.new(country: current_store.default_country, user: try_spree_current_user) if @order.checkout_steps.include?('delivery')
     end
 
     def before_delivery
@@ -161,7 +161,9 @@ module Spree
         end
       end
 
-      @payment_sources = try_spree_current_user.payment_sources if try_spree_current_user&.respond_to?(:payment_sources)
+      return unless try_spree_current_user.respond_to?(:payment_sources)
+
+      @payment_sources = try_spree_current_user.payment_sources.where(payment_method: @order.available_payment_methods)
     end
 
     def add_store_credit_payments
@@ -174,21 +176,21 @@ module Spree
         params.delete(:payment_source)
 
         # Return to the Payments page if additional payment is needed.
-        redirect_to checkout_state_path(@order.state) and return if @order.payments.valid.sum(:amount) < @order.total
+        redirect_to spree.checkout_state_path(@order.state) and return if @order.payments.valid.sum(:amount) < @order.total
       end
     end
 
     def remove_store_credit_payments
       if params.key?(:remove_store_credit)
         remove_store_credit_service.call(order: @order)
-        redirect_to checkout_state_path(@order.state) and return
+        redirect_to spree.checkout_state_path(@order.state) and return
       end
     end
 
     def rescue_from_spree_gateway_error(exception)
       flash.now[:error] = Spree.t(:spree_gateway_error_flash_for_checkout)
       @order.errors.add(:base, exception.message)
-      render :edit
+      render :edit, status: :unprocessable_entity
     end
 
     def check_authorization

data/app/controllers/spree/cms_pages_controller.rb

@@ -0,0 +1,29 @@
+module Spree
+  class CmsPagesController < Spree::StoreController
+    before_action :load_cms_page, only: [:show]
+
+    include Spree::FrontendHelper
+    include Spree::CacheHelper
+
+    def show
+      if @page&.visible?
+        @cms_page = @page
+      elsif @page&.draft_mode? && try_spree_current_user&.admin?
+        @cms_page = @page
+        @edit_mode = true
+      else
+        raise ActiveRecord::RecordNotFound
+      end
+    end
+
+    private
+
+    def accurate_title
+      @page&.seo_title || super
+    end
+
+    def load_cms_page
+      @page = Spree::CmsPage.for_store(current_store).by_locale(I18n.locale).find_by(slug: params[:slug])
+    end
+  end
+end

data/app/controllers/spree/content_controller.rb

@@ -3,8 +3,6 @@ module Spree
     # Don't serve local files or static assets
     after_action :fire_visited_path, except: :cvv
 
-    respond_to :html
-
     def test; end
 
     def cvv

data/app/controllers/spree/currency_controller.rb

@@ -0,0 +1,17 @@
+module Spree
+  class CurrencyController < StoreController
+    def set
+      new_currency = params[:switch_to_currency]&.upcase
+
+      if new_currency.present? && supported_currency?(new_currency)
+        current_order&.update(currency: new_currency)
+        session[:currency] = new_currency
+      end
+
+      respond_to do |format|
+        format.html { redirect_back fallback_location: spree.root_path(currency: new_currency) }
+        format.json { head :ok }
+      end
+    end
+  end
+end

data/app/controllers/spree/errors_controller.rb

@@ -0,0 +1,11 @@
+module Spree
+  class ErrorsController < StoreController
+    def forbidden
+      render status: 403
+    end
+
+    def unauthorized
+      render status: 401
+    end
+  end
+end

data/app/controllers/spree/home_controller.rb

@@ -1,9 +1,46 @@
 module Spree
   class HomeController < Spree::StoreController
+    include Spree::CacheHelper
+
+    before_action :load_homepage, only: [:index]
+
     respond_to :html
 
     def index
-      fresh_when etag: store_etag, last_modified: store_last_modified, public: true
+      if @cms_home_page&.visible?
+        @homepage = @cms_home_page
+      elsif try_spree_current_user&.admin?
+        @homepage = @cms_home_page
+        @edit_mode = true
+      end
+
+      if http_cache_enabled?
+        fresh_when etag: store_etag, last_modified: last_modified_index, public: true
+      end
+    end
+
+    private
+
+    def etag_index
+      [
+        store_etag,
+        last_modified_index,
+      ]
+    end
+
+    def last_modified_index
+      page_last_modified = @cms_home_page&.maximum(:updated_at)&.utc if @cms_home_page.respond_to?(:maximum)
+      current_store_last_modified = current_store.updated_at.utc
+
+      [page_last_modified, current_store_last_modified].compact.max
+    end
+
+    def accurate_title
+      @cms_home_page&.seo_title || super
+    end
+
+    def load_homepage
+      @cms_home_page = current_store.homepage(I18n.locale)
     end
   end
 end

data/app/controllers/spree/locale_controller.rb

@@ -1,14 +1,43 @@
 module Spree
   class LocaleController < Spree::StoreController
+    REDIRECT_TO_ROOT = /\/(pages)\//.freeze
+
+    def index
+      render :index, layout: false
+    end
+
     def set
-      session['user_return_to'] = request.referer if request.referer&.starts_with?('http://' + request.host)
-      if params[:locale] && I18n.available_locales.map(&:to_s).include?(params[:locale])
-        session[:locale] = I18n.locale = params[:locale]
-        flash.notice = Spree.t(:locale_changed)
+      new_locale = (params[:switch_to_locale] || params[:locale]).to_s
+
+      if new_locale.present? && supported_locale?(new_locale)
+
+        if try_spree_current_user && try_spree_current_user.selected_locale != new_locale
+          try_spree_current_user.update!(selected_locale: new_locale)
+        end
+
+        if should_build_new_url?
+          redirect_to BuildLocalizedRedirectUrl.call(
+            url: request.env['HTTP_REFERER'],
+            locale: new_locale,
+            default_locale: current_store.default_locale
+          ).value
+        else
+          redirect_to root_path(locale: new_locale)
+        end
+      else
+        redirect_to root_path
+      end
+    end
+
+    private
+
+    def should_build_new_url?
+      return false if request.env['HTTP_REFERER'].blank?
+      if request.env['HTTP_REFERER'].match(REDIRECT_TO_ROOT)
+        false
       else
-        flash[:error] = Spree.t(:locale_not_changed)
+        request.env['HTTP_REFERER'] != request.env['REQUEST_URI']
       end
-      redirect_back_or_default(spree.root_path)
     end
   end
 end

data/app/controllers/spree/orders_controller.rb

@@ -5,42 +5,40 @@ module Spree
 
     helper 'spree/products', 'spree/orders'
 
-    respond_to :html
-
     before_action :assign_order_with_lock, only: :update
 
     def show
-      @order = Order.includes(line_items: [variant: [:option_values, :images, :product]], bill_address: :state, ship_address: :state).find_by!(number: params[:id])
+      @order = current_store.orders.includes(line_items: [variant: [:option_values, :images, :product]], bill_address: :state, ship_address: :state).find_by!(number: params[:id])
     end
 
     def update
-      @variant = Spree::Variant.find(params[:variant_id]) if params[:variant_id]
+      @variant = curret_store.variants.find(params[:variant_id]) if params[:variant_id]
       if Cart::Update.call(order: @order, params: order_params).success?
         respond_with(@order) do |format|
           format.html do
             if params.key?(:checkout)
               @order.next if @order.cart?
-              redirect_to checkout_state_path(@order.checkout_steps.first)
+              redirect_to spree.checkout_state_path(@order.checkout_steps.first)
             else
-              redirect_to cart_path
+              redirect_to spree.cart_path
             end
           end
         end
       else
-        respond_with(@order)
+        respond_with(@order, status: :unprocessable_entity)
       end
     end
 
     # Shows the current incomplete order from the session
     def edit
-      @order = current_order || Order.incomplete.
+      @order = current_order || current_store.orders.incomplete.
                includes(line_items: [variant: [:images, :product, option_values: :option_type]]).
                find_or_initialize_by(token: cookies.signed[:token])
       associate_user
     end
 
     def empty
-      current_order.try(:empty!)
+      cart_empty_service.call(order: current_order)
 
       redirect_to spree.cart_path
     end
@@ -56,7 +54,7 @@ module Spree
     end
 
     def check_authorization
-      order = Spree::Order.find_by(number: params[:id]) if params[:id].present?
+      order = current_store.orders.find_by(number: params[:id]) if params[:id].present?
       order ||= current_order
 
       if order && action_name.to_sym == :show
@@ -87,5 +85,9 @@ module Spree
     def cart_add_item_service
       Spree::Dependencies.cart_add_item_service.constantize
     end
+
+    def cart_empty_service
+      Spree::Dependencies.cart_empty_service.constantize
+    end
   end
 end

data/app/controllers/spree/products_controller.rb

@@ -2,34 +2,29 @@ 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
 
-    respond_to :html
+    before_action :can_show_product?, only: :show
 
     def index
-      @searcher = build_searcher(params.merge(include_images: true))
+      @searcher = build_searcher(params.merge(include_images: true, current_store: current_store))
       @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
       redirect_if_legacy_path
 
-      @taxon = params[:taxon_id].present? ? Spree::Taxon.find(params[:taxon_id]) : @product.taxons.first
+      @taxon = params[:taxon_id].present? ? taxons_scope.find_by(id: params[:taxon_id]) : nil
+      @taxon = @product.taxons.first unless @taxon.present?
 
-      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 +34,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
@@ -59,19 +52,15 @@ module Spree
     end
 
     def load_product
-      @products = if try_spree_current_user.try(:has_spree_role?, 'admin')
-                    Product.with_deleted
-                  else
-                    Product.active(current_currency)
-                  end
-
-      @product = @products.includes(:master).
-                 friendly.
-                 find(params[:id])
+      @product = find_with_fallback_default_locale { current_store.products.for_user(try_spree_current_user).friendly.find(params[:id]) }
     end
 
     def load_taxon
-      @taxon = Spree::Taxon.find(params[:taxon]) if params[:taxon].present?
+      @taxon = taxons_scope.find(params[:taxon]) if params[:taxon].present?
+    end
+
+    def can_show_product?
+      raise ActiveRecord::RecordNotFound if @product.stores.exclude?(current_store)
     end
 
     def load_variants
@@ -96,7 +85,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 +103,25 @@ 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
+
+    def taxons_scope
+      current_store.taxons
+    end
   end
 end