spree_backend 3.7.0.rc1 → 3.7.0.rc2

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/views/spree/admin/shared/_account_nav.html.erb +9 -7
  3. data/app/views/spree/admin/shared/_order_tabs.html.erb +1 -1
  4. data/app/views/spree/admin/state_changes/index.html.erb +0 -1
  5. data/spree_backend.gemspec +1 -1
  6. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 20586007b7156b7717edaee7ca99c428fc7f1b5cbfded241b9a607440cc2e511
4
- data.tar.gz: ad2c2d66d03ca5b084be641af8cf1df7cc51c33c915038868fe804ea3a6b6760
3
+ metadata.gz: 3adbfc8e5429b591dbd0a4ffce1e007de4fa446aa4c034ede411d9355e4eaf3c
4
+ data.tar.gz: 491102ee01a9961eb61e7f9f5067cbf39906e0dd41757a7fd9a69c11a039f41b
5
5
  SHA512:
6
- metadata.gz: 7136bc70ffbb2f5d44299a06fe6e7be4fdc55fbb10e4b6f06abd2b9728629a918b68f94cfbb1985ac0dc6f3e1cbc7571f709629ef738c27a9b25462beb842194
7
- data.tar.gz: 5deb6bb8ea7249cf0248424cf26198b4ae98f372d9f2bf1c9fd689cd24359b61800ae351b0f694b05139e389b6fa16f7646ea674f06803373426a148189d630f
6
+ metadata.gz: 23918f8b411ae9d03d6f889b96fd3436d19f4cd35aae822dbcf16c0f915fa60c7b0b8597ed3603dbb9734c4ee232b78eb13f8585cb68d6b6f50c9206f2ef9843
7
+ data.tar.gz: b1de435114a71486eafd167dcaa7ff2fa55f39aaed17523a80c2804cce01c3a581ecd8c79edbcb37235da05672fafcee3a924813cb2f35d84d53348c04b8bf8e
data/app/views/spree/admin/shared/_account_nav.html.erb CHANGED
@@ -15,13 +15,15 @@
15
15
  <% end %>
16
16
  </li>
17
17
  <% end %>
18
- <li>
19
- <%= link_to spree.edit_admin_user_path(try_spree_current_user) do %>
20
- <i class="glyphicon glyphicon-user"></i>
21
- &nbsp;
22
- <%= Spree.t(:account) %>
23
- <% end %>
24
- </li>
18
+ <% if can?(:manage, try_spree_current_user) %>
19
+ <li>
20
+ <%= link_to spree.edit_admin_user_path(try_spree_current_user) do %>
21
+ <i class="glyphicon glyphicon-user"></i>
22
+ &nbsp;
23
+ <%= Spree.t(:account) %>
24
+ <% end %>
25
+ </li>
26
+ <% end %>
25
27
  <% if spree.respond_to? :admin_logout_path %>
26
28
  <li>
27
29
  <%= link_to spree.admin_logout_path do %>
data/app/views/spree/admin/shared/_order_tabs.html.erb CHANGED
@@ -11,7 +11,7 @@
11
11
  </li>
12
12
  <% end %>
13
13
 
14
- <% if ((can? :update, @order) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
14
+ <% if ((can?(:update, @order) && can?(:display, Spree::Store)) && (@order.shipments.size.zero? || @order.shipments.shipped.size.zero?)) %>
15
15
  <li<%== ' class="active"' if current == :store %> data-hook='admin_order_tabs_store_details'>
16
16
  <%= link_to_with_icon 'home', Spree.t(:store), store_admin_order_url(@order) %>
17
17
  </li>
data/app/views/spree/admin/state_changes/index.html.erb CHANGED
@@ -2,7 +2,6 @@
2
2
 
3
3
  <% content_for :page_title do %>
4
4
  / <%= plural_resource_name(Spree::StateChange) %>
5
- / <%= Spree::StateChange.human_attribute_name(:state_changes) %>
6
5
  <% end %>
7
6
 
8
7
  <% if @state_changes.any? %>
data/spree_backend.gemspec CHANGED
@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
8
8
  s.summary = 'backend e-commerce functionality for the Spree project.'
9
9
  s.description = 'Required dependency for Spree'
10
10
 
11
- s.required_ruby_version = '>= 2.3.0'
11
+ s.required_ruby_version = '>= 2.3.3'
12
12
 
13
13
  s.author = 'Sean Schofield'
14
14
  s.email = 'sean@spreecommerce.com'
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_backend
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.7.0.rc1
4
+ version: 3.7.0.rc2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-01-11 00:00:00.000000000 Z
11
+ date: 2019-01-22 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: 3.7.0.rc1
19
+ version: 3.7.0.rc2
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: 3.7.0.rc1
26
+ version: 3.7.0.rc2
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: 3.7.0.rc1
33
+ version: 3.7.0.rc2
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: 3.7.0.rc1
40
+ version: 3.7.0.rc2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bootstrap-sass
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -532,7 +532,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
532
532
  requirements:
533
533
  - - ">="
534
534
  - !ruby/object:Gem::Version
535
- version: 2.3.0
535
+ version: 2.3.3
536
536
  required_rubygems_version: !ruby/object:Gem::Requirement
537
537
  requirements:
538
538
  - - ">"
@@ -541,7 +541,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
541
541
  requirements:
542
542
  - none
543
543
  rubyforge_project:
544
- rubygems_version: 2.7.6
544
+ rubygems_version: 2.7.8
545
545
  signing_key:
546
546
  specification_version: 4
547
547
  summary: backend e-commerce functionality for the Spree project.