spree_core 2.0.0.rc1 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGY5MGNlMTExNmVhYTBkOTNlN2Y4N2I1ZTdlNTA2MzdhY2NiODQzOQ==
+    MGJmY2JjMTNjYWQxNjgzMTYzMDEyOTUyMjUzZjE5ODc2YjVlZjU1YQ==
   data.tar.gz: !binary |-
-    YWQxNTc2MjAyNDM1NDk4MWViODEyZTY2MWYyYjdiNTdkYzgxM2Y5YQ==
+    NDc2NmRjNzQ0OTlkNmZlNWNkNTIxY2JmZjhmYTBkMDYyYWI2OGZhMA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OGQxNGQ2MjU4MWY4NmQ1YzkzOTAyOGM1YjA4MTU3YzZkOGQ5ZjUxMDc2YjM0
-    ZDY3N2IyYTAyYjE5NjBmM2Q1MmI3YjU1YThkMjkxNjc2ZTFjYjRmNzc0OGY1
-    MGUwYzQyYTNhYjYyMzI2NDY5MGMzNzVhMTU2OWZkNDczZGUwODI=
+    MDg0OGQyMjYwYmYzOTNlNmExODhhYmY1NGJjYTU0YWViNjdjOGFkYzE0ZTRh
+    MDgzOWY1NDYxNDEzNWFmN2Q2MjE2MTZhODFlYjUyMTU2MTY3ZDMxYjUyYmRj
+    OGFjMjlmNjA5ZmJmMjA4ZmNjZWNhYWJlNDVhN2I4NTlkMzllZTM=
   data.tar.gz: !binary |-
-    YmExYjIxNTgwYzcxNzQyZTBlYmZiNWY2Yzk1ZDdmY2E4ZWY5YTY2OTQzMTJl
-    Yzc5YjZjODgzOGUyZmJlM2YyODA5MGM3YzUzYTU5OWJlM2Q1MWU4ZDc5YTNm
-    MDA5NmQ1NjQxZmNmOGQxMjJhNDU0NzU1NDkxZWJlOGJhMTJmODc=
+    ZmQxMGQ5ODk0ODM5YTUxNDU2MGI5YjE2MDYzNDE5YmZmZGZlZWY0ZGMyMWE2
+    ZjVhNmI2YWM2NGY0OTE0ZmU4ZTIwZGNhYjM0ZDAwOThmN2Y4ODcxZDY0NDQz
+    NzY5OTI1NWI4NzBmNTdkNzA3YmE1ZjFiNzIyMTk0Y2VjNGRjYmM=

data/app/models/spree/order_inventory.rb

@@ -6,33 +6,22 @@ module Spree
       @order = order
     end
 
-    def verify(line_item, shipment=nil)
-      # should only verify inventory for completed orders
-      # as carts have inventory assigned via create_proposed_shipment methh
-      #
-      # or when shipment is explicitly passed
+    # Only verify inventory for completed orders
+    # as carts have inventory assigned via create_proposed_shipment methh
+    #
+    # or when shipment is explicitly passed
+    def verify(line_item, shipment = nil)
       if order.completed? || shipment.present?
 
         variant_units = inventory_units_for(line_item.variant)
 
         if variant_units.size < line_item.quantity
-          #add
           quantity = line_item.quantity - variant_units.size
 
           shipment = determine_target_shipment(line_item.variant) unless shipment
-
           add_to_shipment(shipment, line_item.variant, quantity)
-
         elsif variant_units.size > line_item.quantity
-          #remove
-          quantity = variant_units.size - line_item.quantity
-
-          order.shipments.each do |shipment|
-            break if quantity == 0
-
-            quantity -= remove_from_shipment(shipment, line_item.variant, quantity)
-          end
-
+          remove(line_item, variant_units, shipment)
         end
       else
         true
@@ -45,16 +34,32 @@ module Spree
     end
 
     private
+    def remove(line_item, variant_units, shipment = nil)
+      quantity = variant_units.size - line_item.quantity
 
-    def determine_target_shipment(variant)
-      # get first unshipped shipment that already includes this variant
-      shipment = order.shipments.detect { |shipment| (shipment.ready? || shipment.pending?) && shipment.include?(variant) }
+      if shipment.present?
+        remove_from_shipment(shipment, line_item.variant, quantity)
+      else
+        order.shipments.each do |shipment|
+          break if quantity == 0
+          quantity -= remove_from_shipment(shipment, line_item.variant, quantity)
+        end
+      end
+    end
 
-      # get first unshipped shipment that's leaving from the a stock_location that stocks this variant
-      shipment ||= order.shipments.detect { |shipment| (shipment.ready? || shipment.pending?) && variant.stock_location_ids.include?(shipment.stock_location_id) }
+    # Returns either one of the shipment:
+    #
+    # first unshipped that already includes this variant
+    # first unshipped that's leaving from a stock_location that stocks this variant
+    #
+    def determine_target_shipment(variant)
+      shipment = order.shipments.detect do |shipment|
+        (shipment.ready? || shipment.pending?) && shipment.include?(variant)
+      end
 
-      # ship it!
-      shipment
+      shipment ||= order.shipments.detect do |shipment|
+        (shipment.ready? || shipment.pending?) && variant.stock_location_ids.include?(shipment.stock_location_id)
+      end
     end
 
     def add_to_shipment(shipment, variant, quantity)
@@ -104,6 +109,5 @@ module Spree
       # return quantity removed
       removed_quantity
     end
-
   end
 end

data/app/models/spree/stock_item.rb

@@ -33,6 +33,11 @@ module Spree
       self.count_on_hand > 0
     end
 
+    # Tells whether it's available to be included in a shipment
+    def available?
+      self.in_stock? || self.backorderable?
+    end
+
     private
     def count_on_hand=(value)
       write_attribute(:count_on_hand, value)

data/config/locales/en.yml

@@ -34,6 +34,7 @@ en:
       spree/order:
         checkout_complete: Checkout Complete
         completed_at: Completed At
+        coupon_code: Coupon Code
         created_at: Order Date
         email: Customer E-Mail
         ip_address: IP Address
@@ -357,6 +358,7 @@ en:
     cannot_create_returns: Cannot create returns as this order has no shipped units.
     cannot_perform_operation: Cannot perform requested operation
     cannot_set_shipping_method_without_address: Cannot set shipping method until customer details are provided.
+    capture: Capture
     card_code: Card Code
     card_number: Card Number
     card_type_is: Card type is
@@ -422,6 +424,7 @@ en:
     current_promotion_usage: ! 'Current Usage: %{count}'
     customer: Customer
     customer_details: Customer Details
+    customer_details_updated: Customer Details Updated
     customer_search: Customer Search
     cut: Cut
     dash:
@@ -929,8 +932,6 @@ en:
     smtp_username: SMTP Username
     source: Source
     special_instructions: Special Instructions
-    spree/order:
-      coupon_code: Coupon Code
     spree_gateway_error_flash_for_checkout: There was a problem with your payment information. Please check your information and try again.
     start: Start
     start_date: Valid from

data/db/migrate/20130514151929_add_sku_index_to_spree_variants.rb

@@ -0,0 +1,5 @@
+class AddSkuIndexToSpreeVariants < ActiveRecord::Migration
+  def change
+    add_index :spree_variants, :sku
+  end
+end

data/lib/spree/core/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -569,6 +569,7 @@ files:
 - db/migrate/20130423110707_drop_products_count_on_hand.rb
 - db/migrate/20130423223847_set_default_shipping_rate_cost.rb
 - db/migrate/20130509115210_add_number_to_stock_transfer.rb
+- db/migrate/20130514151929_add_sku_index_to_spree_variants.rb
 - db/seeds.rb
 - vendor/assets/javascripts/jquery-migrate-1.0.0.js
 - vendor/assets/javascripts/jsuri.js
@@ -589,9 +590,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3