spree_frontend 4.0.1 → 4.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 07eda334236eb5a0e4657f358e344ce6713d193a82498a2faca68277063ead2d
4
- data.tar.gz: 3aba772f800d999e1ab239eeba6ab56f0c1e0e4d40f8b2c6127551754577848d
3
+ metadata.gz: e3b3b838174beb5d16c333196eaf39c8c8eb676646aa0b710787d22702f203b3
4
+ data.tar.gz: 1b1268f3ea48e8b0ec998499e8044a57eb0df163b2f365e9c7acf2ca9b5f880d
5
5
  SHA512:
6
- metadata.gz: f1a43498e99d5d3b8b55f3cfdde83865c1257e73bb0b491aea90326ca9f1c698b36be151c7268001dab26d9a3a01c282de7bb7913b0554cee3602075f5b29eb4
7
- data.tar.gz: d9f866a4fadf65b67b41997a7122a8989cb05fa5efde1502b5a9d957d98d0b767ed91ab2adba984632699d584c6e1cede9a7e592bd8c6c9cccce6ff13329f1e6
6
+ metadata.gz: 25aa71428a0e8cdfb54de456f3b6ad87ec6d62c2a1cee8e1f3426d9354bf38b3648d61b1078131457e8fc63e4a0df7216dc2ef16806508fe43b37b003550a567
7
+ data.tar.gz: fcbbe9cf25c765ced64728e7d41c829b2b888080b09b82c3697411f6e50fe06690dbecd54bfc9a3e9f7dc2371572b6b60e3108f8b7874ad50aeb6c6ffd668f5d
@@ -32,21 +32,23 @@ module Spree
32
32
  end
33
33
 
34
34
  def normalize_addresses
35
- return unless params[:state] == 'address' && @order.bill_address_id && @order.ship_address_id
35
+ return unless params[:state] == 'address' && @order.bill_address_id
36
36
 
37
- # ensure that there is no validation errors and addresses were saved
38
- return unless @order.bill_address && @order.ship_address
37
+ if @order.checkout_steps.include?('delivery')
38
+ return unless @order.ship_address_id
39
+ end
39
40
 
40
41
  bill_address = @order.bill_address
41
42
  ship_address = @order.ship_address
43
+
44
+ if params[:save_user_address].present? && try_spree_current_user.present?
45
+ [bill_address, ship_address].each { |address| address&.update_attribute(:user_id, try_spree_current_user&.id) }
46
+ end
47
+
42
48
  if @order.bill_address_id != @order.ship_address_id && bill_address == ship_address
43
49
  @order.update_column(:bill_address_id, ship_address.id)
44
50
  bill_address.destroy
45
- elsif params[:save_user_address]
46
- bill_address.update_attribute(:user_id, try_spree_current_user&.id)
47
51
  end
48
-
49
- ship_address.update_attribute(:user_id, try_spree_current_user&.id) if params[:save_user_address]
50
52
  end
51
53
  end
52
54
  end
@@ -37,6 +37,7 @@ module Spree
37
37
  else
38
38
  new_address = @address.clone
39
39
  new_address.attributes = address_params
40
+ new_address.user_id = @address.user_id
40
41
  @address.update_attribute(:deleted_at, Time.current)
41
42
  if new_address.save
42
43
  flash[:notice] = Spree.t(:successfully_updated, scope: :address_book)
@@ -5,16 +5,22 @@ Gem::Specification.new do |s|
5
5
  s.platform = Gem::Platform::RUBY
6
6
  s.name = 'spree_frontend'
7
7
  s.version = Spree.version
8
- s.summary = 'Frontend e-commerce functionality for the Spree project.'
9
- s.description = s.summary
10
-
11
- s.required_ruby_version = '>= 2.5.0'
12
-
13
8
  s.author = 'Sean Schofield'
14
9
  s.email = 'sean@spreecommerce.com'
10
+ s.summary = 'Frontend e-commerce functionality for the Spree project.'
11
+ s.description = s.summary
15
12
  s.homepage = 'http://spreecommerce.org'
16
13
  s.license = 'BSD-3-Clause'
17
14
 
15
+ s.metadata = {
16
+ "bug_tracker_uri" => "https://github.com/spree/spree/issues",
17
+ "changelog_uri" => "https://github.com/spree/spree/releases/tag/v#{s.version}",
18
+ "documentation_uri" => "https://guides.spreecommerce.org/",
19
+ "source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",
20
+ }
21
+
22
+ s.required_ruby_version = '>= 2.5.0'
23
+
18
24
  s.files = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
19
25
  s.require_path = 'lib'
20
26
  s.requirements << 'none'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_frontend
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.0.1
4
+ version: 4.0.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
- autorequire:
8
+ autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-10-29 00:00:00.000000000 Z
11
+ date: 2020-11-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_api
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 4.0.1
19
+ version: 4.0.6
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 4.0.1
26
+ version: 4.0.6
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: spree_core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 4.0.1
33
+ version: 4.0.6
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 4.0.1
40
+ version: 4.0.6
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -250,8 +250,12 @@ files:
250
250
  homepage: http://spreecommerce.org
251
251
  licenses:
252
252
  - BSD-3-Clause
253
- metadata: {}
254
- post_install_message:
253
+ metadata:
254
+ bug_tracker_uri: https://github.com/spree/spree/issues
255
+ changelog_uri: https://github.com/spree/spree/releases/tag/v4.0.6
256
+ documentation_uri: https://guides.spreecommerce.org/
257
+ source_code_uri: https://github.com/spree/spree/tree/v4.0.6
258
+ post_install_message:
255
259
  rdoc_options: []
256
260
  require_paths:
257
261
  - lib
@@ -267,8 +271,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
267
271
  version: '0'
268
272
  requirements:
269
273
  - none
270
- rubygems_version: 3.0.2
271
- signing_key:
274
+ rubygems_version: 3.1.2
275
+ signing_key:
272
276
  specification_version: 4
273
277
  summary: Frontend e-commerce functionality for the Spree project.
274
278
  test_files: []