spree_core 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf31759b42f3d9c77f519a0a834197545d65fe4d
-  data.tar.gz: e2950f378e975c121125d09ffb62aec3ecd97378
+  metadata.gz: 2b6ba75da732715ef975c684a089a3586b67cec1
+  data.tar.gz: 4afbf2136510cb63bab7f1b60e2192c03a10a48c
 SHA512:
-  metadata.gz: 4e41ee0be0df3a866211bc0c9b96fa1cfe803317f1c0b286d1c8d241e639eff8afd5886a78a55c5b3ee6dd38cc8601c5957898b07cf0cfd65070d66804243b60
-  data.tar.gz: 6bb17dd15d7e92b168eaba7f5d6b662a193a6739125ff3a7ee33ff08a76979924b463964b791b67e8d79e8f3c4e5de1bf694ab0e4bcaae9b9835b6da272c3f33
+  metadata.gz: 33a1fe7fdb7080cac31739ec3202a51d3d6e6ffb1da1bf80ea76688ac796b2a545326eba10f6773fcd1d80bbcc57a7abe0353fa610df2daeeab3209bad473f8d
+  data.tar.gz: 2a9c302304140f816e3f1236790b147de50d96b1816e91208a2808b7ad9818ac426d389d53a6b4b978f3d86b888728d2cf7125f46cce75486ce7d7d2c391de46

data/app/helpers/spree/base_helper.rb

@@ -48,7 +48,7 @@ module Spree
       meta.reverse_merge!({
         keywords: current_store.meta_keywords,
         description: current_store.meta_description,
-      })
+      }) if meta[:keywords].blank? or meta[:description].blank?
       meta
     end
 

data/app/helpers/spree/products_helper.rb

@@ -11,14 +11,13 @@ module Spree
 
     # returns the formatted price for the specified variant as a difference from product price
     def variant_price_diff(variant)
-      diff = variant.amount_in(current_currency) - variant.product.amount_in(current_currency)
-      return nil if diff == 0
-      amount = Spree::Money.new(diff.abs, { currency: current_currency }).to_html
-      if diff > 0
-        "(#{Spree.t(:add)}: #{amount})".html_safe
-      else
-        "(#{Spree.t(:subtract)}: #{amount})".html_safe
-      end
+      variant_amount = variant.amount_in(current_currency)
+      product_amount = variant.product.amount_in(current_currency)
+      return if variant_amount == product_amount || product_amount.nil?
+      diff   = variant.amount_in(current_currency) - product_amount
+      amount = Spree::Money.new(diff.abs, currency: current_currency).to_html
+      label  = diff > 0 ? :add : :subtract
+      "(#{Spree.t(label)}: #{amount})".html_safe
     end
 
     # returns the formatted full price for the variant, if at least one variant price differs from product price

data/app/models/spree/adjustment.rb

@@ -26,6 +26,8 @@ module Spree
     belongs_to :source, polymorphic: true
     belongs_to :order, class_name: "Spree::Order"
 
+    validates :adjustable, presence: true
+    validates :order, presence: true
     validates :label, presence: true
     validates :amount, numericality: true
 
@@ -101,7 +103,7 @@ module Spree
 
     def update_adjustable_adjustment_total
       # Cause adjustable's total to be recalculated
-      Spree::ItemAdjustments.new(adjustable).update if adjustable
+      ItemAdjustments.new(adjustable).update
     end
 
   end

data/app/models/spree/asset.rb

@@ -1,6 +1,6 @@
 module Spree
   class Asset < Spree::Base
     belongs_to :viewable, polymorphic: true, touch: true
-    acts_as_list scope: :viewable
+    acts_as_list scope: [:viewable_id, :viewable_type]
   end
 end

data/app/models/spree/classification.rb

@@ -1,7 +1,7 @@
 module Spree
   class Classification < Spree::Base
     self.table_name = 'spree_products_taxons'
-    acts_as_list
+    acts_as_list scope: :taxon
     belongs_to :product, class_name: "Spree::Product", inverse_of: :classifications
     belongs_to :taxon, class_name: "Spree::Taxon", inverse_of: :classifications
 

data/app/models/spree/credit_card.rb

@@ -132,8 +132,8 @@ module Spree
         if month.to_i < 1 || month.to_i > 12
           errors.add(:base, :expiry_invalid)
         else
-          time = Time.zone.parse("#{year}-#{month}-1")
-          if time < Time.zone.now.to_time.beginning_of_month
+          current = Time.current
+          if year.to_i < current.year or (year.to_i == current.year and month.to_i < current.month)
             errors.add(:base, :card_expired)
           end
         end

data/app/models/spree/gateway/bogus.rb

@@ -19,8 +19,9 @@ module Spree
 
     def create_profile(payment)
       # simulate the storage of credit card profile using remote service
-      success = VALID_CCS.include? payment.source.number
-      payment.source.update_attributes(:gateway_customer_profile_id => generate_profile_id(success))
+      if success = VALID_CCS.include?(payment.source.number)
+        payment.source.update_attributes(:gateway_customer_profile_id => generate_profile_id(success))
+      end
     end
 
     def authorize(money, credit_card, options = {})

data/app/models/spree/inventory_unit.rb

@@ -3,7 +3,7 @@ module Spree
     belongs_to :variant, class_name: "Spree::Variant", inverse_of: :inventory_units
     belongs_to :order, class_name: "Spree::Order", inverse_of: :inventory_units
     belongs_to :shipment, class_name: "Spree::Shipment", touch: true, inverse_of: :inventory_units
-    belongs_to :return_authorization, class_name: "Spree::ReturnAuthorization"
+    belongs_to :return_authorization, class_name: "Spree::ReturnAuthorization", inverse_of: :inventory_units
     belongs_to :line_item, class_name: "Spree::LineItem", inverse_of: :inventory_units
 
     scope :backordered, -> { where state: 'backordered' }

data/app/models/spree/item_adjustments.rb

@@ -9,8 +9,9 @@ module Spree
 
     def initialize(item)
       @item = item
+
       # Don't attempt to reload the item from the DB if it's not there
-      @item.reload if @item.persisted?
+      @item.reload if @item.instance_of?(Shipment) && @item.persisted?
     end
 
     def update
@@ -27,7 +28,7 @@ module Spree
       #
       # It also fits the criteria for sales tax as outlined here:
       # http://www.boe.ca.gov/formspubs/pub113/
-      # 
+      #
       # Tax adjustments come in not one but *two* exciting flavours:
       # Included & additional
 
@@ -37,7 +38,10 @@ module Spree
       # Additional tax adjustments are the opposite; effecting the final total.
       promo_total = 0
       run_callbacks :promo_adjustments do
-        promotion_total = adjustments.promotion.reload.map(&:update!).compact.sum
+        promotion_total = adjustments.promotion.reload.map do |adjustment|
+          adjustment.update!(@item)
+        end.compact.sum
+
         unless promotion_total == 0
           choose_best_promotion_adjustment
         end
@@ -72,7 +76,7 @@ module Spree
     end
 
     def best_promotion_adjustment
-      @best_promotion_adjustment ||= adjustments.promotion.eligible.reorder("amount ASC, created_at DESC").first
+      @best_promotion_adjustment ||= adjustments.promotion.eligible.reorder("amount ASC, created_at DESC, id DESC").first
     end
   end
 end

data/app/models/spree/line_item.rb

@@ -24,6 +24,7 @@ module Spree
 
     validate :ensure_proper_currency
     before_destroy :update_inventory
+    before_destroy :destroy_inventory_units
 
     after_save :update_inventory
     after_save :update_adjustments
@@ -102,6 +103,10 @@ module Spree
         end
       end
 
+      def destroy_inventory_units
+        inventory_units.destroy_all
+      end
+
       def update_adjustments
         if quantity_changed?
           update_tax_charge # Called to ensure pre_tax_amount is updated. 

data/app/models/spree/order.rb

@@ -37,9 +37,9 @@ module Spree
     alias_attribute :ship_total, :shipment_total
 
     has_many :state_changes, as: :stateful
-    has_many :line_items, -> { order('created_at ASC') }, dependent: :destroy, inverse_of: :order
+    has_many :line_items, -> { order("#{LineItem.table_name}.created_at ASC") }, dependent: :destroy, inverse_of: :order
     has_many :payments, dependent: :destroy
-    has_many :return_authorizations, dependent: :destroy
+    has_many :return_authorizations, dependent: :destroy, inverse_of: :order
     has_many :adjustments, -> { order("#{Adjustment.table_name}.created_at ASC") }, as: :adjustable, dependent: :destroy
     has_many :line_item_adjustments, through: :line_items, source: :adjustments
     has_many :shipment_adjustments, through: :shipments, source: :adjustments
@@ -74,7 +74,7 @@ module Spree
 
     validates :email, presence: true, if: :require_email
     validates :email, email: true, if: :require_email, allow_blank: true
-    validates :number, uniqueness: true
+    validates :number, presence: true, uniqueness: { allow_blank: true }
     validate :has_available_shipment
 
     make_permalink field: :number
@@ -415,7 +415,11 @@ module Spree
 
     def ensure_line_items_are_in_stock
       if insufficient_stock_lines.present?
-        errors.add(:base, Spree.t(:insufficient_stock_lines_present)) and return false
+        errors.add(:base, Spree.t(:insufficient_stock_lines_present))
+        restart_checkout_flow
+        false
+      else
+        true
       end
     end
 

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

@@ -102,6 +102,8 @@ module Spree
 
               before_transition to: :resumed, do: :ensure_line_items_are_in_stock
 
+              before_transition to: :complete, do: :ensure_line_items_are_in_stock
+
               after_transition to: :complete, do: :finalize!
               after_transition to: :resumed,  do: :after_resume
               after_transition to: :canceled, do: :after_cancel

data/app/models/spree/payment.rb

@@ -8,7 +8,7 @@ module Spree
 
     belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :payments
     belongs_to :source, polymorphic: true
-    belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
+    belongs_to :payment_method, class_name: 'Spree::PaymentMethod', inverse_of: :payments
 
     has_many :offsets, -> { where("source_type = 'Spree::Payment' AND amount < 0 AND state = 'completed'") },
       class_name: "Spree::Payment", foreign_key: :source_id
@@ -175,6 +175,7 @@ module Spree
 
       def create_payment_profile
         return unless source.respond_to?(:has_payment_profile?) && !source.has_payment_profile?
+        return if %w(invalid failed).include?(state)
         # Imported payments shouldn't create a payment profile.
         return if source.imported
 
@@ -184,8 +185,10 @@ module Spree
       end
 
       def invalidate_old_payments
-        order.payments.with_state('checkout').where("id != ?", self.id).each do |payment|
-          payment.invalidate!
+        if state != 'invalid' and state != 'failed'
+          order.payments.with_state('checkout').where("id != ?", self.id).each do |payment|
+            payment.invalidate!
+          end
         end
       end
 

data/app/models/spree/payment_method.rb

@@ -8,7 +8,7 @@ module Spree
 
     validates :name, presence: true
 
-    has_many :payments, class_name: "Spree::Payment"
+    has_many :payments, class_name: "Spree::Payment", inverse_of: :payment_method
     has_many :credit_cards, class_name: "Spree::CreditCard"
 
     def self.providers
@@ -16,14 +16,14 @@ module Spree
     end
 
     def provider_class
-      raise 'You must implement provider_class method for this gateway.'
+      raise ::NotImplementedError, 'You must implement provider_class method for this gateway.'
     end
 
     # The class that will process payments for this payment type, used for @payment.source
     # e.g. CreditCard in the case of a the Gateway payment type
     # nil means the payment method doesn't require a source e.g. check
     def payment_source_class
-      raise 'You must implement payment_source_class method for this gateway.'
+      raise ::NotImplementedError, 'You must implement payment_source_class method for this gateway.'
     end
 
     def self.available(display_on = 'both')
@@ -67,5 +67,9 @@ module Spree
     def supports?(source)
       true
     end
+
+    def cancel(response)
+      raise ::NotImplementedError, 'You must implement cancel method for this payment method.'
+    end
   end
 end

data/app/models/spree/payment_method/check.rb

@@ -18,6 +18,8 @@ module Spree
       ActiveMerchant::Billing::Response.new(true, "", {}, {})
     end
 
+    def cancel(response); end
+
     def void(*args)
       ActiveMerchant::Billing::Response.new(true, "", {}, {})
     end

data/app/models/spree/price.rb

@@ -21,7 +21,7 @@ module Spree
     end
 
     def price=(price)
-      self[:amount] = parse_price(price)
+      self[:amount] = Spree::LocalizedNumber.parse(price)
     end
 
     # Remove variant default_scope `deleted_at: nil`
@@ -39,18 +39,6 @@ module Spree
       end
     end
 
-    # strips all non-price-like characters from the price, taking into account locale settings
-    def parse_price(price)
-      return price unless price.is_a?(String)
-
-      separator, delimiter = I18n.t([:'number.currency.format.separator', :'number.currency.format.delimiter'])
-      non_price_characters = /[^0-9\-#{separator}]/
-      price.gsub!(non_price_characters, '') # strip everything else first
-      price.gsub!(separator, '.') unless separator == '.' # then replace the locale-specific decimal separator with the standard separator if necessary
-
-      price.to_d
-    end
-
     def maximum_amount
       BigDecimal '999999.99'
     end

data/app/models/spree/product.rb

@@ -40,8 +40,7 @@ module Spree
     has_one :master,
       -> { where is_master: true },
       inverse_of: :product,
-      class_name: 'Spree::Variant',
-      dependent: :destroy
+      class_name: 'Spree::Variant'
 
     has_many :variants,
       -> { where(is_master: false).order("#{::Spree::Variant.quoted_table_name}.position ASC") },
@@ -57,7 +56,7 @@ 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
 
@@ -65,29 +64,32 @@ module Spree
 
     delegate_belongs_to :master, :cost_price
 
+    delegate :images, to: :master, prefix: true
+    alias_method :images, :master_images
+
+    has_many :variant_images, -> { order(:position) }, source: :images, through: :variants_including_master
+
     after_create :set_master_variant_defaults
     after_create :add_properties_and_option_types_from_prototype
     after_create :build_variants_from_option_values_hash, if: :option_values_hash
 
+    after_destroy :punch_slug
+
+    after_initialize :ensure_master
+
     after_save :save_master
     after_save :run_touch_callbacks, if: :anything_changed?
     after_save :reset_nested_changes
     after_touch :touch_taxons
 
-    delegate :images, to: :master, prefix: true
-    alias_method :images, :master_images
-
-    has_many :variant_images, -> { order(:position) }, source: :images, through: :variants_including_master
+    before_validation :normalize_slug, on: :update
+    before_validation :validate_master
 
+    validates :meta_keywords, length: { maximum: 255 }
     validates :name, presence: true
     validates :price, presence: true, if: proc { Spree::Config[:require_master_price] }
     validates :shipping_category_id, presence: true
-    validates :slug, length: { minimum: 3 }
-    validates :slug, uniqueness: true
-
-    before_validation :normalize_slug, on: :update
-
-    after_destroy :punch_slug
+    validates :slug, length: { minimum: 3 }, uniqueness: { allow_blank: true }
 
     attr_accessor :option_values_hash
 
@@ -95,8 +97,6 @@ module Spree
 
     alias :options :product_option_types
 
-    after_initialize :ensure_master
-
     # the master variant is not a member of the variants array
     def has_variants?
       variants.any?
@@ -276,19 +276,21 @@ module Spree
     # when saving so we force a save using a hook
     # Fix for issue #5306
     def save_master
-      begin
-        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
+      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
-      rescue ActiveRecord::RecordInvalid
+    # If the master cannot be saved, the Product object will get its errors
+    # and will be destroyed
+    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?
         master.errors.each do |att, error|
           self.errors.add(att, error)
         end
-        raise
       end
     end
 

data/app/models/spree/promotion.rb

@@ -16,7 +16,7 @@ module Spree
     validates_associated :rules
 
     validates :name, presence: true
-    validates :path, uniqueness: true, allow_blank: true
+    validates :path, uniqueness: { allow_blank: true }
     validates :usage_limit, numericality: { greater_than: 0, allow_nil: true }
     validates :description, length: { maximum: 255 }
 
@@ -30,7 +30,7 @@ module Spree
     end
 
     def self.with_coupon_code(coupon_code)
-      where("lower(code) = ?", coupon_code.strip.downcase).first
+      where("lower(#{self.table_name}.code) = ?", coupon_code.strip.downcase).first
     end
 
     def self.active

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

@@ -14,10 +14,12 @@ module Spree
 
         def perform(payload = {})
           order = payload[:order]
-          # Find only the line items which have not already been adjusted by this promotion
+          # Find only the orders' line items which have not already been adjusted by this promotion
           # HACK: Need to use [0] because `pluck` may return an empty array, which AR helpfully
           # coverts to meaning NOT IN (NULL) and the DB isn't happy about that.
-          already_adjusted_line_items = [0] + self.adjustments.pluck(:adjustable_id)
+          already_adjusted_line_items = [0] + self.adjustments.
+            where(adjustable_id: order.line_items.pluck(:id), adjustable_type: 'Spree::LineItem').
+            pluck(:adjustable_id)
           result = false
           order.line_items.where("id NOT IN (?)", already_adjusted_line_items).find_each do |line_item|
             current_result = self.create_adjustment(line_item, order)
@@ -43,7 +45,7 @@ module Spree
         # item_total and ship_total
         def compute_amount(adjustable)
           promotion_amount = self.calculator.compute(adjustable).to_f.abs
-          
+
           [adjustable.amount, promotion_amount].min * -1
         end