spree_frontend 4.2.1 → 4.2.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/frontend/currency.js +11 -9
  3. data/app/controllers/spree/store_controller.rb +4 -2
  4. data/app/views/spree/shared/_product_added_modal.html.erb +2 -2
  5. data/spree_frontend.gemspec +5 -5
  6. metadata +23 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: eb44ce8a344e6b78adcb87064ed90e0ec7f3f02cfc474dda6d16d41e1077e733
4
- data.tar.gz: 7febb328e551e0396decabb7e357c626c39ab573d71895dc6e55d115bb9d6e7c
3
+ metadata.gz: 5d9d340621918538c58883ecf25bea009aca0d6c1daae8b0b3e84007def3f49c
4
+ data.tar.gz: 5508ae8cc68f390f3dc7e9e3427fc6b3c3c4cb84941fe0571cdae4e36c3c6d45
5
5
  SHA512:
6
- metadata.gz: cd5453aa3218dbbedadfc27b7f3958b33560f0d8ec33d03aee58b1d22b3c255c6cded27469e2a1b6194fb73fd0e5c658545aeb90e6003dbc6355694457ec46be
7
- data.tar.gz: 67815113708206d6f6bab183804c7005d8ccaa707005ff6392d38eebd4b9462951833d8507da6617011a6e4052c208c67bc3be49039f25c5b5cad9e3077b9c31
6
+ metadata.gz: 10343bd225a76f6bacafc977c8c3844c56b53bbb1eead4ba6344122031f0a628a1f1d901de59cb32a5de9a5e6e65b42691312daf977435ca7b36f2b2d5440456
7
+ data.tar.gz: 0b22afe8d10a9b863599d1f68a077c98a1a9b35805ea7670a19b8c04ab4b16a6af3ec92d044cf293328c8791fccf4b19448b78c0e97abffed97cbbb88243458c
data/app/assets/javascripts/spree/frontend/currency.js CHANGED
@@ -29,15 +29,17 @@ document.addEventListener('turbolinks:load', function(event) {
29
29
  // fix back button issue with different currency set
30
30
  // invalidate page if cached page has different currency then the current one
31
31
  document.addEventListener('turbolinks:load', function(event) {
32
- if (SPREE_CURRENCY === SPREE_DEFAULT_CURRENCY) {
33
- var regexAnyCurrency = new RegExp('currency=')
34
- if (event.data.url.match(regexAnyCurrency) && !event.data.url.match(SPREE_CURRENCY)) {
35
- Spree.setCurrency(SPREE_CURRENCY)
36
- }
37
- } else {
38
- var regex = new RegExp('currency=' + SPREE_CURRENCY)
39
- if (!event.data.url.match(regex)) {
40
- Spree.setCurrency(SPREE_CURRENCY)
32
+ if (typeof (SPREE_DEFAULT_CURRENCY) !== 'undefined' && typeof (SPREE_CURRENCY) !== 'undefined') {
33
+ if (SPREE_CURRENCY === SPREE_DEFAULT_CURRENCY) {
34
+ var regexAnyCurrency = new RegExp('currency=')
35
+ if (event.data.url.match(regexAnyCurrency) && !event.data.url.match(SPREE_CURRENCY)) {
36
+ Spree.setCurrency(SPREE_CURRENCY)
37
+ }
38
+ } else {
39
+ var regex = new RegExp('currency=' + SPREE_CURRENCY)
40
+ if (!event.data.url.match(regex)) {
41
+ Spree.setCurrency(SPREE_CURRENCY)
42
+ }
41
43
  }
42
44
  }
43
45
  })
data/app/controllers/spree/store_controller.rb CHANGED
@@ -41,8 +41,10 @@ module Spree
41
41
  [
42
42
  current_store,
43
43
  current_currency,
44
- I18n.locale
45
- ]
44
+ I18n.locale,
45
+ try_spree_current_user.present?,
46
+ try_spree_current_user.try(:has_spree_role?, 'admin')
47
+ ].compact
46
48
  end
47
49
 
48
50
  def store_last_modified
data/app/views/spree/shared/_product_added_modal.html.erb CHANGED
@@ -34,7 +34,7 @@
34
34
  </div>
35
35
  <div class="row pt-5 justify-content-center align-items-center product-added-modal-product">
36
36
  <div class="col-4 col-sm-2 product-added-modal-product-image-container">
37
- <img class="product-added-modal-product-image-container-image" src="data:," alt="<%= @product.name %>">
37
+ <img class="product-added-modal-product-image-container-image" src="data:," alt="<%= @product&.name %>">
38
38
  </div>
39
39
  <div class="col-8 col-sm-6 col-lg-4 py-1 product-added-modal-product-details">
40
40
  <div class="product-added-modal-product-details-name"></div>
@@ -48,7 +48,7 @@
48
48
  <div class="row pb-4 justify-content-center">
49
49
  <div class="col-12 col-lg-8">
50
50
  <%= link_to spree.checkout_path, class: 'btn btn-primary w-100 font-weight-bold text-uppercase product-added-modal-button', method: :get do %>
51
- <%= Spree.t('pdp.checkout') %>
51
+ <%= Spree.t(:checkout) %>
52
52
  <% end %>
53
53
  </div>
54
54
  </div>
data/spree_frontend.gemspec CHANGED
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
19
19
  "source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",
20
20
  }
21
21
 
22
- s.required_ruby_version = '>= 2.5.0'
22
+ s.required_ruby_version = '>= 2.5'
23
23
 
24
24
  s.files = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
25
25
  s.require_path = 'lib'
@@ -28,12 +28,12 @@ Gem::Specification.new do |s|
28
28
  s.add_dependency 'spree_api', s.version
29
29
  s.add_dependency 'spree_core', s.version
30
30
 
31
- s.add_dependency 'bootstrap', '>= 4.3.1', '< 4.7.0'
32
- s.add_dependency 'glyphicons', '~> 1.0.2'
33
- s.add_dependency 'canonical-rails', '~> 0.2.10'
31
+ s.add_dependency 'bootstrap', '~> 4.0'
32
+ s.add_dependency 'glyphicons', '~> 1.0'
33
+ s.add_dependency 'canonical-rails', '~> 0.2', '>= 0.2.10'
34
34
  s.add_dependency 'inline_svg', '~> 1.5'
35
35
  s.add_dependency 'jquery-rails', '~> 4.3'
36
- s.add_dependency 'turbolinks', '~> 5.2.0'
36
+ s.add_dependency 'turbolinks', '~> 5.2'
37
37
 
38
38
  s.add_development_dependency 'capybara-accessible'
39
39
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_frontend
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.1
4
+ version: 4.2.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2021-03-05 00:00:00.000000000 Z
12
+ date: 2021-05-31 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_api
@@ -17,67 +17,64 @@ dependencies:
17
17
  requirements:
18
18
  - - '='
19
19
  - !ruby/object:Gem::Version
20
- version: 4.2.1
20
+ version: 4.2.5
21
21
  type: :runtime
22
22
  prerelease: false
23
23
  version_requirements: !ruby/object:Gem::Requirement
24
24
  requirements:
25
25
  - - '='
26
26
  - !ruby/object:Gem::Version
27
- version: 4.2.1
27
+ version: 4.2.5
28
28
  - !ruby/object:Gem::Dependency
29
29
  name: spree_core
30
30
  requirement: !ruby/object:Gem::Requirement
31
31
  requirements:
32
32
  - - '='
33
33
  - !ruby/object:Gem::Version
34
- version: 4.2.1
34
+ version: 4.2.5
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - '='
40
40
  - !ruby/object:Gem::Version
41
- version: 4.2.1
41
+ version: 4.2.5
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: bootstrap
44
44
  requirement: !ruby/object:Gem::Requirement
45
45
  requirements:
46
- - - ">="
47
- - !ruby/object:Gem::Version
48
- version: 4.3.1
49
- - - "<"
46
+ - - "~>"
50
47
  - !ruby/object:Gem::Version
51
- version: 4.7.0
48
+ version: '4.0'
52
49
  type: :runtime
53
50
  prerelease: false
54
51
  version_requirements: !ruby/object:Gem::Requirement
55
52
  requirements:
56
- - - ">="
57
- - !ruby/object:Gem::Version
58
- version: 4.3.1
59
- - - "<"
53
+ - - "~>"
60
54
  - !ruby/object:Gem::Version
61
- version: 4.7.0
55
+ version: '4.0'
62
56
  - !ruby/object:Gem::Dependency
63
57
  name: glyphicons
64
58
  requirement: !ruby/object:Gem::Requirement
65
59
  requirements:
66
60
  - - "~>"
67
61
  - !ruby/object:Gem::Version
68
- version: 1.0.2
62
+ version: '1.0'
69
63
  type: :runtime
70
64
  prerelease: false
71
65
  version_requirements: !ruby/object:Gem::Requirement
72
66
  requirements:
73
67
  - - "~>"
74
68
  - !ruby/object:Gem::Version
75
- version: 1.0.2
69
+ version: '1.0'
76
70
  - !ruby/object:Gem::Dependency
77
71
  name: canonical-rails
78
72
  requirement: !ruby/object:Gem::Requirement
79
73
  requirements:
80
74
  - - "~>"
75
+ - !ruby/object:Gem::Version
76
+ version: '0.2'
77
+ - - ">="
81
78
  - !ruby/object:Gem::Version
82
79
  version: 0.2.10
83
80
  type: :runtime
@@ -85,6 +82,9 @@ dependencies:
85
82
  version_requirements: !ruby/object:Gem::Requirement
86
83
  requirements:
87
84
  - - "~>"
85
+ - !ruby/object:Gem::Version
86
+ version: '0.2'
87
+ - - ">="
88
88
  - !ruby/object:Gem::Version
89
89
  version: 0.2.10
90
90
  - !ruby/object:Gem::Dependency
@@ -121,14 +121,14 @@ dependencies:
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 5.2.0
124
+ version: '5.2'
125
125
  type: :runtime
126
126
  prerelease: false
127
127
  version_requirements: !ruby/object:Gem::Requirement
128
128
  requirements:
129
129
  - - "~>"
130
130
  - !ruby/object:Gem::Version
131
- version: 5.2.0
131
+ version: '5.2'
132
132
  - !ruby/object:Gem::Dependency
133
133
  name: capybara-accessible
134
134
  requirement: !ruby/object:Gem::Requirement
@@ -793,9 +793,9 @@ licenses:
793
793
  - BSD-3-Clause
794
794
  metadata:
795
795
  bug_tracker_uri: https://github.com/spree/spree/issues
796
- changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.1
796
+ changelog_uri: https://github.com/spree/spree/releases/tag/v4.2.5
797
797
  documentation_uri: https://guides.spreecommerce.org/
798
- source_code_uri: https://github.com/spree/spree/tree/v4.2.1
798
+ source_code_uri: https://github.com/spree/spree/tree/v4.2.5
799
799
  post_install_message:
800
800
  rdoc_options: []
801
801
  require_paths:
@@ -804,7 +804,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
804
804
  requirements:
805
805
  - - ">="
806
806
  - !ruby/object:Gem::Version
807
- version: 2.5.0
807
+ version: '2.5'
808
808
  required_rubygems_version: !ruby/object:Gem::Requirement
809
809
  requirements:
810
810
  - - ">="