spree_core 3.3.2 → 3.3.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/spree/order.rb +2 -2
- data/app/models/spree/order/checkout.rb +1 -1
- data/app/models/spree/order_contents.rb +0 -1
- data/app/models/spree/order_inventory.rb +4 -3
- data/app/models/spree/shipment.rb +9 -4
- data/app/models/spree/shipment_handler.rb +1 -1
- data/config/initializers/premailer_rails.rb +3 -0
- data/lib/spree/core/version.rb +1 -1
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2733d8bdc6f559cdb36ce0472c8ee4ade4553661
|
4
|
+
data.tar.gz: '092f9dea7f54cadb2ffee7411048e487f55a1dee'
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: ecbd86b49f4c2cce96708c8d9b174b8ea50eee7f2e66a7c8764a291d0b11b3067495619e1359bd92c40dcc82e675b63c7885f3f029a2b95210fcf80c4fb99a4a
|
7
|
+
data.tar.gz: f1287c901c06a5116fec3009f28a5a7649b2faf949537f6f8039582b7c4071135ab897de158644f21f92ef789a9f8ba42e75907e0cdf61dd0572fddfdf6d0533
|
data/app/models/spree/order.rb
CHANGED
@@ -268,8 +268,8 @@ module Spree
|
|
268
268
|
self.user = user
|
269
269
|
self.email = user.email if override_email
|
270
270
|
self.created_by ||= user
|
271
|
-
self.bill_address ||= user.bill_address
|
272
|
-
self.ship_address ||= user.ship_address
|
271
|
+
self.bill_address ||= user.bill_address.try(:clone)
|
272
|
+
self.ship_address ||= user.ship_address.try(:clone)
|
273
273
|
|
274
274
|
changes = slice(:user_id, :email, :created_by_id, :bill_address_id, :ship_address_id)
|
275
275
|
|
@@ -72,10 +72,10 @@ module Spree
|
|
72
72
|
if variant.should_track_inventory?
|
73
73
|
on_hand, back_order = shipment.stock_location.fill_status(variant, quantity)
|
74
74
|
|
75
|
-
|
76
|
-
|
75
|
+
shipment.set_up_inventory('on_hand', variant, order, line_item, on_hand)
|
76
|
+
shipment.set_up_inventory('backordered', variant, order, line_item, back_order)
|
77
77
|
else
|
78
|
-
|
78
|
+
shipment.set_up_inventory('on_hand', variant, order, line_item, quantity)
|
79
79
|
end
|
80
80
|
|
81
81
|
# adding to this shipment, and removing from stock_location
|
@@ -103,6 +103,7 @@ module Spree
|
|
103
103
|
end
|
104
104
|
removed_quantity += 1
|
105
105
|
end
|
106
|
+
inventory_unit.save! if inventory_unit.persisted?
|
106
107
|
end
|
107
108
|
|
108
109
|
shipment.destroy if shipment.inventory_units.sum(:quantity).zero?
|
@@ -224,6 +224,7 @@ module Spree
|
|
224
224
|
selected_rate = shipping_rates.detect do |rate|
|
225
225
|
rate.shipping_method_id == original_shipping_method_id
|
226
226
|
end
|
227
|
+
save!
|
227
228
|
self.selected_shipping_rate_id = selected_rate.id if selected_rate
|
228
229
|
end
|
229
230
|
|
@@ -240,12 +241,14 @@ module Spree
|
|
240
241
|
save!
|
241
242
|
end
|
242
243
|
|
243
|
-
def set_up_inventory(state, variant, order, line_item)
|
244
|
+
def set_up_inventory(state, variant, order, line_item, quantity = 1)
|
245
|
+
return if quantity <= 0
|
244
246
|
inventory_units.create(
|
245
247
|
state: state,
|
246
248
|
variant_id: variant.id,
|
247
249
|
order_id: order.id,
|
248
|
-
line_item_id: line_item.id
|
250
|
+
line_item_id: line_item.id,
|
251
|
+
quantity: quantity
|
249
252
|
)
|
250
253
|
end
|
251
254
|
|
@@ -344,6 +347,7 @@ module Spree
|
|
344
347
|
|
345
348
|
order.contents.remove(variant, quantity, shipment: self)
|
346
349
|
order.contents.add(variant, quantity, shipment: new_shipment)
|
350
|
+
order.update_with_updater!
|
347
351
|
|
348
352
|
refresh_rates
|
349
353
|
save!
|
@@ -362,8 +366,9 @@ module Spree
|
|
362
366
|
end
|
363
367
|
|
364
368
|
transaction do
|
365
|
-
order.contents.remove(variant,
|
366
|
-
order.contents.add(variant,
|
369
|
+
order.contents.remove(variant, final_quantity, shipment: self)
|
370
|
+
order.contents.add(variant, final_quantity, shipment: shipment_to_transfer_to)
|
371
|
+
order.update_with_updater!
|
367
372
|
|
368
373
|
refresh_rates
|
369
374
|
save!
|
@@ -20,9 +20,9 @@ module Spree
|
|
20
20
|
def perform
|
21
21
|
@shipment.inventory_units.each &:ship!
|
22
22
|
@shipment.process_order_payments if Spree::Config[:auto_capture_on_dispatch]
|
23
|
-
send_shipped_email
|
24
23
|
@shipment.touch :shipped_at
|
25
24
|
update_order_shipment_state
|
25
|
+
send_shipped_email
|
26
26
|
end
|
27
27
|
|
28
28
|
private
|
data/lib/spree/core/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.3.
|
4
|
+
version: 3.3.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Sean Schofield
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-12-08 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activemerchant
|
@@ -568,6 +568,7 @@ files:
|
|
568
568
|
- config/initializers/assets.rb
|
569
569
|
- config/initializers/friendly_id.rb
|
570
570
|
- config/initializers/premailer_assets.rb
|
571
|
+
- config/initializers/premailer_rails.rb
|
571
572
|
- config/locales/en.yml
|
572
573
|
- config/routes.rb
|
573
574
|
- db/default/spree/countries.rb
|