spree_backend 2.3.6 → 2.3.7

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.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +1 -1
  3. data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +6 -4
  4. data/app/views/spree/admin/shared/_destroy.js.erb +1 -1
  5. data/config/initializers/assets.rb +1 -1
  6. metadata +11 -11
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: df36d531da24ca1defda104b52923fb96b4804b0
4
- data.tar.gz: 00c4dd891b7e114a3da61c40c3bd5f747a353424
3
+ metadata.gz: caaf7543b60d74ead675cef42b81048e73b11cf7
4
+ data.tar.gz: 1063e23473b9f679fa12125820147e3fff57192e
5
5
  SHA512:
6
- metadata.gz: b537d4be483d61dadf4dc833678dcede02348b966245f007913a2881d25bb373a71d4e4517eafce6a2b8967003aa354ba00043089d60fc17799af58500caa5f7
7
- data.tar.gz: 4e28028ed2302c2fd0edde3f6799ce37992b10ac1920fb9ed27754d5a5864b663f15e2edf35e9bbd01e11968b0a0397887c55f15a9e03cd5f538cd5c9d06dbd4
6
+ metadata.gz: 5d4f1bdb2177eb172b85885c56ffbf81791ec14bda2795c7486ef0d5eed2a84f3a913564428fd60fadc44ade44ff0c9d16a6d13e0f5ae0c55f72e890216a8795
7
+ data.tar.gz: 03d4aa6cdbf2e44ba57572662545cddfe70b51582c507b04adef7b2a26676bd3df702b2cba302b580f1acf777da11b92d9fbdfc923c5fce04c5819bb841f498a
data/app/views/spree/admin/orders/_shipment_manifest.html.erb CHANGED
@@ -23,7 +23,7 @@
23
23
  <td class="item-total align-center"><%= line_item_shipment_price(item.line_item, item.quantity) %></td>
24
24
  <% unless shipment.shipped? %>
25
25
  <td class="cart-item-delete actions" data-hook="cart_item_delete">
26
- <% if can? :update, item %>
26
+ <% if can?(:update, item.line_item) %>
27
27
  <%= link_to '', '#', :class => 'save-item fa fa-ok no-text with-tip', :data => {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, :action => 'save'}, :title => Spree.t('actions.save'), :style => 'display: none' %>
28
28
  <%= link_to '', '#', :class => 'cancel-item fa fa-cancel no-text with-tip', :data => {:action => 'cancel'}, :title => Spree.t('actions.cancel'), :style => 'display: none' %>
29
29
  <%= link_to '', '#', :class => 'edit-item fa fa-edit no-text with-tip', :data => {:action => 'edit'}, :title => Spree.t('edit') %>
data/app/views/spree/admin/product_properties/_product_property_fields.html.erb CHANGED
@@ -1,17 +1,19 @@
1
1
  <tr class="product_property fields" id="spree_<%= dom_id(f.object) %>" data-hook="product_property">
2
2
  <td class="no-border">
3
- <span class="handle"></span>
4
- <%= f.hidden_field :id %>
3
+ <% if f.object.persisted? %>
4
+ <span class="handle"></span>
5
+ <%= f.hidden_field :id %>
6
+ <% end %>
5
7
  </td>
6
8
  <td class='property_name'>
7
- <%= f.text_field :property_name, :class => 'autocomplete' %>
9
+ <%= f.text_field :property_name, class: 'autocomplete' %>
8
10
  </td>
9
11
  <td class='value'>
10
12
  <%= f.text_field :value %>
11
13
  </td>
12
14
  <td class="actions">
13
15
  <% if f.object.persisted? %>
14
- <%= link_to_delete f.object, :no_text => true %>
16
+ <%= link_to_delete f.object, no_text: true %>
15
17
  <% end %>
16
18
  </td>
17
19
  </tr>
data/app/views/spree/admin/shared/_destroy.js.erb CHANGED
@@ -1,6 +1,6 @@
1
1
  <% success = flash.discard(:success)
2
2
  if success %>
3
- show_flash('success', "<%= success %>")
3
+ show_flash('success', "<%= j success %>")
4
4
  <% end %>
5
5
 
6
6
  <%= render :partial => '/spree/admin/shared/update_order_state' if @order %>
data/config/initializers/assets.rb CHANGED
@@ -1 +1 @@
1
- Rails.application.config.assets.precompile += %w( jquery-ui/* )
1
+ Rails.application.config.assets.precompile += %w( jquery-ui/* logo/spree_50.png )
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: 2.3.6
4
+ version: 2.3.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-12-05 00:00:00.000000000 Z
11
+ date: 2015-02-23 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: 2.3.6
19
+ version: 2.3.7
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: 2.3.6
26
+ version: 2.3.7
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: 2.3.6
33
+ version: 2.3.7
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: 2.3.6
40
+ version: 2.3.7
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jquery-rails
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -70,16 +70,16 @@ dependencies:
70
70
  name: select2-rails
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - "~>"
73
+ - - '='
74
74
  - !ruby/object:Gem::Version
75
- version: 3.5.0
75
+ version: 3.5.9.1
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - "~>"
80
+ - - '='
81
81
  - !ruby/object:Gem::Version
82
- version: 3.5.0
82
+ version: 3.5.9.1
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: email_spec
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -527,7 +527,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
527
527
  requirements:
528
528
  - none
529
529
  rubyforge_project: spree_backend
530
- rubygems_version: 2.2.2
530
+ rubygems_version: 2.4.5
531
531
  signing_key:
532
532
  specification_version: 4
533
533
  summary: backend e-commerce functionality for the Spree project.