spree_core 2.0.0 → 2.0.1

data/app/models/spree/app_configuration.rb

@@ -25,7 +25,6 @@ module Spree
     preference :admin_interface_logo, :string, default: 'admin/bg/spree_50.png'
     preference :admin_products_per_page, :integer, default: 10
     preference :allow_backorder_shipping, :boolean, default: false # should only be true if you don't need to track inventory
-    preference :allow_backorders, :boolean, default: true
     preference :allow_checkout_on_gateway_error, :boolean, default: false
     preference :allow_guest_checkout, :boolean, default: true
     preference :allow_ssl_in_development_and_test, :boolean, default: false

data/app/models/spree/inventory_unit.rb

@@ -6,7 +6,13 @@ module Spree
     belongs_to :return_authorization, class_name: "Spree::ReturnAuthorization"
 
     scope :backordered, -> { where state: 'backordered' }
-    scope :shipped,     -> { where state: 'shipped' }
+    scope :shipped, -> { where state: 'shipped' }
+    scope :backordered_per_variant, ->(stock_item) do
+      includes(:shipment)
+        .where("spree_shipments.state != 'canceled'")
+        .where(variant_id: stock_item.variant_id)
+        .backordered.order("#{self.table_name}.created_at ASC")
+    end
 
     attr_accessible :shipment, :variant_id
 
@@ -26,14 +32,16 @@ module Spree
       end
     end
 
+    # This was refactored from a simpler query because the previous implementation
+    # 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)
-      stock_locations_table = Spree::StockLocation.table_name
-      shipments_table = Spree::Shipment.table_name
-      joins(shipment: :stock_location).
-      where("#{stock_locations_table}.id = ?", stock_item.stock_location_id).
-      where(variant_id: stock_item.variant_id).
-      where("#{shipments_table}.state != 'canceled'").
-      backordered.order('created_at ASC')
+      backordered_per_variant(stock_item).select do |unit|
+        unit.shipment.stock_location == stock_item.stock_location
+      end
     end
 
     def self.finalize_units!(inventory_units)

data/app/models/spree/order.rb

@@ -16,10 +16,7 @@ module Spree
       go_to_state :address
       go_to_state :delivery
       go_to_state :payment, if: ->(order) {
-        # Fix for #2191
-        if order.shipments
-          order.update_totals
-        end
+        order.update_totals
         order.payment_required?
       }
       go_to_state :confirm, if: ->(order) { order.confirmation_required? }
@@ -170,7 +167,6 @@ module Spree
 
     # Is this a free order in which case the payment step should be skipped
     def payment_required?
-      update_totals
       total.to_f > 0.0
     end
 
@@ -316,9 +312,8 @@ module Spree
       self.number
     end
 
-    # TODO should be deprecated by split shipments
-    # convenience method since many stores will not allow user to create multiple shipments
     def shipment
+      ActiveSupport::Deprecation.warn("[SPREE] Spree::Order#shipment is typically incorrect due to multiple shipments and will be deprecated in Spree 2.1, please process Spree::Order#shipments instead.")
       @shipment ||= shipments.last
     end
 

data/app/models/spree/shipment.rb

@@ -273,12 +273,12 @@ module Spree
       def ensure_correct_adjustment
         if adjustment
           adjustment.originator = shipping_method
-          adjustment.label = shipping_method.name
+          adjustment.label = shipping_method.adjustment_label
           adjustment.amount = selected_shipping_rate.cost if adjustment.open?
           adjustment.save!
           adjustment.reload
         elsif selected_shipping_rate_id
-          shipping_method.create_adjustment shipping_method.name, order, self, true, "open"
+          shipping_method.create_adjustment shipping_method.adjustment_label, order, self, true, "open"
           reload #ensure adjustment is present on later saves
         end
       end

data/app/models/spree/shipping_method.rb

@@ -55,5 +55,13 @@ module Spree
           self.errors[:base] << "You need to select at least one shipping category"
         end
       end
+
+      def self.on_backend_query
+        "#{table_name}.display_on != 'front_end' OR #{table_name}.display_on IS NULL"
+      end
+
+      def self.on_frontend_query
+        "#{table_name}.display_on != 'back_end' OR #{table_name}.display_on IS NULL"
+      end
   end
 end

data/app/models/spree/shipping_rate.rb

@@ -6,6 +6,9 @@ module Spree
     attr_accessible :id, :shipping_method, :shipment,
                     :name, :cost, :selected, :shipping_method_id
 
+    scope :frontend, -> { includes(:shipping_method).where(ShippingMethod.on_frontend_query) }
+    scope :backend, -> { includes(:shipping_method).where(ShippingMethod.on_backend_query) }
+
     delegate :order, :currency, to: :shipment
     delegate :name, to: :shipping_method
 

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

@@ -18,6 +18,7 @@ module Spree
           shipping_rates << ShippingRate.new( :shipping_method => shipping_method,
                                               :cost => cost)
         end
+        shipping_rates.sort_by! { |r| r.cost || 0 }
         shipping_rates.first.selected = true unless shipping_rates.empty?
         shipping_rates
       end

data/app/models/spree/stock_item.rb

@@ -9,8 +9,6 @@ module Spree
 
     attr_accessible :count_on_hand, :variant, :stock_location, :backorderable, :variant_id
 
-    after_save :process_backorders
-
     delegate :weight, to: :variant
 
     def backordered_inventory_units
@@ -23,8 +21,9 @@ module Spree
 
     def adjust_count_on_hand(value)
       self.with_lock do
-        self.reload
-        self.update_attribute(:count_on_hand, self.count_on_hand + value)
+        self.count_on_hand = self.count_on_hand + value
+        process_backorders if in_stock?
+
         self.save!
       end
     end
@@ -39,19 +38,15 @@ module Spree
     end
 
     private
-    def count_on_hand=(value)
-      write_attribute(:count_on_hand, value)
-    end
-
-    def process_backorders
-      return unless changes['count_on_hand'] && changes['count_on_hand'].last.to_i > 0
+      def count_on_hand=(value)
+        write_attribute(:count_on_hand, value)
+      end
 
-      backordered_units = backordered_inventory_units
-      while in_stock? && !backordered_units.empty?
-        inventory_unit = backordered_units.shift
-        inventory_unit.fill_backorder
-        self.adjust_count_on_hand(-1)
+      def process_backorders
+        backordered_inventory_units.each do |unit|
+          return unless in_stock?
+          unit.fill_backorder
+        end
       end
-    end
   end
 end

data/app/models/spree/stock_location.rb

@@ -40,18 +40,21 @@ module Spree
     end
 
     def fill_status(variant, quantity)
-      item = stock_item(variant)
+      if item = stock_item(variant)
+
+        if item.count_on_hand >= quantity
+          on_hand = quantity
+          backordered = 0
+        else
+          on_hand = item.count_on_hand
+          on_hand = 0 if on_hand < 0
+          backordered = item.backorderable? ? (quantity - on_hand) : 0
+        end
 
-      if item.count_on_hand >= quantity
-        on_hand = quantity
-        backordered = 0
+        [on_hand, backordered]
       else
-        on_hand = item.count_on_hand
-        on_hand = 0 if on_hand < 0
-        backordered = item.backorderable? ? (quantity - on_hand) : 0
+        [0, 0]
       end
-
-      [on_hand, backordered]
     end
 
     private

data/config/locales/en.yml

@@ -536,6 +536,18 @@ en:
     height: Height
     hide_cents: Hide cents
     home: Home
+    i18n:
+      available_locales: Available Locales
+      fields: Fields
+      language: Language
+      localization_settings: Localization Settings
+      only_incomplete: Only incomplete
+      only_complete: Only complete
+      select_locale: Select locale
+      show_only: Show only
+      supported_locales: Supported Locales
+      this_file_language: English (US)
+      translations: Translations
     icon: Icon
     image: Image
     image_settings: Image Settings

data/lib/spree/core/engine.rb

@@ -66,7 +66,7 @@ module Spree
         Mail.register_interceptor(Spree::Core::MailInterceptor)
       end
 
-      initializer 'spree.promo.environment', :after => 'spree.environment' do |app|
+      initializer 'spree.promo.environment' do |app|
         app.config.spree.add_class('promotions')
         app.config.spree.promotions = Spree::Promo::Environment.new
       end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "2.0.0"
+    "2.0.1"
   end
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
+  prerelease: 
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-19 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: state_machine
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -139,6 +158,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,6 +166,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -153,6 +174,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,6 +182,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -167,6 +190,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -174,6 +198,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -181,6 +206,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -188,6 +214,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -195,6 +222,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -202,6 +230,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -209,6 +238,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cancan
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -216,6 +246,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -223,6 +254,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: truncate_html
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -230,6 +262,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -237,6 +270,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: money
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -244,6 +278,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -251,6 +286,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -258,6 +294,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -578,25 +615,29 @@ files:
 homepage: http://spreecommerce.com
 licenses:
 - BSD-3
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -283587825053128084
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: The bare bones necessary for Spree.
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGJmY2JjMTNjYWQxNjgzMTYzMDEyOTUyMjUzZjE5ODc2YjVlZjU1YQ==
-  data.tar.gz: !binary |-
-    NDc2NmRjNzQ0OTlkNmZlNWNkNTIxY2JmZjhmYTBkMDYyYWI2OGZhMA==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MDg0OGQyMjYwYmYzOTNlNmExODhhYmY1NGJjYTU0YWViNjdjOGFkYzE0ZTRh
-    MDgzOWY1NDYxNDEzNWFmN2Q2MjE2MTZhODFlYjUyMTU2MTY3ZDMxYjUyYmRj
-    OGFjMjlmNjA5ZmJmMjA4ZmNjZWNhYWJlNDVhN2I4NTlkMzllZTM=
-  data.tar.gz: !binary |-
-    ZmQxMGQ5ODk0ODM5YTUxNDU2MGI5YjE2MDYzNDE5YmZmZGZlZWY0ZGMyMWE2
-    ZjVhNmI2YWM2NGY0OTE0ZmU4ZTIwZGNhYjM0ZDAwOThmN2Y4ODcxZDY0NDQz
-    NzY5OTI1NWI4NzBmNTdkNzA3YmE1ZjFiNzIyMTk0Y2VjNGRjYmM=