spree_core 3.1.10 → 3.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b00892d10335665967c6339896226cb6b16c8e71
-  data.tar.gz: 8dba8567c04b333b2a0f5597aa961dba8cb7b225
+  metadata.gz: 270e63acb2ee4007b6bea2044c6d983e308c0e9e
+  data.tar.gz: 6d048ddd8484553b669a1e38ecae1c82a323add5
 SHA512:
-  metadata.gz: 90ccdba9b15892cf42697e827dcbb085e57d9dc3eecc88a0999b7028e2c665b4cd1c8b294dca19b078fd36622fa983cd9ac5c14cfee0692086819348e0743526
-  data.tar.gz: 48ed45d5883aa09e875f3952afa4be11410371257fb78618d447770e6a36a96c830fb38b0a9b504853cc088cb1b1797abaaaffb1ca096658ce0bff821d359c0b
+  metadata.gz: b8da7ac191edc6933febe5cd2006d8ea31a96d3fc1be13a7043644b0ba7afcd17c33399847a277d88a6eea4d75ad0c94ef83029fdf2ddfaf563a6751f1d008fe
+  data.tar.gz: defab635ca53f329c9539dd6b36835e24b9e9e88080f5cc006818f93f8b4bbcfdd928f996baf28b0508140104f255c7466cdf56568c0d07bedf8353701a6a973

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

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

data/app/models/spree/order.rb

@@ -272,8 +272,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.1.10"
+    "3.1.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.1.10
+  version: 3.1.11
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -584,6 +584,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