spree_core 3.2.9 → 3.3.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaffc297e301b4c04ae9b9622f80d75561d9db45
-  data.tar.gz: f65a262c8ad7454482456cc83a838f661aab498d
+  metadata.gz: 0c9fdf952e713bfe4540fa0cc02c50e0b0d1d463
+  data.tar.gz: fe6f1d0bc7723acc565b94ea5b846ede4836c3bc
 SHA512:
-  metadata.gz: 8d672076c7cd12efd892b3d65cabd2fd06488842645e343f987a7d8921edc1f7b28c02ffb566f1e90ef917e84a088680d17a58620976ecb1575c109bbc1872e6
-  data.tar.gz: d1443c155f8d7f61b2fd9d7cd7eaeae2877dcbef1069c6d2fa9c8b3c2b6b75e877c74d4df7279c98a9e348e2ff1c7145d5a2b331960bbbdc5c0bb59c15447d95
+  metadata.gz: d08fd7351e39b0bf4201ddcb1203bbd79cd793d4c9b65a5af2f42e3455f9e5a3019fcc9cb2d67cb5d9022b6b903e6c261cb5a10a6e5928e462d19e07a864cef1
+  data.tar.gz: ed488419461ff914b3175e55e99857c8776e9359495f7c69c935cabd13ef491e9752a8cb01daccd083e9252eba222afcf1b9000705be1d0cb21c616878bfaf1a

data/app/models/concerns/spree/named_type.rb

@@ -6,7 +6,7 @@ module Spree
       scope :active, -> { where(active: true) }
       default_scope { order("LOWER(#{self.table_name}.name)") }
 
-      validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
+      validates :name, presence: true, uniqueness: { case_sensitive: false }
     end
   end
 end

data/app/models/concerns/spree/number_as_param.rb

@@ -0,0 +1,9 @@
+module Spree
+  module NumberAsParam
+    extend ActiveSupport::Concern
+
+    def to_param
+      number.presence.to_s
+    end
+  end
+end

data/app/models/concerns/spree/user_address.rb

@@ -3,10 +3,12 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address'
+      belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address',
+                 optional: true
       alias_attribute :billing_address, :bill_address
 
-      belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address'
+      belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address',
+                 optional: true
       alias_attribute :shipping_address, :ship_address
 
       accepts_nested_attributes_for :ship_address, :bill_address

data/app/models/concerns/spree/user_methods.rb

@@ -2,7 +2,6 @@ module Spree
   module UserMethods
     extend ActiveSupport::Concern
 
-    include Spree::UserApiAuthentication
     include Spree::UserPaymentSource
     include Spree::UserReporting
     include Spree::RansackableAttributes
@@ -21,8 +20,8 @@ module Spree
       has_many :orders, foreign_key: :user_id, class_name: "Spree::Order"
       has_many :store_credits, foreign_key: :user_id, class_name: 'Spree::StoreCredit'
 
-      belongs_to :ship_address, class_name: 'Spree::Address'
-      belongs_to :bill_address, class_name: 'Spree::Address'
+      belongs_to :ship_address, class_name: 'Spree::Address', optional: true
+      belongs_to :bill_address, class_name: 'Spree::Address', optional: true
 
       self.whitelisted_ransackable_associations = %w[bill_address ship_address]
       self.whitelisted_ransackable_attributes = %w[id email]

data/app/models/spree/ability.rb

@@ -61,8 +61,7 @@ module Spree
 
       # Include any abilities registered by extensions, etc.
       Ability.abilities.merge(abilities_to_register).each do |clazz|
-        ability = clazz.send(:new, user)
-        @rules = rules + ability.send(:rules)
+        merge clazz.new(user)
       end
 
       # Protect admin role

data/app/models/spree/address.rb

@@ -11,7 +11,7 @@ module Spree
     ].freeze
 
     belongs_to :country, class_name: "Spree::Country"
-    belongs_to :state, class_name: "Spree::State"
+    belongs_to :state, class_name: "Spree::State", optional: true
 
     has_many :shipments, inverse_of: :address
 

data/app/models/spree/base.rb

@@ -18,6 +18,8 @@ class Spree::Base < ApplicationRecord
 
   self.abstract_class = true
 
+  self.belongs_to_required_by_default = false
+
   def self.spree_base_scopes
     where(nil)
   end

data/app/models/spree/calculator.rb

@@ -5,7 +5,7 @@ module Spree
       acts_as_paranoid
     end
 
-    belongs_to :calculable, polymorphic: true
+    belongs_to :calculable, polymorphic: true, optional: true
 
     # This method calls a compute_<computable> method. must be overriden in concrete calculator.
     #

data/app/models/spree/calculator/percent_per_item.rb

@@ -4,9 +4,6 @@ module Spree
   # for all matching products in an order. This should not be used as a
   # shipping calculator since it would be the same thing as a flat percent
   # off the entire order.
-  #
-  #
-  # TODO Should be deprecated now that we have adjustments at the line item level in spree core
 
   class Calculator::PercentPerItem < Calculator
     preference :percent, :decimal, default: 0
@@ -16,6 +13,10 @@ module Spree
     end
 
     def compute(object=nil)
+      ActiveSupport::Deprecation.warn(<<-EOS, caller)
+        Spree::Calculator::PercentPerItem will be removed in Spree 3.4
+        There is now a Promotion Action which deals with these types of promotions instead
+      EOS
       return 0 if object.nil?
       object.line_items.reduce(0) do |sum, line_item|
         sum += value_for_line_item(line_item)

data/app/models/spree/calculator/returns/default_refund_amount.rb

@@ -3,6 +3,7 @@ require_dependency 'spree/returns_calculator'
 module Spree
   module Calculator::Returns
     class DefaultRefundAmount < ReturnsCalculator
+      attr_reader :inventory_unit
 
       def self.description
         Spree.t(:default_refund_amount)
@@ -10,27 +11,28 @@ module Spree
 
       def compute(return_item)
         return 0.0.to_d if return_item.exchange_requested?
-        weighted_order_adjustment_amount(return_item.inventory_unit) + weighted_line_item_pre_tax_amount(return_item.inventory_unit)
+        @inventory_unit = return_item.inventory_unit
+        weighted_order_adjustment_amount(return_item) + weighted_line_item_pre_tax_amount(return_item)
       end
 
       private
 
-      def weighted_order_adjustment_amount(inventory_unit)
-        inventory_unit.order.adjustments.eligible.non_tax.sum(:amount) * percentage_of_order_total(inventory_unit)
+      def weighted_order_adjustment_amount(return_item)
+        inventory_unit.order.adjustments.eligible.non_tax.sum(:amount) * percentage_of_order_total(return_item)
       end
 
-      def weighted_line_item_pre_tax_amount(inventory_unit)
-        inventory_unit.line_item.pre_tax_amount * percentage_of_line_item(inventory_unit)
+      def percentage_of_order_total(return_item)
+        return 0.0 if inventory_unit.order.pre_tax_item_amount.zero?
+        weighted_line_item_pre_tax_amount(return_item) / inventory_unit.order.pre_tax_item_amount
       end
 
-      def percentage_of_order_total(inventory_unit)
-       return 0.0 if inventory_unit.order.pre_tax_item_amount.zero?
-       weighted_line_item_pre_tax_amount(inventory_unit) / inventory_unit.order.pre_tax_item_amount
-     end
+      def weighted_line_item_pre_tax_amount(return_item)
+        inventory_unit.line_item.pre_tax_amount * percentage_of_line_item(return_item)
+      end
 
-     def percentage_of_line_item(inventory_unit)
-       1 / BigDecimal.new(inventory_unit.line_item.quantity)
-     end
-   end
- end
+      def percentage_of_line_item(return_item)
+        return_item.return_quantity / BigDecimal.new(inventory_unit.line_item.quantity)
+      end
+    end
+  end
 end

data/app/models/spree/country.rb

@@ -14,7 +14,7 @@ module Spree
 
     has_many :zones, through: :zone_members, class_name: 'Spree::Zone'
 
-    validates :name, :iso_name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
+    validates :name, :iso_name, presence: true, uniqueness: { case_sensitive: false }
 
     def self.default
       country_id = Spree::Config[:default_country_id]

data/app/models/spree/credit_card.rb

@@ -3,7 +3,8 @@ module Spree
     include ActiveMerchant::Billing::CreditCardMethods
 
     belongs_to :payment_method
-    belongs_to :user, class_name: Spree.user_class, foreign_key: 'user_id'
+    belongs_to :user, class_name: Spree.user_class.to_s, foreign_key: 'user_id',
+                      optional: true
     has_many :payments, as: :source
 
     before_save :set_last_digits
@@ -53,49 +54,53 @@ module Spree
       maestro: /^(5[06-8]|6\d)\d{10,17}$/,
       forbrugsforeningen: /^600722\d{10}$/,
       laser: /^(6304|6706|6709|6771(?!89))\d{8}(\d{4}|\d{6,7})?$/
-    }
+    }.freeze
 
     def expiry=(expiry)
       return unless expiry.present?
 
       self[:month], self[:year] =
-      if expiry.match(/\d{2}\s?\/\s?\d{2,4}/) # will match mm/yy and mm / yyyy
-        expiry.delete(' ').split('/')
-      elsif match = expiry.match(/(\d{2})(\d{2,4})/) # will match mmyy and mmyyyy
-        [match[1], match[2]]
-      end
+        if expiry =~ /\d{2}\s?\/\s?\d{2,4}/ # will match mm/yy and mm / yyyy
+          expiry.delete(' ').split('/')
+        elsif match = expiry.match(/(\d{2})(\d{2,4})/) # will match mmyy and mmyyyy
+          [match[1], match[2]]
+        end
       if self[:year]
-        self[:year] = "20#{ self[:year] }" if self[:year] / 100 == 0
+        self[:year] = "20#{self[:year]}" if (self[:year] / 100).zero?
         self[:year] = self[:year].to_i
       end
       self[:month] = self[:month].to_i if self[:month]
     end
 
     def number=(num)
-      @number = num.gsub(/[^0-9]/, '') rescue nil
+      @number = begin
+                  num.gsub(/[^0-9]/, '')
+                rescue
+                  nil
+                end
     end
 
     # cc_type is set by jquery.payment, which helpfully provides different
     # types from Active Merchant. Converting them is necessary.
     def cc_type=(type)
       self[:cc_type] = case type
-      when 'mastercard', 'maestro' then 'master'
-      when 'amex' then 'american_express'
-      when 'dinersclub' then 'diners_club'
-      when '' then try_type_from_number
-      else type
+                       when 'mastercard', 'maestro' then 'master'
+                       when 'amex' then 'american_express'
+                       when 'dinersclub' then 'diners_club'
+                       when '' then try_type_from_number
+                       else type
       end
     end
 
     def set_last_digits
-      number.to_s.gsub!(/\s/,'')
-      verification_value.to_s.gsub!(/\s/,'')
+      number.to_s.gsub!(/\s/, '')
+      verification_value.to_s.gsub!(/\s/, '')
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
     end
 
     def try_type_from_number
       numbers = number.delete(' ') if number
-      CARD_TYPES.find{|type, pattern| return type.to_s if numbers =~ pattern}.to_s
+      CARD_TYPES.find { |type, pattern| return type.to_s if numbers =~ pattern }.to_s
     end
 
     def verification_value?
@@ -156,13 +161,13 @@ module Spree
     private
 
     def require_card_numbers?
-      !self.encrypted_data.present? && !self.has_payment_profile?
+      !encrypted_data.present? && !has_payment_profile?
     end
 
     def ensure_one_default
-      if self.user_id && self.default
-        CreditCard.where(default: true, user_id: self.user_id).where.not(id: self.id)
-          .update_all(default: false)
+      if user_id && default
+        CreditCard.where(default: true, user_id: user_id).where.not(id: id).
+          update_all(default: false)
       end
     end
   end

data/app/models/spree/customer_return.rb

@@ -4,11 +4,12 @@ module Spree
     belongs_to :stock_location
 
     has_many :reimbursements, inverse_of: :customer_return
-    has_many :return_authorizations, through: :return_items
     has_many :return_items, inverse_of: :customer_return
+    has_many :return_authorizations, through: :return_items
 
     after_create :process_return!
 
+    validates :number, uniqueness: true
     validates :return_items, :stock_location, presence: true
     validate :must_have_return_authorization, on: :create
     validate :return_items_belong_to_same_order
@@ -36,7 +37,6 @@ module Spree
       return_items.first.inventory_unit.order
     end
 
-
     def pre_tax_total
       return_items.sum(:pre_tax_amount)
     end

data/app/models/spree/exchange.rb

@@ -18,12 +18,17 @@ module Spree
     end
 
     def perform!
-      shipments = Spree::Stock::Coordinator.new(@order, @reimbursement_objects.map(&:build_exchange_inventory_unit)).shipments
-      if shipments.flat_map(&:inventory_units).size != @reimbursement_objects.size
+      new_exchange_inventory_units = @reimbursement_objects.map(&:build_default_exchange_inventory_unit)
+      shipments = Spree::Stock::Coordinator.new(@order, new_exchange_inventory_units).shipments
+      shipments_units = shipments.flat_map(&:inventory_units)
+
+      if shipments_units.sum(&:quantity) != new_exchange_inventory_units.sum(&:quantity)
         raise UnableToCreateShipments.new("Could not generate shipments for all items. Out of stock?")
       end
+
       @order.shipments += shipments
       @order.save!
+
       shipments.each do |shipment|
         shipment.update!(@order)
         shipment.finalize!

data/app/models/spree/image.rb

@@ -14,7 +14,7 @@ module Spree
 
     # save the w,h of the original image (from which others can be calculated)
     # we need to look at the write-queue for images which have not been saved yet
-    before_save :find_dimensions, if: :attachment_updated_at_changed?
+    before_save :find_dimensions, if: :saved_change_to_attachment_updated_at?
 
     #used by admin products autocomplete
     def mini_url

data/app/models/spree/inventory_unit.rb

@@ -1,6 +1,5 @@
 module Spree
   class InventoryUnit < Spree::Base
-
     with_options inverse_of: :inventory_units do
       belongs_to :variant, class_name: "Spree::Variant"
       belongs_to :order, class_name: "Spree::Order"
@@ -10,7 +9,7 @@ module Spree
     end
 
     has_many :return_items, inverse_of: :inventory_unit
-    has_one :original_return_item, class_name: "Spree::ReturnItem", foreign_key: :exchange_inventory_unit_id
+    belongs_to :original_return_item, class_name: "Spree::ReturnItem"
 
     scope :backordered, -> { where state: 'backordered' }
     scope :on_hand, -> { where state: 'on_hand' }
@@ -25,6 +24,8 @@ module Spree
         .backordered.order("spree_orders.completed_at ASC")
     end
 
+    validates :quantity, numericality: { greater_than: 0 }
+
     # state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
     state_machine initial: :on_hand do
       event :fill_backorder do
@@ -62,6 +63,27 @@ module Spree
         variant_id: variant_id).first
     end
 
+    def self.split(original_inventory_unit, extract_quantity)
+      split = original_inventory_unit.dup
+      split.quantity = extract_quantity
+      original_inventory_unit.quantity -= extract_quantity
+      split
+    end
+
+    # This will fail if extract >= available_quantity
+    def split_inventory!(extract_quantity)
+      split = self.class.split(self, extract_quantity)
+      transaction do
+        split.save!
+        save!
+      end
+      split
+    end
+
+    def extract_singular_inventory!
+      split_inventory!(1)
+    end
+
     # Remove variant default_scope `deleted_at: nil`
     def variant
       Spree::Variant.unscoped { super }
@@ -79,6 +101,20 @@ module Spree
       line_item.included_tax_total * percentage_of_line_item
     end
 
+    def required_quantity
+      return @required_quantity unless @required_quantity.nil?
+
+      if exchanged_unit?
+        @required_quantity = original_return_item.return_quantity
+      else
+        @required_quantity = line_item.quantity
+      end
+    end
+
+    def exchanged_unit?
+      original_return_item_id?
+    end
+
     private
 
       def allow_ship?
@@ -91,7 +127,7 @@ module Spree
       end
 
       def percentage_of_line_item
-        1 / BigDecimal.new(line_item.quantity)
+        quantity / BigDecimal.new(line_item.quantity)
       end
 
       def current_return_item

data/app/models/spree/line_item.rb

@@ -85,11 +85,6 @@ module Spree
     alias total final_amount
     alias money display_total
 
-    def invalid_quantity_check
-      warn "`invalid_quantity_check` is deprecated. Use private `ensure_valid_quantity` instead."
-      ensure_valid_quantity
-    end
-
     def sufficient_stock?
       Stock::Quantifier.new(variant).can_supply? quantity
     end
@@ -132,7 +127,7 @@ module Spree
     end
 
     def update_inventory
-      if (changed? || target_shipment.present?) && order.has_checkout_step?("delivery")
+      if (saved_changes? || target_shipment.present?) && order.has_checkout_step?("delivery")
         verify_order_inventory
       end
     end
@@ -146,7 +141,7 @@ module Spree
     end
 
     def update_adjustments
-      if quantity_changed?
+      if saved_change_to_quantity?
         recalculate_adjustments
         update_tax_charge # Called to ensure pre_tax_amount is updated.
       end