spree_core 2.4.0.rc2 → 2.4.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c974cc01f67cfca0ddbf2139e93097dfb45213d4
-  data.tar.gz: cd6f74faba0892c17ed5bce5394c714f832c7588
+  metadata.gz: 3ad557fa8765c3b9bd3d6532c913962d33865e28
+  data.tar.gz: c424bb23636fd0889e52830a5905bb48069e2440
 SHA512:
-  metadata.gz: 9c217028bbe1b3368d612db4293985921e4e4502c2564b0574f2af8c9621bb0abf86ceb694bab9ff2fad4e33022646676d962b88d4c76430e0a539cb4417cc63
-  data.tar.gz: 50f73eeaf2728c151cf88932519af67a4836b0a96cd4401d9ff45ee8de3fae597e5e8bb25e25b640ad2497b6aabf0379bc5b93a531766d109f25013698f06c15
+  metadata.gz: bc7f1a23e33514c7b732f8c154dad4310c7bf3f2a617eabb5b138d97516d6ea0f67edfca2e4e20fc6d59a4bda1ff0a1d37aab2b1f1888b715a8d31ea617faa81
+  data.tar.gz: f5b67b3fe498f7e92d50cf242df7b9638304563348efd0ff6fbaeedd8bbe653fb971b566224b9d44763c71608d77edecdd652d00728c77face10db1f3aff2d75

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
 
@@ -45,7 +47,10 @@ module Spree
     scope :open, -> { where(state: 'open') }
     scope :closed, -> { where(state: 'closed') }
     scope :tax, -> { where(source_type: 'Spree::TaxRate') }
-    scope :non_tax, -> { where.not(source_type: 'Spree::TaxRate') }
+    scope :non_tax, -> do
+      source_type = arel_table[:source_type]
+      where(source_type.not_eq('Spree::TaxRate').or source_type.eq(nil))
+    end
     scope :price, -> { where(adjustable_type: 'Spree::LineItem') }
     scope :shipping, -> { where(adjustable_type: 'Spree::Shipment') }
     scope :optional, -> { where(mandatory: false) }
@@ -103,7 +108,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/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/exchange.rb

@@ -1,5 +1,6 @@
 module Spree
   class Exchange
+    class UnableToCreateShipments < StandardError; end
 
     def initialize(order, reimbursement_objects)
       @order = order
@@ -18,6 +19,9 @@ module Spree
 
     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
+        raise UnableToCreateShipments.new("Could not generate shipments for all items. Out of stock?")
+      end
       @order.shipments += shipments
       @order.save!
       shipments.each do |shipment|

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

@@ -20,8 +20,9 @@ module Spree
     def create_profile(payment)
       return if payment.source.has_payment_profile?
       # 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
 
     has_many :return_items, inverse_of: :inventory_unit

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, affecting 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

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
@@ -123,6 +124,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

@@ -45,9 +45,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 :reimbursements, 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
@@ -84,7 +84,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

data/app/models/spree/order_contents.rb

@@ -8,24 +8,12 @@ module Spree
 
     def add(variant, quantity = 1, options = {})
       line_item = add_to_line_item(variant, quantity, options)
-      reload_totals
-      shipment = options[:shipment]
-      shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
-      PromotionHandler::Cart.new(order, line_item).activate
-      ItemAdjustments.new(line_item).update
-      reload_totals
-      line_item
+      after_add_or_remove(line_item, options)
     end
 
     def remove(variant, quantity = 1, options = {})
       line_item = remove_from_line_item(variant, quantity, options)
-      reload_totals
-      shipment = options[:shipment]
-      shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
-      PromotionHandler::Cart.new(order, line_item).activate
-      ItemAdjustments.new(line_item).update
-      reload_totals
-      line_item
+      after_add_or_remove(line_item, options)
     end
 
     def update_cart(params)
@@ -45,6 +33,15 @@ module Spree
     end
 
     private
+      def after_add_or_remove(line_item, options = {})
+        reload_totals
+        shipment = options[:shipment]
+        shipment.present? ? shipment.update_amounts : order.ensure_updated_shipments
+        PromotionHandler::Cart.new(order, line_item).activate
+        ItemAdjustments.new(line_item).update
+        reload_totals
+        line_item
+      end
 
       def filter_order_items(params)
         filtered_params = params.symbolize_keys

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, -> { offset_payment }, class_name: "Spree::Payment", foreign_key: :source_id
     has_many :log_entries, as: :source
@@ -184,6 +184,8 @@ module Spree
       end
 
       def create_payment_profile
+        # Don't attempt to create on bad payments.
+        return if %w(invalid failed).include?(state)
         # Payment profile cannot be created without source
         return unless source
         # Imported payments shouldn't create a payment profile.
@@ -195,8 +197,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/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/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
@@ -67,5 +67,9 @@ module Spree
     def supports?(source)
       true
     end
+
+    def cancel
+      raise NotImplimentedError.new 'You must implement cancel method for this payment method.'
+    end
   end
 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
 
@@ -66,7 +65,7 @@ module Spree
     delegate_belongs_to :master, :cost_price
 
     after_create :set_master_variant_defaults
-    after_create :add_properties_and_option_types_from_prototype
+    after_create :add_associations_from_prototype
     after_create :build_variants_from_option_values_hash, if: :option_values_hash
 
     after_save :save_master
@@ -83,7 +82,10 @@ module Spree
     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
+
+    validates :slug, uniqueness: { allow_blank: true }
+    validates :meta_keywords, length: { maximum: 255 }
+    validates :meta_title, length: { maximum: 255 }
 
     before_validation :normalize_slug, on: :update
 
@@ -219,12 +221,13 @@ module Spree
 
     private
 
-    def add_properties_and_option_types_from_prototype
+    def add_associations_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
+        self.taxons = prototype.taxons
       end
     end
 
@@ -300,8 +303,8 @@ module Spree
     # Try building a slug based on the following fields in increasing order of specificity.
     def slug_candidates
       [
-          :name,
-          [:name, :sku]
+        :name,
+        [:name, :sku]
       ]
     end
 

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

@@ -40,9 +40,10 @@ module Spree
         # Ensure a negative amount which does not exceed the sum of the order's
         # item_total and ship_total
         def compute_amount(adjustable)
-          return 0 unless promotion.line_item_actionable? adjustable.order, adjustable
+          order = adjustable.is_a?(Order) ? adjustable : adjustable.order
+          return 0 unless promotion.line_item_actionable?(order, adjustable)
           promotion_amount = self.calculator.compute(adjustable).to_f.abs
-          
+
           [adjustable.amount, promotion_amount].min * -1
         end
 

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

@@ -45,6 +45,7 @@ module Spree
               order.contents.add(item.variant, item.quantity - current_quantity)
             end
           end
+          true
         end
       end
     end

data/app/models/spree/promotion.rb

@@ -20,7 +20,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 }
 
@@ -37,7 +37,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_handler/coupon.rb

@@ -85,11 +85,15 @@ module Spree
           end
         }
 
+        # Check for applied adjustments.
         discount = order.line_item_adjustments.promotion.detect(&detector)
         discount ||= order.shipment_adjustments.promotion.detect(&detector)
         discount ||= order.adjustments.promotion.detect(&detector)
 
-        if discount.eligible
+        # Check for applied line items.
+        created_line_items = promotion.actions.detect { |a| a.type == 'Spree::Promotion::Actions::CreateLineItems' }
+
+        if (discount && discount.eligible) || created_line_items
           order.update_totals
           order.persist_totals
           set_success_code :coupon_code_applied

data/app/models/spree/property.rb

@@ -11,13 +11,6 @@ module Spree
 
     after_touch :touch_all_products
 
-    def self.find_all_by_prototype(prototype)
-      id = prototype
-      id = prototype.id if prototype.class == Prototype
-      joins("LEFT JOIN properties_prototypes ON property_id = #{self.table_name}.id").
-        where(prototype_id: id)
-    end
-
     private
 
     def touch_all_products

data/app/models/spree/prototype.rb

@@ -2,6 +2,7 @@ module Spree
   class Prototype < Spree::Base
     has_and_belongs_to_many :properties, join_table: :spree_properties_prototypes
     has_and_belongs_to_many :option_types, join_table: :spree_option_types_prototypes
+    has_and_belongs_to_many :taxons, join_table: :spree_taxons_prototypes
 
     validates :name, presence: true
   end

data/app/models/spree/reimbursement.rb

@@ -55,7 +55,6 @@ module Spree
     self.reimbursement_failure_hooks = []
 
     state_machine :reimbursement_status, initial: :pending do
-      after_transition to: :reimbursed, do: :send_reimbursement_email
 
       event :errored do
         transition to: :errored, from: :pending
@@ -107,6 +106,7 @@ module Spree
       if unpaid_amount.zero?
         reimbursed!
         reimbursement_success_hooks.each { |h| h.call self }
+        send_reimbursement_email
       else
         errored!
         reimbursement_failure_hooks.each { |h| h.call self }

data/app/models/spree/reimbursement_tax_calculator.rb

@@ -21,7 +21,13 @@ module Spree
       private
 
       def set_tax!(return_item)
-        percent_of_tax = (return_item.pre_tax_amount <= 0) ? 0 : return_item.pre_tax_amount / Spree::ReturnItem.refund_amount_calculator.new.compute(return_item)
+        calculated_refund = Spree::ReturnItem.refund_amount_calculator.new.compute(return_item)
+
+        percent_of_tax = if return_item.pre_tax_amount <= 0 || calculated_refund <= 0
+          0
+        else
+          return_item.pre_tax_amount / calculated_refund
+        end
 
         additional_tax_total = percent_of_tax * return_item.inventory_unit.additional_tax_total
         included_tax_total   = percent_of_tax * return_item.inventory_unit.included_tax_total

data/app/models/spree/return_authorization.rb

@@ -1,6 +1,6 @@
 module Spree
   class ReturnAuthorization < Spree::Base
-    belongs_to :order, class_name: 'Spree::Order'
+    belongs_to :order, class_name: 'Spree::Order', inverse_of: :return_authorizations
 
     has_many :return_items, inverse_of: :return_authorization, dependent: :destroy
     has_many :inventory_units, through: :return_items

data/app/models/spree/shipping_category.rb

@@ -2,7 +2,7 @@ module Spree
   class ShippingCategory < Spree::Base
     validates :name, presence: true
     has_many :products, inverse_of: :shipping_category
-    has_many :shipping_method_categories
+    has_many :shipping_method_categories, inverse_of: :shipping_method
     has_many :shipping_methods, through: :shipping_method_categories
   end
-end
+end

data/app/models/spree/shipping_method_category.rb

@@ -1,6 +1,6 @@
 module Spree
   class ShippingMethodCategory < Spree::Base
     belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
-    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory'
+    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :shipping_method_categories
   end
 end

data/app/models/spree/stock/package.rb

@@ -23,6 +23,12 @@ module Spree
         @contents -= [item] if item
       end
 
+      # Fix regression that removed package.order.
+      # Find it dynamically through an inventory_unit.
+      def order
+        contents.detect {|item| !!item.try(:inventory_unit).try(:order) }.try(:inventory_unit).try(:order)
+      end
+
       def weight
         contents.sum(&:weight)
       end

data/app/models/spree/stock_item.rb

@@ -2,8 +2,8 @@ module Spree
   class StockItem < Spree::Base
     acts_as_paranoid
 
-    belongs_to :stock_location, class_name: 'Spree::StockLocation'
-    belongs_to :variant, class_name: 'Spree::Variant', inverse_of: :stock_items
+    belongs_to :stock_location, class_name: 'Spree::StockLocation', inverse_of: :stock_items
+    belongs_to :variant, class_name: 'Spree::Variant', inverse_of: :stock_items, counter_cache: true
     has_many :stock_movements, inverse_of: :stock_item
 
     validates_presence_of :stock_location, :variant

data/app/models/spree/stock_location.rb

@@ -1,7 +1,7 @@
 module Spree
   class StockLocation < Spree::Base
     has_many :shipments
-    has_many :stock_items, dependent: :delete_all
+    has_many :stock_items, dependent: :delete_all, inverse_of: :stock_location
     has_many :stock_movements, through: :stock_items
 
     belongs_to :state, class_name: 'Spree::State'

data/app/models/spree/store.rb

@@ -1,7 +1,7 @@
 module Spree
   class Store < Spree::Base
 
-    validates :code, presence: true, uniqueness: true
+    validates :code, presence: true, uniqueness: { allow_blank: true }
     validates :name, presence: true
     validates :url, presence: true
     validates :mail_from_address, presence: true

data/app/models/spree/tax_category.rb

@@ -1,9 +1,9 @@
 module Spree
   class TaxCategory < Spree::Base
     acts_as_paranoid
-    validates :name, presence: true, uniqueness: { scope: :deleted_at }
+    validates :name, presence: true, uniqueness: { scope: :deleted_at, allow_blank: true }
 
-    has_many :tax_rates, dependent: :destroy
+    has_many :tax_rates, dependent: :destroy, inverse_of: :tax_category
 
     before_save :set_default_category
 

data/app/models/spree/tax_rate.rb

@@ -11,10 +11,15 @@ end
 module Spree
   class TaxRate < Spree::Base
     acts_as_paranoid
+
+    # Need to deal with adjustments before calculator is destroyed.
+    before_destroy :deals_with_adjustments_for_deleted_source
+
     include Spree::CalculatedAdjustments
     include Spree::AdjustmentSource
-    belongs_to :zone, class_name: "Spree::Zone"
-    belongs_to :tax_category, class_name: "Spree::TaxCategory"
+
+    belongs_to :zone, class_name: "Spree::Zone", inverse_of: :tax_rates
+    belongs_to :tax_category, class_name: "Spree::TaxCategory", inverse_of: :tax_rates
 
     has_many :adjustments, as: :source
 
@@ -22,8 +27,6 @@ module Spree
     validates :tax_category_id, presence: true
     validates_with DefaultTaxZoneValidator
 
-    before_destroy :deals_with_adjustments_for_deleted_source
-
     scope :by_zone, ->(zone) { where(zone_id: zone) }
 
     # Gets the array of TaxRates appropriate for the specified order

data/app/models/spree/taxon.rb

@@ -6,9 +6,14 @@ module Spree
     has_many :classifications, -> { order(:position) }, dependent: :delete_all, inverse_of: :taxon
     has_many :products, through: :classifications
 
+    has_and_belongs_to_many :prototypes, join_table: :spree_taxons_prototypes
+
     before_create :set_permalink
 
     validates :name, presence: true
+    validates :meta_keywords, length: { maximum: 255 }
+    validates :meta_description, length: { maximum: 255 }
+    validates :meta_title, length: { maximum: 255 }
 
     after_touch :touch_ancestors_and_taxonomy
 
@@ -36,7 +41,7 @@ module Spree
 
     # Return meta_title if set otherwise generates from root name and/or taxon name
     def seo_title
-      if meta_title
+      unless meta_title.blank?
         meta_title
       else
         root? ? name : "#{root.name} - #{name}"
@@ -58,8 +63,7 @@ module Spree
     end
 
     def active_products
-      scope = products.active
-      scope
+      products.active
     end
 
     def pretty_name