spree_core 3.2.5 → 3.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 243e933c3a06a8f8c02f31d845eeae521a606f73
-  data.tar.gz: d179eb93766faa8329e114f2f9dcfaf1764aa632
+  metadata.gz: 29390ea0bd0ed2b5069fcab5125778fa23d316cc
+  data.tar.gz: 5079c2417a09e239ee60bbd9a37861e451e8ca46
 SHA512:
-  metadata.gz: 3de5dc5e16ce8f1e9da138ac71c3c29f441af13bf0d74deee6202f53d2dc19e9138d0b1b4cfa39895f1c2a555f032f739c691d54e8b8ef0f5af122d8b62f2802
-  data.tar.gz: 2f407e5f4a72493f978ebae47988fea0b1d0edcf5caccac949cb35a947b2a418b985a5fc38187d6a8ddf0dab34eb116b625f3c5fcaae227c8cd83f84016ae69a
+  metadata.gz: d03cbdee9e12a5497437798a6aada084762a7721793228a3bee3a6a842d84a93c8dbddcad7b9bfa1ce9ffa4c176fb0174182c7811c031eca81039c37608f695b
+  data.tar.gz: 3258f0cf50c6d9eaa892e7c41a663d2a50ea804774189a9e615bbbc2d28087d008cbfdeb37d304a130d0fdd528cf5a9a6a8c1e6336158687d1fff2df7edcd512

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

@@ -62,7 +62,7 @@ module Spree
 
               event :return do
                 transition to: :returned,
-                           from: [:complete, :awaiting_return, :canceled, :resumed],
+                           from: [:complete, :awaiting_return, :canceled, :returned, :resumed],
                            if: :all_inventory_units_returned?
               end
 

data/app/models/spree/order.rb

@@ -267,8 +267,8 @@ module Spree
       self.user           = user
       self.email          = user.email if override_email
       self.created_by   ||= user
-      self.bill_address ||= user.bill_address
-      self.ship_address ||= user.ship_address
+      self.bill_address ||= user.bill_address.try(:clone)
+      self.ship_address ||= user.ship_address.try(:clone)
 
       changes = slice(:user_id, :email, :created_by_id, :bill_address_id, :ship_address_id)
 

data/app/models/spree/shipment_handler.rb

@@ -20,9 +20,9 @@ module Spree
     def perform
       @shipment.inventory_units.each &:ship!
       @shipment.process_order_payments if Spree::Config[:auto_capture_on_dispatch]
-      send_shipped_email
       @shipment.touch :shipped_at
       update_order_shipment_state
+      send_shipped_email
     end
 
     private

data/config/initializers/premailer_rails.rb

@@ -0,0 +1,3 @@
+if Gem.loaded_specs['premailer-rails'].version >= Gem::Version.create('1.10.0')
+  Premailer::Rails.config[:strategies] = [:filesystem, :network, :asset_pipeline]
+end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.2.5"
+    "3.2.6"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -583,6 +583,7 @@ files:
 - config/initializers/assets.rb
 - config/initializers/friendly_id.rb
 - config/initializers/premailer_assets.rb
+- config/initializers/premailer_rails.rb
 - config/initializers/user_class_extensions.rb
 - config/locales/en.yml
 - config/routes.rb
@@ -978,7 +979,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.23
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: The bare bones necessary for Spree.