spree_core 2.3.1 → 2.3.2

data/app/models/spree/order_contents.rb

@@ -9,6 +9,7 @@ module Spree
     def add(variant, quantity = 1, currency = nil, shipment = nil)
       line_item = add_to_line_item(variant, quantity, currency, shipment)
       reload_totals
+      shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
       PromotionHandler::Cart.new(order, line_item).activate
       ItemAdjustments.new(line_item).update
       reload_totals
@@ -18,6 +19,7 @@ module Spree
     def remove(variant, quantity = 1, shipment = nil)
       line_item = remove_from_line_item(variant, quantity, shipment)
       reload_totals
+      shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
       PromotionHandler::Cart.new(order, line_item).activate
       ItemAdjustments.new(line_item).update
       reload_totals
@@ -47,12 +49,7 @@ module Spree
 
       def reload_totals
         order_updater.update_item_count
-        order_updater.update_item_total
-        order_updater.update_adjustment_total
-
-        order_updater.update_payment_state if order.completed?
-        order_updater.persist_totals
-
+        order_updater.update
         order.reload
       end
 

data/app/models/spree/order_populator.rb

@@ -9,9 +9,9 @@ module Spree
       @errors = ActiveModel::Errors.new(self)
     end
 
-    
     def populate(variant_id, quantity)
       attempt_cart_add(variant_id, quantity)
+      order.ensure_updated_shipments
       valid?
     end
 

data/app/models/spree/order_updater.rb

@@ -1,7 +1,7 @@
 module Spree
   class OrderUpdater
     attr_reader :order
-    delegate :payments, :line_items, :adjustments, :all_adjustments, :shipments, :update_hooks, to: :order
+    delegate :payments, :line_items, :adjustments, :all_adjustments, :shipments, :update_hooks, :quantity, to: :order
 
     def initialize(order)
       @order = order
@@ -38,6 +38,7 @@ module Spree
     # +payment_total+      The total value of all finalized Payments (NOTE: non-finalized Payments are excluded)
     # +item_total+         The total value of all LineItems
     # +adjustment_total+   The total value of all adjustments (promotions, credits, etc.)
+    # +promo_total+        The total value of all promotion adjustments
     # +total+              The so-called "order total."  This is equivalent to +item_total+ plus +adjustment_total+.
     def update_totals
       update_payment_total
@@ -49,7 +50,12 @@ module Spree
 
     # give each of the shipments a chance to update themselves
     def update_shipments
-      shipments.each { |shipment| shipment.update!(order) }
+      shipments.each do |shipment|
+        next unless shipment.persisted?
+        shipment.update!(order)
+        shipment.refresh_rates
+        shipment.update_amounts
+      end
     end
 
     def update_payment_total
@@ -73,11 +79,15 @@ module Spree
       order.included_tax_total = line_items.sum(:included_tax_total) + shipments.sum(:included_tax_total)
       order.additional_tax_total = line_items.sum(:additional_tax_total) + shipments.sum(:additional_tax_total)
 
+      order.promo_total = line_items.sum(:promo_total) +
+                          shipments.sum(:promo_total) +
+                          adjustments.promotion.eligible.sum(:amount)
+
       update_order_total
     end
 
     def update_item_count
-      order.item_count = line_items.sum(:quantity)
+      order.item_count = quantity
     end
 
     def update_item_total
@@ -96,6 +106,7 @@ module Spree
         additional_tax_total: order.additional_tax_total,
         payment_total: order.payment_total,
         shipment_total: order.shipment_total,
+        promo_total: order.promo_total,
         total: order.total,
         updated_at: Time.now,
       )
@@ -145,8 +156,12 @@ module Spree
     # The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
     def update_payment_state
       last_state = order.payment_state
-      if payments.present? && payments.last.state == 'failed'
+      if payments.present? && payments.valid.size == 0
         order.payment_state = 'failed'
+      elsif !payments.present? && order.state == 'canceled'
+        order.payment_state = 'void'
+      elsif order.state == 'canceled' && order.payment_total == 0 && payments.completed.size > 0
+        order.payment_state = 'void'
       else
         order.payment_state = 'balance_due' if order.outstanding_balance > 0
         order.payment_state = 'credit_owed' if order.outstanding_balance < 0

data/app/models/spree/payment.rb

@@ -30,6 +30,8 @@ module Spree
 
     after_initialize :build_source
 
+    default_scope -> { order("#{self.table_name}.created_at") }
+
     scope :from_credit_card, -> { where(source_type: 'Spree::CreditCard') }
     scope :with_state, ->(s) { where(state: s.to_s) }
     scope :completed, -> { with_state('completed') }
@@ -173,6 +175,8 @@ module Spree
 
       def create_payment_profile
         return unless source.respond_to?(:has_payment_profile?) && !source.has_payment_profile?
+        # Imported payments shouldn't create a payment profile.
+        return if source.imported
 
         payment_method.create_profile(self)
       rescue ActiveMerchant::ConnectionError => e

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

@@ -5,7 +5,7 @@ module Spree
         if payment_method && payment_method.source_required?
           if source
             if !processing?
-              if payment_method.supports?(source)
+              if payment_method.supports?(source) || token_based?
                 if payment_method.auto_capture?
                   purchase!
                 else
@@ -115,7 +115,7 @@ module Spree
         if payment_method.respond_to?(:cancel)
           payment_method.cancel(response_code)
         else
-          credit!
+          credit!(credit_allowed.abs)
         end
       end
 
@@ -219,6 +219,10 @@ module Spree
       def gateway_order_id
         "#{order.number}-#{self.identifier}"
       end
+
+      def token_based?
+        source.gateway_customer_profile_id.present? || source.gateway_payment_profile_id.present?
+      end
     end
   end
 end

data/app/models/spree/price.rb

@@ -5,6 +5,7 @@ module Spree
 
     validate :check_price
     validates :amount, numericality: { greater_than_or_equal_to: 0 }, allow_nil: true
+    validate :validate_amount_maximum
 
     def display_amount
       money
@@ -50,5 +51,14 @@ module Spree
       price.to_d
     end
 
+    def maximum_amount
+      BigDecimal '999999.99'
+    end
+
+    def validate_amount_maximum
+      if amount && amount > maximum_amount
+        errors.add :amount, I18n.t('errors.messages.less_than_or_equal_to', count: maximum_amount)
+      end
+    end
   end
 end

data/app/models/spree/product.rb

@@ -57,6 +57,9 @@ module Spree
     has_many :prices, -> { order('spree_variants.position, spree_variants.id, currency') }, through: :variants
 
     has_many :stock_items, through: :variants_including_master
+    
+    has_many :line_items, through: :variants_including_master
+    has_many :orders, through: :line_items
 
     delegate_belongs_to :master, :sku, :price, :currency, :display_amount, :display_price, :weight, :height, :width, :depth, :is_master, :has_default_price?, :cost_currency, :price_in, :amount_in
 
@@ -67,7 +70,8 @@ module Spree
     after_create :build_variants_from_option_values_hash, if: :option_values_hash
 
     after_save :save_master
-    after_save :touch
+    after_save :run_touch_callbacks, if: :anything_changed?
+    after_save :reset_nested_changes
     after_touch :touch_taxons
 
     delegate :images, to: :master, prefix: true
@@ -199,10 +203,10 @@ module Spree
     end
 
     def total_on_hand
-      if self.variants_including_master.any? { |v| !v.should_track_inventory? }
+      if any_variants_not_track_inventory?
         Float::INFINITY
       else
-        self.stock_items.to_a.sum(&:count_on_hand)
+        stock_items.sum(:count_on_hand)
       end
     end
 
@@ -215,70 +219,93 @@ module Spree
 
     private
 
-      def normalize_slug
-        self.slug = normalize_friendly_id(slug)
-      end
-
-      # Builds variants from a hash of option types & values
-      def build_variants_from_option_values_hash
-        ensure_option_types_exist_for_values_hash
-        values = option_values_hash.values
-        values = values.inject(values.shift) { |memo, value| memo.product(value).map(&:flatten) }
-
-        values.each do |ids|
-          variant = variants.create(
-            option_value_ids: ids,
-            price: master.price
-          )
+    def add_properties_and_option_types_from_prototype
+      if prototype_id && prototype = Spree::Prototype.find_by(id: prototype_id)
+        prototype.properties.each do |property|
+          product_properties.create(property: property)
         end
-        save
+        self.option_types = prototype.option_types
       end
+    end
 
-      def add_properties_and_option_types_from_prototype
-        if prototype_id && prototype = Spree::Prototype.find_by(id: prototype_id)
-          prototype.properties.each do |property|
-            product_properties.create(property: property)
-          end
-          self.option_types = prototype.option_types
-        end
+    def any_variants_not_track_inventory?
+      if variants_including_master.loaded?
+        variants_including_master.any? { |v| !v.should_track_inventory? }
+      else
+        !Spree::Config.track_inventory_levels || variants_including_master.where(track_inventory: false).any?
       end
+    end
 
-      # ensures the master variant is flagged as such
-      def set_master_variant_defaults
-        master.is_master = true
+    # Builds variants from a hash of option types & values
+    def build_variants_from_option_values_hash
+      ensure_option_types_exist_for_values_hash
+      values = option_values_hash.values
+      values = values.inject(values.shift) { |memo, value| memo.product(value).map(&:flatten) }
+
+      values.each do |ids|
+        variant = variants.create(
+          option_value_ids: ids,
+          price: master.price
+        )
       end
+      save
+    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.
-      def save_master
-        master.save if master && (master.changed? || master.new_record? || (master.default_price && (master.default_price.changed? || master.default_price.new_record?)))
-      end
+    def ensure_master
+      return unless new_record?
+      self.master ||= Variant.new
+    end
 
-      def ensure_master
-        return unless new_record?
-        self.master ||= Variant.new
-      end
+    def normalize_slug
+      self.slug = normalize_friendly_id(slug)
+    end
 
-      # Iterate through this products taxons and taxonomies and touch their timestamps in a batch
-      def touch_taxons
-        taxons_to_touch = taxons.map(&:self_and_ancestors).flatten.uniq
-        Spree::Taxon.where(id: taxons_to_touch.map(&:id)).update_all(updated_at: Time.current)
+    def punch_slug
+      update_column :slug, "#{Time.now.to_i}_#{slug}" # punch slug with date prefix to allow reuse of original
+    end
 
-        taxonomy_ids_to_touch = taxons_to_touch.map(&:taxonomy_id).flatten.uniq
-        Spree::Taxonomy.where(id: taxonomy_ids_to_touch).update_all(updated_at: Time.current)
-      end
+    def anything_changed?
+      changed? || @nested_changes
+    end
 
-      # Try building a slug based on the following fields in increasing order of specificity.
-      def slug_candidates
-        [
-            :name,
-            [:name, :sku]
-        ]
-      end
+    def reset_nested_changes
+      @nested_changes = false
+    end
 
-      def punch_slug
-        update(slug: "#{Time.now.to_i}_#{slug}") # punch slug with date prefix to allow reuse of original
+    # 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.
+    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
+
+    # 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
+      [
+          :name,
+          [:name, :sku]
+      ]
+    end
+
+    def run_touch_callbacks
+      run_callbacks(:touch)
+    end
+
+    # Iterate through this products taxons and taxonomies and touch their timestamps in a batch
+    def touch_taxons
+      taxons_to_touch = taxons.map(&:self_and_ancestors).flatten.uniq
+      Spree::Taxon.where(id: taxons_to_touch.map(&:id)).update_all(updated_at: Time.current)
+
+      taxonomy_ids_to_touch = taxons_to_touch.map(&:taxonomy_id).flatten.uniq
+      Spree::Taxonomy.where(id: taxonomy_ids_to_touch).update_all(updated_at: Time.current)
+    end
 
   end
 end

data/app/models/spree/promotion/actions/create_adjustment.rb

@@ -3,13 +3,14 @@ module Spree
     module Actions
       class CreateAdjustment < PromotionAction
         include Spree::Core::CalculatedAdjustments
+        include Spree::Core::AdjustmentSource
 
         has_many :adjustments, as: :source
 
         delegate :eligible?, to: :promotion
 
         before_validation :ensure_action_has_calculator
-        before_destroy :deals_with_adjustments
+        before_destroy :deals_with_adjustments_for_deleted_source
 
         # Creates the adjustment related to a promotion for the order passed
         # through options hash
@@ -55,16 +56,6 @@ module Spree
             self.calculator = Calculator::FlatPercentItemTotal.new
           end
 
-          def deals_with_adjustments
-            adjustment_scope = self.adjustments.joins("LEFT OUTER JOIN spree_orders ON spree_orders.id = spree_adjustments.adjustable_id")
-            # For incomplete orders, remove the adjustment completely.
-            adjustment_scope.where("spree_orders.completed_at IS NULL").readonly(false).destroy_all
-
-            # For complete orders, the source will be invalid.
-            # Therefore we nullify the source_id, leaving the adjustment in place.
-            # This would mean that the order's total is not altered at all.
-            adjustment_scope.where("spree_orders.completed_at IS NOT NULL").update_all("source_id = NULL")
-          end
       end
     end
   end

data/app/models/spree/promotion/actions/create_item_adjustments.rb

@@ -3,13 +3,14 @@ module Spree
     module Actions
       class CreateItemAdjustments < PromotionAction
         include Spree::Core::CalculatedAdjustments
+        include Spree::Core::AdjustmentSource
 
         has_many :adjustments, as: :source
 
         delegate :eligible?, to: :promotion
 
         before_validation :ensure_action_has_calculator
-        before_destroy :deals_with_adjustments
+        before_destroy :deals_with_adjustments_for_deleted_source
 
         def perform(payload = {})
           order = payload[:order]
@@ -62,24 +63,6 @@ module Spree
             self.calculator = Calculator::PercentOnLineItem.new
           end
 
-          def deals_with_adjustments
-            adjustment_scope = self.adjustments.includes(:order).references(:spree_orders)
-
-            # For incomplete orders, remove the adjustment completely.
-            adjustment_scope.where("spree_orders.completed_at IS NULL").each do |adjustment|
-              adjustment.destroy
-            end
-
-            # For complete orders, the source will be invalid.
-            # Therefore we nullify the source_id, leaving the adjustment in place.
-            # This would mean that the order's total is not altered at all.
-            adjustment_scope.where("spree_orders.completed_at IS NOT NULL").each do |adjustment|
-              adjustment.update_columns(
-                source_id: nil,
-                updated_at: Time.now,
-              )
-            end
-          end
       end
     end
   end

data/app/models/spree/promotion_handler/cart.rb

@@ -29,9 +29,21 @@ module Spree
       end
 
       private
-
         def promotions
-          Promotion.active.includes(:promotion_rules).where(:code => nil, :path => nil)
+          promo_table = Promotion.arel_table
+          join_table = Arel::Table.new(:spree_orders_promotions)
+
+          join_condition = promo_table.join(join_table, Arel::Nodes::OuterJoin).on(
+            promo_table[:id].eq(join_table[:promotion_id])
+          ).join_sources
+
+          Promotion.active.includes(:promotion_rules).
+            joins(join_condition).
+            where(
+              promo_table[:code].eq(nil).and(
+                promo_table[:path].eq(nil)
+              ).or(join_table[:order_id].eq(order.id))
+            ).distinct
         end
     end
   end