spree_admin 5.1.6 → 5.1.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.
- checksums.yaml +4 -4
- data/app/controllers/spree/admin/orders/return_authorizations_controller.rb +7 -0
- data/app/helpers/spree/admin/base_helper.rb +1 -1
- data/app/views/spree/admin/pages/_page.html.erb +1 -1
- data/app/views/spree/admin/shared/sidebar/_returns_nav.html.erb +1 -1
- data/app/views/spree/admin/stores/form/_basic.html.erb +1 -1
- data/app/views/spree/admin/stores/new.html.erb +1 -1
- data/lib/spree/admin.rb +0 -1
- metadata +8 -22
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 1b5fef55ebb0f54365b38f656dd7dcd5d9add0dc89198f524945c539d8c9febd
|
4
|
+
data.tar.gz: d092feb207665dc4682dda6fa130f5d7981cb946f818ea9306c66b46db368b56
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 69996445df30c272c3093ffafcc7987ff3fb334b9ba4e06e729c4916b02435aa107b39e4da64fe7ab703a424526964b31dc936a1111fac1f904b19a7c2b98d97
|
7
|
+
data.tar.gz: e25035318a0cba4e0ae9e305722a879cb59a2518d60b0ede374ab872694ca3c30e61196b1c31a3e21d96d964c982d3e599f854ee7d9c667c39be2cae1af309e0
|
@@ -3,8 +3,10 @@ module Spree
|
|
3
3
|
module Orders
|
4
4
|
class ReturnAuthorizationsController < ResourceController
|
5
5
|
include Spree::Admin::OrderConcern
|
6
|
+
include Spree::Admin::OrderBreadcrumbConcern
|
6
7
|
|
7
8
|
before_action :load_order
|
9
|
+
before_action :add_breadcrumb_for_order
|
8
10
|
|
9
11
|
before_action :load_return_authorization
|
10
12
|
before_action :load_form_data, only: [:new, :edit]
|
@@ -14,6 +16,11 @@ module Spree
|
|
14
16
|
|
15
17
|
private
|
16
18
|
|
19
|
+
|
20
|
+
def add_breadcrumb_for_order
|
21
|
+
add_breadcrumb @order.number, spree.edit_admin_order_path(@order)
|
22
|
+
end
|
23
|
+
|
17
24
|
def location_after_save
|
18
25
|
spree.edit_admin_order_path(@order)
|
19
26
|
end
|
@@ -222,7 +222,7 @@ module Spree
|
|
222
222
|
case key
|
223
223
|
when :currency
|
224
224
|
content_tag(:div, form.label("preferred_#{key}", Spree.t(key, scope: i18n_scope)) +
|
225
|
-
form.
|
225
|
+
form.select("preferred_#{key}", current_store.supported_currencies.split(','), {}, { data: { controller: 'autocomplete-select' }, disabled: current_store.supported_currencies.split(',').count == 1 }),
|
226
226
|
class: 'form-group', id: [object.class.to_s.parameterize, 'preference', key].join('-'))
|
227
227
|
else
|
228
228
|
if object.preference_type(key).to_sym == :boolean
|
@@ -15,7 +15,7 @@
|
|
15
15
|
</button>
|
16
16
|
<ul class="dropdown-menu">
|
17
17
|
<li>
|
18
|
-
<%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_theme_path(current_store.default_theme, page_id: page.id), class: 'dropdown-item' %>
|
18
|
+
<%= link_to_with_icon 'edit', Spree.t(:edit), spree.edit_admin_theme_path(current_store.default_theme, page_id: page.id), class: 'dropdown-item', data: { turbo_frame: '_top' } %>
|
19
19
|
</li>
|
20
20
|
<li>
|
21
21
|
<%= link_to_delete(page, class: 'dropdown-item btn-danger', icon: 'trash') %>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<% returns_active = %[customer_returns return_authorizations].include?(controller_name) %>
|
1
|
+
<% returns_active = %[customer_returns return_authorizations].include?(controller_name) && !@order %>
|
2
2
|
|
3
3
|
<% if can?(:manage, Spree::CustomerReturn) || can?(:manage, Spree::ReturnAuthorization) %>
|
4
4
|
<%= nav_item(Spree.t(:returns), spree.admin_customer_returns_path, icon: 'receipt-refund', active: returns_active) %>
|
@@ -91,7 +91,7 @@
|
|
91
91
|
</p>
|
92
92
|
<div class="form-group">
|
93
93
|
<%= f.label :default_currency, Spree.t(:default_currency) %>
|
94
|
-
<%= f.
|
94
|
+
<%= f.select :default_currency, currency_options(@store.default_currency), {}, { data: { controller: 'autocomplete-select' } } %>
|
95
95
|
<%= f.error_message_on :default_currency %>
|
96
96
|
</div>
|
97
97
|
<div class="form-group">
|
@@ -32,7 +32,7 @@
|
|
32
32
|
|
33
33
|
<div class="form-group">
|
34
34
|
<%= f.label :default_currency, Spree.t(:currency) %>
|
35
|
-
<%= f.
|
35
|
+
<%= f.select :default_currency, currency_options, {}, { data: { controller: 'autocomplete-select', enable_button_target: 'input', store_form_target: 'currency' } } %>
|
36
36
|
</div>
|
37
37
|
|
38
38
|
<% if available_stores.any? %>
|
data/lib/spree/admin.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_admin
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.1.
|
4
|
+
version: 5.1.7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Vendo Connect Inc.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2025-09-
|
11
|
+
date: 2025-09-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: 5.1.
|
19
|
+
version: 5.1.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: 5.1.
|
26
|
+
version: 5.1.7
|
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: 5.1.
|
33
|
+
version: 5.1.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: 5.1.
|
40
|
+
version: 5.1.7
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: active_link_to
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -100,20 +100,6 @@ dependencies:
|
|
100
100
|
- - "~>"
|
101
101
|
- !ruby/object:Gem::Version
|
102
102
|
version: '5.0'
|
103
|
-
- !ruby/object:Gem::Dependency
|
104
|
-
name: currency_select
|
105
|
-
requirement: !ruby/object:Gem::Requirement
|
106
|
-
requirements:
|
107
|
-
- - ">="
|
108
|
-
- !ruby/object:Gem::Version
|
109
|
-
version: '0'
|
110
|
-
type: :runtime
|
111
|
-
prerelease: false
|
112
|
-
version_requirements: !ruby/object:Gem::Requirement
|
113
|
-
requirements:
|
114
|
-
- - ">="
|
115
|
-
- !ruby/object:Gem::Version
|
116
|
-
version: '0'
|
117
103
|
- !ruby/object:Gem::Dependency
|
118
104
|
name: dartsass-rails
|
119
105
|
requirement: !ruby/object:Gem::Requirement
|
@@ -1141,9 +1127,9 @@ licenses:
|
|
1141
1127
|
- AGPL-3.0-or-later
|
1142
1128
|
metadata:
|
1143
1129
|
bug_tracker_uri: https://github.com/spree/spree/issues
|
1144
|
-
changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.
|
1130
|
+
changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.7
|
1145
1131
|
documentation_uri: https://docs.spreecommerce.org/
|
1146
|
-
source_code_uri: https://github.com/spree/spree/tree/v5.1.
|
1132
|
+
source_code_uri: https://github.com/spree/spree/tree/v5.1.7
|
1147
1133
|
post_install_message:
|
1148
1134
|
rdoc_options: []
|
1149
1135
|
require_paths:
|