spree_backend 2.0.0.rc1 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +8 -8
  2. data/app/views/spree/admin/payments/_list.html.erb +1 -1
  3. data/app/views/spree/admin/taxons/_form.html.erb +9 -8
  4. data/app/views/spree/admin/variants/_autocomplete.js.erb +15 -12
  5. metadata +12 -12
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- N2VjN2U3ODQ4ODdmOTM2ZjFlMTNlNTJlZDQxZGQwZjZlZTAwNzZjNw==
4
+ ODRlNDA4YmNiMDU0OGZiMDNlNzc5ZTBkZDdkNjk4ZWIwODQ3MDYyMg==
5
5
  data.tar.gz: !binary |-
6
- NTg0ZmRmZGRjOGVjNDA5MWQ2NzFlZDkzMTdlZmU5MDlmNzEyYWRjYg==
6
+ N2MwNDE2ZjQ4ZmZjZDhkYjg0MTFmMDEzM2NkMzA1MmYzYTUzZTQ3ZQ==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- MmI0NTZjYjM0YWJiYmZhMGRmNzM1NTNkZGYxNTQ0OTcyZGFkZWIzZDRiMTFm
10
- OWM1YTZiZGFiYWFmYTAxYzBhNzRmNjdmMzYxZGYxN2I1NDBkNzAyOGY0MTI5
11
- YmFmMTdiYWM1MWNkZjcwNDg4MmY2NDk2Y2Q0OTQ0NmU1ZjAwZDM=
9
+ OTg2YWYxNzVhMTgwYTM3ZjU0MjJmMzUyODFlZjczYjYwY2QwY2NhZTcxOTA1
10
+ OTdmMjdiMmNhNDgyODM1ZDZlYjI4NmM0ODNjMjc3ZWZkOTU4NzRhNDkyZDQy
11
+ YzgzOWEyMmY5OTU0OGVkY2Q3YWRkNzgwNTIwOGQ5NjY0M2ZkMWY=
12
12
  data.tar.gz: !binary |-
13
- NDdkZDA0YWFlZGViMTU5YzRjMTA4YzIwMjcyODg1YzM2NjhlYzY5Y2ZmNTA3
14
- ZGNhOTc0M2EwYmMxY2ZlNmFlOGQ0MGNjNzVhZTM0NTc2NmRlMGZmODFhNjNj
15
- ODUxN2Y1YTE5YzFkMzRjMzA1MDhiMTMyZjc2M2ZkM2JkZTllOGU=
13
+ NjAzMjZlOWIxNjhkNjkwZWI4ZjU1ZDMxYmMzYzQxYjhjZDk0NDc2NTBjY2I5
14
+ N2VhODg3ZTk3ZjFiMWZhNDU5MDY3OTBlMzdlM2VkNmUwOWZhNWZlMWQzNWUy
15
+ NzRhNTEwZjM0MzNjOThjZDBiZTY1ZGU3Y2VlNjlmMTljMWQ1ZDI=
data/app/views/spree/admin/payments/_list.html.erb CHANGED
@@ -2,7 +2,7 @@
2
2
  <thead>
3
3
  <tr data-hook="payments_header">
4
4
  <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
5
- <th><%= Spree.t(:amount, :scope => 'activerecord.attributes.spree/payment') %></th>
5
+ <th><%= Spree.t(:amount) %></th>
6
6
  <th><%= Spree.t(:payment_method) %></th>
7
7
  <th><%= Spree.t(:payment_state) %></th>
8
8
  <th class="actions"></th>
data/app/views/spree/admin/taxons/_form.html.erb CHANGED
@@ -16,7 +16,16 @@
16
16
  <%= f.label :icon, Spree.t(:icon) %><br />
17
17
  <%= f.file_field :icon %>
18
18
  <% end %>
19
+ </div>
20
+
21
+ <div class="omega seven columns">
22
+ <%= f.field_container :description do %>
23
+ <%= f.label :description, Spree.t(:description) %><br />
24
+ <%= f.text_area :description, :class => 'fullwidth', :rows => 6 %>
25
+ <% end %>
26
+ </div>
19
27
 
28
+ <div class="twelve columns alpha omega">
20
29
  <%= f.field_container :meta_title do %>
21
30
  <%= f.label :meta_title, Spree.t(:meta_title) %><br />
22
31
  <%= f.text_field :meta_title, :class => 'fullwidth', :rows => 6 %>
@@ -31,14 +40,6 @@
31
40
  <%= f.label :meta_keywords, Spree.t(:meta_keywords) %><br />
32
41
  <%= f.text_field :meta_keywords, :class => 'fullwidth', :rows => 6 %>
33
42
  <% end %>
34
-
35
- </div>
36
-
37
- <div class="omega seven columns">
38
- <%= f.field_container :description do %>
39
- <%= f.label :description, Spree.t(:description) %><br />
40
- <%= f.text_area :description, :class => 'fullwidth', :rows => 6 %>
41
- <% end %>
42
43
  </div>
43
44
 
44
45
  </div>
data/app/views/spree/admin/variants/_autocomplete.js.erb CHANGED
@@ -48,18 +48,21 @@
48
48
  {{#each variant.stock_items}}
49
49
  <tr>
50
50
  <td>{{this.stock_location_name}}</td>
51
- <td>
52
- {{this.count_on_hand}}
53
- {{#if this.backorderable}}
54
- (backorders allowed)
55
- {{/if}}
56
- </td>
57
- <td>
58
- <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
59
- </td>
60
- <td class="actions">
61
- <button class="add_variant no-text icon-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="Add" data-action="add"></button>
62
- </td>
51
+ {{#if this.available}}
52
+ <td>
53
+ {{this.count_on_hand}}
54
+ {{#if this.backorderable}} (backorders allowed) {{/if}}
55
+ </td>
56
+ <td>
57
+ <input class="quantity" id="stock_item_quantity" data-stock-location-id="{{this.stock_location_id}}" type="number" min="1" value="1">
58
+ </td>
59
+ <td class="actions">
60
+ <button class="add_variant no-text icon-plus icon_link with-tip" data-stock-location-id="{{this.stock_location_id}}" title="Add" data-action="add"></button>
61
+ </td>
62
+ {{else}}
63
+ <td><%= Spree.t(:out_of_stock) %></td>
64
+ <td>0</td>
65
+ {{/if}}
63
66
  </tr>
64
67
  {{/each}}
65
68
  </tbody>
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.0.0.rc1
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-05-13 00:00:00.000000000 Z
11
+ date: 2013-05-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: spree_core
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 2.0.0.rc1
19
+ version: 2.0.0
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.0.0.rc1
26
+ version: 2.0.0
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: spree_api
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 2.0.0.rc1
33
+ version: 2.0.0
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.0.0.rc1
40
+ version: 2.0.0
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jquery-rails
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
56
56
  name: select2-rails
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - '='
60
60
  - !ruby/object:Gem::Version
61
- version: '3.2'
61
+ version: 3.2.1
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - '='
67
67
  - !ruby/object:Gem::Version
68
- version: '3.2'
68
+ version: 3.2.1
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rails
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -496,9 +496,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
496
496
  version: 1.9.3
497
497
  required_rubygems_version: !ruby/object:Gem::Requirement
498
498
  requirements:
499
- - - ! '>'
499
+ - - ! '>='
500
500
  - !ruby/object:Gem::Version
501
- version: 1.3.1
501
+ version: '0'
502
502
  requirements:
503
503
  - none
504
504
  rubyforge_project: spree_backend