spree_backend 3.3.0.rc3 → 3.3.0.rc4
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.
- checksums.yaml +4 -4
- data/app/assets/stylesheets/spree/backend/components/_labels.scss +1 -0
- data/app/views/spree/admin/orders/index.html.erb +2 -2
- data/app/views/spree/admin/refunds/new.html.erb +6 -4
- data/app/views/spree/admin/shared/_main_menu.html.erb +1 -1
- data/app/views/spree/admin/shared/_order_summary.html.erb +1 -1
- data/app/views/spree/admin/shared/_update_order_state.js.erb +1 -1
- data/app/views/spree/admin/state_changes/index.html.erb +2 -2
- data/app/views/spree/admin/users/items.html.erb +1 -1
- data/app/views/spree/admin/users/orders.html.erb +1 -1
- metadata +7 -8
- data/app/views/spree/admin/products/_properties_form.erb +0 -10
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: dcbed9a59ff4d3255bc7ac771d5f963acb1a417d
|
|
4
|
+
data.tar.gz: e4b9775933f2d19b397769f794771f4e8542b3bd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 72c24116400af9d9f34048037f636af28b93b9f25f5e0c81fae6b49867796d38774496d05174cdcf08fba27543804e80efc11fb952431e677502a38c3204591a
|
|
7
|
+
data.tar.gz: e87afe394986f218222f35b2629a42ee62abffa84a38ddeec6a07ca8121cba3d98353430c07bf507135c4c4ea2dd0bd02c9012deb02e786fde7c9e4111c75f3f
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
<div class="col-xs-12 col-md-4">
|
|
51
51
|
<div class="form-group">
|
|
52
52
|
<%= label_tag :q_state_eq, Spree.t(:status) %>
|
|
53
|
-
<%= f.select :state_eq, Spree::Order.state_machines[:state].states.map {|s| [Spree.t("
|
|
53
|
+
<%= f.select :state_eq, Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]}, {include_blank: true}, class: 'select2 js-filterable' %>
|
|
54
54
|
</div>
|
|
55
55
|
</div>
|
|
56
56
|
|
|
@@ -181,7 +181,7 @@
|
|
|
181
181
|
</span>
|
|
182
182
|
</td>
|
|
183
183
|
<td>
|
|
184
|
-
<span class="label label-<%= order.state.downcase %>"><%= Spree.t("
|
|
184
|
+
<span class="label label-<%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span>
|
|
185
185
|
<span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_state_eq" data-ransack-value="<%= order.state %>"></span>
|
|
186
186
|
</td>
|
|
187
187
|
<td>
|
|
@@ -18,14 +18,16 @@
|
|
|
18
18
|
<%= f.label :credit_allowed, Spree.t(:credit_allowed) %><br/>
|
|
19
19
|
<%= @refund.payment.credit_allowed %>
|
|
20
20
|
</div>
|
|
21
|
-
|
|
21
|
+
<%= f.field_container :amount, class: ['form-group'] do %>
|
|
22
22
|
<%= f.label :amount, Spree.t(:amount) %>
|
|
23
23
|
<%= f.text_field :amount, class: 'form-control' %>
|
|
24
|
-
|
|
25
|
-
|
|
24
|
+
<%= f.error_message_on :amount %>
|
|
25
|
+
<% end %>
|
|
26
|
+
<%= f.field_container :reason, class: ['form-group'] do %>
|
|
26
27
|
<%= f.label :refund_reason_id, Spree.t(:reason) %>
|
|
27
28
|
<%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2'}) %>
|
|
28
|
-
|
|
29
|
+
<%= f.error_message_on :reason %>
|
|
30
|
+
<% end %>
|
|
29
31
|
</div>
|
|
30
32
|
|
|
31
33
|
<div class="form-actions" data-hook="buttons">
|
|
@@ -40,7 +40,7 @@
|
|
|
40
40
|
</ul>
|
|
41
41
|
<% end %>
|
|
42
42
|
|
|
43
|
-
<% if can?
|
|
43
|
+
<% if can?(:admin, current_store) && Spree::Config[:admin_show_version] %>
|
|
44
44
|
<div class="spree-version hidden-xs hidden-sm">
|
|
45
45
|
<%= Spree.version %>
|
|
46
46
|
</div>
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
$('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j Spree.t(@order.state, scope: :
|
|
1
|
+
$('#order_tab_summary h5#order_status').html('<%= j Spree.t(:status) %>: <%= j Spree.t(@order.state, scope: :order_state) %>');
|
|
2
2
|
$('#order_tab_summary h5#order_total').html('<%= j Spree.t(:total) %>: <%= j @order.display_total.to_html %>');
|
|
3
3
|
|
|
4
4
|
<% if @order.completed? %>
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
<% @state_changes.each do |state_change| %>
|
|
22
22
|
<tr>
|
|
23
23
|
<td><%= Spree.t("state_machine_states.#{state_change.name}") %></td>
|
|
24
|
-
<td><%= state_change.previous_state ? Spree.t(state_change.previous_state, scope: "#{ state_change.name }
|
|
25
|
-
<td><%= Spree.t(state_change.next_state, scope: "#{ state_change.name}
|
|
24
|
+
<td><%= state_change.previous_state ? Spree.t(state_change.previous_state, scope: "#{ state_change.name }_state") : Spree.t(:previous_state_missing) %></td>
|
|
25
|
+
<td><%= Spree.t(state_change.next_state, scope: "#{ state_change.name }_state") %></td>
|
|
26
26
|
<td>
|
|
27
27
|
<% if state_change.user %>
|
|
28
28
|
<% user_login = state_change.user.try(:login) || state_change.user.try(:email) %>
|
|
@@ -39,7 +39,7 @@
|
|
|
39
39
|
<td class="item-quantity"><%= item.quantity %></td>
|
|
40
40
|
<td class="item-total"><%= item.money.to_html %></td>
|
|
41
41
|
<td class="order-state">
|
|
42
|
-
<div class="state <%= order.state.downcase %>"><%= Spree.t("
|
|
42
|
+
<div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
|
|
43
43
|
<% if order.payment_state %>
|
|
44
44
|
<div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
|
|
45
45
|
<% end %>
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
<td class="order-completed-at"><%= order_time(order.completed_at) if order.completed_at %></td>
|
|
27
27
|
<td class="order-number"><%= link_to order.number, edit_admin_order_path(order) %></td>
|
|
28
28
|
<td class="order-state">
|
|
29
|
-
<div class="state <%= order.state.downcase %>"><%= Spree.t("
|
|
29
|
+
<div class="state <%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></div>
|
|
30
30
|
<% if order.payment_state %>
|
|
31
31
|
<div class="state <%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></div>
|
|
32
32
|
<% end %>
|
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.3.0.
|
|
4
|
+
version: 3.3.0.rc4
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sean Schofield
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-08-
|
|
11
|
+
date: 2017-08-18 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.3.0.
|
|
19
|
+
version: 3.3.0.rc4
|
|
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.3.0.
|
|
26
|
+
version: 3.3.0.rc4
|
|
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.3.0.
|
|
33
|
+
version: 3.3.0.rc4
|
|
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.3.0.
|
|
40
|
+
version: 3.3.0.rc4
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: bootstrap-sass
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -304,7 +304,6 @@ files:
|
|
|
304
304
|
- app/views/spree/admin/products/_add_stock_form.html.erb
|
|
305
305
|
- app/views/spree/admin/products/_autocomplete.js.erb
|
|
306
306
|
- app/views/spree/admin/products/_form.html.erb
|
|
307
|
-
- app/views/spree/admin/products/_properties_form.erb
|
|
308
307
|
- app/views/spree/admin/products/edit.html.erb
|
|
309
308
|
- app/views/spree/admin/products/index.html.erb
|
|
310
309
|
- app/views/spree/admin/products/new.html.erb
|
|
@@ -536,7 +535,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
536
535
|
requirements:
|
|
537
536
|
- none
|
|
538
537
|
rubyforge_project:
|
|
539
|
-
rubygems_version: 2.6.
|
|
538
|
+
rubygems_version: 2.6.12
|
|
540
539
|
signing_key:
|
|
541
540
|
specification_version: 4
|
|
542
541
|
summary: backend e-commerce functionality for the Spree project.
|
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
<% content_for :page_title do %>
|
|
2
|
-
<%= Spree.t(:properties) %>
|
|
3
|
-
<% end %>
|
|
4
|
-
|
|
5
|
-
<% f.fields_for :product_properties do |properties_form| %>
|
|
6
|
-
<div data-hook="value">
|
|
7
|
-
<%= properties_form.label :value, properties_form.object.property.presentation %>
|
|
8
|
-
<%= properties_form.text_field :value, class: "form-control" %>
|
|
9
|
-
</div>
|
|
10
|
-
<% end %>
|