spree_core 4.0.7 → 4.1.0.rc1

data/db/default/spree/stores.rb

@@ -1,10 +1,15 @@
 # Possibly already created by a migration.
-unless Spree::Store.where(code: 'spree').exists?
+unless Spree::Store.default.persisted?
   Spree::Store.new do |s|
-    s.code              = 'spree'
     s.name              = 'Spree Demo Site'
-    s.url               = 'example.com'
+    s.code              = 'spree'
+    s.url               = Rails.application.routes.default_url_options[:host] || 'demo.spreecommerce.org'
     s.mail_from_address = 'spree@example.com'
     s.default_currency  = 'USD'
+    s.seo_title         = 'Spree Commerce Demo Shop'
+    s.meta_description  = 'Spree Commerce is an open source Ecommerce framework decision makers want, developers enjoy.'
+    s.facebook          = 'spreecommerce'
+    s.twitter           = 'spreecommerce'
+    s.instagram         = 'spreecommerce'
   end.save!
 end

data/db/migrate/20140309033438_create_store_from_preferences.rb

@@ -6,7 +6,7 @@ class CreateStoreFromPreferences < ActiveRecord::Migration[4.2]
         false
       end
     end
-    
+
     preference_store = Spree::Preferences::Store.instance
     if store = Spree::Store.where(default: true).first
       store.meta_description = preference_store.get('spree/app_configuration/default_meta_description') {}
@@ -26,10 +26,14 @@ class CreateStoreFromPreferences < ActiveRecord::Migration[4.2]
           'spree@example.com'
         end
 
-        s.meta_description = preference_store.get('spree/app_configuration/default_meta_description') {}
+        s.meta_description = preference_store.get('spree/app_configuration/default_meta_description') do
+          'Spree Commerce is an open source Ecommerce framework decision makers want, developers enjoy.'
+        end
         s.meta_keywords    = preference_store.get('spree/app_configuration/default_meta_keywords') {}
-        s.seo_title        = preference_store.get('spree/app_configuration/default_seo_title') {}
-        s.default_currency = preference_store.get('spree/app_configuration/currency') {}
+        s.seo_title        = preference_store.get('spree/app_configuration/default_seo_title') do
+          'Spree Commerce Demo Shop'
+        end
+        s.default_currency = preference_store.get('spree/app_configuration/currency') { 'USD' }
         s.code             = 'spree'
       end.save!
     end

data/db/migrate/20191005121504_add_store_id_to_payment_methods.rb

@@ -0,0 +1,7 @@
+class AddStoreIdToPaymentMethods < ActiveRecord::Migration[5.2]
+  def change
+    unless column_exists?(:spree_payment_methods, :store_id)
+      add_reference :spree_payment_methods, :store, references: :spree_stores, index: true
+    end
+  end
+end

data/db/migrate/20191016134113_add_deafult_value_for_store_default_currency.rb

@@ -0,0 +1,5 @@
+class AddDeafultValueForStoreDefaultCurrency < ActiveRecord::Migration[6.0]
+  def change
+    Spree::Store.where(default_currency: nil).update_all(default_currency: Spree::Config[:currency])
+  end
+end

data/db/migrate/20200102141311_add_social_to_spree_stores.rb

@@ -0,0 +1,7 @@
+class AddSocialToSpreeStores < ActiveRecord::Migration[6.0]
+  def change
+    add_column :spree_stores, :facebook, :string
+    add_column :spree_stores, :twitter, :string
+    add_column :spree_stores, :instagram, :string
+  end
+end

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -57,6 +57,7 @@ module Spree
       template 'rails/test.rb', "#{dummy_path}/config/environments/test.rb", force: true
       template 'rails/script/rails', "#{dummy_path}/spec/dummy/script/rails", force: true
       template 'initializers/devise.rb', "#{dummy_path}/config/initializers/devise.rb", force: true
+      template 'initializers/bullet.rb', "#{dummy_path}/config/initializers/bullet.rb", force: true
     end
 
     def test_dummy_inject_extension_requirements
@@ -137,7 +138,7 @@ end
     end
 
     def gemfile_path
-      core_gems = ['spree/core', 'spree/api', 'spree/backend', 'spree/frontend', 'spree/sample']
+      core_gems = ['spree/core', 'spree/api', 'spree/backend', 'spree/frontend']
 
       if core_gems.include?(lib_name)
         '../../../../../Gemfile'

data/lib/generators/spree/dummy/templates/initializers/bullet.rb

@@ -0,0 +1,5 @@
+if Rails.env.development? && defined?(Bullet)
+  Bullet.enable = true
+  Bullet.rails_logger = true
+  Bullet.stacktrace_includes = [ 'spree_core', 'spree_frontend', 'spree_api', 'spree_backend' ]
+end

data/lib/generators/spree/install/install_generator.rb

@@ -10,7 +10,7 @@ module Spree
     class_option :migrate, type: :boolean, default: true, banner: 'Run Spree migrations'
     class_option :seed, type: :boolean, default: true, banner: 'load seed data (migrations must be run)'
     class_option :sample, type: :boolean, default: true, banner: 'load sample data (migrations must be run)'
-    class_option :copy_views, type: :boolean, default: true, banner: 'copy frontend views from spree to your application for easy customization'
+    class_option :copy_storefront, type: :boolean, default: true, banner: 'copy storefront from spree frontend to your application for easy customization'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
     class_option :admin_email, type: :string
@@ -30,7 +30,7 @@ module Spree
       @run_migrations = options[:migrate]
       @load_seed_data = options[:seed]
       @load_sample_data = options[:sample]
-      @copy_views = options[:copy_views]
+      @copy_storefront = options[:copy_storefront]
 
       unless @run_migrations
         @load_seed_data = false
@@ -40,6 +40,11 @@ module Spree
 
     def add_files
       template 'config/initializers/spree.rb', 'config/initializers/spree.rb'
+
+      if Spree::Core::Engine.frontend_available? || Rails.env.test?
+        template 'config/initializers/spree_storefront.rb', 'config/initializers/spree_storefront.rb'
+        template 'config/spree_storefront.yml', 'config/spree_storefront.yml'
+      end
     end
 
     def additional_tweaks
@@ -54,6 +59,9 @@ module Spree
         Disallow: /account
         Disallow: /api
         Disallow: /password
+        Disallow: /api_tokens
+        Disallow: /cart_link
+        Disallow: /account_link
       ROBOTS
     end
 
@@ -83,9 +91,9 @@ module Spree
       empty_directory 'app/overrides'
     end
 
-    def copy_views
-      if @copy_views && Spree::Core::Engine.frontend_available?
-        generate 'spree:frontend:copy_views'
+    def copy_storefront
+      if @copy_storefront && Spree::Core::Engine.frontend_available?
+        generate 'spree:frontend:copy_storefront'
       end
     end
 

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -26,6 +26,5 @@ Spree.dependencies do |dependencies|
   # dependencies.cart_add_item_service = 'MyNewAwesomeService'
 end
 
-# Spree::Api::Dependencies.storefront_cart_serializer = 'MyRailsApp::CartSerializer'
 
 Spree.user_class = <%= (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]).inspect %>

data/lib/generators/spree/install/templates/config/initializers/spree_storefront.rb

@@ -0,0 +1 @@
+SpreeStorefrontConfig = YAML.load_file(Rails.root.join('config', 'spree_storefront.yml')).with_indifferent_access

data/lib/generators/spree/install/templates/config/spree_storefront.yml

@@ -0,0 +1,67 @@
+default:
+  navigation:
+    - title: Women
+      subtitle: Categories
+      url: /t/women
+      items:
+        - :title: Skirts
+          :url: /t/women/skirts
+        - :title: Dresses
+          :url: /t/women/dresses
+        - :title: Shirts and Blouses
+          :url: /t/women/shirts-and-blouses
+        - :title: Sweaters
+          :url: /t/women/sweaters
+        - :title: Tops and T-shirts
+          :url: /t/women/tops-and-t-shirts
+        - :title: Jackets and Coats
+          :url: /t/women/jackets-and-coats
+      promo_banners:
+        - subtitle: New collection
+          title: Summer 2019
+          url: /t/summer-collection
+          image: 'meganav/promo_banner_left-first-category.jpg'
+        - subtitle: Special Offers
+          title: Get up to 30% off
+          url: /t/special-offers
+          image: 'meganav/promo_banner_right-first-category.jpg'
+    - title: Men
+      subtitle: Categories
+      url: /t/men
+      items:
+        - :title: Shirts
+          :url: /t/men/shirts
+        - :title: T-shirts
+          :url: /t/men/t-shirts
+        - :title: Sweaters
+          :url: /t/men/sweaters
+        - :title: Jackets and Coats
+          :url: /t/men/jackets-and-coats
+      promo_banners:
+        - subtitle: New collection
+          title: Summer 2019
+          url: /t/summer-collection
+          image: 'meganav/promo_banner_left-second-category.jpg'
+        - subtitle: Special Offers
+          title: Get up to 30% off
+          url: /t/special-offers
+          image: 'meganav/promo_banner_right-second-category.jpg'
+    - title: Sportswear
+      subtitle: Categories
+      url: /t/sportswear
+      items:
+        - :title: Tops
+          :url: /t/sportswear/tops
+        - :title: Sweatshirts
+          :url: /t/sportswear/sweatshirts
+        - :title: Pants
+          :url: /t/sportswear/pants
+      promo_banners:
+        - subtitle: New collection
+          title: Summer 2019
+          url: /t/summer-collection
+          image: 'meganav/promo_banner_left-third-category.jpg'
+        - subtitle: Special Offers
+          title: Get up to 30% off
+          url: /t/special-offers
+          image: 'meganav/promo_banner_right-third-category.jpg'

data/lib/spree/core.rb

@@ -93,7 +93,6 @@ require 'spree/money'
 require 'spree/permitted_attributes'
 require 'spree/service_module'
 require 'spree/dependencies_helper'
-require 'spree/database_type_utilities'
 
 require 'spree/core/importer'
 require 'spree/core/query_filters'

data/lib/spree/core/controller_helpers/order.rb

@@ -5,8 +5,6 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          before_action :set_current_order
-
           helper_method :current_order
           helper_method :simple_current_order
         end
@@ -28,6 +26,7 @@ module Spree
         # The current incomplete order from the token for use in cart and during checkout
         def current_order(options = {})
           options[:create_order_if_necessary] ||= false
+          options[:includes] ||= true
 
           if @current_order
             @current_order.last_ip_address = ip_address
@@ -66,8 +65,8 @@ module Spree
 
         private
 
-        def last_incomplete_order
-          @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order(current_store)
+        def last_incomplete_order(includes = {})
+          @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order(current_store, includes: includes)
         end
 
         def current_order_params
@@ -77,8 +76,15 @@ module Spree
         def find_order_by_token_or_user(options = {}, with_adjustments = false)
           options[:lock] ||= false
 
+          includes = if options[:includes]
+                       { line_items: [variant: [:images, :option_values, :product]] }
+                     else
+                       {}
+                     end
+
           # Find any incomplete orders for the token
-          incomplete_orders = Spree::Order.incomplete.includes(line_items: [variant: [:images, :option_values, :product]])
+          incomplete_orders = Spree::Order.incomplete.includes(includes)
+
           token_order_params = current_order_params.except(:user_id)
           order = if with_adjustments
                     incomplete_orders.includes(:adjustments).lock(options[:lock]).find_by(token_order_params)
@@ -87,7 +93,7 @@ module Spree
                   end
 
           # Find any incomplete orders for the current user
-          order = last_incomplete_order if order.nil? && try_spree_current_user
+          order = last_incomplete_order(includes) if order.nil? && try_spree_current_user
 
           order
         end

data/lib/spree/core/controller_helpers/store.rb

@@ -11,7 +11,7 @@ module Spree
         end
 
         def current_currency
-          Spree::Config[:currency]
+          current_store.default_currency
         end
 
         def current_store
@@ -43,7 +43,7 @@ module Spree
         private
 
         def current_tax_zone
-          @current_tax_zone ||= current_order.try(:tax_zone) || Spree::Zone.default_tax
+          @current_tax_zone ||= @current_order&.tax_zone || Spree::Zone.default_tax
         end
       end
     end

data/lib/spree/core/search/base.rb

@@ -13,7 +13,7 @@ module Spree
         end
 
         def retrieve_products
-          @products = get_base_scope
+          @products = extended_base_scope&.available
           curr_page = page || 1
 
           unless Spree::Config.show_products_without_price
@@ -33,34 +33,37 @@ module Spree
 
         protected
 
-        def get_base_scope
+        def extended_base_scope
           base_scope = Spree::Product.spree_base_scopes.active
-          base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
           base_scope = get_products_conditions_for(base_scope, keywords)
+          base_scope = Spree::Products::Find.new(
+            scope: base_scope,
+            params: {
+              filter: {
+                price: price,
+                option_value_ids: option_value_ids,
+                taxons: taxon&.id
+              },
+              sort_by: sort_by
+            },
+            current_currency: current_currency
+          ).execute
           base_scope = add_search_scopes(base_scope)
           base_scope = add_eagerload_scopes(base_scope)
           base_scope
         end
 
         def add_eagerload_scopes(scope)
-          # TL;DR Switch from `preload` to `includes` as soon as Rails starts honoring
-          # `order` clauses on `has_many` associations when a `where` constraint
-          # affecting a joined table is present (see
-          # https://github.com/rails/rails/issues/6769).
-          #
-          # Ideally this would use `includes` instead of `preload` calls, leaving it
-          # up to Rails whether associated objects should be fetched in one big join
-          # or multiple independent queries. However as of Rails 4.1.8 any `order`
-          # defined on `has_many` associations are ignored when Rails builds a join
-          # query.
-          #
-          # Would we use `includes` in this particular case, Rails would do
-          # separate queries most of the time but opt for a join as soon as any
-          # `where` constraints affecting joined tables are added to the search;
-          # which is the case as soon as a taxon is added to the base scope.
-          scope = scope.preload(:tax_category)
-          scope = scope.preload(master: :prices)
-          scope = scope.preload(master: :images) if include_images
+          scope = scope.includes(
+            :tax_category,
+            variants: [
+              { images: { attachment_attachment: :blob } }
+            ],
+            master: [
+              :prices,
+              { images: { attachment_attachment: :blob } }
+            ]
+          )
           scope
         end
 
@@ -68,6 +71,7 @@ module Spree
           if search.is_a?(ActionController::Parameters)
             search.each do |name, scope_attribute|
               scope_name = name.to_sym
+
               base_scope = if base_scope.respond_to?(:search_scopes) && base_scope.search_scopes.include?(scope_name.to_sym)
                              base_scope.send(scope_name, *scope_attribute)
                            else
@@ -81,15 +85,48 @@ module Spree
         # method should return new scope based on base_scope
         def get_products_conditions_for(base_scope, query)
           unless query.blank?
-            base_scope = base_scope.like_any([:name, :description], query.split)
+            base_scope = base_scope.like_any([:name, :description], [query])
+          end
+          base_scope
+        end
+
+        def get_products_option_values_conditions(base_scope, option_value_ids)
+          unless option_value_ids.blank?
+            base_scope = base_scope.joins(variants: :option_values).where(spree_option_values: { id: option_value_ids })
           end
           base_scope
         end
 
+        def get_price_range(price_param)
+          return if price_param.blank?
+
+          less_than_string = I18n.t('activerecord.attributes.spree/product.less_than')
+
+          if price_param.include? less_than_string
+            low_price = 0
+            high_price = Monetize.parse(price_param.remove("#{less_than_string} ")).to_i
+          else
+            low_price, high_price = Monetize.parse_collection(price_param).map(&:to_i)
+          end
+
+          "#{low_price},#{high_price}"
+        end
+
+        def build_option_value_ids(params)
+          filter_params = Spree::OptionType.all.map(&:filter_param)
+
+          filter_params.reduce([]) do |acc, filter_param|
+            acc + params[filter_param].to_s.split(',')
+          end
+        end
+
         def prepare(params)
           @properties[:taxon] = params[:taxon].blank? ? nil : Spree::Taxon.find(params[:taxon])
           @properties[:keywords] = params[:keywords]
+          @properties[:option_value_ids] = build_option_value_ids(params)
+          @properties[:price] = get_price_range(params[:price])
           @properties[:search] = params[:search]
+          @properties[:sort_by] = params[:sort_by] || 'default'
           @properties[:include_images] = params[:include_images]
 
           per_page = params[:per_page].to_i

data/lib/spree/core/version.rb

@@ -1,7 +1,5 @@
 module Spree
-  VERSION = '4.0.7'.freeze
-
   def self.version
-    VERSION
+    '4.1.0.rc1'
   end
 end

data/lib/spree/money.rb

@@ -1,6 +1,7 @@
 require 'money'
 
 Money.locale_backend = :i18n
+Money.rounding_mode = BigDecimal::ROUND_HALF_UP
 
 module Spree
   class Money
@@ -18,6 +19,7 @@ module Spree
     delegate    :cents, :currency, to: :money
 
     def initialize(amount, options = {})
+      use_default_currency
       @money   = Monetize.parse([amount, (options[:currency] || Spree::Config[:currency])].join)
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
@@ -27,7 +29,7 @@ module Spree
     end
 
     def to_s
-      money.format(options)
+      money&.format(options)
     end
 
     # 1) prevent blank, breaking spaces
@@ -62,6 +64,11 @@ module Spree
       money == obj.money
     end
 
+    def use_default_currency
+      currency = Spree::Store.default.default_currency || Spree::Config[:currency]
+      ::Money.default_currency = currency
+    end
+
     private
 
     attr_reader :options