spree_core 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8194bdbcc2f3d26d2662205e0deed23ed0bf800
-  data.tar.gz: 232ddcdb7e3b3b8cb25b1029f77015331b2b7043
+  metadata.gz: a4097b8c35f0d4c860dbaeff13518f90e790880e
+  data.tar.gz: 67e8f16ef1ebf41b7fd672a31d17ad3736439856
 SHA512:
-  metadata.gz: da652bb0512643d231a1826e0af01ea36fffc76b2b9f91bffe1ada65133b6ec8d2a6c365f38d88235209db209565816dc44fbfc5868f79dd1b7a111a5c9cc2de
-  data.tar.gz: 9db7c280e5907596695bdb35b9098611ff778b27cbb5fc8f10ca789b3cf86bc7e0aeeda0e6a62b01dc01da7d0fc88ba23ca74a193c301bec105f5f4bfe7805cd
+  metadata.gz: 83ed87a684e91dac0ce56b9d1836d0d4e1cee96cb6dd388e1d68dba07fa9d9140cabf3f77f7c50298e42ae026e1827a668aa8355256965044c0bc097157a69db
+  data.tar.gz: a6bbe1a58e61240068e92db9d3f8a2b577b939e363ff286c7ba95f0738884bc64c1f54339b4163aa51053bec6e25323f349c64fb42a08b93c852d9a19ca99901

data/app/helpers/spree/admin/images_helper.rb

@@ -6,7 +6,7 @@ module Spree
           if image.viewable.is_master?
             Spree.t(:all)
           else
-            image.viewable.options_text
+            image.viewable.sku_and_options_text
           end
         else
           Spree.t(:all)

data/app/helpers/spree/base_helper.rb

@@ -34,7 +34,7 @@ module Spree
       v.options_text
     end
 
-    def meta_data_tags
+    def meta_data
       object = instance_variable_get('@'+controller_name.singularize)
       meta = {}
 
@@ -51,8 +51,11 @@ module Spree
         keywords: Spree::Config[:default_meta_keywords],
         description: Spree::Config[:default_meta_description]
       })
+      meta
+    end
 
-      meta.map do |name, content|
+    def meta_data_tags
+      meta_data.map do |name, content|
         tag('meta', name: name, content: content)
       end.join("\n")
     end

data/app/models/spree/address.rb

@@ -14,7 +14,7 @@ module Spree
     alias_attribute :first_name, :firstname
     alias_attribute :last_name, :lastname
 
-    def self.default
+    def self.build_default
       country = Spree::Country.find(Spree::Config[:default_country_id]) rescue Spree::Country.first
       new(country: country)
     end
@@ -24,6 +24,14 @@ module Spree
     #   new_record? || (shipments.empty? && checkouts.empty?)
     # end
 
+    def self.default(user = nil, kind = "bill")
+      if user
+        user.send(:"#{kind}_address") || build_default
+      else
+        build_default
+      end
+    end
+
     def full_name
       "#{firstname} #{lastname}".strip
     end

data/app/models/spree/adjustment.rb

@@ -54,8 +54,8 @@ module Spree
     scope :shipping, -> { where(originator_type: 'Spree::ShippingMethod') }
     scope :optional, -> { where(mandatory: false) }
     scope :eligible, -> { where(eligible: true) }
-    scope :charge, -> { where('amount >= 0') }
-    scope :credit, -> { where('amount < 0') }
+    scope :charge, -> { where("#{quoted_table_name}.amount >= 0") }
+    scope :credit, -> { where("#{quoted_table_name}.amount < 0") }
     scope :promotion, -> { where(originator_type: 'Spree::PromotionAction') }
     scope :manual, -> { where(originator_type: nil) }
     scope :return_authorization, -> { where(source_type: "Spree::ReturnAuthorization") }

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

@@ -28,7 +28,11 @@ module Spree
         end
 
         line_items_total = matched_line_items.sum(&:total)
-        round_to_two_places(line_items_total * rate.amount)
+        if rate.included_in_price
+          deduced_total_by_rate(line_items_total, rate)
+        else
+          round_to_two_places(line_items_total * rate.amount)
+        end
       end
 
       def compute_line_item(line_item)

data/app/models/spree/credit_card.rb

@@ -29,6 +29,8 @@ module Spree
       if expiry.present?
         self[:month], self[:year] = expiry.delete(' ').split('/')
         self[:year] = "20" + self[:year] if self[:year].length == 2
+        self[:year] = self[:year].to_i
+        self[:month] = self[:month].to_i
       end
     end
 

data/app/models/spree/gateway.rb

@@ -1,6 +1,6 @@
 module Spree
   class Gateway < PaymentMethod
-    delegate_belongs_to :provider, :authorize, :purchase, :capture, :void, :credit
+    delegate :authorize, :purchase, :capture, :void, :credit, to: :provider
 
     validates :name, :type, presence: true
 

data/app/models/spree/inventory_unit.rb

@@ -2,16 +2,17 @@ module Spree
   class InventoryUnit < ActiveRecord::Base
     belongs_to :variant, class_name: "Spree::Variant"
     belongs_to :order, class_name: "Spree::Order"
-    belongs_to :shipment, class_name: "Spree::Shipment"
+    belongs_to :shipment, class_name: "Spree::Shipment", touch: true
     belongs_to :return_authorization, class_name: "Spree::ReturnAuthorization"
 
     scope :backordered, -> { where state: 'backordered' }
     scope :shipped, -> { where state: 'shipped' }
     scope :backordered_per_variant, ->(stock_item) do
-      includes(:shipment)
+      includes(:shipment, :order)
         .where("spree_shipments.state != 'canceled'").references(:shipment)
         .where(variant_id: stock_item.variant_id)
-        .backordered.order("#{self.table_name}.created_at ASC")
+        .where('spree_orders.completed_at is not null')
+        .backordered.order("spree_orders.completed_at ASC")
     end
 
     # state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
@@ -34,7 +35,7 @@ module Spree
     # lead to issues once users tried to modify the objects returned. That's due
     # to ActiveRecord `joins(shipment: :stock_location)` only return readonly
     # objects
-    # 
+    #
     # Returns an array of backordered inventory units as per a given stock item
     def self.backordered_for_stock_item(stock_item)
       backordered_per_variant(stock_item).select do |unit|

data/app/models/spree/legacy_user.rb

@@ -1,24 +1,15 @@
 # Default implementation of User.  This class is intended to be modified by extensions (ex. spree_auth_devise)
 module Spree
   class LegacyUser < ActiveRecord::Base
+    include Core::UserAddress
+
     self.table_name = 'spree_users'
     has_many :orders, foreign_key: :user_id
-    belongs_to :ship_address, class_name: 'Spree::Address'
-    belongs_to :bill_address, class_name: 'Spree::Address'
 
     before_destroy :check_completed_orders
 
     class DestroyWithOrdersError < StandardError; end
 
-    def anonymous?
-      false
-    end
-
-    # Creates an anonymous user
-    def self.anonymous!
-      create
-    end
-
     def has_spree_role?(role)
       true
     end

data/app/models/spree/line_item.rb

@@ -20,12 +20,11 @@ module Spree
     validates :price, numericality: true
     validates_with Stock::AvailabilityValidator
 
-    before_save :update_inventory
-
+    after_save :update_inventory
     after_save :update_order
     after_destroy :update_order
 
-    delegate :name, :description, to: :variant
+    delegate :name, :description, :should_track_inventory?, to: :variant
 
     attr_accessor :target_shipment
 

data/app/models/spree/log_entry.rb

@@ -12,5 +12,9 @@ module Spree
       log.details = details
       log.save!
     end
+
+    def parsed_details
+      @details ||= YAML.load(details)
+    end
   end
 end

data/app/models/spree/option_type.rb

@@ -9,5 +9,11 @@ module Spree
     default_scope -> { order("#{self.table_name}.position") }
 
     accepts_nested_attributes_for :option_values, reject_if: lambda { |ov| ov[:name].blank? || ov[:presentation].blank? }, allow_destroy: true
+
+    after_touch :touch_all_products
+
+    def touch_all_products
+      products.find_each(&:touch)
+    end
   end
 end

data/app/models/spree/option_value.rb

@@ -1,9 +1,20 @@
 module Spree
   class OptionValue < ActiveRecord::Base
-    belongs_to :option_type
+    belongs_to :option_type, :class_name => 'Spree::OptionType', :touch => true
     acts_as_list scope: :option_type
     has_and_belongs_to_many :variants, join_table: 'spree_option_values_variants', class_name: "Spree::Variant"
 
     validates :name, :presentation, presence: true
+
+    after_touch :touch_all_variants
+
+    def touch_all_variants
+      # This can cause a cascade of products to be updated
+      # To disable it in Rails 4.1, we can do this:
+      # https://github.com/rails/rails/pull/12772
+      # Spree::Product.no_touching do
+        variants.find_each(&:touch)
+      # end
+    end
   end
 end

data/app/models/spree/order.rb

@@ -92,7 +92,7 @@ module Spree
     end
 
     def self.complete
-      where('completed_at IS NOT NULL')
+      where.not(completed_at: nil)
     end
 
     def self.incomplete
@@ -161,11 +161,12 @@ module Spree
 
     # If true, causes the confirmation step to happen during the checkout process
     def confirmation_required?
-      if payments.empty? and Spree::Config[:always_include_confirm_step]
-        true
-      else
-        payments.map(&:payment_method).compact.any?(&:payment_profiles_supported?)
-      end
+      Spree::Config[:always_include_confirm_step] ||
+        payments.valid.map(&:payment_method).compact.any?(&:payment_profiles_supported?) ||
+        # Little hacky fix for #4117
+        # If this wasn't here, order would transition to address state on confirm failure
+        # because there would be no valid payments any more.
+        state == 'confirm'
     end
 
     # Indicates the number of items in the order
@@ -350,7 +351,7 @@ module Spree
     end
 
     def available_payment_methods
-      @available_payment_methods ||= PaymentMethod.available(:front_end)
+      @available_payment_methods ||= (PaymentMethod.available(:front_end) + PaymentMethod.available(:both)).uniq
     end
 
     def pending_payments
@@ -447,12 +448,15 @@ module Spree
       state = "#{name}_state"
       if persisted?
         old_state = self.send("#{state}_was")
-        self.state_changes.create(
-          previous_state: old_state,
-          next_state:     self.send(state),
-          name:           name,
-          user_id:        self.user_id
-        )
+        new_state = self.send(state)
+        unless old_state == new_state
+          self.state_changes.create(
+            previous_state: old_state,
+            next_state:     new_state,
+            name:           name,
+            user_id:        self.user_id
+          )
+        end
       end
     end
 
@@ -506,10 +510,14 @@ module Spree
     def ensure_updated_shipments
       if shipments.any?
         self.shipments.destroy_all
-        self.update_column(:state, "address")
+        restart_checkout_flow
       end
     end
 
+    def restart_checkout_flow
+      self.update_column(:state, checkout_steps.first)
+    end
+
     def refresh_shipment_rates
       shipments.map &:refresh_rates
     end
@@ -518,6 +526,15 @@ module Spree
       (bill_address.empty? && ship_address.empty?) || bill_address.same_as?(ship_address)
     end
 
+    def is_risky?
+      self.payments.where(%{
+        (avs_response IS NOT NULL and avs_response != 'D') or
+        (cvv_response_code IS NOT NULL and cvv_response_code != 'M') or
+        cvv_response_message IS NOT NULL or
+        state = 'failed'
+      }.squish!).uniq.count > 0
+    end
+
     private
 
       def link_by_email
@@ -526,7 +543,7 @@ module Spree
 
       # Determine if email is required (we don't want validation errors before we hit the checkout)
       def require_email
-        return true unless new_record? or state == 'cart'
+        return true unless new_record? or ['cart', 'address'].include?(state)
       end
 
       def ensure_line_items_present
@@ -555,9 +572,10 @@ module Spree
 
       def after_cancel
         shipments.each { |shipment| shipment.cancel! }
+        payments.completed.each { |payment| payment.credit! }
 
         send_cancel_email
-        self.payment_state = 'credit_owed' unless shipped?
+        self.update_column(:payment_state, 'credit_owed') unless shipped?
       end
 
       def send_cancel_email

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

@@ -151,6 +151,10 @@ module Spree
             @checkout_steps ||= {}
           end
 
+          def self.checkout_step_names
+            self.checkout_steps.keys
+          end
+
           def self.add_transition(options)
             self.next_event_transitions << { options.delete(:from) => options.delete(:to) }.merge(options)
           end

data/app/models/spree/order_inventory.rb

@@ -65,7 +65,7 @@ module Spree
     end
 
     def add_to_shipment(shipment, variant, quantity)
-      if Config.track_inventory_levels
+      if variant.should_track_inventory?
         on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
 
         on_hand.times { shipment.set_up_inventory('on_hand', variant, order) }

data/app/models/spree/payment.rb

@@ -4,7 +4,7 @@ module Spree
 
     IDENTIFIER_CHARS = (('A'..'Z').to_a + ('0'..'9').to_a - %w(0 1 I O)).freeze
 
-    belongs_to :order, class_name: 'Spree::Order'
+    belongs_to :order, class_name: 'Spree::Order', touch: true
     belongs_to :source, polymorphic: true
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
 
@@ -30,7 +30,7 @@ module Spree
     scope :completed, -> { with_state('completed') }
     scope :pending, -> { with_state('pending') }
     scope :failed, -> { with_state('failed') }
-    scope :valid, -> { where('state NOT IN (?)', %w(failed invalid)) }
+    scope :valid, -> { where.not(state: %w(failed invalid)) }
 
     after_rollback :persist_invalid
 
@@ -118,6 +118,14 @@ module Spree
       res || payment_method
     end
 
+    def is_avs_risky?
+      !(avs_response == "D" || avs_response.nil?)
+    end
+
+    def is_cvv_risky?
+      !(cvv_response_code == "M" || cvv_response_code.nil?)
+    end
+
     private
 
       def validate_source

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

@@ -115,14 +115,15 @@ module Spree
       end
 
       def gateway_options
-        options = { :email    => order.email,
-                    :customer => order.email,
-                    :ip       => order.last_ip_address,
+        options = { :email       => order.email,
+                    :customer    => order.email,
+                    :customer_id => order.user_id,
+                    :ip          => order.last_ip_address,
                     # Need to pass in a unique identifier here to make some
                     # payment gateways happy.
                     #
                     # For more information, please see Spree::Payment#set_unique_identifier
-                    :order_id => gateway_order_id }
+                    :order_id    => gateway_order_id }
 
         options.merge!({ :shipping => order.ship_total * 100,
                          :tax      => order.tax_total * 100,

data/app/models/spree/payment_method.rb

@@ -8,6 +8,8 @@ module Spree
 
     validates :name, presence: true
 
+    has_many :payments, class_name: "Spree::Payment"
+
     def self.providers
       Rails.application.config.spree.payment_methods
     end

data/app/models/spree/price.rb

@@ -22,6 +22,11 @@ module Spree
       self[:amount] = parse_price(price)
     end
 
+    # Remove variant default_scope `deleted_at: nil`
+    def variant
+      Spree::Variant.unscoped { super }
+    end
+
     private
     def check_price
       raise "Price must belong to a variant" if variant.nil?

data/app/models/spree/product.rb

@@ -35,15 +35,18 @@ module Spree
 
     has_one :master,
       -> { where is_master: true },
+      inverse_of: :product,
       class_name: 'Spree::Variant',
       dependent: :destroy
 
     has_many :variants,
       -> { where(is_master: false).order("#{::Spree::Variant.quoted_table_name}.position ASC") },
+      inverse_of: :product,
       class_name: 'Spree::Variant'
 
     has_many :variants_including_master,
       -> { order("#{::Spree::Variant.quoted_table_name}.position ASC") },
+      inverse_of: :product,
       class_name: 'Spree::Variant',
       dependent: :destroy
 
@@ -65,8 +68,6 @@ module Spree
 
     has_many :variant_images, -> { order(:position) }, source: :images, through: :variants_including_master
 
-    accepts_nested_attributes_for :variants, allow_destroy: true
-
     validates :name, presence: true
     validates :permalink, presence: true
     validates :price, presence: true, if: proc { Spree::Config[:require_master_price] }
@@ -191,10 +192,10 @@ module Spree
     end
 
     def total_on_hand
-      if Spree::Config.track_inventory_levels
-        self.stock_items.sum(&:count_on_hand)
-      else
+      if self.variants_including_master.any? { |v| !v.should_track_inventory? }
         Float::INFINITY
+      else
+        self.stock_items.sum(&:count_on_hand)
       end
     end