spree_backend 2.0.11 → 2.0.12

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 +4 -4
  2. data/app/views/spree/admin/products/_form.html.erb +82 -58
  3. data/app/views/spree/admin/products/new.html.erb +5 -5
  4. data/app/views/spree/admin/shared/_order_tabs.html.erb +2 -2
  5. metadata +7 -7
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ac38a1c8eb982af397a8ee7870733b7bfba622d9
4
- data.tar.gz: 3539ac302b1a4e238e64e07c658bb5201d078d62
3
+ metadata.gz: 17354e9cb87da19042cc2d206b7a899b0380d295
4
+ data.tar.gz: 4024557d17276e6a24ade2fe845e3fb0ff226ee2
5
5
  SHA512:
6
- metadata.gz: 0aa87b4dbe801f0f789d92b78cba799587016a7fd9560c20af848023a7b073cdf453f8944d36d9667484d039c358b98bdf1a49ccb9c69033280d3247e1b07f18
7
- data.tar.gz: fc7d0eb712de1855a734545c8c776b10e13f7edf1a184a2045337496e7ecc95f6c2f2e207444439ca67f7a258b26f5e3d95dfeeb7ce52e818b96fedadf2883e5
6
+ metadata.gz: 334e8777b5327a562e8a327e0f77b8e0ce3443e4b33edf1c1b87202ee48129c24395c3080c3d82b17f82d60191f2b5b5a515fafd2fa6967205a5572a46d425bb
7
+ data.tar.gz: b611abbcefdebe71c1335fe7598c6a12a5fb5170725208eee720222181e2c79b492df4af3af3eaa6d0428227063ef57659dd65de7d94d80ebae9e709cde62a5d
data/app/views/spree/admin/products/_form.html.erb CHANGED
@@ -1,40 +1,48 @@
1
1
  <div data-hook="admin_product_form_fields">
2
-
3
- <div class="left eight columns alpha" data-hook="admin_product_form_left">
4
- <%= f.field_container :name do %>
5
- <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
6
- <%= f.text_field :name, :class => 'fullwidth title' %>
7
- <%= f.error_message_on :name %>
8
- <% end %>
9
2
 
10
- <%= f.field_container :permalink do %>
11
- <%= f.label :permalink, raw(Spree.t(:permalink) + content_tag(:span, ' *', :class => "required")) %>
12
- <%= f.text_field :permalink, :class => 'fullwidth title' %>
13
- <%= f.error_message_on :permalink %>
14
- <% end %>
3
+ <div class="left eight columns alpha" data-hook="admin_product_form_left">
4
+ <div data-hook="admin_product_form_name">
5
+ <%= f.field_container :name do %>
6
+ <%= f.label :name, raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
7
+ <%= f.text_field :name, :class => 'fullwidth title' %>
8
+ <%= f.error_message_on :name %>
9
+ <% end %>
10
+ </div>
15
11
 
16
- <%= f.field_container :description do %>
17
- <%= f.label :description, Spree.t(:description) %>
18
- <%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '20' else '13' end}", :class => 'fullwidth'} %>
19
- <%= f.error_message_on :description %>
20
- <% end %>
12
+ <div data-hook="admin_product_form_permalink">
13
+ <%= f.field_container :permalink do %>
14
+ <%= f.label :permalink, raw(Spree.t(:permalink) + content_tag(:span, ' *', :class => "required")) %>
15
+ <%= f.text_field :permalink, :class => 'fullwidth title' %>
16
+ <%= f.error_message_on :permalink %>
17
+ <% end %>
18
+ </div>
19
+
20
+ <div data-hook="admin_product_form_description">
21
+ <%= f.field_container :description do %>
22
+ <%= f.label :description, Spree.t(:description) %>
23
+ <%= f.text_area :description, {:rows => "#{unless @product.has_variants? then '20' else '13' end}", :class => 'fullwidth'} %>
24
+ <%= f.error_message_on :description %>
25
+ <% end %>
26
+ </div>
21
27
  </div>
22
28
 
23
29
  <div class="right four columns omega" data-hook="admin_product_form_right">
30
+ <div data-hook="admin_product_form_price">
24
31
  <%= f.field_container :price do %>
25
32
  <%= f.label :price, raw(Spree.t(:master_price) + content_tag(:span, ' *', :class => "required")) %>
26
33
  <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => '') %>
27
34
  <%= f.error_message_on :price %>
28
35
  <% end %>
36
+ </div>
29
37
 
30
- <div class="alpha two columns">
38
+ <div data-hook="admin_product_form_cost_price" class="alpha two columns">
31
39
  <%= f.field_container :cost_price do %>
32
40
  <%= f.label :cost_price, Spree.t(:cost_price) %>
33
41
  <%= f.text_field :cost_price, :value => number_to_currency(@product.cost_price, :unit => '') %>
34
42
  <%= f.error_message_on :cost_price %>
35
43
  <% end %>
36
44
  </div>
37
- <div class="omega two columns">
45
+ <div data-hook="admin_product_form_cost_currency" class="omega two columns">
38
46
  <%= f.field_container :cost_currency do %>
39
47
  <%= f.label :cost_currency, Spree.t(:cost_currency) %>
40
48
  <%= f.text_field :cost_currency %>
@@ -44,73 +52,89 @@
44
52
 
45
53
  <div class="clear"></div>
46
54
 
47
- <%= f.field_container :available_on do %>
48
- <%= f.label :available_on, Spree.t(:available_on) %>
49
- <%= f.error_message_on :available_on %>
50
- <%= f.text_field :available_on, :value => datepicker_field_value(@product.available_on), :class => 'datepicker' %>
51
- <% end %>
55
+ <div data-hook="admin_product_form_available_on">
56
+ <%= f.field_container :available_on do %>
57
+ <%= f.label :available_on, Spree.t(:available_on) %>
58
+ <%= f.error_message_on :available_on %>
59
+ <%= f.text_field :available_on, :value => datepicker_field_value(@product.available_on), :class => 'datepicker' %>
60
+ <% end %>
61
+ </div>
52
62
 
53
63
  <% unless @product.has_variants? %>
54
- <%= f.field_container :sku do %>
55
- <%= f.label :sku, Spree.t(:sku) %>
56
- <%= f.text_field :sku, :size => 16 %>
57
- <% end %>
64
+ <div data-hook="admin_product_form_sku">
65
+ <%= f.field_container :sku do %>
66
+ <%= f.label :sku, Spree.t(:sku) %>
67
+ <%= f.text_field :sku, :size => 16 %>
68
+ <% end %>
69
+ </div>
58
70
 
59
71
  <ul id="shipping_specs">
60
- <li id="shipping_specs_weight_field" class="field alpha two columns">
72
+ <li id="shipping_specs_weight_field" data-hook="admin_product_form_weight" class="field alpha two columns">
61
73
  <%= f.label :weight, Spree.t(:weight) %>
62
74
  <%= f.text_field :weight, :size => 4 %>
63
75
  </li>
64
- <li id="shipping_specs_height_field" class="field omega two columns">
76
+ <li id="shipping_specs_height_field" data-hook="admin_product_form_height" class="field omega two columns">
65
77
  <%= f.label :height, Spree.t(:height) %>
66
78
  <%= f.text_field :height, :size => 4 %>
67
79
  </li>
68
- <li id="shipping_specs_width_field" class="field alpha two columns">
80
+ <li id="shipping_specs_width_field" data-hook="admin_product_form_width" class="field alpha two columns">
69
81
  <%= f.label :width, Spree.t(:width) %>
70
82
  <%= f.text_field :width, :size => 4 %>
71
83
  </li>
72
- <li id="shipping_specs_depth_field" class="field omega two columns">
84
+ <li id="shipping_specs_depth_field" data-hook="admin_product_form_depth" class="field omega two columns">
73
85
  <%= f.label :depth, Spree.t(:depth) %>
74
86
  <%= f.text_field :depth, :size => 4 %>
75
87
  </li>
76
88
  </ul>
77
89
  <% end %>
78
90
 
79
- <%= f.field_container :shipping_categories do %>
80
- <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %>
81
- <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
82
- <%= f.error_message_on :shipping_category %>
83
- <% end %>
91
+ <div data-hook="admin_product_form_shipping_categories">
92
+ <%= f.field_container :shipping_categories do %>
93
+ <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %>
94
+ <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
95
+ <%= f.error_message_on :shipping_category %>
96
+ <% end %>
97
+ </div>
84
98
 
85
- <%= f.field_container :tax_category do %>
86
- <%= f.label :tax_category_id, Spree.t(:tax_category) %>
87
- <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
88
- <%= f.error_message_on :tax_category %>
89
- <% end %>
99
+ <div data-hook="admin_product_form_tax_category">
100
+ <%= f.field_container :tax_category do %>
101
+ <%= f.label :tax_category_id, Spree.t(:tax_category) %>
102
+ <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2' }) %>
103
+ <%= f.error_message_on :tax_category %>
104
+ <% end %>
105
+ </div>
90
106
  </div>
91
107
 
92
108
  <div class="twelve columns alpha omega">
93
- <%= f.field_container :taxons do %>
94
- <%= f.label :taxon_ids, Spree.t(:taxons) %><br />
95
- <%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
96
- <% end %>
109
+ <div data-hook="admin_product_form_taxons">
110
+ <%= f.field_container :taxons do %>
111
+ <%= f.label :taxon_ids, Spree.t(:taxons) %><br />
112
+ <%= f.hidden_field :taxon_ids, :value => @product.taxon_ids.join(',') %>
113
+ <% end %>
114
+ </div>
97
115
 
98
- <%= f.field_container :option_types do %>
99
- <%= f.label :option_type_ids, Spree.t(:option_types) %>
100
- <%= f.hidden_field :option_type_ids, :value => @product.option_type_ids.join(',') %>
101
- <% end %>
116
+ <div data-hook="admin_product_form_option_types">
117
+ <%= f.field_container :option_types do %>
118
+ <%= f.label :option_type_ids, Spree.t(:option_types) %>
119
+ <%= f.hidden_field :option_type_ids, :value => @product.option_type_ids.join(',') %>
120
+ <% end %>
121
+ </div>
102
122
  </div>
103
123
 
104
124
  <div data-hook="admin_product_form_meta" class="alpha omega twelve columns">
105
- <%= f.field_container :meta_keywords do %>
106
- <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
107
- <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
108
- <% end %>
125
+ <div data-hook="admin_product_form_meta_keywords">
126
+ <%= f.field_container :meta_keywords do %>
127
+ <%= f.label :meta_keywords, Spree.t(:meta_keywords) %>
128
+ <%= f.text_field :meta_keywords, :class => 'fullwidth' %>
129
+ <% end %>
130
+ </div>
109
131
 
110
- <%= f.field_container :meta_description do %>
111
- <%= f.label :meta_description, Spree.t(:meta_description) %>
112
- <%= f.text_field :meta_description, :class => 'fullwidth' %>
113
- <% end %>
132
+ <div data-hook="admin_product_form_meta_description">
133
+ <%= f.field_container :meta_description do %>
134
+ <%= f.label :meta_description, Spree.t(:meta_description) %>
135
+ <%= f.text_field :meta_description, :class => 'fullwidth' %>
136
+ <% end %>
137
+ </div>
114
138
  </div>
115
139
 
116
140
  <div class="clear"></div>
data/app/views/spree/admin/products/new.html.erb CHANGED
@@ -15,7 +15,7 @@
15
15
 
16
16
  <div data-hook="new_product_attrs" class="row">
17
17
  <% unless @product.has_variants? %>
18
- <div class="alpha four columns">
18
+ <div data-hook="new_product_sku" class="alpha four columns">
19
19
  <%= f.field_container :sku do %>
20
20
  <%= f.label :sku, Spree.t(:sku) %><br />
21
21
  <%= f.text_field :sku, :size => 16, :class => 'fullwidth' %>
@@ -24,14 +24,14 @@
24
24
  </div>
25
25
  <% end %>
26
26
 
27
- <div class="four columns">
27
+ <div data-hook="new_product_prototype" class="four columns">
28
28
  <%= f.field_container :prototype do %>
29
29
  <%= f.label :prototype_id, Spree.t(:prototype) %><br />
30
30
  <%= f.collection_select :prototype_id, Spree::Prototype.all, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth'} %>
31
31
  <% end %>
32
32
  </div>
33
33
 
34
- <div class="four columns">
34
+ <div data-hook="new_product_price" class="four columns">
35
35
  <%= f.field_container :price do %>
36
36
  <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span><br />
37
37
  <%= f.text_field :price, :value => number_to_currency(@product.price, :unit => ''), :class => 'fullwidth' %>
@@ -39,7 +39,7 @@
39
39
  <% end %>
40
40
  </div>
41
41
 
42
- <div class="omega four columns">
42
+ <div data-hook="new_product_available_on" class="omega four columns">
43
43
  <%= f.field_container :available_on do %>
44
44
  <%= f.label :available_on, Spree.t(:available_on) %>
45
45
  <%= f.error_message_on :available_on %>
@@ -50,7 +50,7 @@
50
50
  </div>
51
51
 
52
52
  <div class='row'>
53
- <div class="alpha four columns">
53
+ <div data-hook="new_product_shipping_category" class="alpha four columns">
54
54
  <%= f.field_container :shipping_category do %>
55
55
  <%= f.label :shipping_category_id, Spree.t(:shipping_categories) %><span class="required">*</span><br />
56
56
  <%= f.collection_select(:shipping_category_id, @shipping_categories, :id, :name, { :include_blank => Spree.t('match_choices.none') }, { :class => 'select2 fullwidth' }) %>
data/app/views/spree/admin/shared/_order_tabs.html.erb CHANGED
@@ -47,7 +47,7 @@
47
47
  <%= link_to_with_icon 'icon-edit', Spree.t(:order_details), edit_admin_order_url(@order) %>
48
48
  </li>
49
49
  <% end %>
50
- <% if can? :update, @order && checkout_steps.include?("address") %>
50
+ <% if can?(:update, @order) && checkout_steps.include?("address") %>
51
51
  <li<%== ' class="active"' if current == 'Customer Details' %>>
52
52
  <%= link_to_with_icon 'icon-user', Spree.t(:customer_details), admin_order_customer_url(@order) %>
53
53
  </li>
@@ -57,7 +57,7 @@
57
57
  <%= link_to_with_icon 'icon-cogs', Spree.t(:adjustments), admin_order_adjustments_url(@order) %>
58
58
  </li>
59
59
  <% end %>
60
- <% if can? :index, Spree::Payment && @payment_required %>
60
+ <% if can?(:index, Spree::Payment) && @order.payment_required? %>
61
61
  <li<%== ' class="active"' if current == 'Payments' %>>
62
62
  <%= link_to_with_icon 'icon-credit-card', Spree.t(:payments), admin_order_payments_url(@order) %>
63
63
  </li>
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.11
4
+ version: 2.0.12
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-05-15 00:00:00.000000000 Z
11
+ date: 2014-08-29 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.11
19
+ version: 2.0.12
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.11
26
+ version: 2.0.12
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.11
33
+ version: 2.0.12
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.11
40
+ version: 2.0.12
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: jquery-rails
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -498,7 +498,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
498
498
  requirements:
499
499
  - none
500
500
  rubyforge_project: spree_backend
501
- rubygems_version: 2.2.0
501
+ rubygems_version: 2.2.2
502
502
  signing_key:
503
503
  specification_version: 4
504
504
  summary: backend e-commerce functionality for the Spree project.