spree_admin 5.2.0.rc2 → 5.2.0.rc3
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/admin/components/_alerts.scss +1 -1
- data/app/assets/stylesheets/spree/admin/components/_buttons.scss +5 -4
- data/app/assets/stylesheets/spree/admin/components/_dialogs.scss +0 -1
- data/app/assets/stylesheets/spree/admin/components/_dropdowns.scss +4 -0
- data/app/assets/stylesheets/spree/admin/components/_main.scss +7 -7
- data/app/assets/stylesheets/spree/admin/components/_tables.scss +2 -2
- data/app/assets/stylesheets/spree/admin/components/_variants_form.scss +1 -2
- data/app/assets/stylesheets/spree/admin/global/_variables.scss +14 -12
- data/app/assets/stylesheets/spree/admin/shared/_base.scss +2 -2
- data/app/assets/stylesheets/spree/admin/shared/_forms.scss +5 -6
- data/app/controllers/spree/admin/admin_users_controller.rb +0 -2
- data/app/controllers/spree/admin/checkouts_controller.rb +1 -4
- data/app/controllers/spree/admin/coupon_codes_controller.rb +0 -14
- data/app/controllers/spree/admin/customer_returns_controller.rb +0 -13
- data/app/controllers/spree/admin/digital_assets_controller.rb +2 -2
- data/app/controllers/spree/admin/exports_controller.rb +2 -9
- data/app/controllers/spree/admin/gift_cards_controller.rb +7 -14
- data/app/controllers/spree/admin/invitations_controller.rb +0 -2
- data/app/controllers/spree/admin/oauth_applications_controller.rb +0 -10
- data/app/controllers/spree/admin/option_types_controller.rb +0 -10
- data/app/controllers/spree/admin/orders_controller.rb +1 -1
- data/app/controllers/spree/admin/pages_controller.rb +1 -1
- data/app/controllers/spree/admin/payment_methods_controller.rb +0 -10
- data/app/controllers/spree/admin/policies_controller.rb +4 -0
- data/app/controllers/spree/admin/posts_controller.rb +2 -10
- data/app/controllers/spree/admin/properties_controller.rb +0 -12
- data/app/controllers/spree/admin/resource_controller.rb +27 -17
- data/app/controllers/spree/admin/return_authorizations_controller.rb +0 -10
- data/app/controllers/spree/admin/shipping_methods_controller.rb +4 -0
- data/app/controllers/spree/admin/stock_items_controller.rb +8 -11
- data/app/controllers/spree/admin/stock_locations_controller.rb +1 -1
- data/app/controllers/spree/admin/stock_transfers_controller.rb +0 -10
- data/app/controllers/spree/admin/store_credits_controller.rb +35 -35
- data/app/controllers/spree/admin/taxonomies_controller.rb +0 -10
- data/app/controllers/spree/admin/themes_controller.rb +6 -2
- data/app/controllers/spree/admin/users_controller.rb +7 -17
- data/app/controllers/spree/admin/webhooks_subscribers_controller.rb +0 -10
- data/app/controllers/spree/admin/zones_controller.rb +0 -7
- data/app/helpers/spree/admin/dropdown_helper.rb +18 -16
- data/app/helpers/spree/admin/navigation_helper.rb +1 -1
- data/app/helpers/spree/admin/orders_filters_helper.rb +2 -0
- data/app/models/spree/admin/form_builder.rb +13 -12
- data/app/views/spree/admin/custom_domains/_custom_domains.html.erb +1 -1
- data/app/views/spree/admin/digital_assets/_table.html.erb +1 -1
- data/app/views/spree/admin/gift_cards/_filters.html.erb +2 -1
- data/app/views/spree/admin/integrations/index.html.erb +20 -8
- data/app/views/spree/admin/invitations/new.html.erb +2 -1
- data/app/views/spree/admin/metafield_definitions/_filters.html.erb +1 -1
- data/app/views/spree/admin/newsletter_subscribers/_filters.html.erb +1 -1
- data/app/views/spree/admin/newsletter_subscribers/_table_header.html.erb +2 -2
- data/app/views/spree/admin/oauth_applications/_table_header.html.erb +1 -1
- data/app/views/spree/admin/orders/_customer.html.erb +1 -1
- data/app/views/spree/admin/orders/_filters.html.erb +4 -5
- data/app/views/spree/admin/orders/_header.html.erb +0 -5
- data/app/views/spree/admin/orders/_list.html.erb +3 -3
- data/app/views/spree/admin/page_blocks/edit.html.erb +3 -3
- data/app/views/spree/admin/page_builder/_add_block.html.erb +1 -1
- data/app/views/spree/admin/page_builder/_header.html.erb +1 -1
- data/app/views/spree/admin/page_builder/_pages_dropdown.html.erb +2 -2
- data/app/views/spree/admin/page_builder/_sidebar_block.html.erb +1 -1
- data/app/views/spree/admin/page_builder/_sidebar_colors.html.erb +2 -2
- data/app/views/spree/admin/page_builder/_sidebar_fonts.html.erb +3 -3
- data/app/views/spree/admin/page_builder/_sidebar_section.html.erb +1 -1
- data/app/views/spree/admin/page_links/_list.html.erb +1 -1
- data/app/views/spree/admin/page_links/edit.html.erb +1 -1
- data/app/views/spree/admin/page_sections/edit.html.erb +3 -3
- data/app/views/spree/admin/page_sections/new.html.erb +1 -1
- data/app/views/spree/admin/pages/_table_header.html.erb +3 -3
- data/app/views/spree/admin/payment_methods/index.html.erb +5 -1
- data/app/views/spree/admin/policies/_filters.html.erb +1 -1
- data/app/views/spree/admin/products/_bulk_operations.html.erb +2 -2
- data/app/views/spree/admin/products/edit.html.erb +0 -2
- data/app/views/spree/admin/products/form/_status.html.erb +0 -3
- data/app/views/spree/admin/products/form/_variants.html.erb +1 -1
- data/app/views/spree/admin/promotions/_table_header.html.erb +1 -1
- data/app/views/spree/admin/promotions/form/_kind.html.erb +4 -4
- data/app/views/spree/admin/refund_reasons/_table_header.html.erb +1 -1
- data/app/views/spree/admin/reimbursement_types/_table_header.html.erb +1 -1
- data/app/views/spree/admin/return_authorization_reasons/_table_header.html.erb +1 -1
- data/app/views/spree/admin/roles/index.html.erb +1 -1
- data/app/views/spree/admin/shared/_calendar_range_picker.html.erb +2 -2
- data/app/views/spree/admin/shared/_content_header.html.erb +4 -1
- data/app/views/spree/admin/shared/_index_table.html.erb +5 -4
- data/app/views/spree/admin/shared/_index_table_options.html.erb +1 -1
- data/app/views/spree/admin/shared/_new_item_dropdown.html.erb +1 -1
- data/app/views/spree/admin/shared/_user_dropdown.html.erb +4 -3
- data/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb +1 -1
- data/app/views/spree/admin/shipping_categories/_table_header.html.erb +1 -1
- data/app/views/spree/admin/shipping_methods/_table_header.html.erb +1 -1
- data/app/views/spree/admin/stock_locations/_table_header.html.erb +2 -2
- data/app/views/spree/admin/store_credit_categories/index.html.erb +1 -1
- data/app/views/spree/admin/store_credits/_list.html.erb +3 -3
- data/app/views/spree/admin/stores/form/_checkout.html.erb +2 -2
- data/app/views/spree/admin/stores/form/_checkout_links.html.erb +1 -1
- data/app/views/spree/admin/tax_categories/_table_header.html.erb +2 -2
- data/app/views/spree/admin/tax_rates/_table_header.html.erb +2 -2
- data/app/views/spree/admin/taxonomies/_table_header.html.erb +1 -1
- data/app/views/spree/admin/users/_filters.html.erb +4 -5
- data/app/views/spree/admin/users/index.html.erb +1 -1
- data/config/locales/en.yml +2 -0
- data/lib/generators/spree/admin/scaffold/templates/views/_filters.html.erb.tt +1 -1
- data/lib/generators/spree/admin/scaffold/templates/views/_table_header.html.erb.tt +2 -2
- metadata +8 -8
|
@@ -6,8 +6,7 @@
|
|
|
6
6
|
date_from_input_name: "q[created_at_gt]",
|
|
7
7
|
date_to_input_name: "q[created_at_lt]",
|
|
8
8
|
date_from_value: params.dig(:q, :created_at_gt),
|
|
9
|
-
date_to_value: params.dig(:q, :created_at_lt)
|
|
10
|
-
dropdown_direction: "right" %>
|
|
9
|
+
date_to_value: params.dig(:q, :created_at_lt) %>
|
|
11
10
|
|
|
12
11
|
<%= render 'spree/admin/shared/filters_button' %>
|
|
13
12
|
</div>
|
|
@@ -23,7 +22,7 @@
|
|
|
23
22
|
<div class="form-group">
|
|
24
23
|
<%= f.label :addresses_country_name_eq, Spree.t(:location) %>
|
|
25
24
|
<%= tom_select_tag "q[addresses_country_name_eq]",
|
|
26
|
-
active_option: params
|
|
25
|
+
active_option: params.dig(:q, :addresses_country_name_eq),
|
|
27
26
|
options: Spree::Country.all.to_tom_select_json,
|
|
28
27
|
value_field: :name,
|
|
29
28
|
select_class: "w-100",
|
|
@@ -34,7 +33,7 @@
|
|
|
34
33
|
<div class="form-group">
|
|
35
34
|
<%= f.label :tags_name_in, Spree.t(:tags) %>
|
|
36
35
|
<%= tom_select_tag "q[tags_name_in]",
|
|
37
|
-
active_option: params
|
|
36
|
+
active_option: params.dig(:q, :tags_name_in),
|
|
38
37
|
options: user_tags_json_array,
|
|
39
38
|
multiple: true,
|
|
40
39
|
value_field: :name,
|
|
@@ -46,7 +45,7 @@
|
|
|
46
45
|
<div class="form-group">
|
|
47
46
|
<%= f.label :accepts_email_marketing_eq, Spree.t(:accepts_email_marketing) %>
|
|
48
47
|
<%= f.select :accepts_email_marketing_eq,
|
|
49
|
-
options_for_select([["Yes", true], ["No", false]], params
|
|
48
|
+
options_for_select([["Yes", true], ["No", false]], params.dig(:q, :accepts_email_marketing_eq)),
|
|
50
49
|
{ include_blank: true },
|
|
51
50
|
{ class: "custom-select", data: { filters_target: :input } } %>
|
|
52
51
|
</div>
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
</div>
|
|
64
64
|
<% end %>
|
|
65
65
|
</div>
|
|
66
|
-
<%= render "spree/admin/shared/index_table_options", collection: @collection
|
|
66
|
+
<%= render "spree/admin/shared/index_table_options", collection: @collection %>
|
|
67
67
|
<% else %>
|
|
68
68
|
<%= render "spree/admin/shared/no_resource_found" %>
|
|
69
69
|
<% end %>
|
data/config/locales/en.yml
CHANGED
|
@@ -67,6 +67,7 @@ en:
|
|
|
67
67
|
back_end: Only on admin panel
|
|
68
68
|
both: On both admin panel & storefront
|
|
69
69
|
front_end: Only on storefront
|
|
70
|
+
documentation: Documentation
|
|
70
71
|
edit_billing_address: Edit billing address
|
|
71
72
|
edit_contact_information: Edit contact information
|
|
72
73
|
edit_profile: Edit Profile
|
|
@@ -228,6 +229,7 @@ en:
|
|
|
228
229
|
shipment_transfer:
|
|
229
230
|
wrong_destination: Wrong destination
|
|
230
231
|
show_json: Show JSON
|
|
232
|
+
slack: Slack
|
|
231
233
|
stock_transfers:
|
|
232
234
|
add_products_tip: You need to select a destination location first
|
|
233
235
|
store_credit:
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
<%%= search_form_for [:admin,
|
|
1
|
+
<%%= search_form_for [:admin, @search], class: "filter-wrap", data: { controller: "filters dropdown" } do |f| %>
|
|
2
2
|
<div class="d-flex flex-column flex-lg-row gap-2">
|
|
3
3
|
<%%= render 'spree/admin/shared/filters_search_bar', param: :name_i_cont, label: Spree.t(:name) %>
|
|
4
4
|
<%%= render 'spree/admin/shared/filters_button' %>
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
<tr>
|
|
2
|
-
<th scope="col"><%%= sort_link
|
|
3
|
-
<th scope="col"><%%= sort_link
|
|
2
|
+
<th scope="col"><%%= sort_link @search, :name, Spree.t(:name) %></th>
|
|
3
|
+
<th scope="col"><%%= sort_link @search, :created_at, Spree.t(:created_at) %></th>
|
|
4
4
|
<th scope="col"></th>
|
|
5
5
|
</tr>
|
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.2.0.
|
|
4
|
+
version: 5.2.0.rc3
|
|
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-11-
|
|
11
|
+
date: 2025-11-18 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.2.0.
|
|
19
|
+
version: 5.2.0.rc3
|
|
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.2.0.
|
|
26
|
+
version: 5.2.0.rc3
|
|
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.2.0.
|
|
33
|
+
version: 5.2.0.rc3
|
|
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.2.0.
|
|
40
|
+
version: 5.2.0.rc3
|
|
41
41
|
- !ruby/object:Gem::Dependency
|
|
42
42
|
name: active_link_to
|
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -1267,9 +1267,9 @@ licenses:
|
|
|
1267
1267
|
- AGPL-3.0-or-later
|
|
1268
1268
|
metadata:
|
|
1269
1269
|
bug_tracker_uri: https://github.com/spree/spree/issues
|
|
1270
|
-
changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.0.
|
|
1270
|
+
changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.0.rc3
|
|
1271
1271
|
documentation_uri: https://docs.spreecommerce.org/
|
|
1272
|
-
source_code_uri: https://github.com/spree/spree/tree/v5.2.0.
|
|
1272
|
+
source_code_uri: https://github.com/spree/spree/tree/v5.2.0.rc3
|
|
1273
1273
|
post_install_message:
|
|
1274
1274
|
rdoc_options: []
|
|
1275
1275
|
require_paths:
|