spree_frontend 4.2.4 → 4.3.0.rc3

data/app/controllers/spree/addresses_controller.rb

@@ -10,7 +10,7 @@ module Spree
 
     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
@@ -23,28 +23,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
-        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)
-          redirect_back_or_default(addresses_path)
-        else
-          render :edit
-        end
+        render :edit
       end
     end
 
@@ -60,5 +47,13 @@ module Spree
     def address_params
       params.require(:address).permit(permitted_address_attributes)
     end
+
+    def create_service
+      Spree::Dependencies.account_create_address_service.constantize
+    end
+
+    def update_service
+      Spree::Dependencies.account_update_address_service.constantize
+    end
   end
 end

data/app/controllers/spree/checkout_controller.rb

@@ -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

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

@@ -2,12 +2,45 @@ module Spree
   class HomeController < Spree::StoreController
     include Spree::CacheHelper
 
+    before_action :load_homepage, only: [:index]
+
     respond_to :html
 
     def index
+      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: store_last_modified, public: true
+        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,5 +1,7 @@
 module Spree
   class LocaleController < Spree::StoreController
+    REDIRECT_TO_ROOT = /\/(#{Spree::Config[:storefront_pages_path]})\//.freeze
+
     def index
       render :index, layout: false
     end
@@ -25,7 +27,11 @@ module Spree
     private
 
     def should_build_new_url?
-      request.env['HTTP_REFERER'].present? && request.env['HTTP_REFERER'] != request.env['REQUEST_URI']
+      if request.env['HTTP_REFERER'].match(REDIRECT_TO_ROOT)
+        false
+      else
+        request.env['HTTP_REFERER'].present? && request.env['HTTP_REFERER'] != request.env['REQUEST_URI']
+      end
     end
   end
 end

data/app/controllers/spree/orders_controller.rb

@@ -5,16 +5,14 @@ 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
@@ -33,14 +31,14 @@ module Spree
 
     # 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

@@ -7,10 +7,10 @@ module Spree
     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, current_store_id: current_store.id))
+      @searcher = build_searcher(params.merge(include_images: true, current_store: current_store))
       @products = @searcher.retrieve_products
 
       if http_cache_enabled?
@@ -21,7 +21,8 @@ module Spree
     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 !http_cache_enabled? || stale?(etag: etag_show, last_modified: last_modified_show, public: true)
         @product_summary = Spree::ProductSummaryPresenter.new(@product).call
@@ -51,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 = 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
@@ -122,5 +119,9 @@ module Spree
 
       [product_last_modified, current_store_last_modified].compact.max
     end
+
+    def taxons_scope
+      current_store.taxons
+    end
   end
 end

data/app/controllers/spree/store_controller.rb

@@ -1,8 +1,18 @@
 module Spree
-  class StoreController < Spree::BaseController
+  class StoreController < ApplicationController
+    include Spree::Core::ControllerHelpers::Auth
+    include Spree::Core::ControllerHelpers::Common
+    include Spree::Core::ControllerHelpers::Search
+    include Spree::Core::ControllerHelpers::Store
+    include Spree::Core::ControllerHelpers::StrongParameters
+    include Spree::Core::ControllerHelpers::Locale
+    include Spree::Core::ControllerHelpers::Currency
     include Spree::Core::ControllerHelpers::Order
     include Spree::LocaleUrls
 
+    respond_to :html
+
+    helper 'spree/base'
     helper 'spree/locale'
     helper 'spree/currency'
 
@@ -50,5 +60,19 @@ module Spree
     def store_last_modified
       (current_store.updated_at || Time.current).utc
     end
+
+    def redirect_unauthorized_access
+      if try_spree_current_user
+        flash[:error] = Spree.t(:authorization_failure)
+        redirect_to spree.forbidden_path
+      else
+        store_location
+        if respond_to?(:spree_login_path)
+          redirect_to spree_login_path
+        else
+          redirect_to spree.root_path
+        end
+      end
+    end
   end
 end

data/app/controllers/spree/taxons_controller.rb

@@ -6,8 +6,6 @@ module Spree
 
     before_action :load_taxon
 
-    respond_to :html
-
     def show
       if !http_cache_enabled? || stale?(etag: etag, last_modified: last_modified, public: true)
         load_products
@@ -32,11 +30,17 @@ module Spree
     end
 
     def load_taxon
-      @taxon = Spree::Taxon.friendly.find(params[:id])
+      @taxon = current_store.taxons.friendly.find(params[:id])
     end
 
     def load_products
-      @searcher = build_searcher(params.merge(taxon: @taxon.id, include_images: true))
+      search_params = params.merge(
+        current_store: current_store,
+        taxon: @taxon,
+        include_images: true
+      )
+
+      @searcher = build_searcher(search_params)
       @products = @searcher.retrieve_products
     end
 
@@ -57,7 +61,10 @@ module Spree
     end
 
     def last_modified
-      @taxon.updated_at&.utc
+      taxon_last_modified = @taxon&.updated_at&.utc
+      current_store_last_modified = current_store.updated_at.utc
+
+      [taxon_last_modified, current_store_last_modified].compact.max
     end
   end
 end

data/app/helpers/spree/addresses_helper.rb

@@ -22,7 +22,7 @@ module Spree
     end
 
     def address_zipcode(form, country, address_id = 'b')
-      country ||= Spree::Country.default
+      country ||= address_default_country
       is_required = country.zipcode_required?
       method_name = Spree.t(:zipcode)
       required = Spree.t(:required)
@@ -38,7 +38,7 @@ module Spree
     end
 
     def address_state(form, country, address_id = 'b')
-      country ||= Spree::Country.find(Spree::Config[:default_country_id])
+      country ||= address_default_country
       have_states = country.states.any?
       state_elements = [
         form.collection_select(:state_id, checkout_zone_applicable_states_for(country).sort_by(&:name),
@@ -60,8 +60,9 @@ 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)) +
-        javascript_tag("document.write(\"<span class='d-block position-relative'>#{state_elements.html_safe}</span>\");")
+      content_tag :span, class: 'd-block position-relative' do
+        state_elements.html_safe
+      end
     end
 
     def user_available_addresses
@@ -80,5 +81,9 @@ module Spree
     def checkout_zone_applicable_states_for(country)
       current_store.states_available_for_checkout(country)
     end
+
+    def address_default_country
+      @address_default_country ||= current_store.default_country
+    end
   end
 end

data/app/helpers/spree/cms_pages_helper.rb

@@ -0,0 +1,23 @@
+module Spree
+  module CmsPagesHelper
+    def simple_page?(page)
+      page.content.present? && !page.sections?
+    end
+
+    def section_tags(section, &block)
+      inner_content = content_tag(:div, class: section.css_classes, &block)
+
+      if section.fullscreen?
+        inner_content
+      else
+        content_tag(:div, inner_content, class: 'container')
+      end
+    end
+
+    def build_section(section)
+      section_tags(section) do
+        render "spree/shared/cms/sections/#{spree_resource_path(section)}", section: section
+      end
+    end
+  end
+end