solidus_core 1.1.4 → 1.2.0.beta1

data/app/models/spree/order_update_attributes.rb

@@ -0,0 +1,42 @@
+module Spree
+  class OrderUpdateAttributes
+    # @param order [Order] existing (persisted) order
+    # @param attributes [Hash] attributes which are assigned to the new order.
+    #   These attributes should already have been filtered.
+    #   * :payments_attributes attributes
+    def initialize(order, attributes, request_env: nil)
+      @order = order
+      @attributes = attributes.dup
+      @payments_attributes = @attributes.delete(:payments_attributes) || []
+      @request_env = request_env
+    end
+
+    # Assign the attributes to the order and save the order
+    # @return true if saved, otherwise false and errors will be set on the order
+    def apply
+      assign_order_attributes
+      assign_payments_attributes
+
+      if order.save
+        order.set_shipments_cost if order.shipments.any?
+        true
+      else
+        false
+      end
+    end
+
+    private
+
+    attr_reader :attributes, :payments_attributes, :order
+
+    def assign_order_attributes
+      order.assign_attributes attributes
+    end
+
+    def assign_payments_attributes
+      @payments_attributes.each do |payment_attributes|
+        PaymentCreate.new(order, payment_attributes, request_env: @request_env).build
+      end
+    end
+  end
+end

data/app/models/spree/order_updater.rb

@@ -109,7 +109,7 @@ module Spree
         shipment_total: order.shipment_total,
         promo_total: order.promo_total,
         total: order.total,
-        updated_at: Time.now,
+        updated_at: Time.current,
       )
     end
 

data/app/models/spree/payment.rb

@@ -32,13 +32,13 @@ module Spree
     # invalidate previously entered payments
     after_create :invalidate_old_payments
 
-    attr_accessor :source_attributes, :request_env
+    attr_accessor :source_attributes
+    after_initialize :apply_source_attributes
 
-    after_initialize :build_source
+    attr_accessor :request_env
 
     validates :amount, numericality: true
     validates :source, presence: true, if: :source_required?
-    validates :payment_method, presence: true
 
     default_scope -> { order(:created_at) }
 
@@ -149,13 +149,19 @@ module Spree
     # this payment's payment method and associates it correctly.
     #
     # @see https://github.com/spree/spree/issues/981
-    def build_source
+    #
+    # TODO: Move this into upcoming CartUpdate class
+    def apply_source_attributes
       return unless new_record?
-      if source_attributes.present? && source.blank? && payment_method.try(:payment_source_class)
-        self.source = payment_method.payment_source_class.new(source_attributes)
-        self.source.payment_method_id = payment_method.id
-        self.source.user_id = self.order.user_id if self.order
-      end
+      return if source_attributes.blank?
+
+      ActiveSupport::Deprecation.warn(<<WARN.squish)
+Building payment sources by assigning source_attributes on payments is
+deprecated. Instead use either the PaymentCreate class or the
+OrderUpdateAttributes class.
+WARN
+
+      PaymentCreate.new(order, {source_attributes: source_attributes}, payment: self, request_env: request_env).build
     end
 
     # @return [Array<String>] the actions available on this payment
@@ -255,7 +261,7 @@ module Spree
       # Necessary because some payment gateways will refuse payments with
       # duplicate IDs. We *were* using the Order number, but that's set once and
       # is unchanging. What we need is a unique identifier on a per-payment basis,
-      # and this is it. Related to #1998.
+      # and this is it. Related to https://github.com/spree/spree/issues/1998.
       # See https://github.com/spree/spree/issues/1998#issuecomment-12869105
       def set_unique_identifier
         begin

data/app/models/spree/payment_create.rb

@@ -0,0 +1,68 @@
+module Spree
+  # Service object for creating new payments on an Order
+  class PaymentCreate
+    # @param order [Order] The order for the new payment
+    # @param attributes [Hash] attributes which are assigned to the new payment
+    #   * :payment_method_id Id of payment method used for this payment
+    #   * :source_attributes Attributes used to build the source of this payment. Usually a {CreditCard}
+    #     * :existing_card_id (Integer) The id of an existing {CreditCard} object to use
+    # @param request_env [Hash] rack env of user creating the payment
+    # @param payment [Payment] Internal use only. Instead of making a new payment, change the attributes for an existing one.
+    def initialize(order, attributes, payment: nil, request_env: {})
+      @order = order
+      @payment = payment
+      @attributes = attributes.dup.with_indifferent_access
+      @source_attributes = @attributes.delete(:source_attributes) || {}
+      @request_env = request_env
+    end
+
+    # Build the new Payment
+    # @return [Payment] a new (unpersisted) Payment
+    def build
+      @payment ||= order.payments.new
+      @payment.request_env = @request_env if @request_env
+      @payment.attributes = @attributes
+
+      if source_attributes[:existing_card_id].present?
+        build_existing_card
+      else
+        build_source
+      end
+
+      @payment
+    end
+
+    private
+
+    attr_reader :order, :payment, :attributes, :source_attributes
+
+    def build_source
+      payment_method = payment.payment_method
+      if source_attributes.present? && payment_method.try(:payment_source_class)
+        payment.source = payment_method.payment_source_class.new(source_attributes)
+        payment.source.payment_method_id = payment_method.id
+        payment.source.user_id = order.user_id if order
+      end
+    end
+
+    def build_existing_card
+      credit_card = available_cards.find(source_attributes[:existing_card_id])
+
+      # FIXME: does this work?
+      if source_attributes[:verification_value]
+        credit_card.verification_value = source_attributes[:verification_value]
+      end
+
+      payment.source = credit_card
+      payment.payment_method_id = credit_card.payment_method_id
+    end
+
+    def available_cards
+      if user_id = order.user_id
+        CreditCard.where(user_id: user_id)
+      else
+        CreditCard.none
+      end
+    end
+  end
+end

data/app/models/spree/payment_method.rb

@@ -2,7 +2,6 @@ module Spree
   class PaymentMethod < Spree::Base
     acts_as_paranoid
     DISPLAY = [:both, :front_end, :back_end]
-    default_scope -> { where(deleted_at: nil) }
 
     validates :name, presence: true
 

data/app/models/spree/preference.rb

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

data/app/models/spree/price.rb

@@ -1,7 +1,7 @@
 module Spree
   class Price < Spree::Base
     acts_as_paranoid
-    belongs_to :variant, class_name: 'Spree::Variant', inverse_of: :prices, touch: true
+    belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant', touch: true
 
     validate :check_price
     validates :amount, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
@@ -31,13 +31,6 @@ module Spree
       self[:amount] = Spree::LocalizedNumber.parse(price)
     end
 
-    # @note This returns the variant regardless of whether it was soft
-    #   deleted.
-    # @return [Spree::Variant] this price's variant.
-    def variant
-      Spree::Variant.unscoped { super }
-    end
-
     private
 
     def check_price

data/app/models/spree/product.rb

@@ -32,9 +32,10 @@ module Spree
     belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :products
 
     has_one :master,
-      -> { where is_master: true },
+      -> { where(is_master: true).with_deleted },
       inverse_of: :product,
-      class_name: 'Spree::Variant'
+      class_name: 'Spree::Variant',
+      autosave: true
 
     has_many :variants,
       -> { where(is_master: false).order(:position) },
@@ -70,7 +71,6 @@ module Spree
 
     has_many :variant_images, -> { order(:position) }, source: :images, through: :variants_including_master
 
-    after_create :set_master_variant_defaults
     after_create :add_associations_from_prototype
     after_create :build_variants_from_option_values_hash, if: :option_values_hash
 
@@ -78,9 +78,7 @@ module Spree
 
     after_initialize :ensure_master
 
-    after_save :save_master
-    after_save :run_touch_callbacks, if: :anything_changed?
-    after_save :reset_nested_changes
+    after_save :run_touch_callbacks, if: :changed?
     after_touch :touch_taxons
 
     before_validation :normalize_slug, on: :update
@@ -231,7 +229,7 @@ module Spree
     # @param property_value [String] the property value
     def set_property(property_name, property_value)
       ActiveRecord::Base.transaction do
-        # Works around spree_i18n #301
+        # Works around spree_i18n https://github.com/spree/spree/issues/301
         property = Property.create_with(presentation: property_name).find_or_create_by(name: property_name)
         product_property = ProductProperty.where(product: self, property: property).first_or_initialize
         product_property.value = property_value
@@ -257,13 +255,6 @@ module Spree
       end
     end
 
-    # Override so if the master variant is deleted, we can still find it.
-    #
-    # @return [Spree::Variant] the master variant
-    def master
-      super || variants_including_master.with_deleted.find_by(is_master: true)
-    end
-
     # Image that can be used for the product.
     #
     # Will first search for images on the product, then those belonging to the
@@ -320,7 +311,7 @@ module Spree
 
     def ensure_master
       return unless new_record?
-      self.master ||= build_master
+      find_or_build_master
     end
 
     def normalize_slug
@@ -328,44 +319,18 @@ module Spree
     end
 
     def punch_slug
-      update_column :slug, "#{Time.now.to_i}_#{slug}" # punch slug with date prefix to allow reuse of original
-    end
-
-    def anything_changed?
-      changed? || @nested_changes
+      update_column :slug, "#{Time.current.to_i}_#{slug}" # punch slug with date prefix to allow reuse of original
     end
 
-    def reset_nested_changes
-      @nested_changes = false
-    end
-
-    # there's a weird quirk with the delegate stuff that does not automatically save the delegate object
-    # when saving so we force a save using a hook
-    # Fix for issue #5306
-    def save_master
-      if master && (master.changed? || master.new_record? || (master.default_price && (master.default_price.changed? || master.default_price.new_record?)))
-        master.save!
-        @nested_changes = true
-      end
-    end
-
-    # If the master cannot be saved, the Product object will get its errors
-    # and will be destroyed
+    # If the master is invalid, the Product object will be assigned its errors
     def validate_master
-      # We call master.default_price here to ensure price is initialized.
-      # Required to avoid Variant#check_price validation failing on create.
-      unless master.default_price && master.valid?
+      unless master.valid?
         master.errors.each do |att, error|
           self.errors.add(att, error)
         end
       end
     end
 
-    # ensures the master variant is flagged as such
-    def set_master_variant_defaults
-      master.is_master = true
-    end
-
     # Try building a slug based on the following fields in increasing order of specificity.
     def slug_candidates
       [

data/app/models/spree/product/scopes.rb

@@ -168,12 +168,12 @@ module Spree
     end
 
     add_search_scope :not_deleted do
-      where("#{Product.quoted_table_name}.deleted_at IS NULL or #{Product.quoted_table_name}.deleted_at >= ?", Time.zone.now)
+      where("#{Product.quoted_table_name}.deleted_at IS NULL or #{Product.quoted_table_name}.deleted_at >= ?", Time.current)
     end
 
     # Can't use add_search_scope for this as it needs a default argument
     def self.available(available_on = nil, currency = nil)
-      joins(:master => :prices).where("#{Product.quoted_table_name}.available_on <= ?", available_on || Time.now)
+      joins(:master => :prices).where("#{Product.quoted_table_name}.available_on <= ?", available_on || Time.current)
     end
     search_scopes << :available
 
@@ -211,27 +211,28 @@ module Spree
       end
     end
 
-    private
+    class << self
+      private
 
-      def self.price_table_name
+      def price_table_name
         Price.quoted_table_name
       end
 
       # specifically avoid having an order for taxon search (conflicts with main order)
-      def self.prepare_taxon_conditions(taxons)
+      def prepare_taxon_conditions(taxons)
         ids = taxons.map { |taxon| taxon.self_and_descendants.pluck(:id) }.flatten.uniq
         joins(:taxons).where("#{Taxon.table_name}.id" => ids)
       end
 
       # Produce an array of keywords for use in scopes.
       # Always return array with at least an empty string to avoid SQL errors
-      def self.prepare_words(words)
+      def prepare_words(words)
         return [''] if words.blank?
         a = words.split(/[,\s]/).map(&:strip)
         a.any? ? a : ['']
       end
 
-      def self.get_taxons(*ids_or_records_or_names)
+      def get_taxons(*ids_or_records_or_names)
         taxons = Taxon.table_name
         ids_or_records_or_names.flatten.map { |t|
           case t
@@ -244,4 +245,5 @@ module Spree
         }.compact.flatten.uniq
       end
     end
+  end
 end

data/app/models/spree/promotion/rules/nth_order.rb

@@ -30,7 +30,7 @@ module Spree
             user.
             orders.
             complete.
-            where(Spree::Order.arel_table[:completed_at].lt(order.completed_at || Time.now)).
+            where(Spree::Order.arel_table[:completed_at].lt(order.completed_at || Time.current)).
             count
         end
 

data/app/models/spree/promotion/rules/taxon.rb

@@ -2,7 +2,8 @@ module Spree
   class Promotion
     module Rules
       class Taxon < PromotionRule
-        has_and_belongs_to_many :taxons, class_name: '::Spree::Taxon', join_table: 'spree_taxons_promotion_rules', foreign_key: 'promotion_rule_id'
+        has_many :promotion_rule_taxons, class_name: 'Spree::PromotionRuleTaxon', foreign_key: :promotion_rule_id
+        has_many :taxons, through: :promotion_rule_taxons, class_name: 'Spree::Taxon'
 
         MATCH_POLICIES = %w(any all)
         preference :match_policy, default: MATCH_POLICIES.first

data/app/models/spree/promotion_chooser.rb

@@ -20,6 +20,7 @@ module Spree
       end
     end
 
+    private
     # @return The best promotion from this set of adjustments.
     def best_promotion_adjustment
       @best_promotion_adjustment ||= @adjustments.select(&:eligible?).min_by do |a|

data/app/models/spree/promotion_code.rb

@@ -2,7 +2,7 @@ class Spree::PromotionCode < Spree::Base
   belongs_to :promotion, inverse_of: :codes
   has_many :adjustments
 
-  validates :value, presence: true, uniqueness: true
+  validates :value, presence: true, uniqueness: { allow_blank: true }
   validates :promotion, presence: true
 
   before_save :downcase_value

data/app/models/spree/promotion_rule_taxon.rb

@@ -0,0 +1,6 @@
+module Spree
+  class PromotionRuleTaxon < Spree::Base
+    belongs_to :promotion_rule
+    belongs_to :taxon
+  end
+end

data/app/models/spree/property.rb

@@ -1,6 +1,7 @@
 module Spree
   class Property < Spree::Base
-    has_and_belongs_to_many :prototypes, join_table: 'spree_properties_prototypes'
+    has_many :property_prototypes
+    has_many :prototypes, through: :property_prototypes
 
     has_many :product_properties, dependent: :delete_all, inverse_of: :property
     has_many :products, through: :product_properties

data/app/models/spree/property_prototype.rb

@@ -0,0 +1,6 @@
+module Spree
+  class PropertyPrototype < Spree::Base
+    belongs_to :prototype
+    belongs_to :property
+  end
+end