spree_core 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 706e09496cdbf5806081a07927edc5c3d893ad6f
-  data.tar.gz: 6f4fcaeb2ed3904863cfd68e698a90c8b03144c5
+  metadata.gz: 2733d8bdc6f559cdb36ce0472c8ee4ade4553661
+  data.tar.gz: '092f9dea7f54cadb2ffee7411048e487f55a1dee'
 SHA512:
-  metadata.gz: 76f29fbe6ab01134d006c073f545bcfd40a0d66aa14a93985e89726e95eb1ed330a92c3a886d43d0f18cfd976629753afce1b036e9b8b76a9f6075e7d9f5c130
-  data.tar.gz: 5f05204d62ef1503a04aac199e5db37e162c40a05c6b9b53b20dfc2faeb5ad5e0906be286550f99e955d74c1128b38e0a0349f8bc821e68e2ecf57b39c14c84d
+  metadata.gz: ecbd86b49f4c2cce96708c8d9b174b8ea50eee7f2e66a7c8764a291d0b11b3067495619e1359bd92c40dcc82e675b63c7885f3f029a2b95210fcf80c4fb99a4a
+  data.tar.gz: f1287c901c06a5116fec3009f28a5a7649b2faf949537f6f8039582b7c4071135ab897de158644f21f92ef789a9f8ba42e75907e0cdf61dd0572fddfdf6d0533

data/app/models/spree/order.rb

@@ -268,8 +268,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/order/checkout.rb

@@ -58,7 +58,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_contents.rb

@@ -81,7 +81,6 @@ module Spree
     end
 
     def persist_totals
-      order_updater.update_item_count
       order_updater.update
     end
 

data/app/models/spree/order_inventory.rb

@@ -72,10 +72,10 @@ module Spree
       if variant.should_track_inventory?
         on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
 
-        on_hand.times { shipment.set_up_inventory('on_hand', variant, order, line_item) }
-        back_order.times { shipment.set_up_inventory('backordered', variant, order, line_item) }
+        shipment.set_up_inventory('on_hand', variant, order, line_item, on_hand)
+        shipment.set_up_inventory('backordered', variant, order, line_item, back_order)
       else
-        quantity.times { shipment.set_up_inventory('on_hand', variant, order, line_item) }
+        shipment.set_up_inventory('on_hand', variant, order, line_item, quantity)
       end
 
       # adding to this shipment, and removing from stock_location
@@ -103,6 +103,7 @@ module Spree
           end
           removed_quantity += 1
         end
+        inventory_unit.save! if inventory_unit.persisted?
       end
 
       shipment.destroy if shipment.inventory_units.sum(:quantity).zero?

data/app/models/spree/shipment.rb

@@ -224,6 +224,7 @@ module Spree
         selected_rate = shipping_rates.detect do |rate|
           rate.shipping_method_id == original_shipping_method_id
         end
+        save!
         self.selected_shipping_rate_id = selected_rate.id if selected_rate
       end
 
@@ -240,12 +241,14 @@ module Spree
       save!
     end
 
-    def set_up_inventory(state, variant, order, line_item)
+    def set_up_inventory(state, variant, order, line_item, quantity = 1)
+      return if quantity <= 0
       inventory_units.create(
         state: state,
         variant_id: variant.id,
         order_id: order.id,
-        line_item_id: line_item.id
+        line_item_id: line_item.id,
+        quantity: quantity
       )
     end
 
@@ -344,6 +347,7 @@ module Spree
 
         order.contents.remove(variant, quantity, shipment: self)
         order.contents.add(variant, quantity, shipment: new_shipment)
+        order.update_with_updater!
 
         refresh_rates
         save!
@@ -362,8 +366,9 @@ module Spree
       end
 
       transaction do
-        order.contents.remove(variant, quantity, shipment: self)
-        order.contents.add(variant, quantity, shipment: shipment_to_transfer_to)
+        order.contents.remove(variant, final_quantity, shipment: self)
+        order.contents.add(variant, final_quantity, shipment: shipment_to_transfer_to)
+        order.update_with_updater!
 
         refresh_rates
         save!

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.3.2"
+    "3.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 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
@@ -568,6 +568,7 @@ files:
 - config/initializers/assets.rb
 - config/initializers/friendly_id.rb
 - config/initializers/premailer_assets.rb
+- config/initializers/premailer_rails.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/default/spree/countries.rb