spree_core 4.3.0 → 4.6.1

data/app/models/spree/cms_section.rb

@@ -7,29 +7,29 @@ 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, presence: true
-
-    validates :image_one, :image_two, :image_three, content_type: IMAGE_TYPES
+    validates :name, :cms_page, :type, presence: true
 
     LINKED_RESOURCE_TYPE = []
 

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/country.rb

@@ -2,7 +2,7 @@ module Spree
   class Country < Spree::Base
     # we need to have this callback before any dependent: :destroy associations
     # https://github.com/rails/rails/issues/3458
-    before_destroy :ensure_not_default
+    # before_destroy :ensure_not_default
 
     has_many :addresses, dependent: :restrict_with_error
     has_many :states,
@@ -16,7 +16,7 @@ module Spree
              foreign_key: :zoneable_id
     has_many :zones, through: :zone_members, class_name: 'Spree::Zone'
 
-    validates :name, :iso_name, :iso, :iso3, presence: true, uniqueness: { case_sensitive: false }
+    validates :name, :iso_name, :iso, :iso3, presence: true, uniqueness: { case_sensitive: false, scope: spree_base_uniqueness_scope }
 
     def self.default(store = nil)
       ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
@@ -49,6 +49,8 @@ module Spree
     private
 
     def ensure_not_default
+      ActiveSupport::Deprecation.warn('Country#ensure_not_default is deprecated and will be removed in Spree v5')
+
       if id.eql?(Spree::Config[:default_country_id])
         errors.add(:base, Spree.t(:default_country_cannot_be_deleted))
         throw(:abort)

data/app/models/spree/credit_card.rb

@@ -1,11 +1,18 @@
 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
 
@@ -171,6 +178,15 @@ module Spree
       )
     end
 
+    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',
+        'payment_method_id', 'default', 'deleted_at'
+      ]
+    end
+
     private
 
     def require_card_numbers?

data/app/models/spree/customer_return.rb

@@ -1,6 +1,12 @@
 module Spree
   class CustomerReturn < Spree::Base
     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
 
@@ -11,7 +17,6 @@ module Spree
     after_create :process_return!
 
     validates :store, presence: true
-    validates :number, uniqueness: { case_sensitive: true }
     validates :return_items, :stock_location, presence: true
     validate :must_have_return_authorization, on: :create
     validate :return_items_belong_to_same_order

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

@@ -0,0 +1,19 @@
+module Spree
+  class Digital < Spree::Base
+    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
+      has_one_attached :attachment
+    end
+
+    validates :attachment, attached: true
+    validates :variant, presence: true
+  end
+end

data/app/models/spree/digital_link.rb

@@ -0,0 +1,57 @@
+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
+
+    before_validation :set_defaults, on: :create
+    validates :digital, :line_item, presence: true
+    validates :access_counter, numericality: { greater_than_or_equal_to: 0 }
+
+    def authorizable?
+      !(expired? || access_limit_exceeded?)
+    end
+
+    def expired?
+      if line_item.order.store.limit_digital_download_days
+        created_at <= line_item.order.store.digital_asset_authorized_days.day.ago
+      else
+        false
+      end
+    end
+
+    def access_limit_exceeded?
+      if line_item.order.store.limit_digital_download_count
+        access_counter >= line_item.order.store.digital_asset_authorized_clicks
+      else
+        false
+      end
+    end
+
+    # This method should be called when a download is initiated.
+    # It returns +true+ or +false+ depending on whether the authorization is granted.
+    def authorize!
+      authorizable? && increment!(:access_counter, touch: true) ? true : false
+    end
+
+    def reset!
+      self.access_counter = 0
+      self.created_at = Time.current
+      save!
+    end
+
+    private
+
+    def set_defaults
+      self.access_counter ||= 0
+    end
+  end
+end

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
 
@@ -71,6 +71,10 @@ module Spree
       true
     end
 
+    def payment_source_class
+      CreditCard
+    end
+
     def actions
       %w(capture void credit)
     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,10 +5,13 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          validate :check_attachment_presence
-          validate :check_attachment_content_type
+          if Spree.public_storage_service_name
+            has_one_attached :attachment, service: Spree.public_storage_service_name
+          else
+            has_one_attached :attachment
+          end
 
-          has_one_attached :attachment
+          validates :attachment, attached: true, content_type: /\Aimage\/.*\z/
 
           default_scope { includes(attachment_attachment: :blob) }
 
@@ -32,22 +35,6 @@ module Spree
           def default_style
             :product
           end
-
-          def accepted_image_types
-            %w(image/jpeg image/jpg image/png image/gif)
-          end
-
-          def check_attachment_presence
-            unless attachment.attached?
-              errors.add(:attachment, :attachment_must_be_present)
-            end
-          end
-
-          def check_attachment_content_type
-            if attachment.attached? && !attachment.content_type.in?(accepted_image_types)
-              errors.add(:attachment, :not_allowed_content_type)
-            end
-          end
         end
       end
     end

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

@@ -4,10 +4,10 @@ module Spree
     include UserAddress
     include UserPaymentSource
     include UserMethods
+    include Spree::Metadata
 
     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,17 +1,23 @@
 module Spree
   class LineItem < Spree::Base
+    include Metadata
+    if defined?(Spree::Webhooks)
+      include Spree::Webhooks::HasWebhooks
+    end
+
     before_validation :ensure_valid_quantity
 
     with_options inverse_of: :line_items do
       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
 
     has_many :adjustments, as: :adjustable, dependent: :destroy
     has_many :inventory_units, inverse_of: :line_item
+    has_many :digital_links, dependent: :destroy
 
     before_validation :copy_price
     before_validation :copy_tax_category
@@ -27,7 +33,7 @@ module Spree
 
     validates :price, numericality: true
 
-    validates_with Spree::Stock::AvailabilityValidator
+    validates_with Spree::Stock::AvailabilityValidator, if: -> { variant.present? }
     validate :ensure_proper_currency, if: -> { order.present? }
 
     before_destroy :verify_order_inventory_before_destroy, if: -> { order.has_checkout_step?('delivery') }
@@ -42,11 +48,16 @@ module Spree
     delegate :name, :description, :sku, :should_track_inventory?, :product, :options_text, :slug, :product_id, to: :variant
     delegate :brand, :category, to: :product
     delegate :tax_zone, to: :order
+    delegate :digital?, to: :variant
 
     attr_accessor :target_shipment
 
-    self.whitelisted_ransackable_associations = ['variant']
-    self.whitelisted_ransackable_attributes = ['variant_id']
+    self.whitelisted_ransackable_associations = %w[variant order tax_category]
+    self.whitelisted_ransackable_attributes = %w[variant_id order_id tax_category_id quantity
+                                                 price cost_price cost_currency adjustment_total
+                                                 additional_tax_total promo_total included_tax_total
+                                                 pre_tax_amount taxable_adjustment_total
+                                                 non_taxable_adjustment_total]
 
     def copy_price
       if 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

@@ -1,6 +1,17 @@
 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) }
@@ -12,10 +23,7 @@ module Spree
     has_many :option_type_prototypes, class_name: 'Spree::OptionTypePrototype'
     has_many :prototypes, through: :option_type_prototypes, class_name: 'Spree::Prototype'
 
-    with_options presence: true do
-      validates :name, uniqueness: { case_sensitive: false, allow_blank: true }
-      validates :presentation
-    end
+    validates :presentation, presence: true
 
     default_scope { order(:position) }
 

data/app/models/spree/option_value.rb

@@ -1,7 +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/checkout.rb

@@ -83,6 +83,11 @@ module Spree
                     order.process_payments!
                   end
                 end
+
+                before_transition to: :complete do |order|
+                  order.create_digital_links if order.some_digital?
+                end
+
                 after_transition to: :complete, do: :persist_user_credit_card
                 before_transition to: :payment, do: :set_shipments_cost
                 before_transition to: :payment, do: :create_tax_charge!
@@ -107,6 +112,7 @@ module Spree
 
               before_transition to: :resumed, do: :ensure_line_item_variants_are_not_discontinued
               before_transition to: :resumed, do: :ensure_line_items_are_in_stock
+              before_transition to: :resumed, do: proc { |order| order.state_machine_resumed = true }
 
               after_transition to: :complete, do: :finalize!
               after_transition to: :resumed, do: :after_resume
@@ -220,7 +226,7 @@ module Spree
             @updating_params = params
             run_callbacks :updating_from_params do
               # Set existing card after setting permitted parameters because
-              # rails would slice parameters containg ruby objects, apparently
+              # rails would slice parameters containing ruby objects, apparently
               existing_card_id = @updating_params[:order] ? @updating_params[:order].delete(:existing_card) : nil
 
               attributes = if @updating_params[:order]