spree_core 4.2.5 → 4.3.0.rc1

data/app/models/spree/store_credit.rb

@@ -1,5 +1,7 @@
 module Spree
   class StoreCredit < Spree::Base
+    include SingleStoreResource
+
     acts_as_paranoid
 
     VOID_ACTION       = 'void'.freeze
@@ -16,9 +18,10 @@ module Spree
     belongs_to :category, class_name: 'Spree::StoreCreditCategory'
     belongs_to :created_by, class_name: Spree.user_class.to_s, foreign_key: 'created_by_id'
     belongs_to :credit_type, class_name: 'Spree::StoreCreditType', foreign_key: 'type_id'
-    has_many :store_credit_events
+    belongs_to :store, class_name: 'Spree::Store'
+    has_many :store_credit_events, class_name: 'Spree::StoreCreditEvent'
 
-    validates :user, :category, :credit_type, :created_by, :currency, presence: true
+    validates :user, :category, :credit_type, :created_by, :currency, :store, presence: true
     validates :amount, numericality: { greater_than: 0 }
     validates :amount_used, numericality: { greater_than_or_equal_to: 0 }
     validate :amount_used_less_than_or_equal_to_amount
@@ -188,7 +191,8 @@ module Spree
         created_by_id: created_by_id,
         currency: currency,
         type_id: type_id,
-        memo: credit_allocation_memo
+        memo: credit_allocation_memo,
+        store: store
       }
     end
 

data/app/models/spree/store_credit_event.rb

@@ -8,7 +8,7 @@ module Spree
     scope :exposed_events, -> { where.not(action: [Spree::StoreCredit::ELIGIBLE_ACTION, Spree::StoreCredit::AUTHORIZE_ACTION]) }
     scope :reverse_chronological, -> { order(created_at: :desc) }
 
-    delegate :currency, to: :store_credit
+    delegate :currency, :store, to: :store_credit
 
     def display_amount
       Spree::Money.new(amount, currency: currency)
@@ -32,7 +32,7 @@ module Spree
     end
 
     def order
-      Spree::Payment.find_by(response_code: authorization_code).try(:order)
+      store.payments.find_by(response_code: authorization_code).try(:order)
     end
   end
 end

data/app/models/spree/store_payment_method.rb

@@ -0,0 +1,11 @@
+module Spree
+  class StorePaymentMethod < Spree::Base
+    self.table_name = 'spree_payment_methods_stores'
+
+    belongs_to :store, class_name: 'Spree::Store', touch: true
+    belongs_to :payment_method, class_name: 'Spree::PaymentMethod', touch: true
+
+    validates :store, :payment_method, presence: true
+    validates :store_id, uniqueness: { scope: :payment_method_id }
+  end
+end

data/app/models/spree/store_product.rb

@@ -0,0 +1,11 @@
+module Spree
+  class StoreProduct < Spree::Base
+    self.table_name = 'spree_products_stores'
+
+    belongs_to :store, class_name: 'Spree::Store', touch: true
+    belongs_to :product, class_name: 'Spree::Product', touch: true
+
+    validates :store, :product, presence: true
+    validates :store_id, uniqueness: { scope: :product_id }
+  end
+end

data/app/models/spree/store_promotion.rb

@@ -0,0 +1,11 @@
+module Spree
+  class StorePromotion < Spree::Base
+    self.table_name = 'spree_promotions_stores'
+
+    belongs_to :store, class_name: 'Spree::Store', touch: true
+    belongs_to :promotion, class_name: 'Spree::Promotion', touch: true
+
+    validates :store, :promotion, presence: true
+    validates :store_id, uniqueness: { scope: :promotion_id }
+  end
+end

data/app/models/spree/taxon.rb

@@ -13,6 +13,9 @@ module Spree
     has_many :classifications, -> { order(:position) }, dependent: :delete_all, inverse_of: :taxon
     has_many :products, through: :classifications
 
+    has_many :menu_items, as: :linked_resource
+    has_many :cms_sections, as: :linked_resource
+
     has_many :prototype_taxons, class_name: 'Spree::PrototypeTaxon', dependent: :destroy
     has_many :prototypes, through: :prototype_taxons, class_name: 'Spree::Prototype'
 
@@ -20,23 +23,30 @@ module Spree
     has_many :promotion_rules, through: :promotion_rule_taxons, class_name: 'Spree::PromotionRule'
 
     validates :name, presence: true, uniqueness: { scope: [:parent_id, :taxonomy_id], allow_blank: true, case_sensitive: false }
-    validates :permalink, uniqueness: { case_sensitive: false }
+    validates :taxonomy, presence: true
+    validates :permalink, uniqueness: { case_sensitive: false, scope: [:parent_id, :taxonomy_id] }
     validates :hide_from_nav, inclusion: { in: [true, false] }
     validates_associated :icon
     validate :check_for_root, on: :create
+    validate :parent_belongs_to_same_taxonomy
     with_options length: { maximum: 255 }, allow_blank: true do
       validates :meta_keywords
       validates :meta_description
       validates :meta_title
     end
 
+    before_validation :copy_taxonomy_from_parent
     after_save :touch_ancestors_and_taxonomy
     after_touch :touch_ancestors_and_taxonomy
 
     has_one :icon, as: :viewable, dependent: :destroy, class_name: 'Spree::TaxonImage'
 
+    scope :for_store, ->(store) { joins(:taxonomy).where(spree_taxonomies: { store_id: store.id }) }
+
     self.whitelisted_ransackable_associations = %w[taxonomy]
 
+    scope :for_stores, ->(stores) { joins(:taxonomy).where(spree_taxonomies: { store_id: stores.ids }) }
+
     # indicate which filters should be used for a taxon
     # this method should be customized to your own site
     def applicable_filters
@@ -104,5 +114,15 @@ module Spree
         errors.add(:root_conflict, 'this taxonomy already has a root taxon')
       end
     end
+
+    def parent_belongs_to_same_taxonomy
+      if parent.present? && parent.taxonomy_id != taxonomy_id
+        errors.add(:parent, 'must belong to the same taxonomy')
+      end
+    end
+
+    def copy_taxonomy_from_parent
+      self.taxonomy = parent.taxonomy if parent.present? && taxonomy.blank?
+    end
   end
 end

data/app/models/spree/taxon_image/configuration/active_storage.rb

@@ -9,6 +9,8 @@ module Spree
 
           has_one_attached :attachment
 
+          default_scope { includes(attachment_attachment: :blob) }
+
           def self.styles
             @styles ||= {
               mini: '32x32>',

data/app/models/spree/taxonomy.rb

@@ -2,10 +2,12 @@ module Spree
   class Taxonomy < Spree::Base
     acts_as_list
 
-    validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
+    validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true, scope: :store_id }
+    validates :store, presence: true
 
     has_many :taxons, inverse_of: :taxonomy
     has_one :root, -> { where parent_id: nil }, class_name: 'Spree::Taxon', dependent: :destroy
+    belongs_to :store, class_name: 'Spree::Store'
 
     after_create :set_root
     after_save :set_root_taxon_name

data/app/models/spree/variant.rb

@@ -3,6 +3,10 @@ module Spree
     acts_as_paranoid
     acts_as_list scope: :product
 
+    include MemoizedData
+
+    MEMOIZED_METHODS = %w(purchasable in_stock backorderable tax_category options_text compare_at_price)
+
     belongs_to :product, -> { with_deleted }, touch: true, class_name: 'Spree::Product', inverse_of: :variants
     belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
 
@@ -29,7 +33,7 @@ module Spree
     end
 
     has_many :option_value_variants, class_name: 'Spree::OptionValueVariant'
-    has_many :option_values, through: :option_value_variants, class_name: 'Spree::OptionValue'
+    has_many :option_values, through: :option_value_variants, dependent: :destroy, class_name: 'Spree::OptionValue'
 
     has_many :images, -> { order(:position) }, as: :viewable, dependent: :destroy, class_name: 'Spree::Image'
 
@@ -93,6 +97,7 @@ module Spree
       not_discontinued.not_deleted.
         for_currency_and_available_price_amount(currency)
     end
+    # FIXME: cost price should be represented with DisplayMoney class
     LOCALIZED_NUMBERS = %w(cost_price weight depth width height)
 
     LOCALIZED_NUMBERS.each do |m|
@@ -199,6 +204,10 @@ module Spree
       price_in(currency).try(:amount)
     end
 
+    def compare_at_amount_in(currency)
+      price_in(currency).try(:compare_at_amount)
+    end
+
     def price_modifier_amount_in(currency, options = {})
       return 0 unless options.present?
 
@@ -242,7 +251,7 @@ module Spree
       # Check if model responds to cache version and fall back to updated_at for older rails versions
       # This makes sure a version is supplied when recyclable cache keys are disabled.
       version = respond_to?(:cache_version) ? cache_version : updated_at.to_i
-      Rails.cache.fetch(in_stock_cache_key, version: version) do
+      @in_stock ||= Rails.cache.fetch(in_stock_cache_key, version: version) do
         total_on_hand > 0
       end
     end
@@ -252,7 +261,7 @@ module Spree
     alias is_backorderable? backorderable?
 
     def purchasable?
-      in_stock? || backorderable?
+      @purchasable ||= in_stock? || backorderable?
     end
 
     # Shortcut method to determine if inventory tracking is enabled for this variant
@@ -282,7 +291,7 @@ module Spree
     end
 
     def backordered?
-      total_on_hand <= 0 && stock_items.exists?(backorderable: true)
+      @backordered ||= total_on_hand <= 0 && stock_items.exists?(backorderable: true)
     end
 
     private

data/app/presenters/spree/filters/options_presenter.rb

@@ -0,0 +1,27 @@
+module Spree
+  module Filters
+    class OptionsPresenter
+      FilterableOptionType = Struct.new(:option_type, :option_values, keyword_init: true) do
+        delegate_missing_to :option_type
+      end
+
+      def initialize(option_values_scope:)
+        @option_values = option_values_scope.includes(:option_type)
+      end
+
+      def to_a
+        grouped_options.map do |option_type, option_values|
+          FilterableOptionType.new(option_type: option_type, option_values: option_values)
+        end
+      end
+
+      private
+
+      attr_reader :option_values
+
+      def grouped_options
+        option_values.group_by(&:option_type)
+      end
+    end
+  end
+end

data/app/presenters/spree/filters/price_presenter.rb

@@ -0,0 +1,22 @@
+module Spree
+  module Filters
+    class PricePresenter
+      def initialize(amount:, currency:)
+        @amount = amount.to_i
+        @currency = currency
+      end
+
+      def to_i
+        amount
+      end
+
+      def to_s
+        Spree::Money.new(amount, currency: currency, no_cents_if_whole: true).to_s
+      end
+
+      private
+
+      attr_reader :amount, :currency
+    end
+  end
+end

data/app/presenters/spree/filters/price_range_presenter.rb

@@ -0,0 +1,29 @@
+module Spree
+  module Filters
+    class PriceRangePresenter
+      def self.from_param(param, currency:)
+        prices = param.split('-')
+
+        new(
+          min_price: PricePresenter.new(amount: prices.first, currency: currency),
+          max_price: PricePresenter.new(amount: prices.last, currency: currency)
+        )
+      end
+
+      def initialize(min_price:, max_price:)
+        @min_price = min_price
+        @max_price = max_price
+      end
+
+      attr_reader :min_price, :max_price
+
+      def to_param
+        "#{min_price.to_i}-#{max_price.to_i}"
+      end
+
+      def to_s
+        "#{min_price} - #{max_price}"
+      end
+    end
+  end
+end

data/app/presenters/spree/filters/properties_presenter.rb

@@ -0,0 +1,23 @@
+module Spree
+  module Filters
+    class PropertiesPresenter
+      def initialize(product_properties_scope:)
+        @product_properties = product_properties_scope.includes(:property)
+      end
+
+      def to_a
+        grouped_options.map do |property, product_properties|
+          PropertyPresenter.new(property: property, product_properties: product_properties)
+        end
+      end
+
+      private
+
+      attr_reader :product_properties
+
+      def grouped_options
+        product_properties.group_by(&:property)
+      end
+    end
+  end
+end

data/app/presenters/spree/filters/property_presenter.rb

@@ -0,0 +1,22 @@
+module Spree
+  module Filters
+    class PropertyPresenter
+      def initialize(property:, product_properties:)
+        @property = property
+        @product_properties = product_properties
+      end
+
+      attr_reader :product_properties
+
+      delegate_missing_to :property
+
+      def uniq_values
+        property.uniq_values(product_properties_scope: product_properties)
+      end
+
+      private
+
+      attr_reader :property
+    end
+  end
+end

data/app/presenters/spree/filters/quantified_price_range_presenter.rb

@@ -0,0 +1,44 @@
+module Spree
+  module Filters
+    class QuantifiedPriceRangePresenter
+      ALLOWED_QUANTIFIERS = [
+        :less_than,
+        :more_than
+      ].freeze
+
+      def initialize(price:, quantifier:)
+        if ALLOWED_QUANTIFIERS.exclude?(quantifier.to_sym)
+          raise ArgumentError, "quantifier must be one of: #{ALLOWED_QUANTIFIERS.join(', ')}"
+        end
+
+        @price = price
+        @quantifier = quantifier.to_sym
+      end
+
+      def to_param
+        case quantifier
+        when :less_than
+          less_than_param
+        when :more_than
+          more_than_param
+        end
+      end
+
+      def to_s
+        "#{I18n.t("activerecord.attributes.spree/product.#{quantifier}")} #{price}"
+      end
+
+      private
+
+      attr_reader :price, :quantifier
+
+      def less_than_param
+        "0-#{price.to_i}"
+      end
+
+      def more_than_param
+        "#{price.to_i}-Infinity"
+      end
+    end
+  end
+end

data/app/services/spree/account/addresses/create.rb

@@ -12,6 +12,7 @@ module Spree
 
           address = user.addresses.new(address_params)
           if address.save
+            assign_to_user_as_default(user: user, address_id: address.id)
             success(address)
           else
             failure(address)

data/app/services/spree/account/addresses/helper.rb

@@ -31,6 +31,12 @@ module Spree
           params[:state_id] = country.states.find_by(name: state_name)&.id
           params
         end
+
+        def assign_to_user_as_default(user:, address_id:)
+          if user.addresses.pluck(:id) == [address_id] # check if it's user first address
+            user.update(bill_address_id: address_id, ship_address_id: address_id)
+          end
+        end
       end
     end
   end

data/app/services/spree/account/addresses/update.rb

@@ -11,12 +11,18 @@ module Spree
           address_params[:country_id] ||= address.country_id
           fill_country_and_state_ids(address_params)
 
-          if address.update(address_params)
-            success(address)
+          if address&.editable?
+            address.update(address_params) ? success(address) : failure(address)
           else
-            failure(address)
+            new_address(address_params).valid? ? address.destroy && success(new_address) : failure(new_address)
           end
         end
+
+        private
+
+        def new_address(address_params = {})
+          @new_address ||= ::Spree::Address.find_or_create_by(address_params.except(:id, :updated_at, :created_at))
+        end
       end
     end
   end