spree_core 4.4.0 → 4.6.0

data/app/models/spree/address.rb

@@ -3,6 +3,12 @@ module Spree
     require 'validates_zipcode'
 
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+    if defined?(Spree::Security::Addresses)
+      include Spree::Security::Addresses
+    end
 
     if Rails::VERSION::STRING >= '6.1'
       serialize :preferences, Hash, default: {}
@@ -31,7 +37,7 @@ module Spree
 
     belongs_to :country, class_name: 'Spree::Country'
     belongs_to :state, class_name: 'Spree::State', optional: true
-    belongs_to :user, class_name: Spree.user_class.name, optional: true
+    belongs_to :user, class_name: "::#{Spree.user_class}", optional: true
 
     has_many :shipments, inverse_of: :address
 

data/app/models/spree/asset/support/active_storage.rb

@@ -8,7 +8,7 @@ module Spree
           def url(style)
             return placeholder(style) unless attachment.attached?
 
-            attachment.variant(resize: dimensions_for_style(style))
+            attachment.variant(resize_to_limit: dimensions_for_style(style))
           end
 
           def placeholder(style)
@@ -16,7 +16,8 @@ module Spree
           end
 
           def dimensions_for_style(style)
-            self.class.styles.with_indifferent_access[style] || self.class.styles.with_indifferent_access[default_style]
+            dimensions = self.class.styles.with_indifferent_access[style] || self.class.styles.with_indifferent_access[default_style]
+            dimensions.split('x').map(&:to_i)
           end
         end
       end

data/app/models/spree/asset.rb

@@ -2,6 +2,9 @@ module Spree
   class Asset < Spree::Base
     include Support::ActiveStorage
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     belongs_to :viewable, polymorphic: true, touch: true
     acts_as_list scope: [:viewable_id, :viewable_type]

data/app/models/spree/base.rb

@@ -3,6 +3,7 @@ class Spree::Base < ApplicationRecord
   serialize :preferences, Hash
 
   include Spree::RansackableAttributes
+  include Spree::TranslatableResourceScopes
 
   after_initialize do
     if has_attribute?(:preferences) && !preferences.nil?

data/app/models/spree/cms_page.rb

@@ -3,6 +3,10 @@ module Spree
     include SingleStoreResource
     include DisplayLink
 
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
     acts_as_paranoid
 
     TYPES = ['Spree::Cms::Pages::StandardPage',

data/app/models/spree/cms_section.rb

@@ -7,30 +7,30 @@ module Spree
 
     validate :reset_link_attributes
 
-    IMAGE_COUNT = ['one', 'two', 'three']
-    IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].freeze
-    IMAGE_SIZE = ['sm', 'md', 'lg', 'xl']
+    has_one :image_one, class_name: 'Spree::CmsSectionImageOne', dependent: :destroy, as: :viewable
+    accepts_nested_attributes_for :image_one, reject_if: :all_blank
 
-    IMAGE_COUNT.each do |count|
-      send(:has_one_attached, "image_#{count}".to_sym)
+    has_one :image_two, class_name: 'Spree::CmsSectionImageTwo', dependent: :destroy, as: :viewable
+    accepts_nested_attributes_for :image_two, reject_if: :all_blank
 
-      IMAGE_SIZE.each do |size|
+    has_one :image_three, class_name: 'Spree::CmsSectionImageThree', dependent: :destroy, as: :viewable
+    accepts_nested_attributes_for :image_three, reject_if: :all_blank
+
+    Spree::CmsSectionImage::IMAGE_COUNT.each do |count|
+      Spree::CmsSectionImage::IMAGE_SIZE.each do |size|
         define_method("img_#{count}_#{size}") do |dimensions = nil|
-          return if !send("image_#{count}").attached? || dimensions.nil?
+          image = send("image_#{count}")&.attachment
+          return if !image&.attached? || dimensions.nil?
 
-          send("image_#{count}").variant(resize: dimensions)
+          image.variant(resize_to_limit: dimensions.split('x').map(&:to_i))
         end
       end
     end
 
-    belongs_to :linked_resource, polymorphic: true
-
     default_scope { order(position: :asc) }
 
     validates :name, :cms_page, :type, presence: true
 
-    validates :image_one, :image_two, :image_three, content_type: IMAGE_TYPES
-
     LINKED_RESOURCE_TYPE = []
 
     TYPES = ['Spree::Cms::Sections::HeroImage',

data/app/models/spree/cms_section_image.rb

@@ -0,0 +1,15 @@
+module Spree
+  class CmsSectionImage < Asset
+    if Spree.public_storage_service_name
+      has_one_attached :attachment, service: Spree.public_storage_service_name
+    else
+      has_one_attached :attachment
+    end
+
+    IMAGE_COUNT = ['one', 'two', 'three']
+    IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].freeze
+    IMAGE_SIZE = ['sm', 'md', 'lg', 'xl']
+
+    validates :attachment, attached: true, content_type: IMAGE_TYPES
+  end
+end

data/app/models/spree/cms_section_image_one.rb

@@ -0,0 +1,4 @@
+module Spree
+  class CmsSectionImageOne < CmsSectionImage
+  end
+end

data/app/models/spree/cms_section_image_three.rb

@@ -0,0 +1,4 @@
+module Spree
+  class CmsSectionImageThree < CmsSectionImage
+  end
+end

data/app/models/spree/cms_section_image_two.rb

@@ -0,0 +1,4 @@
+module Spree
+  class CmsSectionImageTwo < CmsSectionImage
+  end
+end

data/app/models/spree/credit_card.rb

@@ -2,11 +2,17 @@ module Spree
   class CreditCard < Spree::Base
     include ActiveMerchant::Billing::CreditCardMethods
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+    if defined?(Spree::Security::CreditCards)
+      include Spree::Security::CreditCards
+    end
 
     acts_as_paranoid
 
     belongs_to :payment_method
-    belongs_to :user, class_name: Spree.user_class.to_s, foreign_key: 'user_id',
+    belongs_to :user, class_name: "::#{Spree.user_class}", foreign_key: 'user_id',
                       optional: true
     has_many :payments, as: :source
 
@@ -174,9 +180,9 @@ module Spree
 
     def self.json_api_permitted_attributes
       [
-        'number', 'month', 'year', 'expiry', 'verification_value', 'first_name', 'last_name', 
-        'cc_type', 'gateway_customer_profile_id', 'gateway_payment_profile_id', 'last_digits', 
-        'name', 'encrypted_data', 'address_id', 'created_at', 'updated_at', 'user_id', 
+        'number', 'month', 'year', 'expiry', 'verification_value', 'first_name', 'last_name',
+        'cc_type', 'gateway_customer_profile_id', 'gateway_payment_profile_id', 'last_digits',
+        'name', 'encrypted_data', 'address_id', 'created_at', 'updated_at', 'user_id',
         'payment_method_id', 'default', 'deleted_at'
       ]
     end

data/app/models/spree/customer_return.rb

@@ -3,6 +3,9 @@ module Spree
     include Spree::Core::NumberGenerator.new(prefix: 'CR', length: 9)
     include NumberIdentifier
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     belongs_to :stock_location
     belongs_to :store, class_name: 'Spree::Store', inverse_of: :customer_returns

data/app/models/spree/data_feed/google.rb

@@ -0,0 +1,15 @@
+require_dependency 'spree/data_feed'
+
+module Spree
+  class DataFeed::Google < DataFeed
+    class << self
+      def label
+        'Google Merchant Center Feed'
+      end
+
+      def provider_name
+        'google'
+      end
+    end
+  end
+end

data/app/models/spree/data_feed.rb

@@ -0,0 +1,40 @@
+module Spree
+  class DataFeed < Base
+    belongs_to :store, class_name: 'Spree::Store', foreign_key: 'store_id'
+
+    scope :for_store, ->(store) { where(store: store) }
+
+    before_validation :generate_slug
+
+    with_options presence: true do
+      validates :store
+      validates :name, uniqueness: true
+      validates :slug, uniqueness: { scope: :store_id }
+    end
+
+    def formatted_url
+      "#{store.formatted_url}/api/v2/data_feeds/#{self.class.provider_name}/#{slug}.rss"
+    end
+
+    private
+
+    def generate_slug
+      new_slug = slug.blank? ? SecureRandom.uuid : slug.parameterize
+      write_attribute(:slug, new_slug)
+    end
+
+    class << self
+      def label
+        raise NotImplementedError
+      end
+
+      def provider_name
+        raise NotImplementedError
+      end
+
+      def available_types
+        Rails.application.config.spree.data_feed_types
+      end
+    end
+  end
+end

data/app/models/spree/digital.rb

@@ -3,6 +3,10 @@ module Spree
     belongs_to :variant
     has_many :digital_links, dependent: :destroy
 
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
     if Spree.private_storage_service_name
       has_one_attached :attachment, service: Spree.private_storage_service_name
     else

data/app/models/spree/digital_link.rb

@@ -2,6 +2,13 @@ module Spree
   class DigitalLink < Spree::Base
     has_secure_token
 
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+    if defined?(Spree::Security::DigitalLinks)
+      include Spree::Security::DigitalLinks
+    end
+
     belongs_to :digital
     belongs_to :line_item
 

data/app/models/spree/fulfilment_changer.rb

@@ -92,7 +92,7 @@ module Spree
     end
 
     def get_desired_shipment_inventory_unit(state)
-      desired_shipment.inventory_units.find_or_create_by(state: state) do |unit|
+      desired_shipment.inventory_units.find_or_create_by(state: state, variant: variant) do |unit|
         current_shipment_unit = current_shipment_units.first
         unit.variant_id = current_shipment_unit.variant_id
         unit.order_id = current_shipment_unit.order_id

data/app/models/spree/gateway/bogus.rb

@@ -58,7 +58,7 @@ module Spree
       ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
     end
 
-    def cancel(_response_code)
+    def cancel(_response_code, _payment = nil)
       ActiveMerchant::Billing::Response.new(true, 'Bogus Gateway: Forced success', {}, test: true, authorization: '12345')
     end
 

data/app/models/spree/icon.rb

@@ -1,6 +1,10 @@
 module Spree
   class Icon < Spree::Asset
-    has_one_attached :attachment
+    if Spree.public_storage_service_name
+      has_one_attached :attachment, service: Spree.public_storage_service_name
+    else
+      has_one_attached :attachment
+    end
 
     ICON_TYPES = %i[png jpg jpeg gif svg]
 

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

@@ -5,7 +5,11 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          has_one_attached :attachment
+          if Spree.public_storage_service_name
+            has_one_attached :attachment, service: Spree.public_storage_service_name
+          else
+            has_one_attached :attachment
+          end
 
           validates :attachment, attached: true, content_type: /\Aimage\/.*\z/
 

data/app/models/spree/image.rb

@@ -13,7 +13,7 @@ module Spree
 
     def styles
       self.class.styles.map do |_, size|
-        width, height = size.chop.split('x')
+        width, height = size.chop.split('x').map(&:to_i)
 
         {
           url: generate_url(size: size),
@@ -28,7 +28,7 @@ module Spree
       size = self.class.styles[name]
       return unless size
 
-      width, height = size.chop.split('x')
+      width, height = size.chop.split('x').map(&:to_i)
 
       {
         url: generate_url(size: size),
@@ -40,7 +40,7 @@ module Spree
 
     def style_dimensions(name)
       size = self.class.styles[name]
-      width, height = size.chop.split('x')
+      width, height = size.chop.split('x').map(&:to_i)
 
       {
         width: width,

data/app/models/spree/inventory_unit.rb

@@ -1,5 +1,9 @@
 module Spree
   class InventoryUnit < Spree::Base
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
     with_options inverse_of: :inventory_units do
       belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'
       belongs_to :order, class_name: 'Spree::Order'
@@ -59,8 +63,7 @@ module Spree
     end
 
     def find_stock_item
-      Spree::StockItem.where(stock_location_id: shipment.stock_location_id,
-                             variant_id: variant_id).first
+      shipment.stock_location.stock_item_or_create(variant)
     end
 
     def self.split(original_inventory_unit, extract_quantity)

data/app/models/spree/legacy_user.rb

@@ -8,7 +8,6 @@ module Spree
 
     self.table_name = 'spree_users'
 
-    attr_accessor :password
-    attr_accessor :password_confirmation
+    attr_accessor :password, :password_confirmation
   end
 end

data/app/models/spree/line_item.rb

@@ -1,6 +1,9 @@
 module Spree
   class LineItem < Spree::Base
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     before_validation :ensure_valid_quantity
 
@@ -8,7 +11,7 @@ module Spree
       belongs_to :order, class_name: 'Spree::Order', touch: true
       belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant'
     end
-    belongs_to :tax_category, class_name: 'Spree::TaxCategory'
+    belongs_to :tax_category, -> { with_deleted }, class_name: 'Spree::TaxCategory'
 
     has_one :product, through: :variant
 

data/app/models/spree/linkable/homepage.rb

@@ -0,0 +1,3 @@
+module Spree::Linkable::Homepage
+  # Placeholder for polymorphic lookup.
+end

data/app/models/spree/linkable/uri.rb

@@ -0,0 +1,3 @@
+module Spree::Linkable::Uri
+  # Placeholder for polymorphic lookup.
+end

data/app/models/spree/log_entry.rb

@@ -1,5 +1,9 @@
 module Spree
   class LogEntry < Spree::Base
+    if defined?(Spree::Security::LogEntries)
+      include Spree::Security::LogEntries
+    end
+
     belongs_to :source, polymorphic: true
 
     # Fix for #1767
@@ -11,7 +15,11 @@ module Spree
     end
 
     def parsed_details
-      @details ||= YAML.safe_load(details, [ActiveMerchant::Billing::Response])
+      @details ||= if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.1.0')
+                     YAML.safe_load(details, permitted_classes: [ActiveMerchant::Billing::Response])
+                   else
+                     YAML.safe_load(details, [ActiveMerchant::Billing::Response])
+                   end
     end
   end
 end

data/app/models/spree/menu.rb

@@ -1,6 +1,9 @@
 module Spree
   class Menu < Spree::Base
     include SingleStoreResource
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     MENU_LOCATIONS = ['Header', 'Footer']
     MENU_LOCATIONS_PARAMETERIZED = []

data/app/models/spree/menu_item.rb

@@ -1,11 +1,16 @@
 module Spree
   class MenuItem < Spree::Base
     include Spree::DisplayLink
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
 
     acts_as_nested_set dependent: :destroy
 
+    ITEM_TYPE = %w[Link Container]
+    LINKED_RESOURCE_TYPE = ['Spree::Linkable::Uri', 'Spree::Linkable::Homepage', 'Spree::Product', 'Spree::Taxon', 'Spree::CmsPage']
+
     belongs_to :menu, touch: true
-    belongs_to :linked_resource, polymorphic: true
 
     before_create :ensure_item_belongs_to_root
     before_update :reset_link_attributes
@@ -14,15 +19,6 @@ module Spree
     after_save :touch_ancestors_and_menu
     after_touch :touch_ancestors_and_menu
 
-    ITEM_TYPE = %w[Link Container]
-
-    LINKED_RESOURCE_TYPE = ['URL']
-    STATIC_RESOURCE_TYPE = ['Home Page']
-    DYNAMIC_RESOURCE_TYPE = ['Spree::Product', 'Spree::Taxon', 'Spree::CmsPage']
-
-    LINKED_RESOURCE_TYPE.unshift(*STATIC_RESOURCE_TYPE)
-    LINKED_RESOURCE_TYPE.push(*DYNAMIC_RESOURCE_TYPE)
-
     validates :name, :menu, presence: true
     validates :item_type, inclusion: { in: ITEM_TYPE }
     validates :linked_resource_type, inclusion: { in: LINKED_RESOURCE_TYPE }
@@ -50,7 +46,7 @@ module Spree
         self.destination = nil
         self.new_window = false
 
-        self.linked_resource_type = 'URL' if item_type == 'Container'
+        self.linked_resource_type = 'Spree::Linkable::Uri' if item_type == 'Container'
       end
     end
 

data/app/models/spree/option_type.rb

@@ -2,8 +2,16 @@ module Spree
   class OptionType < Spree::Base
     include UniqueName
     include Metadata
+    include TranslatableResource
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
+    TRANSLATABLE_FIELDS = %i[name presentation].freeze
+    translates(*TRANSLATABLE_FIELDS)
 
     acts_as_list
+    auto_strip_attributes :name, :presentation
 
     with_options dependent: :destroy, inverse_of: :option_type do
       has_many :option_values, -> { order(:position) }

data/app/models/spree/option_value.rb

@@ -1,9 +1,18 @@
 module Spree
   class OptionValue < Spree::Base
     include Metadata
+    include TranslatableResource
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
+    TRANSLATABLE_FIELDS = %i[name presentation].freeze
+    translates(*TRANSLATABLE_FIELDS)
 
     belongs_to :option_type, class_name: 'Spree::OptionType', touch: true, inverse_of: :option_values
+
     acts_as_list scope: :option_type
+    auto_strip_attributes :name, :presentation
 
     has_many :option_value_variants, class_name: 'Spree::OptionValueVariant'
     has_many :variants, through: :option_value_variants, class_name: 'Spree::Variant'

data/app/models/spree/order/address_book.rb

@@ -54,6 +54,7 @@ module Spree
         return if attributes.blank?
 
         attributes.transform_values! { |v| v == '' ? nil : v }
+        attributes = attributes.to_h.symbolize_keys
 
         default_address_scope = user ? user.addresses : ::Spree::Address
         default_address = default_address_scope.find_by(id: attributes[:id])

data/app/models/spree/order.rb

@@ -24,7 +24,16 @@ module Spree
     include NumberAsParam
     include SingleStoreResource
     include MemoizedData
-    include Metadata
+    include Spree::Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+    if defined?(Spree::Security::Orders)
+      include Spree::Security::Orders
+    end
+    if defined?(Spree::VendorConcern)
+      include Spree::VendorConcern
+    end
 
     MEMOIZED_METHODS = %w(tax_zone)
 
@@ -77,7 +86,7 @@ module Spree
     attribute :state_machine_resumed, :boolean
 
     if Spree.user_class
-      belongs_to :user, class_name: Spree.user_class.to_s, optional: true
+      belongs_to :user, class_name: "::#{Spree.user_class}", optional: true
     else
       belongs_to :user, optional: true
     end
@@ -146,7 +155,7 @@ module Spree
 
     before_create :create_token
     before_create :link_by_email
-    before_update :homogenize_line_item_currencies, if: :currency_changed?
+    before_update :ensure_updated_shipments, :homogenize_line_item_currencies, if: :currency_changed?
 
     with_options presence: true do
       # we want to have this case_sentive: true as changing it to false causes all SQL to use LOWER(slug)

data/app/models/spree/order_merger.rb

@@ -54,7 +54,7 @@ module Spree
 
     # Change the error messages as you choose.
     def handle_error(line_item)
-      order.errors[:base] << line_item.errors.full_messages
+      order.errors.add(:base, line_item.errors.full_messages)
     end
 
     def persist_merge

data/app/models/spree/payment/processing.rb

@@ -72,7 +72,7 @@ module Spree
       end
 
       def cancel!
-        response = payment_method.cancel(response_code)
+        response = payment_method.cancel(response_code, self)
         handle_response(response, :void, :failure)
       end
 

data/app/models/spree/payment.rb

@@ -6,12 +6,18 @@ module Spree
     include NumberIdentifier
     include NumberAsParam
     include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+    if defined?(Spree::Security::Payments)
+      include Spree::Security::Payments
+    end
 
     include Spree::Payment::Processing
 
     NON_RISKY_AVS_CODES = ['B', 'D', 'H', 'J', 'M', 'Q', 'T', 'V', 'X', 'Y'].freeze
     RISKY_AVS_CODES     = ['A', 'C', 'E', 'F', 'G', 'I', 'K', 'L', 'N', 'O', 'P', 'R', 'S', 'U', 'W', 'Z'].freeze
-    INVALID_STATES      = %w(failed invalid).freeze
+    INVALID_STATES      = %w(failed invalid void).freeze
 
     with_options inverse_of: :payments do
       belongs_to :order, class_name: 'Spree::Order', touch: true

data/app/models/spree/payment_capture_event.rb

@@ -1,5 +1,9 @@
 module Spree
   class PaymentCaptureEvent < Spree::Base
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
     belongs_to :payment, class_name: 'Spree::Payment'
 
     def display_amount

data/app/models/spree/payment_method/store_credit.rb

@@ -74,7 +74,7 @@ module Spree
       handle_action(action, :credit, auth_code)
     end
 
-    def cancel(auth_code)
+    def cancel(auth_code, _payment = nil)
       store_credit_event = StoreCreditEvent.find_by(authorization_code: auth_code,
                                                     action: Spree::StoreCredit::CAPTURE_ACTION)
       store_credit = store_credit_event.try(:store_credit)

data/app/models/spree/payment_method.rb

@@ -5,6 +5,9 @@ module Spree
 
     include MultiStoreResource
     include Spree::Metadata
+    if defined?(Spree::Security::PaymentMethods)
+      include Spree::Security::PaymentMethods
+    end
 
     DISPLAY = [:both, :front_end, :back_end].freeze
 

data/app/models/spree/payment_source.rb

@@ -0,0 +1,10 @@
+module Spree
+  class PaymentSource < Spree::Base
+    include Metadata
+
+    belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
+    belongs_to :user, class_name: 'Spree::User', optional: true
+
+    validates_uniqueness_of :gateway_payment_profile_id, scope: :type
+  end
+end