spree_backend 4.2.0.beta → 4.2.0.rc5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/spree/backend.js +0 -1
- data/app/assets/javascripts/spree/backend/address_states.js +20 -9
- data/app/assets/javascripts/spree/backend/admin.js +8 -9
- data/app/assets/javascripts/spree/backend/calculator.js +2 -0
- data/app/assets/javascripts/spree/backend/checkouts/edit.js +99 -71
- data/app/assets/javascripts/spree/backend/line_items_on_order_edit.js +1 -1
- data/app/assets/javascripts/spree/backend/option_type_autocomplete.js +31 -37
- data/app/assets/javascripts/spree/backend/option_value_picker.js +50 -23
- data/app/assets/javascripts/spree/backend/product_picker.js +35 -19
- data/app/assets/javascripts/spree/backend/promotions.js +32 -27
- data/app/assets/javascripts/spree/backend/shipments.js +28 -37
- data/app/assets/javascripts/spree/backend/spree-select2.js +33 -14
- data/app/assets/javascripts/spree/backend/stock_transfer.js +32 -13
- data/app/assets/javascripts/spree/backend/taxon_autocomplete.js +30 -43
- data/app/assets/javascripts/spree/backend/taxons.js +60 -47
- data/app/assets/javascripts/spree/backend/user_picker.js +16 -18
- data/app/assets/javascripts/spree/backend/variant_autocomplete.js +23 -22
- data/app/assets/stylesheets/spree/backend/components/_badges.scss +1 -1
- data/app/assets/stylesheets/spree/backend/components/_tables.scss +2 -2
- data/app/assets/stylesheets/spree/backend/global/_variables.scss +1 -1
- data/app/assets/stylesheets/spree/backend/plugins/_select2_custom.scss +11 -0
- data/app/assets/stylesheets/spree/backend/plugins/select2_bootstrap4.scss +622 -0
- data/app/assets/stylesheets/spree/backend/shared/_base.scss +4 -0
- data/app/assets/stylesheets/spree/backend/spree_admin.css.scss +2 -1
- data/app/controllers/spree/admin/adjustments_controller.rb +8 -0
- data/app/controllers/spree/admin/base_controller.rb +1 -0
- data/app/controllers/spree/admin/general_settings_controller.rb +1 -1
- data/app/controllers/spree/admin/images_controller.rb +3 -3
- data/app/controllers/spree/admin/orders/customer_details_controller.rb +1 -1
- data/app/controllers/spree/admin/orders_controller.rb +15 -2
- data/app/controllers/spree/admin/prices_controller.rb +0 -13
- data/app/controllers/spree/admin/products_controller.rb +2 -2
- data/app/controllers/spree/admin/states_controller.rb +1 -1
- data/app/controllers/spree/admin/stores_controller.rb +5 -14
- data/app/controllers/spree/admin/taxons_controller.rb +15 -5
- data/app/helpers/spree/admin/base_helper.rb +67 -5
- data/app/helpers/spree/admin/navigation_helper.rb +11 -1
- data/app/helpers/spree/admin/payments_helper.rb +3 -3
- data/app/helpers/spree/admin/stock_movements_helper.rb +2 -0
- data/app/helpers/spree/admin/stores_helper.rb +9 -0
- data/app/views/kaminari/admin-twitter-bootstrap-4/_first_page.html.erb +2 -2
- data/app/views/kaminari/admin-twitter-bootstrap-4/_gap.html.erb +2 -2
- data/app/views/kaminari/admin-twitter-bootstrap-4/_last_page.html.erb +2 -2
- data/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb +2 -2
- data/app/views/kaminari/admin-twitter-bootstrap-4/_page.html.erb +2 -2
- data/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb +2 -2
- data/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb +2 -2
- data/app/views/spree/admin/adjustments/index.html.erb +2 -2
- data/app/views/spree/admin/countries/index.html.erb +6 -6
- data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +48 -46
- data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +3 -1
- data/app/views/spree/admin/customer_returns/edit.html.erb +1 -1
- data/app/views/spree/admin/customer_returns/index.html.erb +2 -2
- data/app/views/spree/admin/customer_returns/new.html.erb +1 -1
- data/app/views/spree/admin/general_settings/edit.html.erb +27 -4
- data/app/views/spree/admin/images/edit.html.erb +1 -1
- data/app/views/spree/admin/log_entries/index.html.erb +1 -1
- data/app/views/spree/admin/option_types/_form.html.erb +9 -0
- data/app/views/spree/admin/option_types/index.html.erb +3 -1
- data/app/views/spree/admin/orders/_add_line_item.html.erb +1 -1
- data/app/views/spree/admin/orders/_add_product.html.erb +1 -1
- data/app/views/spree/admin/orders/_adjustments.html.erb +2 -2
- data/app/views/spree/admin/orders/_channel_form.html.erb +18 -0
- data/app/views/spree/admin/orders/_form.html.erb +6 -10
- data/app/views/spree/admin/orders/_line_items.html.erb +1 -1
- data/app/views/spree/admin/orders/_line_items_edit_form.html.erb +5 -8
- data/app/views/spree/admin/orders/_order_actions.html.erb +1 -2
- data/app/views/spree/admin/orders/_risk_analysis.html.erb +3 -3
- data/app/views/spree/admin/orders/_shipment.html.erb +3 -2
- data/app/views/spree/admin/orders/_shipment_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/_store_form.html.erb +1 -1
- data/app/views/spree/admin/orders/cart.html.erb +1 -1
- data/app/views/spree/admin/orders/channel.html.erb +7 -0
- data/app/views/spree/admin/orders/customer_details/_autocomplete.js.erb +35 -12
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +3 -3
- data/app/views/spree/admin/orders/customer_details/edit.html.erb +1 -1
- data/app/views/spree/admin/orders/edit.html.erb +1 -1
- data/app/views/spree/admin/orders/index.html.erb +12 -11
- data/app/views/spree/admin/payment_methods/_form.html.erb +65 -46
- data/app/views/spree/admin/payment_methods/index.html.erb +2 -2
- data/app/views/spree/admin/payments/_form.html.erb +2 -3
- data/app/views/spree/admin/payments/show.html.erb +1 -2
- data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +2 -2
- data/app/views/spree/admin/prices/_variant_prices.html.erb +5 -5
- data/app/views/spree/admin/prices/index.html.erb +2 -2
- data/app/views/spree/admin/product_properties/index.html.erb +3 -4
- data/app/views/spree/admin/products/_form.html.erb +8 -9
- data/app/views/spree/admin/products/index.html.erb +3 -2
- data/app/views/spree/admin/products/new.html.erb +5 -3
- data/app/views/spree/admin/products/stock.html.erb +2 -2
- data/app/views/spree/admin/promotion_rules/create.js.erb +1 -1
- data/app/views/spree/admin/promotions/_actions.html.erb +2 -3
- data/app/views/spree/admin/promotions/_form.html.erb +7 -7
- data/app/views/spree/admin/promotions/_rules.html.erb +1 -1
- data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb +1 -1
- data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb +1 -1
- data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb +1 -1
- data/app/views/spree/admin/promotions/index.html.erb +7 -5
- data/app/views/spree/admin/promotions/rules/_option_value.html.erb +8 -7
- data/app/views/spree/admin/promotions/rules/_product.html.erb +1 -1
- data/app/views/spree/admin/promotions/rules/_taxon.html.erb +1 -1
- data/app/views/spree/admin/promotions/rules/_user.html.erb +1 -1
- data/app/views/spree/admin/prototypes/_form.html.erb +1 -1
- data/app/views/spree/admin/prototypes/show.html.erb +1 -1
- data/app/views/spree/admin/refunds/edit.html.erb +2 -2
- data/app/views/spree/admin/refunds/new.html.erb +3 -3
- data/app/views/spree/admin/reimbursements/edit.html.erb +5 -4
- data/app/views/spree/admin/reimbursements/show.html.erb +3 -1
- data/app/views/spree/admin/return_authorizations/_form.html.erb +7 -5
- data/app/views/spree/admin/return_authorizations/index.html.erb +2 -2
- data/app/views/spree/admin/return_index/customer_returns.html.erb +2 -2
- data/app/views/spree/admin/return_index/return_authorizations.html.erb +2 -2
- data/app/views/spree/admin/roles/index.html.erb +1 -1
- data/app/views/spree/admin/shared/_account_nav.html.erb +3 -3
- data/app/views/spree/admin/shared/_address_form.html.erb +9 -9
- data/app/views/spree/admin/shared/_error_messages.html.erb +1 -1
- data/app/views/spree/admin/shared/_head.html.erb +6 -2
- data/app/views/spree/admin/shared/_header.html.erb +0 -2
- data/app/views/spree/admin/shared/_main_menu.html.erb +1 -1
- data/app/views/spree/admin/shared/_order_summary.html.erb +25 -21
- data/app/views/spree/admin/shared/_order_tabs.html.erb +9 -0
- data/app/views/spree/admin/shared/_refunds.html.erb +2 -2
- data/app/views/spree/admin/shared/_report_order_criteria.html.erb +4 -2
- data/app/views/spree/admin/shared/_translations.html.erb +10 -38
- data/app/views/spree/admin/shared/_update_order_state.js.erb +6 -2
- data/app/views/spree/admin/shared/named_types/_index.html.erb +1 -1
- data/app/views/spree/admin/shipping_categories/index.html.erb +2 -2
- data/app/views/spree/admin/shipping_methods/_form.html.erb +2 -2
- data/app/views/spree/admin/shipping_methods/index.html.erb +7 -3
- data/app/views/spree/admin/states/index.html.erb +2 -2
- data/app/views/spree/admin/stock_locations/_form.html.erb +2 -2
- data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +1 -1
- data/app/views/spree/admin/stock_locations/index.html.erb +6 -6
- data/app/views/spree/admin/stock_movements/_form.html.erb +1 -1
- data/app/views/spree/admin/stock_movements/index.html.erb +2 -2
- data/app/views/spree/admin/stock_transfers/_stock_movements.html.erb +1 -1
- data/app/views/spree/admin/stock_transfers/index.html.erb +42 -37
- data/app/views/spree/admin/stock_transfers/new.html.erb +1 -1
- data/app/views/spree/admin/stock_transfers/show.html.erb +0 -1
- data/app/views/spree/admin/stores/_form.html.erb +92 -23
- data/app/views/spree/admin/stores/index.html.erb +12 -7
- data/app/views/spree/admin/tax_categories/index.html.erb +3 -3
- data/app/views/spree/admin/tax_rates/index.html.erb +8 -8
- data/app/views/spree/admin/taxonomies/_js_head.html.erb +1 -2
- data/app/views/spree/admin/taxonomies/_list.html.erb +1 -1
- data/app/views/spree/admin/taxons/_form.html.erb +38 -35
- data/app/views/spree/admin/taxons/_taxon_table.html.erb +2 -2
- data/app/views/spree/admin/taxons/index.html.erb +1 -1
- data/app/views/spree/admin/users/_addresses_form.html.erb +4 -6
- data/app/views/spree/admin/users/_form.html.erb +0 -1
- data/app/views/spree/admin/users/edit.html.erb +1 -1
- data/app/views/spree/admin/users/index.html.erb +2 -2
- data/app/views/spree/admin/users/items.html.erb +1 -1
- data/app/views/spree/admin/variants/_form.html.erb +5 -3
- data/app/views/spree/admin/zones/_country_members.html.erb +1 -1
- data/app/views/spree/admin/zones/_form.html.erb +2 -2
- data/app/views/spree/admin/zones/index.html.erb +1 -1
- data/app/views/spree/admin/zones/new.html.erb +1 -1
- data/app/views/spree/layouts/admin.html.erb +2 -3
- data/config/initializers/assets.rb +1 -1
- data/config/routes.rb +7 -1
- data/spree_backend.gemspec +2 -2
- metadata +21 -20
- data/app/assets/javascripts/spree/backend/flatpickr_locals.js +0 -37
- data/app/assets/javascripts/spree/backend/tag_picker.js +0 -52
- data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +0 -190
- data/app/views/spree/admin/general_settings/_form.html.erb +0 -27
@@ -3,8 +3,8 @@
|
|
3
3
|
current_page: a page object for the currently displayed page
|
4
4
|
total_pages: total number of pages
|
5
5
|
per_page: number of items to fetch per page
|
6
|
-
remote: data-remote
|
7
|
-
|
6
|
+
remote: data-remote -%>
|
7
|
+
|
8
8
|
<li class="page gap disabled page-item d-none d-lg-flex">
|
9
9
|
<a href="#" onclick="return false;" class="page-link">
|
10
10
|
<%= raw(t 'views.pagination.truncate') %>
|
@@ -4,8 +4,8 @@
|
|
4
4
|
current_page: a page object for the currently displayed page
|
5
5
|
total_pages: total number of pages
|
6
6
|
per_page: number of items to fetch per page
|
7
|
-
remote: data-remote
|
8
|
-
|
7
|
+
remote: data-remote -%>
|
8
|
+
|
9
9
|
<% unless current_page.last? %>
|
10
10
|
<li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %>
|
11
11
|
<%= link_to_unless current_page.last?, svg_icon(name: "double-chevron-right.svg", width: '13', height: '16', classes: 'spree-icon-arrow-right mb-0'), url, remote: remote, class: 'page-link', 'aria-label': 'Last page' %>
|
@@ -4,8 +4,8 @@
|
|
4
4
|
current_page: a page object for the currently displayed page
|
5
5
|
total_pages: total number of pages
|
6
6
|
per_page: number of items to fetch per page
|
7
|
-
remote: data-remote
|
8
|
-
|
7
|
+
remote: data-remote -%>
|
8
|
+
|
9
9
|
<% unless current_page.last? %>
|
10
10
|
<li class="next_page page-item">
|
11
11
|
<%= link_to_unless current_page.last?, svg_icon(name: "chevron-right.svg", width: '13', height: '16', classes: 'spree-icon-arrow-right mb-0'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>
|
@@ -5,8 +5,8 @@
|
|
5
5
|
current_page: a page object for the currently displayed page
|
6
6
|
total_pages: total number of pages
|
7
7
|
per_page: number of items to fetch per page
|
8
|
-
remote: data-remote
|
9
|
-
|
8
|
+
remote: data-remote -%>
|
9
|
+
|
10
10
|
<li class="page<%= ' active' if page.current? %> page-item">
|
11
11
|
<%= link_to page,
|
12
12
|
url,
|
@@ -4,8 +4,8 @@
|
|
4
4
|
total_pages: total number of pages
|
5
5
|
per_page: number of items to fetch per page
|
6
6
|
remote: data-remote
|
7
|
-
paginator: the paginator that renders the pagination tags inside
|
8
|
-
|
7
|
+
paginator: the paginator that renders the pagination tags inside -%>
|
8
|
+
|
9
9
|
<% pagination_class ||= '' %>
|
10
10
|
|
11
11
|
<%= paginator.render do %>
|
@@ -4,8 +4,8 @@
|
|
4
4
|
current_page: a page object for the currently displayed page
|
5
5
|
total_pages: total number of pages
|
6
6
|
per_page: number of items to fetch per page
|
7
|
-
remote: data-remote
|
8
|
-
|
7
|
+
remote: data-remote -%>
|
8
|
+
|
9
9
|
<% unless current_page.first? %>
|
10
10
|
<li class="prev page-item">
|
11
11
|
<%= link_to_unless current_page.first?, svg_icon(name: "chevron-left.svg", width: '13', height: '16', classes: 'spree-icon-arrow-left mb-0'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>
|
@@ -10,9 +10,9 @@
|
|
10
10
|
<thead>
|
11
11
|
<tr data-hook="tax_header">
|
12
12
|
<th><%= Spree.t(:country_name) %></th>
|
13
|
-
<th><%= Spree.t(:iso3) %></th>
|
14
|
-
<th><%= Spree.t(:states_required) %></th>
|
15
|
-
<th><%= Spree.t(:zipcode_required) %></th>
|
13
|
+
<th class="text-center"><%= Spree.t(:iso3) %></th>
|
14
|
+
<th class="text-center"><%= Spree.t(:states_required) %></th>
|
15
|
+
<th class="text-center"><%= Spree.t(:zipcode_required) %></th>
|
16
16
|
<th class="actions"></th>
|
17
17
|
</tr>
|
18
18
|
</thead>
|
@@ -20,9 +20,9 @@
|
|
20
20
|
<% @countries.each do |country| %>
|
21
21
|
<tr id="<%= spree_dom_id country %>" data-hook="country_row">
|
22
22
|
<td><%= country.name %></td>
|
23
|
-
<td><%= country.iso3 %></td>
|
24
|
-
<td class="text-center"><%= country.states_required?
|
25
|
-
<td class="text-center"><%= country.zipcode_required?
|
23
|
+
<td class="text-center"><%= country.iso3 %></td>
|
24
|
+
<td class="text-center"><%= active_badge(country.states_required?) %></td>
|
25
|
+
<td class="text-center"><%= active_badge(country.zipcode_required?) %></td>
|
26
26
|
<td class="actions actions-2 text-right">
|
27
27
|
<%= link_to_edit(country, no_text: true) if can? :edit, country %>
|
28
28
|
<%= link_to_delete(country, no_text: true) if can? :delete, country %>
|
@@ -1,52 +1,54 @@
|
|
1
1
|
<div class="table-responsive">
|
2
|
-
<table class="show return-items-table table table-condensed table-bordered index">
|
3
|
-
|
4
|
-
<tr>
|
5
|
-
<th><%= Spree.t(:product) %></th>
|
6
|
-
<th><%= Spree.t(:sku) %></th>
|
7
|
-
<th><%= Spree.t(:pre_tax_amount) %></th>
|
8
|
-
<th><%= Spree.t(:preferred_reimbursement_type) %></th>
|
9
|
-
<th><%= Spree.t(:exchange_for) %></th>
|
10
|
-
<th><%= Spree.t(:acceptance_errors) %></th>
|
11
|
-
<% if show_decision %>
|
12
|
-
<th></th>
|
13
|
-
<% end %>
|
14
|
-
</tr>
|
15
|
-
</thead>
|
16
|
-
<tbody>
|
17
|
-
<% return_items.each do |return_item| %>
|
2
|
+
<table class="show return-items-table table table-condensed table-bordered index">
|
3
|
+
<thead>
|
18
4
|
<tr>
|
19
|
-
<
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
<
|
24
|
-
|
25
|
-
</td>
|
26
|
-
<td>
|
27
|
-
<%= return_item.display_pre_tax_amount %>
|
28
|
-
</td>
|
29
|
-
<td>
|
30
|
-
<%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
|
31
|
-
</td>
|
32
|
-
<td>
|
33
|
-
<%= return_item.exchange_variant.try(:exchange_name) %>
|
34
|
-
</td>
|
35
|
-
<td>
|
36
|
-
<%= return_item.acceptance_status_errors %>
|
37
|
-
</td>
|
5
|
+
<th><%= Spree.t(:product) %></th>
|
6
|
+
<th><%= Spree.t(:sku) %></th>
|
7
|
+
<th><%= Spree.t(:pre_tax_amount) %></th>
|
8
|
+
<th><%= Spree.t(:preferred_reimbursement_type) %></th>
|
9
|
+
<th><%= Spree.t(:exchange_for) %></th>
|
10
|
+
<th><%= Spree.t(:acceptance_errors) %></th>
|
38
11
|
<% if show_decision %>
|
39
|
-
<
|
40
|
-
<%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-success btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
|
41
|
-
<%= Spree.t(:accept) %>
|
42
|
-
<% end if can?(:accept, return_item) %>
|
43
|
-
<%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-danger btn-sm', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
|
44
|
-
<%= Spree.t(:reject) %>
|
45
|
-
<% end if can?(:reject, return_item) %>
|
46
|
-
</td>
|
12
|
+
<th></th>
|
47
13
|
<% end %>
|
48
14
|
</tr>
|
49
|
-
|
50
|
-
|
51
|
-
|
15
|
+
</thead>
|
16
|
+
<tbody>
|
17
|
+
<% return_items.each do |return_item| %>
|
18
|
+
<tr>
|
19
|
+
<td>
|
20
|
+
<div class="variant-name">
|
21
|
+
<%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
|
22
|
+
</div>
|
23
|
+
<div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
|
24
|
+
</td>
|
25
|
+
<td>
|
26
|
+
<%= return_item.inventory_unit.variant.sku %>
|
27
|
+
</td>
|
28
|
+
<td>
|
29
|
+
<%= return_item.display_pre_tax_amount %>
|
30
|
+
</td>
|
31
|
+
<td>
|
32
|
+
<%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
|
33
|
+
</td>
|
34
|
+
<td>
|
35
|
+
<%= return_item.exchange_variant.try(:exchange_name) %>
|
36
|
+
</td>
|
37
|
+
<td>
|
38
|
+
<%= return_item.acceptance_status_errors if return_item.acceptance_status_errors.present? %>
|
39
|
+
</td>
|
40
|
+
<% if show_decision %>
|
41
|
+
<td class='actions actions-2'>
|
42
|
+
<%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-success btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
|
43
|
+
<%= Spree.t(:accept) %>
|
44
|
+
<% end if can?(:accept, return_item) %>
|
45
|
+
<%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-danger btn-sm', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
|
46
|
+
<%= Spree.t(:reject) %>
|
47
|
+
<% end if can?(:reject, return_item) %>
|
48
|
+
</td>
|
49
|
+
<% end %>
|
50
|
+
</tr>
|
51
|
+
<% end %>
|
52
|
+
</tbody>
|
53
|
+
</table>
|
52
54
|
</div>
|
@@ -25,7 +25,9 @@
|
|
25
25
|
<%= item_fields.check_box :returned, {checked: false, class: 'add-item', "data-price" => return_item.pre_tax_amount}, '1', '0' %>
|
26
26
|
</td>
|
27
27
|
<td>
|
28
|
-
<div class="variant-name"
|
28
|
+
<div class="variant-name">
|
29
|
+
<%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
|
30
|
+
</div>
|
29
31
|
<div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
|
30
32
|
</td>
|
31
33
|
<td>
|
@@ -44,7 +44,7 @@
|
|
44
44
|
</fieldset>
|
45
45
|
|
46
46
|
<% if !@customer_return.fully_reimbursed? && @pending_reimbursements.empty? && can?(:create, Spree::Reimbursement) %>
|
47
|
-
<fieldset data-hook="reimbursements" class="
|
47
|
+
<fieldset data-hook="reimbursements" class="mb-3">
|
48
48
|
<% if @customer_return.completely_decided? %>
|
49
49
|
<%= form_for [:admin, @order, Spree::Reimbursement.new] do |f| %>
|
50
50
|
<%= hidden_field_tag :build_from_customer_return_id, @customer_return.id %>
|
@@ -32,9 +32,9 @@
|
|
32
32
|
<td><%= pretty_time(customer_return.created_at) %></td>
|
33
33
|
<td>
|
34
34
|
<% if customer_return.fully_reimbursed? %>
|
35
|
-
<
|
35
|
+
<strong class="badge badge-success text-uppercase"><%= Spree.t(:reimbursed) %></strong>
|
36
36
|
<% else %>
|
37
|
-
<
|
37
|
+
<strong class="badge badge-inactive text-uppercase"><%= Spree.t(:incomplete) %></strong>
|
38
38
|
<% end %>
|
39
39
|
</td>
|
40
40
|
<td class='actions actions-1' data-hook="admin_orders_customer_returns_index_row_actions">
|
@@ -24,7 +24,7 @@
|
|
24
24
|
|
25
25
|
<%= f.field_container :stock_location, class: ['form-group'] do %>
|
26
26
|
<%= f.label :stock_location, Spree.t(:stock_location) %> <span class="required">*</span>
|
27
|
-
<%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
|
27
|
+
<%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
|
28
28
|
<%= f.error_message_on :stock_location %>
|
29
29
|
<% end %>
|
30
30
|
</div>
|
@@ -39,7 +39,7 @@
|
|
39
39
|
<%#-------------------------------------------------%>
|
40
40
|
<div class="card mb-3" id="general-settings-cache" data-hook="general_settings_cache">
|
41
41
|
<div class="card-header">
|
42
|
-
<h1 class="card-title mb-0 h5"><%= Spree.t(:clear_cache)%></h1>
|
42
|
+
<h1 class="card-title mb-0 h5"><%= Spree.t(:clear_cache) %></h1>
|
43
43
|
</div>
|
44
44
|
|
45
45
|
<div class="card-body">
|
@@ -61,16 +61,39 @@
|
|
61
61
|
<div class="card mb-3" id="general-settings-currency" data-hook="general_settings_currency">
|
62
62
|
<div class="card-header">
|
63
63
|
<h1 class="card-title mb-0 h5">
|
64
|
-
<%= Spree.t(:currency_settings)%>
|
64
|
+
<%= Spree.t(:currency_settings) %>
|
65
65
|
</h1>
|
66
66
|
</div>
|
67
67
|
|
68
68
|
<div class="card-body">
|
69
|
+
<div class="alert alert-warning col-12">
|
70
|
+
This can be overriden by individual Store settings
|
71
|
+
</div>
|
69
72
|
<div class="form-group">
|
70
|
-
<%= label_tag :currency, Spree.t(:
|
73
|
+
<%= label_tag :currency, Spree.t(:default_currency) %>
|
71
74
|
<%= select_tag :currency, currency_options %>
|
72
75
|
</div>
|
73
|
-
|
76
|
+
</div>
|
77
|
+
</div>
|
78
|
+
|
79
|
+
<div class="card mb-3" id="general-settings-stores" data-hook="general_settings_stores">
|
80
|
+
<div class="card-header">
|
81
|
+
<h1 class="card-title mb-0 h5">
|
82
|
+
<%= Spree.t(:multiple_stores) %>
|
83
|
+
</h1>
|
84
|
+
</div>
|
85
|
+
<div class="card-body">
|
86
|
+
<div class="alert alert-warning col-12">
|
87
|
+
<%= Spree.t('show_store_selector.long') %>
|
88
|
+
</div>
|
89
|
+
<div class="form-group">
|
90
|
+
<div class="checkbox">
|
91
|
+
<label>
|
92
|
+
<%= check_box('', :show_store_selector, { checked: Spree::Config.show_store_selector }) %>
|
93
|
+
<%= Spree.t('show_store_selector.short') %>
|
94
|
+
</label>
|
95
|
+
</div>
|
96
|
+
</div>
|
74
97
|
</div>
|
75
98
|
</div>
|
76
99
|
</div>
|
@@ -14,4 +14,13 @@
|
|
14
14
|
<%= f.error_message_on :presentation %>
|
15
15
|
<% end %>
|
16
16
|
</div>
|
17
|
+
|
18
|
+
<div class="col-12 col-md-6">
|
19
|
+
<%= f.field_container :filterable, class: ['form-group'] do %>
|
20
|
+
<%= label_tag :option_type_filterable do %>
|
21
|
+
<%= f.check_box :filterable %>
|
22
|
+
<%= Spree.t(:filterable) %>
|
23
|
+
<% end %>
|
24
|
+
<% end %>
|
25
|
+
</div>
|
17
26
|
</div>
|
@@ -18,17 +18,19 @@
|
|
18
18
|
<th class="no-border handel-head"></th>
|
19
19
|
<th><%= Spree.t(:name) %></th>
|
20
20
|
<th><%= Spree.t(:presentation) %></th>
|
21
|
+
<th><%= Spree.t(:filterable) %></th>
|
21
22
|
<th class="actions"></th>
|
22
23
|
</tr>
|
23
24
|
</thead>
|
24
25
|
<tbody id="sortVert">
|
25
26
|
<% @option_types.each do |option_type| %>
|
26
|
-
<tr class="spree_option_type <%= cycle('odd', 'even')%>" id="<%= spree_dom_id option_type %>" data-hook="option_row">
|
27
|
+
<tr class="spree_option_type <%= cycle('odd', 'even') %>" id="<%= spree_dom_id option_type %>" data-hook="option_row">
|
27
28
|
<td class="move-handle text-center">
|
28
29
|
<%= svg_icon name: "sort.svg", width: '18', height: '18' %>
|
29
30
|
</td>
|
30
31
|
<td><%= option_type.name %></td>
|
31
32
|
<td class="presentation"><%= option_type.presentation %></td>
|
33
|
+
<td><%= active_badge(option_type.filterable) %></td>
|
32
34
|
<td class="actions actions-2 text-right">
|
33
35
|
<%= link_to_edit(option_type, class: 'admin_edit_option_type', no_text: true) if can?(:edit, option_type) %>
|
34
36
|
<%= link_to_delete(option_type, no_text: true) if can?(:delete, option_type) %>
|
@@ -9,7 +9,7 @@
|
|
9
9
|
<div class="card-body">
|
10
10
|
<div data-hook="add_product_name" class="form-group">
|
11
11
|
<%= label_tag :add_line_item_variant_id, Spree.t(:name_or_sku) %>
|
12
|
-
<%=
|
12
|
+
<%= select_tag 'add_line_item_variant_id', nil , class: 'variant_autocomplete d-block w-100' %>
|
13
13
|
</div>
|
14
14
|
|
15
15
|
<div id="stock_details"></div>
|
@@ -10,7 +10,7 @@
|
|
10
10
|
<div class="card-body">
|
11
11
|
<div data-hook="add_product_name">
|
12
12
|
<%= label_tag :add_variant_id, Spree.t(:name_or_sku) %>
|
13
|
-
<%=
|
13
|
+
<%= select_tag 'variants', nil, id: :add_variant_id, class: 'variant_autocomplete d-block w-100' %>
|
14
14
|
</div>
|
15
15
|
|
16
16
|
<div id="stock_details"></div>
|
@@ -9,8 +9,8 @@
|
|
9
9
|
<table class="table table-bordered">
|
10
10
|
<thead>
|
11
11
|
<tr>
|
12
|
-
<th><%= Spree.t('name')%></th>
|
13
|
-
<th><%= Spree.t('amount')%></th>
|
12
|
+
<th><%= Spree.t('name') %></th>
|
13
|
+
<th><%= Spree.t('amount') %></th>
|
14
14
|
</tr>
|
15
15
|
</thead>
|
16
16
|
<tbody id="order-charges" data-hook="order_details_adjustments">
|
@@ -0,0 +1,18 @@
|
|
1
|
+
<div data-hook="channel-form-container">
|
2
|
+
<%= form_for [:admin, order], method: :put, url: set_channel_admin_order_url do |f| %>
|
3
|
+
<fieldset>
|
4
|
+
<div data-hook="admin_order_channel_field">
|
5
|
+
<%= f.field_container :channel, class: %w[form-group] do %>
|
6
|
+
<%= f.label :channel, Spree.t(:channel) %>
|
7
|
+
<%= f.text_field :channel, name: 'channel', class: 'form-control' %>
|
8
|
+
<%= f.error_message_on :channel %>
|
9
|
+
<% end %>
|
10
|
+
</div>
|
11
|
+
<div class="form-actions" data-hook="buttons">
|
12
|
+
<%= button Spree.t('actions.update'), 'refresh', 'submit', { class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
|
13
|
+
<span class="or"><%= Spree.t(:or) %></span>
|
14
|
+
<%= button_link_to Spree.t('actions.cancel'), edit_admin_order_url(order), icon: 'delete' %>
|
15
|
+
</div>
|
16
|
+
<fieldset>
|
17
|
+
<% end %>
|
18
|
+
</div>
|
@@ -12,18 +12,15 @@
|
|
12
12
|
<%= render "spree/admin/orders/adjustments",
|
13
13
|
adjustments: @order.line_item_adjustments,
|
14
14
|
order: order,
|
15
|
-
title: Spree.t(:line_item_adjustments)
|
16
|
-
%>
|
15
|
+
title: Spree.t(:line_item_adjustments) %>
|
17
16
|
<%= render "spree/admin/orders/adjustments",
|
18
17
|
adjustments: @order.shipment_adjustments,
|
19
18
|
order: order,
|
20
|
-
title: Spree.t(:shipment_adjustments)
|
21
|
-
%>
|
19
|
+
title: Spree.t(:shipment_adjustments) %>
|
22
20
|
<%= render "spree/admin/orders/adjustments",
|
23
21
|
adjustments: @order.adjustments,
|
24
22
|
order: order,
|
25
|
-
title: Spree.t(:order_adjustments)
|
26
|
-
%>
|
23
|
+
title: Spree.t(:order_adjustments) %>
|
27
24
|
|
28
25
|
<% if order.line_items.exists? %>
|
29
26
|
<div class="alert alert-success" id="order-total" data-hook="order_details_total">
|
@@ -34,7 +31,7 @@
|
|
34
31
|
</div>
|
35
32
|
<% end %>
|
36
33
|
|
37
|
-
|
34
|
+
<script>
|
38
35
|
var order_number = '<%= @order.number %>';
|
39
36
|
var shipments = [];
|
40
37
|
|
@@ -46,11 +43,10 @@
|
|
46
43
|
:id, :tracking, :number, :state, :stock_location_id
|
47
44
|
], include: [
|
48
45
|
:inventory_units, :stock_location
|
49
|
-
]).to_json
|
50
|
-
%>
|
46
|
+
]).to_json %>
|
51
47
|
);
|
52
48
|
<% end %>
|
53
49
|
|
54
50
|
<%= render partial: 'spree/admin/shared/update_order_state', formats: [:js], handlers: [:erb] %>
|
55
|
-
|
51
|
+
</script>
|
56
52
|
</div>
|