spree_core 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3affc0ac5855ce03665194985d21e1bf01bcda44
-  data.tar.gz: ad8218d37fb42edea1f6e34e0554fced3aa4758b
+  metadata.gz: 1d168d119d3a44a1239b14adbbbbd73e6fe2d23e
+  data.tar.gz: a3fa4208dc96c9d0c279fcd46a579a309faed8de
 SHA512:
-  metadata.gz: fac94f550dc92e07f5ecbdefe2151853b8f7963ecf5378bcc61bccc6cb47063792185175041551ff301f810100a4f43873480b0d9d75673f1ad3376532e0ac65
-  data.tar.gz: 60c7dd641591eaaf0f80bcb48d8fb169fb9e150fe31e87705f3a537a13d107826bb2138ea3019d6f97ba3ebe63c682873a62e3e34e60c3be0b6d58e59e1ca071
+  metadata.gz: c968dcf2009be78df09de90f3760f77c945cc86c16d2ca356213defed6699f049fc8823303b737ab6518ce0cec7ff5243d317b8464147e19e90df97dc03d593c
+  data.tar.gz: 45a207f6c1c87d87f49d14f0f18798568cb0709ed35f0c8de036c23ef335bf1cb2bbf8046f31ed8b176d452252f7f910f3e1d9f3c7f6d71b4fb6ee2e875b8c07

data/app/assets/javascripts/spree.js.coffee.erb

@@ -3,6 +3,10 @@ class window.Spree
   @ready: (callback) ->
     jQuery(document).ready(callback)
 
+    # fire ready callbacks also on turbolinks page change event
+    jQuery(document).on 'page:load', ->
+      callback(jQuery)
+
   @mountedAt: ->
     "<%= Rails.application.routes.url_helpers.spree_path %>"
 

data/app/helpers/spree/base_helper.rb

@@ -44,7 +44,7 @@ module Spree
       end
 
       if meta[:description].blank? && object.kind_of?(Spree::Product)
-        meta[:description] = strip_tags(truncate(object.description, length: 160, separator: ' '))
+        meta[:description] = truncate(strip_tags(object.description), length: 160, separator: ' ')
       end
 
       meta.reverse_merge!({

data/app/helpers/spree/products_helper.rb

@@ -45,7 +45,7 @@ module Spree
 
     def line_item_description_text description_text
       if description_text.present?
-        truncate(strip_tags(description_text.gsub(' ', ' ')), length: 100)
+        truncate(strip_tags(description_text.gsub(' ', ' ').squish), length: 100)
       else
         Spree.t(:product_has_no_description)
       end

data/app/models/spree/classification.rb

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

data/app/models/spree/credit_card.rb

@@ -24,6 +24,14 @@ module Spree
     # needed for some of the ActiveMerchant gateways (eg. SagePay)
     alias_attribute :brand, :cc_type
 
+    # ActiveMerchant::Billing::CreditCard added this accessor used by some gateways.
+    # More info: https://github.com/spree/spree/issues/6209
+    #
+    # Returns or sets the track data for the card
+    #
+    # @return [String]
+    attr_accessor :track_data
+
     CARD_TYPES = {
       visa: /^4[0-9]{12}(?:[0-9]{3})?$/,
       master: /(^5[1-5][0-9]{14}$)|(^6759[0-9]{2}([0-9]{10})$)|(^6759[0-9]{2}([0-9]{12})$)|(^6759[0-9]{2}([0-9]{13})$)/,

data/app/models/spree/order.rb

@@ -3,6 +3,9 @@ require 'spree/order/checkout'
 
 module Spree
   class Order < Spree::Base
+    PAYMENT_STATES = %w(balance_due checkout completed credit_owed failed paid pending processing void).freeze
+    SHIPMENT_STATES = %w(backorder canceled partial pending ready shipped).freeze
+
     extend FriendlyId
     friendly_id :number, slug_column: :number, use: :slugged
 
@@ -277,6 +280,13 @@ module Spree
     def outstanding_balance
       if state == 'canceled'
         -1 * payment_total
+      elsif reimbursements.includes(:refunds).size > 0
+        reimbursed = reimbursements.includes(:refunds).inject(0) do |sum, reimbursement|
+          sum + reimbursement.refunds.sum(:amount)
+        end
+        # If reimbursement has happened add it back to total to prevent balance_due payment state
+        # See: https://github.com/spree/spree/issues/6229
+        total - (payment_total + reimbursed)
       else
         total - payment_total
       end

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

@@ -229,11 +229,11 @@ module Spree
             success = false
             @updating_params = params
             run_callbacks :updating_from_params do
-              attributes = @updating_params[:order] ? @updating_params[:order].permit(permitted_params).delete_if { |k,v| v.nil? } : {}
-
               # Set existing card after setting permitted parameters because
               # rails would slice parameters containg ruby objects, apparently
-              existing_card_id = @updating_params[:order] ? @updating_params[:order][:existing_card] : nil
+              existing_card_id = @updating_params[:order] ? @updating_params[:order].delete(:existing_card) : nil
+
+              attributes = @updating_params[:order] ? @updating_params[:order].permit(permitted_params).delete_if { |k,v| v.nil? } : {}
 
               if existing_card_id.present?
                 credit_card = CreditCard.find existing_card_id

data/app/models/spree/product.rb

@@ -90,7 +90,7 @@ module Spree
     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 }, uniqueness: { allow_blank: true }
+    validates :slug, length: { minimum: 3 }, allow_blank: true, uniqueness: true
 
     attr_accessor :option_values_hash
 
@@ -264,7 +264,7 @@ module Spree
 
     def punch_slug
       # punch slug with date prefix to allow reuse of original
-      update_column :slug, "#{Time.now.to_i}_#{slug}" unless frozen?
+      update_column :slug, "#{Time.now.to_i}_#{slug}"[0..254] unless frozen?
     end
 
     def anything_changed?

data/app/models/spree/product_property.rb

@@ -1,5 +1,7 @@
 module Spree
   class ProductProperty < Spree::Base
+    acts_as_list scope: :product
+
     belongs_to :product, touch: true, class_name: 'Spree::Product', inverse_of: :product_properties
     belongs_to :property, class_name: 'Spree::Property', inverse_of: :product_properties
 

data/app/models/spree/promotion.rb

@@ -91,23 +91,28 @@ module Spree
       # Promotions without rules are eligible by default.
       return [] if rules.none?
       eligible = lambda { |r| r.eligible?(promotable, options) }
-      specific_rules = rules.for(promotable)
+      specific_rules = rules.select { |rule| rule.applicable?(promotable) }
       return [] if specific_rules.none?
 
+      rule_eligibility = Hash[specific_rules.map do |rule|
+        [rule, rule.eligible?(promotable, options)]
+      end]
+
       if match_all?
         # If there are rules for this promotion, but no rules for this
         # particular promotable, then the promotion is ineligible by default.
-        unless specific_rules.all?(&eligible)
+        unless rule_eligibility.values.all?
           @eligibility_errors = specific_rules.map(&:eligibility_errors).detect(&:present?)
           return nil
         end
         specific_rules
       else
-        unless specific_rules.any?(&eligible)
+        unless rule_eligibility.values.any?
           @eligibility_errors = specific_rules.map(&:eligibility_errors).detect(&:present?)
           return nil
         end
-        specific_rules.select(&eligible)
+
+        [rule_eligibility.detect { |_, eligibility| eligibility }.first]
       end
     end
 
@@ -120,7 +125,8 @@ module Spree
     end
 
     def adjusted_credits_count(promotable)
-      credits_count - promotable.adjustments.promotion.where(:source_id => actions.pluck(:id)).count
+      adjustments = promotable.is_a?(Order) ? promotable.all_adjustments : promotable.adjustments
+      credits_count - adjustments.promotion.where(:source_id => actions.pluck(:id)).count
     end
 
     def credits

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

@@ -39,14 +39,23 @@ module Spree
           order = options[:order]
           return unless self.eligible? order
 
+          action_taken = false
           promotion_action_line_items.each do |item|
             current_quantity = order.quantity_of(item.variant)
-            if current_quantity < item.quantity
-              order.contents.add(item.variant, item.quantity - current_quantity)
+            if current_quantity < item.quantity && item_available?(item)
+              line_item = order.contents.add(item.variant, item.quantity - current_quantity)
+              action_taken = true if line_item.try(:valid?)
             end
           end
-          true
+          action_taken
         end
+
+        # Checks that there's enough stock to add the line item to the order
+        def item_available?(item)
+          quantifier = Spree::Stock::Quantifier.new(item.variant)
+          quantifier.can_supply? item.quantity
+        end
+
       end
     end
   end

data/app/models/spree/promotion_handler/coupon.rb

@@ -79,21 +79,15 @@ module Spree
       end
 
       def determine_promotion_application_result
-        detector = lambda { |p|
-          if p.source.promotion.code
-            p.source.promotion.code.downcase == order.coupon_code.downcase
-          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)
+        discount = order.all_adjustments.promotion.eligible.detect do |p|
+          p.source.promotion.code.try(:downcase) == order.coupon_code.downcase
+        end
 
         # 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
+        if discount || created_line_items
           order.update_totals
           order.persist_totals
           set_success_code :coupon_code_applied

data/app/models/spree/shipment.rb

@@ -27,6 +27,8 @@ module Spree
 
     before_validation :set_cost_zero_when_nil
 
+    validates :stock_location, presence: true
+
     attr_accessor :special_instructions
 
     accepts_nested_attributes_for :address

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

@@ -87,6 +87,10 @@ module Spree
           inventory_units: contents.map(&:inventory_unit)
         )
       end
+
+      def contents_by_weight
+        contents.sort { |x, y| y.weight <=> x.weight }
+      end
     end
   end
 end

data/app/models/spree/stock/splitter/weight.rb

@@ -20,8 +20,10 @@ module Spree
         def reduce(package)
           removed = []
           while package.weight > self.threshold
-            break if package.contents.size == 1
-            removed << package.contents.shift
+            contents = package.contents_by_weight
+            break if contents.size == 1
+            # Deleting the second heaviest item in the package should yield best results
+            removed << package.contents.delete(contents[1])
           end
           removed
         end

data/app/models/spree/variant.rb

@@ -1,6 +1,7 @@
 module Spree
   class Variant < Spree::Base
     acts_as_paranoid
+    acts_as_list
 
     include Spree::DefaultPrice
 
@@ -47,6 +48,10 @@ module Spree
       joins(:prices).where(deleted_at: nil).where('spree_prices.currency' => currency || Spree::Config[:currency]).where('spree_prices.amount IS NOT NULL')
     end
 
+    def self.having_orders
+      joins(:line_items).distinct
+    end
+
     def tax_category
       if self[:tax_category_id].nil?
         product.tax_category
@@ -172,7 +177,7 @@ module Spree
       return 0 unless options.present?
 
       options.keys.map { |key|
-        m = "#{options[key]}_price_modifier_amount".to_sym
+        m = "#{key}_price_modifier_amount".to_sym
         if self.respond_to? m
           self.send(m, options[key])
         else

data/config/locales/en.yml

@@ -400,7 +400,6 @@ en:
     add_rule_of_type: Add rule of type
     add_state: Add State
     add_stock: Add Stock
-    add_stock_management: Add Stock Management
     add_to_cart: Add To Cart
     add_variant: Add Variant
     additional_item: Additional Item
@@ -617,7 +616,7 @@ en:
     discount_amount: Discount Amount
     dismiss_banner: No. Thanks! I'm not interested, do not display this message again
     display: Display
-    doesnt_track_inventory: It doesnt track inventory
+    doesnt_track_inventory: It doesn't track inventory
     edit: Edit
     editing_resource: 'Editing %{resource}'
     editing_rma_reason: Editing RMA Reason
@@ -1071,6 +1070,7 @@ en:
     received: Received
     reception_status: Reception Status
     reference: Reference
+    reference_contains: Reference Contains
     refund: Refund
     refund_amount_must_be_greater_than_zero: Refund amount must be greater than zero
     refund_reasons: Refund Reasons

data/db/migrate/20140309033438_create_store_from_preferences.rb

@@ -1,5 +1,12 @@
 class CreateStoreFromPreferences < ActiveRecord::Migration
   def change
+    # workaround for spree_i18n and Store translations
+    Spree::Store.class_eval do
+      def self.translated?(name)
+        false
+      end
+    end
+    
     preference_store = Spree::Preferences::Store.instance
     if store = Spree::Store.where(default: true).first
       store.meta_description = preference_store.get('spree/app_configuration/default_meta_description') {}

data/db/migrate/20150309161154_ensure_payments_have_numbers.rb

@@ -2,7 +2,7 @@ class EnsurePaymentsHaveNumbers < ActiveRecord::Migration
   def change
     Spree::Payment.where(number: nil).find_each do |payment|
       payment.generate_number
-      payment.save
+      payment.update_columns(number: payment.number)
     end
   end
 end

data/lib/spree/core/controller_helpers/auth.rb

@@ -72,7 +72,7 @@ module Spree
             if respond_to?(:spree_login_path)
               redirect_to spree_login_path
             else
-              redirect_to spree.respond_to?(:root_path) ? spree.root_path : root_path
+              redirect_to spree.respond_to?(:root_path) ? spree.root_path : main_app.root_path
             end
           end
         end

data/lib/spree/core/importer/order.rb

@@ -16,9 +16,8 @@ module Spree
 
             shipments_attrs = params.delete(:shipments_attributes)
 
-            create_shipments_from_params(shipments_attrs, order)
             create_line_items_from_params(params.delete(:line_items_attributes),order)
-            create_shipments_from_params(params.delete(:shipments_attributes), order)
+            create_shipments_from_params(shipments_attrs, order)
             create_adjustments_from_params(params.delete(:adjustments_attributes), order)
             create_payments_from_params(params.delete(:payments_attributes), order)
 
@@ -50,44 +49,45 @@ module Spree
         def self.create_shipments_from_params(shipments_hash, order)
           return [] unless shipments_hash
 
-          line_items = order.line_items
+          inventory_units = Spree::Stock::InventoryUnitBuilder.new(order).units
+
           shipments_hash.each do |s|
             begin
               shipment = order.shipments.build
               shipment.tracking       = s[:tracking]
               shipment.stock_location = Spree::StockLocation.find_by_admin_name(s[:stock_location]) || Spree::StockLocation.find_by_name!(s[:stock_location])
 
-              inventory_units = s[:inventory_units] || []
-              inventory_units.each do |iu|
-                ensure_variant_id_from_params(iu)
-
-                unit = shipment.inventory_units.build
-                unit.order = order
-
-                # Spree expects a Inventory Unit to always reference a line
-                # item and variant otherwise users might get exceptions when
-                # trying to view these units. Note the Importer might not be
-                # able to find the line item if line_item.variant_id |= iu.variant_id
-                unit.variant_id = iu[:variant_id]
-                unit.line_item_id = line_items.select do |l|
-                  l.variant_id.to_i == iu[:variant_id].to_i
-                end.first.try(:id)
+              shipment_units = s[:inventory_units] || []
+              shipment_units.each do |su|
+                ensure_variant_id_from_params(su)
+
+                inventory_unit = inventory_units.detect { |iu| iu.variant_id.to_i == su[:variant_id].to_i }
+
+                if inventory_unit.present?
+                  inventory_unit.shipment = shipment
+
+                  if s[:shipped_at].present?
+                    inventory_unit.pending = false
+                    inventory_unit.state = 'shipped'
+                  end
+
+                  inventory_unit.save!
+
+                  # Don't assign shipments to this inventory unit more than once
+                  inventory_units.delete(inventory_unit)
+                end
               end
 
-              # Mark shipped if it should be.
               if s[:shipped_at].present?
                 shipment.shipped_at = s[:shipped_at]
                 shipment.state      = 'shipped'
-                shipment.inventory_units.each do |unit|
-                  unit.state = 'shipped'
-                end
               end
 
               shipment.save!
 
               shipping_method = Spree::ShippingMethod.find_by_name(s[:shipping_method]) || Spree::ShippingMethod.find_by_admin_name!(s[:shipping_method])
-              rate = shipment.shipping_rates.create!(:shipping_method => shipping_method,
-                                                     :cost => s[:cost])
+              rate = shipment.shipping_rates.create!(shipping_method: shipping_method, cost: s[:cost])
+
               shipment.selected_shipping_rate_id = rate.id
               shipment.update_amounts
 
@@ -192,6 +192,7 @@ module Spree
               # Order API should be using state as that's the normal payment field.
               # spree_wombat serializes payment state as status so imported orders should fall back to status field.
               payment.state = p[:state] || p[:status] || 'completed'
+              payment.created_at = p[:created_at] if p[:created_at]
               payment.payment_method = Spree::PaymentMethod.find_by_name!(p[:payment_method])
               payment.source = create_source_payment_from_params(p[:source], payment) if p[:source]
               payment.save!

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.0.0"
+    "3.0.1"
   end
 end

data/lib/spree/permitted_attributes.rb

@@ -61,7 +61,9 @@ module Spree
       :meta_keywords, :price, :sku, :deleted_at, :prototype_id,
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
-      :taxon_ids, :option_type_ids, :cost_currency, :cost_price]
+      :taxon_ids, :cost_currency, :cost_price,
+      option_type_ids: []
+    ]
 
     @@property_attributes = [:name, :presentation]
 
@@ -101,8 +103,10 @@ module Spree
 
     @@variant_attributes = [
       :name, :presentation, :cost_price, :lock_version,
-      :position, :option_value_ids, :track_inventory,
+      :position, :track_inventory,
       :product_id, :product, :option_values_attributes, :price,
-      :weight, :height, :width, :depth, :sku, :cost_currency, options: [ :name, :value ]]
+      :weight, :height, :width, :depth, :sku, :cost_currency,
+      options: [:name, :value], option_value_ids: []
+    ]
   end
 end

data/lib/spree/testing_support/factories/image_factory.rb

@@ -0,0 +1,5 @@
+FactoryGirl.define do
+  factory :image, class: Spree::Image do
+    attachment { File.new(Spree::Core::Engine.root + "spec/fixtures" + 'thinking-cat.jpg') }
+  end
+end

data/lib/tasks/email.rake

@@ -1,9 +1,9 @@
 namespace :email do
-  desc 'Sends test email to specified address - Example: EMAIL=spree@example.com bundle exec rake test:email'
+  desc 'Sends test email to specified address - Example: EMAIL=spree@example.com bundle exec rake email:test'
   task test: :environment do
     unless ENV['EMAIL'].present?
       raise ArgumentError, "Must pass EMAIL environment variable. " \
-                           "Example: EMAIL=spree@example.com bundle exec rake test:email"
+                           "Example: EMAIL=spree@example.com bundle exec rake email:test"
     end
     Spree::TestMailer.test_email(ENV['EMAIL']).deliver_now
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.46.0
+        version: 1.47.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.46.0
+        version: 1.47.0
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
@@ -842,6 +842,7 @@ files:
 - lib/spree/testing_support/factories/country_factory.rb
 - lib/spree/testing_support/factories/credit_card_factory.rb
 - lib/spree/testing_support/factories/customer_return_factory.rb
+- lib/spree/testing_support/factories/image_factory.rb
 - lib/spree/testing_support/factories/inventory_unit_factory.rb
 - lib/spree/testing_support/factories/line_item_factory.rb
 - lib/spree/testing_support/factories/options_factory.rb