spree_core 3.1.3 → 3.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aad45a1717f46487e95d1f1ce2e84d8b153e9e28
-  data.tar.gz: f45c1a7ff4a2b26a2f27dc9c52daa0ff150457eb
+  metadata.gz: fda09b369307c4509d6d6581ad4aaafe7b926d07
+  data.tar.gz: 6cad03a8dd918b6fa93c4a50cfb5c84d83663bfb
 SHA512:
-  metadata.gz: b194e0b9e7af550b59adc6c1b650a3ef1af726d6fd974beb40987200857951311f99388665a14c652cef27c932e4945e2c1835b10bc5561a0e5b8a139920fd61
-  data.tar.gz: 33274a91a3b47949e274017e691ac38d205793dd571fa66ebdbca4af35a1995794ac1e89df109774cd4f64ebe23f2fec11cdebf4a3f6e45f37856a2807ed0390
+  metadata.gz: 9a16807219ecdad98881d86671f3694574553ff202fc1cb979fe44b429be11a49459d0e52cf2b0cc51ba1608235975c6718d0d14050ae463d013df75815bd91f
+  data.tar.gz: 5afbdf7144d7e61ca450949ad3a7fae54cddd9f231a39b817365925502542d555057a6009fa7abb1da24ef2668a38b27aeef615c56ce12356ed0bb11e1436609

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

@@ -82,10 +82,11 @@ module Spree
 
           # Find any incomplete orders for the guest_token
           incomplete_orders = Spree::Order.incomplete.includes(line_items: [variant: [:images, :option_values, :product]])
+          guest_token_order_params = current_order_params.except(:user_id)
           order = if with_adjustments
-                    incomplete_orders.includes(:adjustments).lock(options[:lock]).find_by(current_order_params)
+                    incomplete_orders.includes(:adjustments).lock(options[:lock]).find_by(guest_token_order_params)
                   else
-                    incomplete_orders.lock(options[:lock]).find_by(current_order_params)
+                    incomplete_orders.lock(options[:lock]).find_by(guest_token_order_params)
                   end
 
           # Find any incomplete orders for the current user

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.1.3"
+    "3.1.4"
   end
 end

data/spec/lib/spree/core/controller_helpers/order_spec.rb

@@ -45,6 +45,21 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller do
         expect(Spree::Order.last.store_id).to eq store.id
       end
     end
+
+    context 'gets using the guest_token' do
+      let!(:order) { create :order, user: user }
+      let!(:guest_order) { create :order, user: nil, email: nil, guest_token: 'token' }
+
+      before do
+        expect(controller).to receive(:current_order_params).and_return(
+          currency: Spree::Config[:currency], guest_token: 'token', store_id: guest_order.store_id, user_id: user.id,
+        )
+      end
+
+      specify 'without the guest token being bound to any user yet' do
+        expect(controller.current_order).to eq guest_order
+      end
+    end
   end
 
   describe '#associate_user' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.1.4
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -1163,7 +1163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.