spree_core 3.2.9 → 3.3.0.rc1

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

@@ -14,7 +14,7 @@ module Spree
 
       # Updates prices of order's line items
       def update_line_item_currencies!
-        line_items.where('currency != ?', currency).each do |line_item|
+        line_items.where.not(currency: currency).each do |line_item|
           update_line_item_price!(line_item)
         end
       end

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

@@ -52,7 +52,7 @@ module Spree
 
             payment.public_send(method)
 
-            if payment.completed? && payment_total != total
+            if payment.completed?
               self.payment_total += payment.amount
             end
           end

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

@@ -2,7 +2,7 @@ module Spree
   class Order < Spree::Base
     module StoreCredit
       def add_store_credit_payments
-        payments.store_credits.where(state: 'checkout').map(&:invalidate!)
+        payments.store_credits.where(state: :checkout).map(&:invalidate!)
 
         remaining_total = outstanding_balance
 
@@ -18,9 +18,14 @@ module Spree
             create_store_credit_payment(payment_method, credit, amount_to_take)
             remaining_total -= amount_to_take
           end
+          payments.store_credits.checkout
         end
       end
 
+      def remove_store_credit_payments
+        payments.checkout.store_credits.map(&:invalidate!) unless completed?
+      end
+
       def covered_by_store_credit?
         return false unless user
         user.total_available_store_credit >= total

data/app/models/spree/order_contents.rb

@@ -32,6 +32,7 @@ module Spree
         persist_totals
         PromotionHandler::Cart.new(order).activate
         order.ensure_updated_shipments
+        order.payments.store_credits.checkout.destroy_all
         persist_totals
         true
       else
@@ -42,9 +43,19 @@ module Spree
     private
 
     def after_add_or_remove(line_item, options = {})
+      order.payments.store_credits.checkout.destroy_all
       persist_totals
       shipment = options[:shipment]
-      shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
+      if shipment.present?
+        # ADMIN END SHIPMENT RATE FIX
+        # refresh shipments to ensure correct shipment amount is calculated when using price sack calculator
+        # for calculating shipment rates.
+        # Currently shipment rate is calculated on previous order total instead of current order total when updating a shipment from admin end.
+        order.refresh_shipment_rates(ShippingMethod::DISPLAY_ON_BACK_END)
+        shipment.update_amounts
+      else
+        order.ensure_updated_shipments
+      end
       PromotionHandler::Cart.new(order, line_item).activate
       Adjustable::AdjustmentsUpdater.update(line_item)
       TaxRate.adjust(order, [line_item]) if options[:line_item_created]
@@ -81,7 +92,8 @@ module Spree
         line_item.quantity += quantity.to_i
         line_item.currency = currency unless currency.nil?
       else
-        opts = ActionController::Parameters.new(options.to_h).
+        options_params = options.is_a?(ActionController::Parameters) ? options : ActionController::Parameters.new(options.to_h)
+        opts = options_params.
                permit(PermittedAttributes.line_item_attributes).to_h.
                merge( { currency: order.currency } )
 

data/app/models/spree/order_inventory.rb

@@ -19,96 +19,100 @@ module Spree
     # are always unstocked when the order is completed through +shipment.finalize+
     def verify(shipment = nil)
       if order.completed? || shipment.present?
-
-        if inventory_units.size < line_item.quantity
-          quantity = line_item.quantity - inventory_units.size
+        units_count = inventory_units.reload.sum(&:quantity)
+        if units_count < line_item.quantity
+          quantity = line_item.quantity - units_count
 
           shipment = determine_target_shipment unless shipment
           add_to_shipment(shipment, quantity)
-        elsif inventory_units.size == line_item.quantity && !line_item.changed?
-          remove(inventory_units, shipment)
-        elsif inventory_units.size > line_item.quantity
-          remove(inventory_units, shipment)
+        elsif (units_count > line_item.quantity) || (units_count == line_item.quantity && !line_item.changed?)
+          remove(units_count, shipment)
         end
       end
     end
 
     private
 
-      def remove(item_units, shipment = nil)
-        quantity = set_quantity_to_remove(item_units)
+    def remove(units_count, target_shipment = nil)
+      quantity = set_quantity_to_remove(units_count)
 
-        if shipment.present?
-          remove_from_shipment(shipment, quantity)
-        else
-          order.shipments.each do |shipment|
-            break if quantity == 0
-            quantity -= remove_from_shipment(shipment, quantity)
-          end
+      if target_shipment.present?
+        remove_from_shipment(target_shipment, quantity)
+      else
+        order.shipments.each do |shipment|
+          break if quantity.zero?
+          quantity -= remove_from_shipment(shipment, quantity)
         end
       end
+    end
 
-      def set_quantity_to_remove(item_units)
-        if (item_units.size - line_item.quantity).zero?
-          line_item.quantity
-        else
-          item_units.size - line_item.quantity
-        end
+    def set_quantity_to_remove(units_count)
+      if (units_count - line_item.quantity).zero?
+        line_item.quantity
+      else
+        units_count - line_item.quantity
       end
+    end
 
-      # Returns either one of the shipment:
-      #
-      # first unshipped that already includes this variant
-      # first unshipped that's leaving from a stock_location that stocks this variant
-      def determine_target_shipment
-        shipment = order.shipments.detect do |shipment|
-          shipment.ready_or_pending? && shipment.include?(variant)
-        end
-
-        shipment ||= order.shipments.detect do |shipment|
-          shipment.ready_or_pending? && variant.stock_location_ids.include?(shipment.stock_location_id)
-        end
+    # Returns either one of the shipment:
+    #
+    # first unshipped that already includes this variant
+    # first unshipped that's leaving from a stock_location that stocks this variant
+    def determine_target_shipment
+      target_shipment = order.shipments.detect do |shipment|
+        shipment.ready_or_pending? && shipment.include?(variant)
       end
 
-      def add_to_shipment(shipment, quantity)
-        if variant.should_track_inventory?
-          on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
+      target_shipment || order.shipments.detect do |shipment|
+        shipment.ready_or_pending? && variant.stock_location_ids.include?(shipment.stock_location_id)
+      end
+    end
 
-          on_hand.times { shipment.set_up_inventory('on_hand', variant, order, line_item) }
-          back_order.times { shipment.set_up_inventory('backordered', variant, order, line_item) }
-        else
-          quantity.times { shipment.set_up_inventory('on_hand', variant, order, line_item) }
-        end
+    def add_to_shipment(shipment, quantity)
+      if variant.should_track_inventory?
+        on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
 
-        # adding to this shipment, and removing from stock_location
-        if order.completed?
-          shipment.stock_location.unstock(variant, quantity, shipment)
-        end
+        on_hand.times { shipment.set_up_inventory('on_hand', variant, order, line_item) }
+        back_order.times { shipment.set_up_inventory('backordered', variant, order, line_item) }
+      else
+        quantity.times { shipment.set_up_inventory('on_hand', variant, order, line_item) }
+      end
 
-        quantity
+      # adding to this shipment, and removing from stock_location
+      if order.completed?
+        shipment.stock_location.unstock(variant, quantity, shipment)
       end
 
-      def remove_from_shipment(shipment, quantity)
-        return 0 if quantity == 0 || shipment.shipped?
+      quantity
+    end
+
+    def remove_from_shipment(shipment, quantity)
+      return 0 if quantity.zero? || shipment.shipped?
 
-        shipment_units = shipment.inventory_units_for_item(line_item, variant).reject(&:shipped?).sort_by(&:state)
+      shipment_units = shipment.inventory_units_for_item(line_item, variant).reject(&:shipped?).sort_by(&:state)
 
-        removed_quantity = 0
+      removed_quantity = 0
 
-        shipment_units.each do |inventory_unit|
+      shipment_units.each do |inventory_unit|
+        inventory_unit.quantity.times do
           break if removed_quantity == quantity
-          inventory_unit.destroy
+          if inventory_unit.quantity > 1
+            inventory_unit.decrement(:quantity)
+          else
+            inventory_unit.destroy
+          end
           removed_quantity += 1
         end
+      end
 
-        shipment.destroy if shipment.inventory_units.count.zero?
-
-        # removing this from shipment, and adding to stock_location
-        if order.completed?
-          shipment.stock_location.restock variant, removed_quantity, shipment
-        end
+      shipment.destroy if shipment.inventory_units.sum(:quantity).zero?
 
-        removed_quantity
+      # removing this from shipment, and adding to stock_location
+      if order.completed?
+        shipment.stock_location.restock variant, removed_quantity, shipment
       end
+
+      removed_quantity
+    end
   end
 end

data/app/models/spree/payment.rb

@@ -2,11 +2,10 @@ module Spree
   class Payment < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'P', letters: true, length: 7)
 
-    extend FriendlyId
-    friendly_id :number, slug_column: :number, use: :slugged
-
     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
@@ -24,6 +23,8 @@ module Spree
     has_many :refunds, inverse_of: :payment
 
     validates :payment_method, presence: true
+    validates :number, uniqueness: true
+
     before_validation :validate_source
 
     after_save :create_payment_profile, if: :profiles_supported?
@@ -211,14 +212,6 @@ module Spree
         gateway_error e
       end
 
-      def invalidate_old_payments
-        unless has_invalid_state?
-          order.payments.with_state('checkout').where("id != ?", self.id).each do |payment|
-            payment.invalidate!
-          end
-        end
-      end
-
       def split_uncaptured_amount
         if uncaptured_amount > 0
           order.payments.create!(
@@ -265,8 +258,10 @@ module Spree
       end
 
       def invalidate_old_payments
-        return if store_credit? # store credits shouldn't invalidate other payment types
-        order.payments.with_state('checkout').where("id != ?", self.id).each do |payment|
+        # invalid payment or store_credit payment shouldn't invalidate other payment types
+        return if has_invalid_state? || store_credit?
+
+        order.payments.with_state('checkout').where.not(id: id).each do |payment|
           payment.invalidate! unless payment.store_credit?
         end
       end

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

@@ -29,7 +29,7 @@ module Spree
       # a new pending payment record for the remaining amount to capture later.
       def capture!(amount = nil)
         return true if completed?
-        amount ||= money.amount_in_cents
+        amount ||= money.money.cents
         started_processing!
         protect_from_connection_error do
           # Standard ActiveMerchant capture usage
@@ -115,7 +115,7 @@ module Spree
 
       def gateway_action(source, action, success_state)
         protect_from_connection_error do
-          response = payment_method.send(action, money.amount_in_cents,
+          response = payment_method.send(action, money.money.cents,
                                          source,
                                          gateway_options)
           handle_response(response, success_state, :failure)

data/app/models/spree/payment_method.rb

@@ -12,8 +12,10 @@ module Spree
 
     validates :name, presence: true
 
-    has_many :payments, class_name: "Spree::Payment", inverse_of: :payment_method
-    has_many :credit_cards, class_name: "Spree::CreditCard"
+    with_options dependent: :restrict_with_error do
+      has_many :payments, class_name: "Spree::Payment", inverse_of: :payment_method
+      has_many :credit_cards, class_name: "Spree::CreditCard"
+    end
 
     def self.providers
       Rails.application.config.spree.payment_methods

data/app/models/spree/preference.rb

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

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

@@ -93,7 +93,7 @@ module Spree::Preferences::Preferable
     when :password
       value.to_s
     when :decimal
-      BigDecimal.new(value.to_s)
+      (value.presence || 0).to_s.to_d
     when :integer
       value.to_i
     when :boolean

data/app/models/spree/product.rb

@@ -300,7 +300,7 @@ module Spree
     end
 
     def anything_changed?
-      changed? || @nested_changes
+      saved_changes? || @nested_changes
     end
 
     def reset_nested_changes

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

@@ -197,7 +197,7 @@ module Spree
     # Can't use add_search_scope for this as it needs a default argument
     def self.available(available_on = nil, currency = nil)
       available_on ||= Time.current
-      not_discontinued.joins(master: :prices).where("#{Product.quoted_table_name}.available_on <= ?", available_on).distinct
+      not_discontinued.joins(master: :prices).where("#{Product.quoted_table_name}.available_on <= ?", available_on)
     end
     search_scopes << :available
 
@@ -244,7 +244,7 @@ module Spree
       # specifically avoid having an order for taxon search (conflicts with main order)
       def self.prepare_taxon_conditions(taxons)
         ids = taxons.map { |taxon| taxon.self_and_descendants.pluck(:id) }.flatten.uniq
-        joins(:taxons).where("#{Taxon.table_name}.id" => ids)
+        joins(:classifications).where(Classification.table_name => { taxon_id: ids })
       end
 
       # Produce an array of keywords for use in scopes.

data/app/models/spree/promotion.rb

@@ -5,7 +5,7 @@ module Spree
 
     attr_reader :eligibility_errors
 
-    belongs_to :promotion_category
+    belongs_to :promotion_category, optional: true
 
     has_many :promotion_rules, autosave: true, dependent: :destroy
     alias_method :rules, :promotion_rules
@@ -21,7 +21,7 @@ module Spree
     validates_associated :rules
 
     validates :name, presence: true
-    validates :path, uniqueness: { allow_blank: true }
+    validates :path, :code, uniqueness: { case_sensitive: false, allow_blank: true }
     validates :usage_limit, numericality: { greater_than: 0, allow_nil: true }
     validates :description, length: { maximum: 255 }, allow_blank: true
     validate :expires_at_must_be_later_than_starts_at, if: -> { starts_at && expires_at }

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

@@ -31,12 +31,20 @@ module Spree
         end
 
         def actionable?(line_item)
-          product_id = line_item.product.id
-          option_values_ids = line_item.variant.option_value_ids
-          eligible_product_ids = preferred_eligible_values.keys
-          eligible_value_ids = preferred_eligible_values[product_id]
+          pid = line_item.product.id
+          ovids = line_item.variant.option_values.pluck(:id)
 
-          eligible_product_ids.include?(product_id) && (eligible_value_ids & option_values_ids).present?
+          product_ids.include?(pid) && (value_ids(pid) - ovids).empty?
+        end
+
+        private
+
+        def product_ids
+          preferred_eligible_values.keys
+        end
+
+        def value_ids(product_id)
+          preferred_eligible_values[product_id]
         end
       end
     end

data/app/models/spree/promotion_rule_user.rb

@@ -1,7 +1,7 @@
 module Spree
   class PromotionRuleUser < Spree::Base
     belongs_to :promotion_rule, class_name: 'Spree::PromotionRule'
-    belongs_to :user, class_name: Spree.user_class
+    belongs_to :user, class_name: Spree.user_class.to_s
 
     validates :user, :promotion_rule, presence: true
     validates :user_id, uniqueness: { scope: :promotion_rule_id }, allow_nil: true

data/app/models/spree/property_prototype.rb

@@ -4,6 +4,6 @@ module Spree
     belongs_to :property, class_name: 'Spree::Property'
 
     validates :prototype, :property, presence: true
-    validates :prototype_id, uniqueness: { scope: :property_id }, allow_nil: true
+    validates :prototype_id, uniqueness: { scope: :property_id }
   end
 end

data/app/models/spree/prototype_taxon.rb

@@ -4,6 +4,6 @@ module Spree
     belongs_to :prototype, class_name: 'Spree::Prototype'
 
     validates :prototype, :taxon, presence: true
-    validates :prototype_id, uniqueness: { scope: :taxon_id }, allow_nil: true
+    validates :prototype_id, uniqueness: { scope: :taxon_id }
   end
 end