spree_admin 5.0.0.rc1 → 5.0.1
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/_bulk_panel.scss +11 -1
- data/app/assets/stylesheets/spree/admin/components/_cards.scss +3 -4
- data/app/assets/stylesheets/spree/admin/components/_dropdowns.scss +1 -1
- data/app/assets/stylesheets/spree/admin/components/_main.scss +22 -5
- data/app/assets/stylesheets/spree/admin/components/_modals.scss +1 -1
- data/app/assets/stylesheets/spree/admin/global/_variables.scss +8 -2
- data/app/assets/stylesheets/spree/admin/shared/_base.scss +12 -1
- data/app/controllers/spree/admin/dashboard_controller.rb +4 -1
- data/app/controllers/spree/admin/products_controller.rb +1 -8
- data/app/controllers/spree/admin/storefront_controller.rb +1 -1
- data/app/controllers/spree/admin/translations_controller.rb +1 -1
- data/app/helpers/spree/admin/base_helper.rb +69 -63
- data/app/helpers/spree/admin/bulk_operations_helper.rb +86 -0
- data/app/helpers/spree/admin/modal_helper.rb +29 -0
- data/app/helpers/spree/admin/navigation_helper.rb +89 -11
- data/app/helpers/spree/admin/orders_helper.rb +0 -19
- data/app/helpers/spree/admin/stores_helper.rb +8 -36
- data/app/helpers/spree/admin/webhooks_subscribers_helper.rb +1 -1
- data/app/javascript/spree/admin/controllers/variants_form_controller.js +10 -3
- data/app/views/active_storage/_upload_form.html.erb +4 -8
- data/app/views/layouts/spree/admin.html.erb +4 -0
- data/app/views/spree/admin/assets/edit.html.erb +3 -8
- data/app/views/spree/admin/coupon_codes/index.html.erb +4 -6
- data/app/views/spree/admin/custom_domains/_custom_domains.html.erb +1 -1
- data/app/views/spree/admin/custom_domains/index.html.erb +1 -1
- data/app/views/spree/admin/customer_returns/index.html.erb +4 -17
- data/app/views/spree/admin/dashboard/_setup_progress.html.erb +4 -2
- data/app/views/spree/admin/dashboard/_sidebar.html.erb +2 -0
- data/app/views/spree/admin/dashboard/_top_products.html.erb +34 -24
- data/app/views/spree/admin/dashboard/analytics.html.erb +3 -1
- data/app/views/spree/admin/dashboard/show.html.erb +4 -8
- data/app/views/spree/admin/digital_assets/_table.html.erb +1 -1
- data/app/views/spree/admin/digital_assets/edit.html.erb +3 -11
- data/app/views/spree/admin/digital_assets/new.html.erb +3 -11
- data/app/views/spree/admin/exports/index.html.erb +22 -24
- data/app/views/spree/admin/exports/new.html.erb +3 -9
- data/app/views/spree/admin/line_items/new.html.erb +2 -5
- data/app/views/spree/admin/oauth_applications/index.html.erb +57 -58
- data/app/views/spree/admin/option_types/_filter.html.erb +1 -1
- data/app/views/spree/admin/option_types/index.html.erb +7 -11
- data/app/views/spree/admin/orders/_customer_summary.html.erb +0 -2
- data/app/views/spree/admin/orders/_filters.html.erb +3 -8
- data/app/views/spree/admin/orders/_header.html.erb +2 -0
- data/app/views/spree/admin/orders/_list.html.erb +2 -4
- data/app/views/spree/admin/orders/_summary.html.erb +1 -1
- data/app/views/spree/admin/orders/billing_address/create.turbo_stream.erb +3 -6
- data/app/views/spree/admin/orders/billing_address/edit.html.erb +3 -6
- data/app/views/spree/admin/orders/billing_address/new.html.erb +3 -6
- data/app/views/spree/admin/orders/billing_address/update.turbo_stream.erb +3 -6
- data/app/views/spree/admin/orders/contact_information/edit.html.erb +3 -6
- data/app/views/spree/admin/orders/customer_returns/edit.html.erb +1 -10
- data/app/views/spree/admin/orders/edit.html.erb +3 -5
- data/app/views/spree/admin/orders/index.html.erb +1 -1
- data/app/views/spree/admin/orders/return_authorizations/_form.html.erb +1 -1
- data/app/views/spree/admin/orders/return_authorizations/show.html.erb +45 -43
- data/app/views/spree/admin/orders/shipping_address/create.turbo_stream.erb +3 -6
- data/app/views/spree/admin/orders/shipping_address/edit.html.erb +3 -6
- data/app/views/spree/admin/orders/shipping_address/new.html.erb +3 -6
- data/app/views/spree/admin/orders/shipping_address/update.turbo_stream.erb +3 -6
- data/app/views/spree/admin/pages/_filters.html.erb +1 -1
- data/app/views/spree/admin/pages/edit.html.erb +2 -5
- data/app/views/spree/admin/pages/index.html.erb +4 -4
- data/app/views/spree/admin/payment_methods/index.html.erb +10 -8
- data/app/views/spree/admin/post_categories/index.html.erb +4 -6
- data/app/views/spree/admin/posts/_filters.html.erb +2 -7
- data/app/views/spree/admin/posts/_post.html.erb +1 -11
- data/app/views/spree/admin/posts/index.html.erb +5 -9
- data/app/views/spree/admin/products/_bulk_operations.html.erb +59 -94
- data/app/views/spree/admin/products/_filters.html.erb +13 -8
- data/app/views/spree/admin/products/_form.html.erb +3 -3
- data/app/views/spree/admin/products/_list.html.erb +2 -10
- data/app/views/spree/admin/products/_product.html.erb +1 -4
- data/app/views/spree/admin/products/bulk_modal.html.erb +3 -8
- data/app/views/spree/admin/products/edit.html.erb +3 -0
- data/app/views/spree/admin/products/form/_variants.html.erb +1 -0
- data/app/views/spree/admin/products/index.html.erb +5 -5
- data/app/views/spree/admin/promotion_actions/new.html.erb +7 -12
- data/app/views/spree/admin/promotion_rules/new.html.erb +7 -12
- data/app/views/spree/admin/promotions/_filters.html.erb +27 -0
- data/app/views/spree/admin/promotions/index.html.erb +7 -35
- data/app/views/spree/admin/properties/index.html.erb +10 -9
- data/app/views/spree/admin/refund_reasons/index.html.erb +37 -35
- data/app/views/spree/admin/refunds/edit.html.erb +3 -8
- data/app/views/spree/admin/reimbursement_types/index.html.erb +42 -40
- data/app/views/spree/admin/reports/_report.html.erb +1 -1
- data/app/views/spree/admin/return_authorization_reasons/index.html.erb +41 -41
- data/app/views/spree/admin/return_authorizations/_filters.html.erb +1 -1
- data/app/views/spree/admin/return_authorizations/_list.html.erb +1 -10
- data/app/views/spree/admin/return_authorizations/index.html.erb +1 -1
- data/app/views/spree/admin/roles/_form.html.erb +1 -1
- data/app/views/spree/admin/roles/index.html.erb +26 -24
- data/app/views/spree/admin/shared/_bulk_modal.html.erb +6 -7
- data/app/views/spree/admin/shared/_developers_nav.html.erb +2 -2
- data/app/views/spree/admin/shared/_filter_submit.html.erb +6 -0
- data/app/views/spree/admin/shared/_head.html.erb +3 -1
- data/app/views/spree/admin/shared/_modal.html.erb +2 -8
- data/app/views/spree/admin/shared/_multi_product_picker.html.erb +2 -4
- data/app/views/spree/admin/shared/_no_resource_found.html.erb +1 -1
- data/app/views/spree/admin/shared/_posts_tabs.html.erb +2 -2
- data/app/views/spree/admin/shared/_product_image.html.erb +1 -10
- data/app/views/spree/admin/shared/_refunds.html.erb +1 -1
- data/app/views/spree/admin/shared/_returns_and_refunds_nav.html.erb +3 -3
- data/app/views/spree/admin/shared/_shipping_nav.html.erb +2 -2
- data/app/views/spree/admin/shared/_stock_nav.html.erb +2 -2
- data/app/views/spree/admin/shared/_tax_nav.html.erb +2 -2
- data/app/views/spree/admin/shared/_user.html.erb +2 -2
- data/app/views/spree/admin/shared/_user_dropdown.html.erb +2 -2
- data/app/views/spree/admin/shared/sidebar/_orders_nav.html.erb +19 -29
- data/app/views/spree/admin/shared/sidebar/_products_nav.html.erb +6 -25
- data/app/views/spree/admin/shared/sidebar/_returns_nav.html.erb +8 -15
- data/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb +36 -7
- data/app/views/spree/admin/shared/sidebar/_store_nav.html.erb +28 -52
- data/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb +19 -26
- data/app/views/spree/admin/shared/sortable_tree/_taxonomy.html.erb +3 -23
- data/app/views/spree/admin/shipping_categories/index.html.erb +28 -26
- data/app/views/spree/admin/shipping_methods/_actions.html.erb +1 -1
- data/app/views/spree/admin/shipping_methods/index.html.erb +23 -21
- data/app/views/spree/admin/stock_items/_filters.html.erb +2 -7
- data/app/views/spree/admin/stock_items/index.html.erb +5 -8
- data/app/views/spree/admin/stock_locations/_stock_location.html.erb +16 -13
- data/app/views/spree/admin/stock_locations/index.html.erb +24 -21
- data/app/views/spree/admin/stock_transfers/_filters.html.erb +1 -1
- data/app/views/spree/admin/stock_transfers/_new_variant_modal.html.erb +3 -5
- data/app/views/spree/admin/stock_transfers/index.html.erb +6 -6
- data/app/views/spree/admin/store_credit_categories/_form.html.erb +1 -1
- data/app/views/spree/admin/store_credit_categories/edit.html.erb +6 -4
- data/app/views/spree/admin/store_credit_categories/index.html.erb +28 -24
- data/app/views/spree/admin/store_credits/index.html.erb +2 -2
- data/app/views/spree/admin/storefront/edit.html.erb +7 -9
- data/app/views/spree/admin/stores/form/_basic.html.erb +2 -2
- data/app/views/spree/admin/stores/form/_policies.html.erb +1 -1
- data/app/views/spree/admin/stores/new.html.erb +8 -6
- data/app/views/spree/admin/tax_categories/index.html.erb +24 -22
- data/app/views/spree/admin/tax_rates/index.html.erb +26 -24
- data/app/views/spree/admin/taxonomies/index.html.erb +4 -4
- data/app/views/spree/admin/taxonomies/show.html.erb +2 -2
- data/app/views/spree/admin/themes/_theme_preview_image.html.erb +1 -10
- data/app/views/spree/admin/themes/index.html.erb +2 -2
- data/app/views/spree/admin/translations/_translations_unavailable.html.erb +6 -8
- data/app/views/spree/admin/users/_filters.html.erb +2 -7
- data/app/views/spree/admin/users/_tabs.html.erb +4 -4
- data/app/views/spree/admin/users/_user.html.erb +1 -4
- data/app/views/spree/admin/users/bulk_modal.html.erb +3 -8
- data/app/views/spree/admin/users/index.html.erb +25 -58
- data/app/views/spree/admin/variants/_variant.html.erb +8 -2
- data/app/views/spree/admin/variants/form/_media_asset.html.erb +1 -7
- data/app/views/spree/admin/variants/form/_pricing.html.erb +5 -4
- data/app/views/spree/admin/webhooks_subscribers/_form.html.erb +1 -1
- data/app/views/spree/admin/webhooks_subscribers/index.html.erb +25 -22
- data/app/views/spree/admin/webhooks_subscribers/show.html.erb +3 -3
- data/app/views/spree/admin/zones/index.html.erb +34 -32
- data/config/locales/en.yml +1 -46
- data/lib/spree/admin/engine.rb +50 -0
- metadata +13 -14
- data/app/views/spree/admin/orders/_extra_filters.html.erb +0 -0
- data/app/views/spree/admin/products/_empty_list.html.erb +0 -1
- data/app/views/spree/admin/products/form/_extra_filters.html.erb +0 -0
- data/app/views/spree/admin/products/form/_extra_form.html.erb +0 -0
- data/app/views/spree/admin/products/form/_extra_form_sidebar.erb +0 -0
- data/app/views/spree/admin/stores/form/_custom.html.erb +0 -0
@@ -1,20 +1,12 @@
|
|
1
1
|
<%= turbo_frame_tag :dialog_modal do %>
|
2
2
|
<%= form_for :digital_asset, url: spree.admin_product_digital_assets_path(@product) do |f| %>
|
3
3
|
<div class="modal-content">
|
4
|
-
|
5
|
-
<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_digital_asset) %></h5>
|
6
|
-
<button
|
7
|
-
type="button"
|
8
|
-
class="btn-close"
|
9
|
-
data-dismiss="modal"
|
10
|
-
aria-label="<%= Spree.t(:close) %>"
|
11
|
-
/>
|
12
|
-
</div>
|
4
|
+
<%= modal_header(Spree.t(:new_digital_asset)) %>
|
13
5
|
<div class="modal-body">
|
14
6
|
<%= render "spree/admin/digital_assets/form", f: f %>
|
15
7
|
</div>
|
16
|
-
<div class="modal-footer
|
17
|
-
|
8
|
+
<div class="modal-footer">
|
9
|
+
<%= modal_discard_button %>
|
18
10
|
<%= turbo_save_button_tag Spree.t("actions.save"), data: { turbo_frame: :_top } %>
|
19
11
|
</div>
|
20
12
|
</div>
|
@@ -1,30 +1,28 @@
|
|
1
1
|
<%= render 'spree/admin/shared/audit_nav' %>
|
2
2
|
|
3
|
-
|
4
|
-
|
5
|
-
<
|
6
|
-
<
|
7
|
-
<
|
8
|
-
<
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
3
|
+
<div class="card-lg">
|
4
|
+
<% if @collection.any? %>
|
5
|
+
<div class="table-responsive">
|
6
|
+
<table class="table">
|
7
|
+
<thead class="text-muted">
|
8
|
+
<tr>
|
9
|
+
<th><%= Spree.t(:number) %></th>
|
10
|
+
<th class="text-center"><%= Spree.t(:kind) %></th>
|
11
|
+
<th class="text-center"><%= Spree.t(:status) %></th>
|
12
|
+
<th><%= Spree.t(:user) %></th>
|
13
|
+
<th><%= Spree.t(:filename) %></th>
|
14
|
+
<th><%= Spree.t(:date) %></th>
|
15
|
+
<th><%= Spree.t(:size) %></th>
|
16
|
+
<th class="text-center"><%= Spree.t(:download) %></th>
|
17
|
+
</tr>
|
18
|
+
</thead>
|
18
19
|
<tbody>
|
19
|
-
<%= render partial: 'export', collection: @
|
20
|
+
<%= render partial: 'export', collection: @collection, cached: true %>
|
20
21
|
</tbody>
|
21
22
|
</table>
|
23
|
+
<%= render 'spree/admin/shared/index_table_options', collection: @collection %>
|
22
24
|
</div>
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
</div>
|
28
|
-
<% end %>
|
29
|
-
|
30
|
-
<%= render 'spree/admin/shared/index_table_options', collection: @imports, simple: true if @imports.present? %>
|
25
|
+
<% else %>
|
26
|
+
<%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
|
27
|
+
<% end %>
|
28
|
+
</div>
|
@@ -3,13 +3,7 @@
|
|
3
3
|
<%= f.hidden_field :type %>
|
4
4
|
<%= f.hidden_field :search_params %>
|
5
5
|
<div class="modal-content">
|
6
|
-
|
7
|
-
<h5 class="modal-title" id="exampleModalLabel">
|
8
|
-
<%= Spree.t(:export) %>
|
9
|
-
<%= plural_resource_name(@export.model_class) %>
|
10
|
-
</h5>
|
11
|
-
<button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
|
12
|
-
</div>
|
6
|
+
<%= modal_header(Spree.t(:export) + ' ' + plural_resource_name(@export.model_class)) %>
|
13
7
|
<div class="modal-body">
|
14
8
|
<%= render 'spree/admin/shared/error_messages', target: @export %>
|
15
9
|
<div class="custom-control custom-radio">
|
@@ -33,8 +27,8 @@
|
|
33
27
|
<% end %>
|
34
28
|
</div>
|
35
29
|
</div>
|
36
|
-
<div class="modal-footer
|
37
|
-
|
30
|
+
<div class="modal-footer">
|
31
|
+
<%= modal_discard_button %>
|
38
32
|
<%= turbo_save_button_tag Spree.t(:export), class: 'btn btn-primary' %>
|
39
33
|
</div>
|
40
34
|
</div>
|
@@ -1,9 +1,6 @@
|
|
1
1
|
<%= turbo_frame_tag :dialog_modal do %>
|
2
2
|
<div class="modal-content" data-controller="search-picker">
|
3
|
-
|
4
|
-
<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:add_variant) %></h5>
|
5
|
-
<button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
|
6
|
-
</div>
|
3
|
+
<%= modal_header(Spree.t(:add_variant)) %>
|
7
4
|
<div class="modal-body border-bottom">
|
8
5
|
<%= form_with url: spree.admin_variants_search_path, method: :post, data: { controller: 'auto-submit', turbo_frame: '_top' } do |form| %>
|
9
6
|
<%= form.hidden_field :omit_ids, value: @order.variant_ids.join(',') %>
|
@@ -20,7 +17,7 @@
|
|
20
17
|
</p>
|
21
18
|
</div>
|
22
19
|
</div>
|
23
|
-
<div class="modal-footer
|
20
|
+
<div class="modal-footer border-top">
|
24
21
|
<div class="d-flex gap-2 m-0 align-items-center">
|
25
22
|
<%= form.label :quantity, Spree.t(:quantity), class: "mb-0" %>
|
26
23
|
<%= form.number_field :quantity, class: "form-control", min: 1 %>
|
@@ -3,7 +3,7 @@
|
|
3
3
|
<%= content_for(:title, Spree.t('admin.oauth_applications.list')) %>
|
4
4
|
|
5
5
|
<% content_for :page_actions do %>
|
6
|
-
<%=
|
6
|
+
<%= link_to_with_icon 'plus', Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn btn-primary" %>
|
7
7
|
<% end if can? :create, Spree::OauthApplication %>
|
8
8
|
|
9
9
|
<%= content_for :page_alerts do %>
|
@@ -15,61 +15,60 @@
|
|
15
15
|
</div>
|
16
16
|
<% end %>
|
17
17
|
|
18
|
-
|
19
|
-
|
20
|
-
<
|
21
|
-
<
|
22
|
-
<
|
23
|
-
<
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
</thead>
|
30
|
-
<tbody>
|
31
|
-
<% @oauth_applications.each do |application| %>
|
32
|
-
<tr id="<%= spree_dom_id application %>">
|
33
|
-
<td class="w-20"><code><%= application.name %></code></td>
|
34
|
-
<td class="w-40">
|
35
|
-
<div class="input-group" data-controller="password-toggle">
|
36
|
-
<%= button_tag class: 'btn hover-gray px-1', data: { action: 'click->password-toggle#password' } do %>
|
37
|
-
<%= icon 'eye', class: 'mr-0' %>
|
38
|
-
<% end %>
|
39
|
-
<%= password_field_tag :password, application.uid, class: 'form-control-plaintext', data: { password_toggle_target: 'unhide' }, readonly: true %>
|
40
|
-
</div>
|
41
|
-
</td>
|
42
|
-
<td class="w-15">
|
43
|
-
<% if application.scopes.include?('write') %>
|
44
|
-
<span class="badge badge-warning">
|
45
|
-
<%= icon('pencil', class: 'mr-1') %>
|
46
|
-
<%= Spree.t('admin.oauth_applications.read_and_write') %>
|
47
|
-
</span>
|
48
|
-
<% else %>
|
49
|
-
<span class="badge badge-light">
|
50
|
-
<%= icon('eye', class: 'mr-1') %>
|
51
|
-
<%= Spree.t('admin.oauth_applications.read_only') %>
|
52
|
-
</span>
|
53
|
-
<% end %>
|
54
|
-
</td>
|
55
|
-
<td class="w-15">
|
56
|
-
<% if application.last_used_at %>
|
57
|
-
<%= local_time(application.last_used_at) %>
|
58
|
-
<% else %>
|
59
|
-
<span class="text-muted"><%= Spree.t('admin.oauth_applications.never') %></span>
|
60
|
-
<% end %>
|
61
|
-
</td>
|
62
|
-
<td class="actions w-10">
|
63
|
-
<%= link_to_edit(application, no_text: true) if can? :edit, application %>
|
64
|
-
</td>
|
18
|
+
<div class="card-lg">
|
19
|
+
<% if @collection.any? %>
|
20
|
+
<div class="table-responsive">
|
21
|
+
<table class="table">
|
22
|
+
<thead class="text-muted">
|
23
|
+
<tr>
|
24
|
+
<th><%= Spree.t(:name) %></th>
|
25
|
+
<th>Client ID</th>
|
26
|
+
<th><%= Spree.t('admin.oauth_applications.scopes') %></th>
|
27
|
+
<th><%= Spree.t('admin.oauth_applications.last_used') %></th>
|
28
|
+
<th></th>
|
65
29
|
</tr>
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
<% end %>
|
30
|
+
</thead>
|
31
|
+
<tbody>
|
32
|
+
<% @collection.each do |application| %>
|
33
|
+
<tr id="<%= spree_dom_id application %>">
|
34
|
+
<td class="w-20"><code><%= application.name %></code></td>
|
35
|
+
<td class="w-40">
|
36
|
+
<div class="input-group" data-controller="password-toggle">
|
37
|
+
<%= button_tag class: 'btn hover-gray px-1', data: { action: 'click->password-toggle#password' } do %>
|
38
|
+
<%= icon 'eye', class: 'mr-0' %>
|
39
|
+
<% end %>
|
40
|
+
<%= password_field_tag :password, application.uid, class: 'form-control-plaintext', data: { password_toggle_target: 'unhide' }, readonly: true %>
|
41
|
+
</div>
|
42
|
+
</td>
|
43
|
+
<td class="w-15">
|
44
|
+
<% if application.scopes.include?('write') %>
|
45
|
+
<span class="badge badge-warning">
|
46
|
+
<%= icon('pencil', class: 'mr-1') %>
|
47
|
+
<%= Spree.t('admin.oauth_applications.read_and_write') %>
|
48
|
+
</span>
|
49
|
+
<% else %>
|
50
|
+
<span class="badge badge-light">
|
51
|
+
<%= icon('eye', class: 'mr-1') %>
|
52
|
+
<%= Spree.t('admin.oauth_applications.read_only') %>
|
53
|
+
</span>
|
54
|
+
<% end %>
|
55
|
+
</td>
|
56
|
+
<td class="w-15">
|
57
|
+
<% if application.last_used_at %>
|
58
|
+
<%= local_time(application.last_used_at) %>
|
59
|
+
<% else %>
|
60
|
+
<span class="text-muted"><%= Spree.t('admin.oauth_applications.never') %></span>
|
61
|
+
<% end %>
|
62
|
+
</td>
|
63
|
+
<td class="actions w-10">
|
64
|
+
<%= link_to_edit(application, no_text: true) if can? :edit, application %>
|
65
|
+
</td>
|
66
|
+
</tr>
|
67
|
+
<% end %>
|
68
|
+
</tbody>
|
69
|
+
</table>
|
70
|
+
</div>
|
71
|
+
<% else %>
|
72
|
+
<%= render 'spree/admin/shared/no_resource_found', resource_name: 'API keys' %>
|
73
|
+
<% end %>
|
74
|
+
</div>
|
@@ -1,4 +1,4 @@
|
|
1
|
-
<%= search_form_for [:admin, @search], class: "filter-wrap
|
1
|
+
<%= search_form_for [:admin, @search], class: "filter-wrap", data: {controller: "filters reveal", reveal_hidden_class: "d-none"} do |f| %>
|
2
2
|
<%= render 'spree/admin/shared/filters_search_bar', param: :name_cont, label: Spree.t(:name) %>
|
3
3
|
|
4
4
|
<%= render "spree/admin/shared/filter_badge_template" %>
|
@@ -3,11 +3,7 @@
|
|
3
3
|
<% end %>
|
4
4
|
|
5
5
|
<% content_for :page_actions do %>
|
6
|
-
|
7
|
-
<%= button_link_to Spree.t(:new_option_type),
|
8
|
-
new_object_url,
|
9
|
-
{ class: "btn-primary", icon: "plus", id: "new_option_type_link" } %>
|
10
|
-
</span>
|
6
|
+
<%= link_to_with_icon 'plus', Spree.t(:new_option_type), new_object_url, class: 'btn btn-primary' %>
|
11
7
|
<% end if can?(:create, Spree::OptionType) %>
|
12
8
|
|
13
9
|
<%= content_for(:page_alerts) do %>
|
@@ -17,12 +13,8 @@
|
|
17
13
|
</div>
|
18
14
|
<% end %>
|
19
15
|
|
20
|
-
<div
|
21
|
-
|
22
|
-
<div class="card-lg p-0">
|
23
|
-
|
16
|
+
<div class="card-lg">
|
24
17
|
<%= render partial: "spree/admin/option_types/filter" %>
|
25
|
-
|
26
18
|
<% if @option_types.any? %>
|
27
19
|
<div class="table-responsive">
|
28
20
|
<table class="table" id="listing_option_types">
|
@@ -44,7 +36,7 @@
|
|
44
36
|
<th>
|
45
37
|
<%= Spree.t(:products) %>
|
46
38
|
</th>
|
47
|
-
<th
|
39
|
+
<th></th>
|
48
40
|
</tr>
|
49
41
|
</thead>
|
50
42
|
<tbody
|
@@ -61,3 +53,7 @@
|
|
61
53
|
<%= render "spree/admin/shared/no_resource_found" %>
|
62
54
|
<% end %>
|
63
55
|
</div>
|
56
|
+
|
57
|
+
<p class="documentation-link-container">
|
58
|
+
<%= external_link_to "Learn more about options", "https://spreecommerce.org/docs/user/manage-products/product-options" %>
|
59
|
+
</p>
|
@@ -1,8 +1,6 @@
|
|
1
1
|
<% if order %>
|
2
2
|
<% if order.user %>
|
3
3
|
<span class="d-flex">
|
4
|
-
<%#= image_tag(avatar_url_for( order.user), width: 24, height: 24, class: 'mr-2 rounded') %>
|
5
|
-
|
6
4
|
<% if can?(:manage, order.user) %>
|
7
5
|
<%= link_to order.full_name, spree.admin_user_path(order.user), class: 'text-dark', data: { 'turbo-frame': '_top' } %>
|
8
6
|
<% else %>
|
@@ -2,7 +2,7 @@
|
|
2
2
|
|
3
3
|
<%= search_form_for [:admin, @vendor || @user, @search],
|
4
4
|
url: controller_name == 'checkouts' ? spree.admin_checkouts_path : nil,
|
5
|
-
class: "filter-wrap
|
5
|
+
class: "filter-wrap",
|
6
6
|
data: {
|
7
7
|
controller: "filters reveal",
|
8
8
|
reveal_hidden_class: "d-none",
|
@@ -89,15 +89,10 @@
|
|
89
89
|
</div>
|
90
90
|
</div>
|
91
91
|
|
92
|
-
<%=
|
92
|
+
<%= render_admin_partials(:orders_filters_partials, f: f) %>
|
93
93
|
</div>
|
94
94
|
|
95
|
-
|
96
|
-
<%= turbo_save_button_tag Spree.t(:filter_results) do %>
|
97
|
-
<%= icon("search") %>
|
98
|
-
<%= Spree.t(:filter_results) %>
|
99
|
-
<% end %>
|
100
|
-
</div>
|
95
|
+
<%= render 'spree/admin/shared/filter_submit' %>
|
101
96
|
</div>
|
102
97
|
|
103
98
|
<%= render "spree/admin/shared/filter_badge_template" %>
|
@@ -23,8 +23,6 @@
|
|
23
23
|
</table>
|
24
24
|
</div>
|
25
25
|
<% else %>
|
26
|
-
|
27
|
-
<%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Order)) %>
|
28
|
-
</div>
|
26
|
+
<%= render 'spree/admin/shared/no_resource_found', new_object_url: nil, model_class: Spree::Order %>
|
29
27
|
<% end %>
|
30
|
-
<%= render 'spree/admin/shared/index_table_options', collection: @orders
|
28
|
+
<%= render 'spree/admin/shared/index_table_options', collection: @orders if @orders.any? %>
|
@@ -74,7 +74,7 @@
|
|
74
74
|
<%= render 'tax_lines', tax_lines: tax_lines, id: 'tax-lines-additional' %>
|
75
75
|
</li>
|
76
76
|
|
77
|
-
<%=
|
77
|
+
<%= render_admin_partials(:order_page_body_partials, order: @order) %>
|
78
78
|
|
79
79
|
<li class="list-group-item d-flex justify-content-between align-items-center border-0">
|
80
80
|
<span data-hook='admin_order_tab_total_title'><%= Spree.t(:total) %></span>
|
@@ -1,10 +1,7 @@
|
|
1
1
|
<%= turbo_stream.update :dialog_modal do %>
|
2
2
|
<%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
|
3
3
|
<div class="modal-content">
|
4
|
-
|
5
|
-
<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:new_billing_address) %></h5>
|
6
|
-
<button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
|
7
|
-
</div>
|
4
|
+
<%= modal_header(Spree.t(:new_billing_address)) %>
|
8
5
|
<div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
|
9
6
|
<div>
|
10
7
|
<% if @order.shipping_address.present? %>
|
@@ -26,8 +23,8 @@
|
|
26
23
|
</div>
|
27
24
|
<%= render 'form', address: @address, f: f %>
|
28
25
|
</div>
|
29
|
-
<div class="modal-footer
|
30
|
-
|
26
|
+
<div class="modal-footer">
|
27
|
+
<%= modal_discard_button %>
|
31
28
|
<%= turbo_save_button_tag Spree.t('actions.save') %>
|
32
29
|
</div>
|
33
30
|
</div>
|
@@ -1,10 +1,7 @@
|
|
1
1
|
<%= turbo_frame_tag :dialog_modal do %>
|
2
2
|
<%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
|
3
3
|
<div class="modal-content">
|
4
|
-
|
5
|
-
<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:billing_address) %></h5>
|
6
|
-
<button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>"></button>
|
7
|
-
</div>
|
4
|
+
<%= modal_header(Spree.t(:billing_address)) %>
|
8
5
|
<div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
|
9
6
|
<div>
|
10
7
|
<% if @order.shipping_address.present? %>
|
@@ -33,8 +30,8 @@
|
|
33
30
|
</div>
|
34
31
|
<%= render 'form', address: @address, f: f %>
|
35
32
|
</div>
|
36
|
-
<div class="modal-footer
|
37
|
-
|
33
|
+
<div class="modal-footer">
|
34
|
+
<%= modal_discard_button %>
|
38
35
|
<%= turbo_save_button_tag Spree.t('actions.update') %>
|
39
36
|
</div>
|
40
37
|
</div>
|
@@ -1,10 +1,7 @@
|
|
1
1
|
<%= turbo_frame_tag :dialog_modal do %>
|
2
2
|
<%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :post do |f| %>
|
3
3
|
<div class="modal-content">
|
4
|
-
|
5
|
-
<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:billing_address) %></h5>
|
6
|
-
<button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" ></button>
|
7
|
-
</div>
|
4
|
+
<%= modal_header(Spree.t(:billing_address)) %>
|
8
5
|
<div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
|
9
6
|
<div>
|
10
7
|
<% if @order.shipping_address.present? %>
|
@@ -26,8 +23,8 @@
|
|
26
23
|
</div>
|
27
24
|
<%= render 'form', address: @address, f: f %>
|
28
25
|
</div>
|
29
|
-
<div class="modal-footer
|
30
|
-
|
26
|
+
<div class="modal-footer">
|
27
|
+
<%= modal_discard_button %>
|
31
28
|
<%= turbo_save_button_tag Spree.t('actions.save') %>
|
32
29
|
</div>
|
33
30
|
</div>
|
@@ -1,10 +1,7 @@
|
|
1
1
|
<%= turbo_stream.update :dialog_modal do %>
|
2
2
|
<%= form_for @address, url: spree.admin_order_billing_address_path(@order), data: {controller: 'auto-submit', form_target: 'form', turbo_frame: :_top}, method: :put do |f| %>
|
3
3
|
<div class="modal-content">
|
4
|
-
|
5
|
-
<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_billing_address) %></h5>
|
6
|
-
<button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>"></button>
|
7
|
-
</div>
|
4
|
+
<%= modal_header(Spree.t(:update_billing_address)) %>
|
8
5
|
<div class="modal-body d-flex flex-col gap-3" data-controller="order-billing-address">
|
9
6
|
<div>
|
10
7
|
<% if @order.shipping_address.present? %>
|
@@ -26,8 +23,8 @@
|
|
26
23
|
</div>
|
27
24
|
<%= render 'form', address: @address, f: f %>
|
28
25
|
</div>
|
29
|
-
<div class="modal-footer
|
30
|
-
|
26
|
+
<div class="modal-footer">
|
27
|
+
<%= modal_discard_button %>
|
31
28
|
<%= turbo_save_button_tag Spree.t('actions.update') %>
|
32
29
|
</div>
|
33
30
|
</div>
|
@@ -1,18 +1,15 @@
|
|
1
1
|
<%= turbo_frame_tag :dialog_modal do %>
|
2
2
|
<%= form_for @order, url: spree.admin_order_contact_information_path(@order), method: :put, data: { turbo_frame: :_top } do |f| %>
|
3
3
|
<div class="modal-content">
|
4
|
-
|
5
|
-
<h5 class="modal-title" id="exampleModalLabel"><%= Spree.t(:update_contact_information) %></h5>
|
6
|
-
<button type="button" class="btn-close" data-dismiss="modal" aria-label="<%= Spree.t(:close) %>" />
|
7
|
-
</div>
|
4
|
+
<%= modal_header(Spree.t(:update_contact_information)) %>
|
8
5
|
<div class="modal-body">
|
9
6
|
<div class="form-group">
|
10
7
|
<%= f.label :email, Spree.t(:email) %>
|
11
8
|
<%= f.email_field :email, class: 'form-control', required: true %>
|
12
9
|
</div>
|
13
10
|
</div>
|
14
|
-
<div class="modal-footer
|
15
|
-
|
11
|
+
<div class="modal-footer">
|
12
|
+
<%= modal_discard_button %>
|
16
13
|
<%= turbo_save_button_tag Spree.t('actions.update') %>
|
17
14
|
</div>
|
18
15
|
</div>
|
@@ -110,16 +110,7 @@
|
|
110
110
|
reimbursements: @customer_return.reimbursements,
|
111
111
|
} %>
|
112
112
|
<% else %>
|
113
|
-
|
114
|
-
class="
|
115
|
-
text-muted p-5 d-flex align-items-center w-100 justify-content-center
|
116
|
-
"
|
117
|
-
>
|
118
|
-
<%= Spree.t(
|
119
|
-
:no_resource_found,
|
120
|
-
resource: plural_resource_name(Spree::Reimbursement),
|
121
|
-
) %>
|
122
|
-
</div>
|
113
|
+
<%= render 'spree/admin/shared/no_resource_found', new_object_url: nil %>
|
123
114
|
<% end %>
|
124
115
|
</div>
|
125
116
|
</div>
|
@@ -1,23 +1,21 @@
|
|
1
1
|
<%= render 'header' %>
|
2
|
-
<%=
|
2
|
+
<%= render_admin_partials(:order_page_header_partials, order: @order) %>
|
3
3
|
|
4
4
|
<div class="container px-0">
|
5
5
|
<div class="row">
|
6
6
|
<div class="col-lg-8">
|
7
|
-
|
8
7
|
<%= render 'line_items' %>
|
9
8
|
<%= render 'shipments' %>
|
10
9
|
<%= render 'customer_returns' %>
|
11
10
|
<%= render 'return_authorizations' %>
|
12
11
|
<%= render 'payments'%>
|
13
12
|
<%= render 'refunds'%>
|
14
|
-
|
15
|
-
<%= render 'body_custom' %>
|
13
|
+
<%= render_admin_partials(:order_page_body_partials, order: @order) %>
|
16
14
|
<%= render 'summary' %>
|
17
15
|
</div>
|
18
16
|
<div class="col-lg-4">
|
19
|
-
<!-- TODO: add notes -->
|
20
17
|
<%= render 'customer' %>
|
18
|
+
<%= render_admin_partials(:order_page_sidebar_partials, order: @order) %>
|
21
19
|
</div>
|
22
20
|
</div>
|
23
21
|
</div>
|
@@ -10,7 +10,7 @@
|
|
10
10
|
<%= link_to_with_icon 'plus', Spree.t(:new_order), spree.admin_orders_path, class: "btn btn-primary", data: { turbo_method: :post } if can?(:create, Spree::Order) %>
|
11
11
|
<% end %>
|
12
12
|
|
13
|
-
<div class="card-lg
|
13
|
+
<div class="card-lg">
|
14
14
|
<% if params[:frame_name].present? %>
|
15
15
|
<%= turbo_frame_tag params[:frame_name], autoscroll: true, data: { autoscroll_block: :nearest, autoscroll_behavior: :smooth } do %>
|
16
16
|
<%= render 'spree/admin/orders/filters', frame_name: params[:frame_name] %>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<% allow_return_item_changes = !@return_authorization.customer_returned_items? %>
|
2
2
|
|
3
3
|
<div data-controller="return-items">
|
4
|
-
<div class="table-responsive card-lg
|
4
|
+
<div class="table-responsive card-lg mb-4">
|
5
5
|
<table class="table table-condensed return-items-table">
|
6
6
|
<thead class="text-muted">
|
7
7
|
<tr>
|