spree_core 4.3.0.rc1 → 4.3.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b031163e0c77da6776854068fb9769ed6cd44ff048e75a088ee6526c40db986
-  data.tar.gz: 2cfbcbfb7a1c5221270e7b677222a94047b5965cb32e5144ca6540d927f2b51b
+  metadata.gz: d280751e897448ce4593ebe1d5f2fc9cd823e998699864ac8b52d2dfa28b49d6
+  data.tar.gz: 21ed38407942b369d6a7a2360730190a124264bd9b8137e79c49d4058fac16f6
 SHA512:
-  metadata.gz: 375bd44efe93e706a1bd58abcc9be1fb3f2af0b0a993fe223a1e093033193105012284e0a7f03413fad0099feb105fa4b1526b8d576d76e58e62e37967c67768
-  data.tar.gz: c82f2406e121b6fff092677e91d0344e35c5b6e19aee5aca1916ee819d7909a42ef854653922413e215c67934cb73df2a1af002fbe3d48f53db99ff854d80f93
+  metadata.gz: 803917626fa68a87c54fd9d88dbb2388e84fefce8873ef3a7a96e7a49e1a1a7a9b327864a7c222fc31006795eaefbf10c12db584e5cd308b19464617b3235b80
+  data.tar.gz: f1ecb88f76d6061727b9bd569f24ae672491507248584106d1be936a2dfb3c78a1a1693b0affb84d0f8e34fe2991346b2884386ac7ac67df838408a81d10bc85

data/app/finders/spree/products/find.rb

@@ -27,6 +27,9 @@ module Spree
         @deleted          = params.dig(:filter, :show_deleted)
         @discontinued     = params.dig(:filter, :show_discontinued)
         @properties       = params.dig(:filter, :properties)
+        @in_stock         = params.dig(:filter, :in_stock)
+        @backorderable    = params.dig(:filter, :backorderable)
+        @purchasable      = params.dig(:filter, :purchasable)
       end
 
       def execute
@@ -42,6 +45,9 @@ module Spree
         products = by_properties(products)
         products = include_deleted(products)
         products = include_discontinued(products)
+        products = show_only_stock(products)
+        products = show_only_backorderable(products)
+        products = show_only_purchasable(products)
         products = ordered(products)
 
         products.distinct
@@ -49,8 +55,8 @@ module Spree
 
       private
 
-      attr_reader :ids, :skus, :price, :currency, :taxons, :concat_taxons, :name, :options,
-                  :option_value_ids, :scope, :sort_by, :deleted, :discontinued, :properties, :store
+      attr_reader :ids, :skus, :price, :currency, :taxons, :concat_taxons, :name, :options, :option_value_ids, :scope,
+                  :sort_by, :deleted, :discontinued, :properties, :store, :in_stock, :backorderable, :purchasable
 
       def ids?
         ids.present?
@@ -231,6 +237,24 @@ module Spree
         discontinued ? products : products.active(currency)
       end
 
+      def show_only_stock(products)
+        return products unless in_stock.to_s == 'true'
+
+        products.in_stock
+      end
+
+      def show_only_backorderable(products)
+        return products unless backorderable.to_s == 'true'
+
+        products.backorderable
+      end
+
+      def show_only_purchasable(products)
+        return products unless purchasable.to_s == 'true'
+
+        products.in_stock_or_backorderable
+      end
+
       def map_prices(prices)
         prices.map do |price|
           price == 'Infinity' ? Float::INFINITY : price.to_f

data/app/models/concerns/spree/display_money.rb

@@ -17,13 +17,17 @@ module Spree
     # Decorate a method, but with some additional options
     #     extend Spree::DisplayMoney
     #     money_methods tax_amount: { currency: "CAD", no_cents: true }, :price
+    # Use generated method with the same arguments as in wrapped method
+    #     def tax_amount(order, country)
+    #     display_tax_amount(order, country)
     def money_methods(*args)
       args.each do |money_method|
         money_method = { money_method => {} } unless money_method.is_a? Hash
         money_method.each do |method_name, opts|
-          define_method("display_#{method_name}") do
+          define_method("display_#{method_name}") do |**args_list|
             default_opts = respond_to?(:currency) ? { currency: currency } : {}
-            Spree::Money.new(send(method_name), default_opts.merge(opts))
+
+            Spree::Money.new(send(method_name, **args_list), default_opts.merge(opts).merge(args_list.slice(:currency)))
           end
         end
       end

data/app/models/concerns/spree/product_scopes.rb

@@ -62,6 +62,18 @@ module Spree
         where("#{price_table_name}.amount >= ?", price)
       end
 
+      add_search_scope :in_stock do
+        joins(:variants_including_master).merge(Spree::Variant.in_stock)
+      end
+
+      add_search_scope :backorderable do
+        joins(:variants_including_master).merge(Spree::Variant.backorderable)
+      end
+
+      add_search_scope :in_stock_or_backorderable do
+        joins(:variants_including_master).merge(Spree::Variant.in_stock_or_backorderable)
+      end
+
       # This scope selects products in taxon AND all its descendants
       # If you need products only within one taxon use
       #

data/app/models/concerns/spree/single_store_resource.rb

@@ -3,7 +3,17 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
+      validate :ensure_store_association_is_not_changed
+
       scope :for_store, ->(store) { where(store_id: store.id) }
     end
+
+    protected
+
+    def ensure_store_association_is_not_changed
+      if store_id_changed? && persisted?
+        errors.add(:store, Spree.t('errors.messages.store_association_can_not_be_changed'))
+      end
+    end
   end
 end

data/app/models/concerns/spree/user_methods.rb

@@ -4,6 +4,7 @@ module Spree
 
     include Spree::UserPaymentSource
     include Spree::UserReporting
+    include Spree::UserRoles
     include Spree::RansackableAttributes
 
     included do
@@ -15,9 +16,6 @@ module Spree
 
       attr_accessor :use_billing
 
-      has_many :role_users, class_name: 'Spree::RoleUser', foreign_key: :user_id, dependent: :destroy
-      has_many :spree_roles, through: :role_users, class_name: 'Spree::Role', source: :role
-
       has_many :promotion_rule_users, class_name: 'Spree::PromotionRuleUser', foreign_key: :user_id, dependent: :destroy
       has_many :promotion_rules, through: :promotion_rule_users, class_name: 'Spree::PromotionRule'
 
@@ -47,11 +45,6 @@ module Spree
       end
     end
 
-    # has_spree_role? simply needs to return true or false whether a user has a role or not.
-    def has_spree_role?(role_in_question)
-      spree_roles.any? { |role| role.name == role_in_question.to_s }
-    end
-
     def last_incomplete_spree_order(store, options = {})
       orders.where(store: store).incomplete.
         includes(options[:includes]).
@@ -65,6 +58,14 @@ module Spree
       store_credits.for_store(store).where(currency: currency).reload.to_a.sum(&:amount_remaining)
     end
 
+    def available_store_credits(store)
+      store ||= Store.default
+
+      store_credits.for_store(store).pluck(:currency).uniq.each_with_object([]) do |currency, arr|
+        arr << Spree::Money.new(total_available_store_credit(currency, store), currency: currency)
+      end
+    end
+
     private
 
     def check_completed_orders

data/app/models/concerns/spree/user_reporting.rb

@@ -3,20 +3,45 @@ module Spree
     extend DisplayMoney
     money_methods :lifetime_value, :average_order_value
 
-    def lifetime_value
-      orders.complete.sum(:total)
+    def report_values_for(report_name, store)
+      store ||= Store.default
+
+      completed_orders(store).pluck(:currency).uniq.each_with_object([]) do |currency, arr|
+        arr << send("display_#{report_name}", store: store, currency: currency)
+      end
     end
 
-    def order_count
-      orders.complete.size
+    def lifetime_value(**args)
+      order_calculate(operation: :sum,
+                      column: :total,
+                      **args)
     end
 
-    def average_order_value
-      if order_count > 0
-        lifetime_value / order_count
-      else
-        BigDecimal('0.00')
-      end
+    def average_order_value(**args)
+      order_calculate(operation: :average,
+                      column: :total,
+                      **args)
+    end
+
+    def order_count(store = nil)
+      store ||= Store.default
+      order_calculate(store: store,
+                      currency: store.supported_currencies.split(','),
+                      operation: :count,
+                      column: :all)
+    end
+
+    private
+
+    def order_calculate(operation:, column:, store: nil, currency: nil)
+      store ||= Store.default
+      currency ||= store.default_currency
+
+      completed_orders(store).where(currency: currency).calculate(operation, column) || BigDecimal('0.00')
+    end
+
+    def completed_orders(store)
+      orders.for_store(store).complete
     end
   end
 end

data/app/models/concerns/spree/user_roles.rb

@@ -0,0 +1,25 @@
+module Spree
+  module UserRoles
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :role_users, class_name: 'Spree::RoleUser', foreign_key: :user_id, dependent: :destroy
+      has_many :spree_roles, through: :role_users, class_name: 'Spree::Role', source: :role
+
+      scope :admin, -> { joins(:spree_roles).where(Spree::Role.table_name => { name: 'admin' }) }
+
+      # has_spree_role? simply needs to return true or false whether a user has a role or not.
+      def has_spree_role?(role_name)
+        spree_roles.exists?(name: role_name)
+      end
+
+      def self.admin_created?
+        admin.exists?
+      end
+
+      def admin?
+        has_spree_role?('admin')
+      end
+    end
+  end
+end

data/app/models/spree/property.rb

@@ -18,7 +18,7 @@ module Spree
     after_touch :touch_all_products
     after_save :ensure_product_properties_have_filter_params
 
-    self.whitelisted_ransackable_attributes = ['presentation']
+    self.whitelisted_ransackable_attributes = ['presentation', 'filterable']
 
     def uniq_values(product_properties_scope: nil)
       with_uniq_values_cache_key(product_properties_scope) do

data/app/models/spree/store.rb

@@ -76,8 +76,8 @@ module Spree
 
     def self.current(url = nil)
       ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-        `Spree::Store.current` is deprecated and will be removed in Spree 5
-        Spree::Stores::FindCurrent.new(url: "http://example.com") instead
+        `Spree::Store.current` is deprecated and will be removed in Spree 5.0
+        Please use `Spree::Stores::FindCurrent.new(url: "https://example.com").execute` instead
       DEPRECATION
       Stores::FindCurrent.new(url: url).execute
     end

data/config/locales/en.yml

@@ -184,6 +184,12 @@ en:
       spree/address:
         one: Address
         other: Addresses
+      spree/cms_page:
+        one: Page
+        other: Pages
+      spree/cms_section:
+        one: Section
+        other: Sections
       spree/country:
         one: Country
         other: Countries
@@ -964,6 +970,8 @@ en:
     error: error
     errors:
       messages:
+        store_association_can_not_be_changed: The store association can not be changed
+        store_is_already_set: Store is already set
         blank: can't be blank
         could_not_create_taxon: Could not create taxon
         no_shipping_methods_available: No shipping methods available for selected location, please change your address and try again.
@@ -1132,7 +1140,7 @@ en:
     log_in_to_continue: Log in to continue
     logs: "Logs"
     logged_in_as: Logged in as
-    logged_in_succesfully: Logged in successfully
+    logged_in_successfully: Logged in successfully
     logged_out: You have been logged out.
     login: Login
     login_as_existing: Login as Existing Customer

data/db/migrate/20210527094055_create_spree_products_stores.rb

@@ -1,6 +1,13 @@
 class CreateSpreeProductsStores < ActiveRecord::Migration[5.2]
   def up
-    unless table_exists?(:spree_products_stores)
+    if table_exists?(:spree_products_stores)
+      unless index_exists?(:spree_products_stores, [:product_id, :store_id], unique: true)
+        add_index :spree_products_stores, [:product_id, :store_id], unique: true
+      end
+      unless column_exists?(:spree_products_stores, :created_at)
+        add_timestamps :spree_products_stores
+      end
+    else
       create_table :spree_products_stores do |t|
         t.references :product, index: true
         t.references :store,  index: true
@@ -12,13 +19,13 @@ class CreateSpreeProductsStores < ActiveRecord::Migration[5.2]
       stores = Spree::Store.all
       product_ids = Spree::Product.with_deleted.order(:id).ids
 
-      stores.find_each do |store|
-        prepared_values = product_ids.map { |id| "(#{id}, #{store.id}, '#{Time.current.to_s(:db)}', '#{Time.current.to_s(:db)}')" }.join(', ')
-        next if prepared_values.empty?
+      if product_ids.any? && Spree::StoreProduct.respond_to?(:insert_all)
+        stores.find_each do |store|
+          records = product_ids.map { |product_id| { product_id: product_id, store_id: store.id } }
 
-        begin
-          execute "INSERT INTO spree_products_stores (product_id, store_id, created_at, updated_at) VALUES #{prepared_values};"
-        rescue ActiveRecord::RecordNotUnique; end
+          # Rails 5 does not have insert_all
+          Spree::StoreProduct.insert_all(records)
+        end
       end
     end
   end

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

@@ -68,7 +68,7 @@ module Spree
             inside dummy_path do
               inject_require_for(gem)
             end
-          rescue
+          rescue StandardError, LoadError
           end
         end
       end

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -35,4 +35,6 @@ Dummy::Application.configure do
   config.active_support.deprecation = :stderr
 
   config.active_job.queue_adapter = :test
+
+  config.cache_store = :redis_cache_store
 end

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

@@ -22,6 +22,20 @@ module Spree
           current_store.default_locale
         end
 
+        def ensure_current_store(object)
+          return if object.nil?
+
+          if object.has_attribute?(:store_id)
+            if object.store.present? && object.store != current_store
+              raise Spree.t('errors.messages.store_is_already_set')
+            else
+              object.store = current_store
+            end
+          elsif object.class.method_defined?(:stores) && object.stores.exclude?(current_store)
+            object.stores << current_store
+          end
+        end
+
         # Return a Hash of things that influence the prices displayed in your shop.
         #
         # By default, the only thing that influences prices that is the current order's +tax_zone+

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.3.0.rc1'.freeze
+  VERSION = '4.3.0.rc2'.freeze
 
   def self.version
     VERSION

data/lib/spree/testing_support/factories/product_factory.rb

@@ -36,6 +36,12 @@ FactoryBot.define do
         after :create do |product|
           product.master.stock_items.first.adjust_count_on_hand(10)
         end
+
+        trait :without_backorder do
+          after :create do |product|
+            product.master.stock_items.update_all(backorderable: false)
+          end
+        end
       end
 
       factory :product_with_option_types do

data/lib/spree/testing_support/locale_helpers.rb

@@ -48,7 +48,7 @@ module Spree
             remember_me: 'Se souvenir de moi',
             my_account: 'Mon compte',
             my_orders: 'Mes commandes',
-            logged_in_succesfully: 'Connexion réussie'
+            logged_in_successfully: 'Connexion réussie'
           })
       end
       # rubocop:enable Layout/ArgumentAlignment

data/lib/spree/testing_support/rspec_retry_config.rb

@@ -7,4 +7,9 @@ RSpec.configure do |config|
   config.around :each, type: :feature do |ex|
     ex.run_with_retry retry: ENV.fetch('RSPEC_RETRY_RETRY_COUNT', 3).to_i
   end
+
+  # callback to be run between retries
+  config.retry_callback = proc do |ex|
+    Rails.cache.clear
+  end
 end

data/spree_core.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.metadata = {
     "bug_tracker_uri"   => "https://github.com/spree/spree/issues",
     "changelog_uri"     => "https://github.com/spree/spree/releases/tag/v#{s.version}",
-    "documentation_uri" => "https://guides.spreecommerce.org/",
+    "documentation_uri" => "https://dev-docs.spreecommerce.org/",
     "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
   }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.3.0.rc1
+  version: 4.3.0.rc2
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -483,6 +483,7 @@ files:
 - app/models/concerns/spree/user_methods.rb
 - app/models/concerns/spree/user_payment_source.rb
 - app/models/concerns/spree/user_reporting.rb
+- app/models/concerns/spree/user_roles.rb
 - app/models/concerns/spree/vat_price_calculation.rb
 - app/models/friendly_id/slug_decorator.rb
 - app/models/spree/ability.rb
@@ -1192,9 +1193,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.3.0.rc1
-  documentation_uri: https://guides.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.3.0.rc1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.3.0.rc2
+  documentation_uri: https://dev-docs.spreecommerce.org/
+  source_code_uri: https://github.com/spree/spree/tree/v4.3.0.rc2
 post_install_message:
 rdoc_options: []
 require_paths: