spree_core 4.3.0.rc1 → 4.4.0.rc1

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

@@ -5,11 +5,10 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          validate :check_attachment_presence
-          validate :check_attachment_content_type
-
           has_one_attached :attachment
 
+          validates :attachment, attached: true, content_type: /\Aimage\/.*\z/
+
           default_scope { includes(attachment_attachment: :blob) }
 
           def self.styles
@@ -32,22 +31,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

@@ -2,6 +2,7 @@ module Spree
   class Image < Asset
     include Configuration::ActiveStorage
     include Rails.application.routes.url_helpers
+    include ::Spree::ImageMethods
 
     # In Rails 5.x class constants are being undefined/redefined during the code reloading process
     # in a rails development environment, after which the actual ruby objects stored in those class constants
@@ -15,13 +16,8 @@ module Spree
         width, height = size.chop.split('x')
 
         {
-          url: polymorphic_path(attachment.variant(
-                                  gravity: 'center',
-                                  resize: size,
-                                  extent: size,
-                                  background: 'snow2',
-                                  quality: 80
-                                ), only_path: true),
+          url: generate_url(size: size),
+          size: size,
           width: width,
           height: height
         }
@@ -35,13 +31,7 @@ module Spree
       width, height = size.chop.split('x')
 
       {
-        url: polymorphic_path(attachment.variant(
-                                gravity: 'center',
-                                resize: size,
-                                extent: size,
-                                background: 'snow2',
-                                quality: 80
-                              ), only_path: true),
+        url: generate_url(size: size),
         size: size,
         width: width,
         height: height
@@ -59,16 +49,7 @@ module Spree
     end
 
     def plp_url
-      size = self.class.styles[:plp_and_carousel]
-      variant = attachment.variant(
-        gravity: 'center',
-        resize: size,
-        extent: size,
-        background: 'snow2',
-        quality: 80
-      )
-
-      polymorphic_path(variant, only_path: true)
+      generate_url(size: self.class.styles[:plp_and_carousel])
     end
   end
 end

data/app/models/spree/legacy_user.rb

@@ -4,6 +4,7 @@ module Spree
     include UserAddress
     include UserPaymentSource
     include UserMethods
+    include Spree::Metadata
 
     self.table_name = 'spree_users'
 

data/app/models/spree/line_item.rb

@@ -1,5 +1,7 @@
 module Spree
   class LineItem < Spree::Base
+    include Metadata
+
     before_validation :ensure_valid_quantity
 
     with_options inverse_of: :line_items do
@@ -12,6 +14,7 @@ module Spree
 
     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 +30,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 +45,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/option_type.rb

@@ -1,5 +1,8 @@
 module Spree
   class OptionType < Spree::Base
+    include UniqueName
+    include Metadata
+
     acts_as_list
 
     with_options dependent: :destroy, inverse_of: :option_type do
@@ -12,10 +15,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,5 +1,7 @@
 module Spree
   class OptionValue < Spree::Base
+    include Metadata
+
     belongs_to :option_type, class_name: 'Spree::OptionType', touch: true, inverse_of: :option_values
     acts_as_list scope: :option_type
 

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]

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

@@ -0,0 +1,33 @@
+module Spree
+  class Order < Spree::Base
+    module Digital
+      def digital?
+        if line_items.empty?
+          false
+        else
+          line_items.all?(&:digital?)
+        end
+      end
+
+      def some_digital?
+        line_items.any?(&:digital?)
+      end
+
+      def digital_line_items
+        line_items.select(&:digital?)
+      end
+
+      def digital_links
+        digital_line_items.map(&:digital_links).flatten
+      end
+
+      def create_digital_links
+        digital_line_items.each do |line_item|
+          line_item.variant.digitals.each do |digital|
+            line_item.digital_links.create!(digital: digital)
+          end
+        end
+      end
+    end
+  end
+end

data/app/models/spree/order.rb

@@ -1,5 +1,6 @@
 require_dependency 'spree/order/checkout'
 require_dependency 'spree/order/currency_updater'
+require_dependency 'spree/order/digital'
 require_dependency 'spree/order/payments'
 require_dependency 'spree/order/store_credit'
 require_dependency 'spree/order/emails'
@@ -11,6 +12,7 @@ module Spree
 
     include Spree::Order::Checkout
     include Spree::Order::CurrencyUpdater
+    include Spree::Order::Digital
     include Spree::Order::Payments
     include Spree::Order::StoreCredit
     include Spree::Order::AddressBook
@@ -18,9 +20,11 @@ module Spree
     include Spree::Core::NumberGenerator.new(prefix: 'R')
     include Spree::Core::TokenGenerator
 
+    include NumberIdentifier
     include NumberAsParam
     include SingleStoreResource
     include MemoizedData
+    include Metadata
 
     MEMOIZED_METHODS = %w(tax_zone)
 
@@ -54,26 +58,34 @@ module Spree
 
     checkout_flow do
       go_to_state :address
-      go_to_state :delivery
+      go_to_state :delivery, if: ->(order) { order.delivery_required? }
       go_to_state :payment, if: ->(order) { order.payment? || order.payment_required? }
       go_to_state :confirm, if: ->(order) { order.confirmation_required? }
       go_to_state :complete
       remove_transition from: :delivery, to: :confirm, unless: ->(order) { order.confirmation_required? }
     end
 
-    self.whitelisted_ransackable_associations = %w[shipments user promotions bill_address ship_address line_items store]
-    self.whitelisted_ransackable_attributes = %w[completed_at email number state payment_state shipment_state total considered_risky channel]
+    self.whitelisted_ransackable_associations = %w[shipments user created_by approver canceler promotions bill_address ship_address line_items store]
+    self.whitelisted_ransackable_attributes = %w[
+      completed_at email number state payment_state shipment_state
+      total item_total considered_risky channel
+    ]
 
     attr_reader :coupon_code
     attr_accessor :temporary_address, :temporary_credit_card
 
+    attribute :state_machine_resumed, :boolean
+
     if Spree.user_class
       belongs_to :user, class_name: Spree.user_class.to_s, optional: true
-      belongs_to :created_by, class_name: Spree.user_class.to_s, optional: true
-      belongs_to :approver, class_name: Spree.user_class.to_s, optional: true
-      belongs_to :canceler, class_name: Spree.user_class.to_s, optional: true
     else
       belongs_to :user, optional: true
+    end
+    if Spree.admin_user_class
+      belongs_to :created_by, class_name: Spree.admin_user_class.to_s, optional: true
+      belongs_to :approver, class_name: Spree.admin_user_class.to_s, optional: true
+      belongs_to :canceler, class_name: Spree.admin_user_class.to_s, optional: true
+    else
       belongs_to :created_by, optional: true
       belongs_to :approver, optional: true
       belongs_to :canceler, optional: true
@@ -128,7 +140,6 @@ module Spree
     # Needs to happen before save_permalink is called
     before_validation :ensure_store_presence
     before_validation :ensure_currency_presence
-    before_validation :uppercase_number
 
     before_validation :clone_billing_address, if: :use_billing?
     attr_accessor :use_billing
@@ -140,7 +151,6 @@ module Spree
     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)
       # which is very costly and slow on large set of records
-      validates :number, length: { maximum: 32, allow_blank: true }, uniqueness: { allow_blank: true, case_sensitive: true }
       validates :email, length: { maximum: 254, allow_blank: true }, email: { allow_blank: true }, if: :require_email
       validates :item_count, numericality: { greater_than_or_equal_to: 0, less_than: 2**31, only_integer: true, allow_blank: true }
       validates :store
@@ -181,7 +191,7 @@ module Spree
       update_hooks.add(hook)
     end
 
-    # For compatiblity with Calculator::PriceSack
+    # For compatibility with Calculator::PriceSack
     def amount
       line_items.inject(0.0) { |sum, li| sum + li.amount }
     end
@@ -212,6 +222,11 @@ module Spree
       line_items.exists?
     end
 
+    # Does this order require a physical delivery.
+    def delivery_required?
+      !digital?
+    end
+
     # Is this a free order in which case the payment step should be skipped
     def payment_required?
       total.to_f > 0.0
@@ -386,7 +401,7 @@ module Spree
 
     # Helper methods for checkout steps
     def paid?
-      payment_state == 'paid' || payment_state == 'credit_owed'
+      payments.valid.completed.size == payments.valid.size && payments.valid.sum(:amount) >= total
     end
 
     def available_payment_methods(store = nil)
@@ -476,6 +491,10 @@ module Spree
       %w(partial shipped).include?(shipment_state)
     end
 
+    def fully_shipped?
+      shipments.shipped.size == shipments.size
+    end
+
     def create_proposed_shipments
       all_adjustments.shipping.delete_all
 
@@ -618,17 +637,14 @@ module Spree
       promotions.pluck(:code).compact.first
     end
 
-    def payments_attributes=(attributes)
-      validate_payments_attributes(attributes)
-      super(attributes)
-    end
-
     def validate_payments_attributes(attributes)
+      ActiveSupport::Deprecation.warn('`Order#validate_payments_attributes` is deprecated and will be removed in Spree 5')
+
       # Ensure the payment methods specified are allowed for this user
-      payment_method_ids = available_payment_methods.map(&:id)
+      payment_method_ids = available_payment_methods.map(&:id).map(&:to_s)
 
       attributes.each do |payment_attributes|
-        payment_method_id = payment_attributes[:payment_method_id].to_i
+        payment_method_id = payment_attributes[:payment_method_id].to_s
 
         raise ActiveRecord::RecordNotFound unless payment_method_ids.include?(payment_method_id)
       end
@@ -711,7 +727,7 @@ module Spree
     end
 
     def ensure_currency_presence
-      self.currency ||= store.default_currency || Spree::Config[:currency]
+      self.currency ||= store.default_currency
     end
 
     def create_token
@@ -730,9 +746,5 @@ module Spree
     def credit_card_nil_payment?(attributes)
       payments.store_credits.present? && attributes[:amount].to_f.zero?
     end
-
-    def uppercase_number
-      number&.upcase!
-    end
   end
 end

data/app/models/spree/order_inventory.rb

@@ -120,7 +120,7 @@ module Spree
       if order.completed?
         current_on_hand = shipment.stock_location.count_on_hand(variant)
 
-        if current_on_hand.negative? && current_on_hand.abs < removed_backordered
+        if current_on_hand&.negative? && current_on_hand.abs < removed_backordered
           shipment.stock_location.restock_backordered variant, current_on_hand.abs, shipment
         else
           shipment.stock_location.restock_backordered variant, removed_backordered, shipment

data/app/models/spree/order_promotion.rb

@@ -3,7 +3,7 @@ module Spree
     belongs_to :order, class_name: 'Spree::Order'
     belongs_to :promotion, class_name: 'Spree::Promotion'
 
-    delegate :name, :description, :code, to: :promotion
+    delegate :name, :description, :code, :public_metadata, to: :promotion
     delegate :currency, to: :order
 
     extend Spree::DisplayMoney

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

@@ -152,6 +152,7 @@ module Spree
       def protect_from_connection_error
         yield
       rescue ActiveMerchant::ConnectionError => e
+        failure!
         gateway_error(e)
       end
 

data/app/models/spree/payment.rb

@@ -3,11 +3,12 @@ require_dependency 'spree/payment/processing'
 module Spree
   class Payment < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'P', letters: true, length: 7)
+    include NumberIdentifier
+    include NumberAsParam
+    include Metadata
 
     include Spree::Payment::Processing
 
-    include NumberAsParam
-
     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
@@ -25,8 +26,8 @@ module Spree
     has_many :refunds, inverse_of: :payment
 
     validates :payment_method, presence: true
-    validates :number, uniqueness: { case_sensitive: true }
     validates :source, presence: true, if: -> { payment_method&.source_required? }
+    validate :payment_method_available_for_order, on: :create
 
     before_validation :validate_source
 
@@ -66,6 +67,9 @@ module Spree
     scope :store_credits, -> { where(source_type: Spree::StoreCredit.to_s) }
     scope :not_store_credits, -> { where(arel_table[:source_type].not_eq(Spree::StoreCredit.to_s).or(arel_table[:source_type].eq(nil))) }
 
+    self.whitelisted_ransackable_associations = %w[payment_method order source]
+    self.whitelisted_ransackable_attributes = %w[number amount state response_code avs_response cvv_response_code cvv_response_message]
+
     # transaction_id is much easier to understand
     def transaction_id
       response_code
@@ -95,10 +99,12 @@ module Spree
       event :complete do
         transition from: [:processing, :pending, :checkout], to: :completed
       end
+      after_transition to: :completed, do: :after_completed
       event :void do
         transition from: [:pending, :processing, :completed, :checkout], to: :void
       end
-      # when the card brand isnt supported
+      after_transition to: :void, do: :after_void
+      # when the card brand isn't supported
       event :invalidate do
         transition from: [:checkout], to: :invalid
       end
@@ -196,6 +202,14 @@ module Spree
 
     private
 
+    def after_void
+      # this method is prepended in api/ to queue Webhooks requests
+    end
+
+    def after_completed
+      # this method is prepended in api/ to queue Webhooks requests
+    end
+
     def has_invalid_state?
       INVALID_STATES.include?(state)
     end
@@ -219,6 +233,13 @@ module Spree
       !errors.present?
     end
 
+    def payment_method_available_for_order
+      return if payment_method.blank?
+      return if order.blank?
+
+      errors.add(:payment_method, :invalid) if !payment_method.available_for_order?(order) || !payment_method.available_for_store?(order.store)
+    end
+
     def add_source_error(field, message)
       field_name = I18n.t("activerecord.attributes.#{source.class.to_s.underscore}.#{field}")
       errors.add(Spree.t(source.class.to_s.demodulize.underscore), "#{field_name} #{message}")

data/app/models/spree/payment_method.rb

@@ -4,6 +4,7 @@ module Spree
     acts_as_list
 
     include MultiStoreResource
+    include Spree::Metadata
 
     DISPLAY = [:both, :front_end, :back_end].freeze
 
@@ -14,7 +15,8 @@ module Spree
 
     validates :name, presence: true
 
-    has_and_belongs_to_many :stores
+    has_many :store_payment_methods, class_name: 'Spree::StorePaymentMethod'
+    has_many :stores, class_name: 'Spree::Store', through: :store_payment_methods
 
     with_options dependent: :restrict_with_error do
       has_many :payments, class_name: 'Spree::Payment', inverse_of: :payment_method
@@ -87,5 +89,17 @@ module Spree
 
       store_ids.include?(store.id)
     end
+
+    def public_preferences
+      public_preference_keys.each_with_object({}) do |key, hash|
+        hash[key] = preferences[key]
+      end
+    end
+
+    protected
+
+    def public_preference_keys
+      []
+    end
   end
 end

data/app/models/spree/preference.rb

@@ -1,5 +1,6 @@
 class Spree::Preference < Spree::Base
   serialize :value
 
-  validates :key, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
+  validates :key, presence: true,
+                  uniqueness: { case_sensitive: false, allow_blank: true, scope: spree_base_uniqueness_scope }
 end

data/app/models/spree/preferences/configuration.rb

@@ -1,5 +1,5 @@
-# This takes the preferrable methods and adds some
-# syntatic sugar to access the preferences
+# This takes the preferable methods and adds some
+# syntactic sugar to access the preferences
 #
 # class App < Configuration
 #   preference :color, :string

data/app/models/spree/preferences/store.rb

@@ -36,7 +36,7 @@ module Spree::Preferences
 
     def get(key)
       # return the retrieved value, if it's in the cache
-      # use unless nil? incase the value is actually boolean false
+      # use unless nil? in case the value is actually boolean false
       #
       unless (val = @cache.read(key)).nil?
         return val

data/app/models/spree/price.rb

@@ -66,7 +66,7 @@ module Spree
     private
 
     def ensure_currency
-      self.currency ||= Spree::Config[:currency]
+      self.currency ||= Spree::Store.default.default_currency
     end
   end
 end