solidus_backend 3.3.1 → 3.4.1
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/datepicker.js +2 -1
- data/app/assets/javascripts/spree/backend/navigation.js +13 -3
- data/app/assets/javascripts/spree/backend/shipments.js +1 -1
- data/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs +1 -1
- data/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs +2 -2
- data/app/controllers/spree/admin/orders_controller.rb +4 -0
- data/app/controllers/spree/admin/payments_controller.rb +2 -0
- data/app/controllers/spree/admin/resource_controller.rb +3 -1
- data/app/helpers/spree/admin/adjustments_helper.rb +2 -2
- data/app/helpers/spree/admin/base_helper.rb +1 -1
- data/app/helpers/spree/admin/orders_helper.rb +18 -0
- data/app/helpers/spree/admin/stock_movements_helper.rb +1 -1
- data/app/views/spree/admin/adjustment_reasons/index.html.erb +3 -3
- data/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb +2 -2
- data/app/views/spree/admin/adjustments/_form.html.erb +1 -1
- data/app/views/spree/admin/adjustments/index.html.erb +2 -2
- data/app/views/spree/admin/adjustments/new.html.erb +0 -1
- data/app/views/spree/admin/cancellations/index.html.erb +6 -6
- data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +1 -1
- data/app/views/spree/admin/customer_returns/new.html.erb +0 -1
- data/app/views/spree/admin/images/_image_row.html.erb +1 -2
- data/app/views/spree/admin/images/edit.html.erb +0 -1
- data/app/views/spree/admin/images/index.html.erb +0 -1
- data/app/views/spree/admin/option_types/_form.html.erb +2 -2
- data/app/views/spree/admin/option_types/_option_value_fields.html.erb +1 -1
- data/app/views/spree/admin/option_types/edit.html.erb +0 -1
- data/app/views/spree/admin/option_types/index.html.erb +0 -1
- data/app/views/spree/admin/orders/_adjustments.html.erb +2 -2
- data/app/views/spree/admin/orders/_carton.html.erb +5 -5
- data/app/views/spree/admin/orders/_carton_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/_form.html.erb +2 -2
- data/app/views/spree/admin/orders/_line_items.html.erb +6 -6
- data/app/views/spree/admin/orders/_risk_analysis.html.erb +20 -44
- data/app/views/spree/admin/orders/_shipment.html.erb +6 -6
- data/app/views/spree/admin/orders/_shipment_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/cart.html.erb +2 -3
- data/app/views/spree/admin/orders/confirm/_customer_details.html.erb +1 -1
- data/app/views/spree/admin/orders/confirm/_line_items.html.erb +1 -1
- data/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb +1 -1
- data/app/views/spree/admin/orders/confirm.html.erb +0 -1
- data/app/views/spree/admin/orders/confirm_advance.html.erb +1 -2
- data/app/views/spree/admin/orders/customer_details/edit.html.erb +0 -1
- data/app/views/spree/admin/orders/customer_details/show.html.erb +0 -2
- data/app/views/spree/admin/orders/edit.html.erb +2 -2
- data/app/views/spree/admin/orders/index.html.erb +1 -2
- data/app/views/spree/admin/payment_methods/index.html.erb +2 -3
- data/app/views/spree/admin/payment_methods/new.html.erb +0 -1
- data/app/views/spree/admin/payments/_form.html.erb +1 -1
- data/app/views/spree/admin/payments/_list.html.erb +11 -8
- data/app/views/spree/admin/payments/_log_entries.html.erb +3 -3
- data/app/views/spree/admin/payments/credit.html.erb +0 -1
- data/app/views/spree/admin/payments/new.html.erb +0 -1
- data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +1 -1
- data/app/views/spree/admin/payments/source_views/_gateway.html.erb +46 -3
- data/app/views/spree/admin/payments/source_views/_store_credit.html.erb +1 -1
- data/app/views/spree/admin/products/_form.html.erb +68 -64
- data/app/views/spree/admin/products/index.html.erb +1 -1
- data/app/views/spree/admin/promotion_categories/edit.html.erb +0 -1
- data/app/views/spree/admin/promotion_categories/index.html.erb +0 -1
- data/app/views/spree/admin/promotion_categories/new.html.erb +0 -1
- data/app/views/spree/admin/promotions/_actions.html.erb +1 -1
- data/app/views/spree/admin/promotions/_form.html.erb +4 -4
- data/app/views/spree/admin/promotions/_rules.html.erb +1 -2
- data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb +1 -1
- data/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb +1 -2
- data/app/views/spree/admin/promotions/index.html.erb +0 -1
- data/app/views/spree/admin/properties/_form.html.erb +2 -2
- data/app/views/spree/admin/properties/edit.html.erb +0 -1
- data/app/views/spree/admin/properties/filtered.html.erb +1 -1
- data/app/views/spree/admin/properties/index.html.erb +0 -1
- data/app/views/spree/admin/refund_reasons/index.html.erb +3 -4
- data/app/views/spree/admin/refund_reasons/new.html.erb +0 -1
- data/app/views/spree/admin/refund_reasons/shared/_form.html.erb +2 -2
- data/app/views/spree/admin/refunds/edit.html.erb +2 -2
- data/app/views/spree/admin/refunds/new.html.erb +3 -4
- data/app/views/spree/admin/reimbursement_types/index.html.erb +0 -1
- data/app/views/spree/admin/reimbursements/edit.html.erb +1 -2
- data/app/views/spree/admin/reimbursements/show.html.erb +0 -1
- data/app/views/spree/admin/return_authorizations/edit.html.erb +4 -4
- data/app/views/spree/admin/return_authorizations/index.html.erb +0 -1
- data/app/views/spree/admin/return_authorizations/new.html.erb +0 -1
- data/app/views/spree/admin/shared/_head.html.erb +5 -5
- data/app/views/spree/admin/shared/_js_locale_data.html.erb +1 -1
- data/app/views/spree/admin/shared/_order_summary.html.erb +1 -1
- data/app/views/spree/admin/shared/_order_tabs.html.erb +0 -1
- data/app/views/spree/admin/shared/named_types/_edit.html.erb +0 -1
- data/app/views/spree/admin/shared/named_types/_form.html.erb +1 -1
- data/app/views/spree/admin/shared/named_types/_index.html.erb +3 -4
- data/app/views/spree/admin/shared/named_types/_new.html.erb +0 -1
- data/app/views/spree/admin/shipping_categories/edit.html.erb +0 -1
- data/app/views/spree/admin/shipping_categories/index.html.erb +1 -2
- data/app/views/spree/admin/shipping_categories/new.html.erb +0 -1
- data/app/views/spree/admin/shipping_methods/edit.html.erb +0 -1
- data/app/views/spree/admin/shipping_methods/index.html.erb +1 -2
- data/app/views/spree/admin/shipping_methods/new.html.erb +0 -1
- data/app/views/spree/admin/stock_items/_stock_management.html.erb +5 -5
- data/app/views/spree/admin/stock_locations/_form.html.erb +1 -1
- data/app/views/spree/admin/stock_locations/edit.html.erb +1 -2
- data/app/views/spree/admin/stock_locations/index.html.erb +9 -9
- data/app/views/spree/admin/stock_locations/new.html.erb +0 -1
- data/app/views/spree/admin/stock_movements/index.html.erb +8 -13
- data/app/views/spree/admin/store_credit_reasons/index.html.erb +3 -3
- data/app/views/spree/admin/store_credit_reasons/shared/_form.html.erb +1 -1
- data/app/views/spree/admin/store_credits/edit_amount.html.erb +1 -2
- data/app/views/spree/admin/store_credits/edit_validity.html.erb +0 -1
- data/app/views/spree/admin/store_credits/index.html.erb +0 -1
- data/app/views/spree/admin/store_credits/new.html.erb +0 -1
- data/app/views/spree/admin/store_credits/show.html.erb +10 -11
- data/app/views/spree/admin/stores/_form.html.erb +6 -5
- data/app/views/spree/admin/style_guide/topics/components/_modals.html.erb +12 -14
- data/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb +0 -1
- data/app/views/spree/admin/style_guide/topics/forms/_helper_text.html.erb +0 -6
- data/app/views/spree/admin/style_guide/topics/forms/_inputs.html.erb +1 -1
- data/app/views/spree/admin/style_guide/topics/layout/_full_width_table_layout.html.erb +0 -4
- data/app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb +1 -1
- data/app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb +2 -2
- data/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb +0 -1
- data/app/views/spree/admin/style_guide/topics/typography/_lists.html.erb +1 -1
- data/app/views/spree/admin/tax_categories/edit.html.erb +0 -1
- data/app/views/spree/admin/tax_categories/index.html.erb +11 -10
- data/app/views/spree/admin/tax_categories/new.html.erb +0 -2
- data/app/views/spree/admin/tax_rates/_form.html.erb +1 -1
- data/app/views/spree/admin/tax_rates/edit.html.erb +0 -1
- data/app/views/spree/admin/tax_rates/index.html.erb +9 -10
- data/app/views/spree/admin/tax_rates/new.html.erb +0 -1
- data/app/views/spree/admin/taxonomies/_form.html.erb +1 -1
- data/app/views/spree/admin/taxonomies/edit.html.erb +0 -2
- data/app/views/spree/admin/taxonomies/index.html.erb +0 -1
- data/app/views/spree/admin/taxonomies/new.html.erb +0 -1
- data/app/views/spree/admin/taxons/_form.html.erb +7 -7
- data/app/views/spree/admin/taxons/edit.html.erb +0 -1
- data/app/views/spree/admin/taxons/index.html.erb +1 -1
- data/app/views/spree/admin/users/_form.html.erb +0 -1
- data/app/views/spree/admin/users/_tabs.html.erb +5 -5
- data/app/views/spree/admin/users/addresses.html.erb +0 -1
- data/app/views/spree/admin/users/index.html.erb +2 -2
- data/app/views/spree/admin/users/items.html.erb +8 -8
- data/app/views/spree/admin/users/orders.html.erb +1 -2
- data/app/views/spree/admin/variants/_form.html.erb +0 -2
- data/app/views/spree/admin/variants/_table.html.erb +5 -5
- data/app/views/spree/admin/variants/edit.html.erb +0 -2
- data/app/views/spree/admin/variants/index.html.erb +1 -1
- data/app/views/spree/admin/zones/_form.html.erb +4 -4
- data/app/views/spree/admin/zones/edit.html.erb +0 -1
- data/app/views/spree/admin/zones/index.html.erb +4 -4
- data/app/views/spree/admin/zones/new.html.erb +0 -1
- data/app/views/spree/layouts/admin_style_guide.html.erb +1 -1
- data/config/routes.rb +1 -1
- metadata +10 -10
@@ -28,7 +28,7 @@
|
|
28
28
|
<th>2/3 column<br>(main content area)</th>
|
29
29
|
<th>1/3 column<br>(secondary content area)</th>
|
30
30
|
<th>1/2 column<br>(main content, small screen)</th>
|
31
|
-
<th>1 column<br>(main & secondary content, small screen)
|
31
|
+
<th>1 column<br>(main & secondary content, small screen)</th>
|
32
32
|
</tr>
|
33
33
|
<tr>
|
34
34
|
<td>text field - 'normal'</td>
|
@@ -14,9 +14,9 @@
|
|
14
14
|
<div class="style-guide-code">
|
15
15
|
<pre><code class="language-html"><%= escape_once snippet %></code></pre>
|
16
16
|
</div>
|
17
|
-
<br
|
17
|
+
<br>
|
18
18
|
<%- info_tooltip = capture do %>
|
19
|
-
<a title="Some info." class="fa fa-info-circle with-tip"
|
19
|
+
<a title="Some info." class="fa fa-info-circle with-tip" href="#"></a>
|
20
20
|
<%- end %>
|
21
21
|
<table class="with-actions-borders">
|
22
22
|
<thead>
|
@@ -4,7 +4,6 @@
|
|
4
4
|
<% admin_breadcrumb(t('spree.admin.tab.taxes')) %>
|
5
5
|
<% admin_breadcrumb(plural_resource_name(Spree::TaxCategory)) %>
|
6
6
|
|
7
|
-
|
8
7
|
<% content_for :page_actions do %>
|
9
8
|
<ul class="actions inline-menu">
|
10
9
|
<% if can?(:create, Spree::TaxCategory) %>
|
@@ -18,11 +17,11 @@
|
|
18
17
|
<% if @tax_categories.any? %>
|
19
18
|
<table class="index" id='listing_tax_categories' data-hook>
|
20
19
|
<colgroup>
|
21
|
-
<col style="width: 20%"
|
22
|
-
<col style="width: 10%"
|
23
|
-
<col style="width: 40%"
|
24
|
-
<col style="width: 15%"
|
25
|
-
<col style="width: 15%"
|
20
|
+
<col style="width: 20%">
|
21
|
+
<col style="width: 10%">
|
22
|
+
<col style="width: 40%">
|
23
|
+
<col style="width: 15%">
|
24
|
+
<col style="width: 15%">
|
26
25
|
</colgroup>
|
27
26
|
<thead>
|
28
27
|
<tr data-hook="tax_header">
|
@@ -34,10 +33,11 @@
|
|
34
33
|
</tr>
|
35
34
|
</thead>
|
36
35
|
<tbody>
|
37
|
-
<% @tax_categories.each do |tax_category|
|
38
|
-
|
39
|
-
|
40
|
-
|
36
|
+
<% @tax_categories.each do |tax_category| %>
|
37
|
+
<%
|
38
|
+
@edit_url = edit_admin_tax_category_path(tax_category)
|
39
|
+
@delete_url = admin_tax_category_path(tax_category)
|
40
|
+
%>
|
41
41
|
<tr id="<%= spree_dom_id tax_category %>" data-hook="tax_row">
|
42
42
|
<td><%= tax_category.name %></td>
|
43
43
|
<td><%= tax_category.tax_code %></td>
|
@@ -50,6 +50,7 @@
|
|
50
50
|
<% if can?(:destroy, tax_category) %>
|
51
51
|
<%= link_to_delete tax_category, no_text: true %>
|
52
52
|
<% end %>
|
53
|
+
</td>
|
53
54
|
</tr>
|
54
55
|
<% end %>
|
55
56
|
</tbody>
|
@@ -5,11 +5,9 @@
|
|
5
5
|
<% admin_breadcrumb(link_to plural_resource_name(Spree::TaxCategory), spree.admin_tax_categories_path) %>
|
6
6
|
<% admin_breadcrumb(t('spree.new_tax_category')) %>
|
7
7
|
|
8
|
-
|
9
8
|
<% content_for :page_actions do %>
|
10
9
|
<% end %>
|
11
10
|
|
12
|
-
|
13
11
|
<%= render partial: 'spree/shared/error_messages', locals: { target: @tax_category } %>
|
14
12
|
|
15
13
|
<%= form_for [:admin, @tax_category] do |f| %>
|
@@ -11,7 +11,7 @@
|
|
11
11
|
<div data-hook="rate" class="field">
|
12
12
|
<%= f.label :amount %>
|
13
13
|
<%= f.text_field :amount, class: 'fullwidth' %>
|
14
|
-
<br
|
14
|
+
<br><span class="info"><%= t('spree.tax_rate_amount_explanation') %></span>
|
15
15
|
</div>
|
16
16
|
<div data-hook="included" class="field">
|
17
17
|
<label>
|
@@ -4,7 +4,6 @@
|
|
4
4
|
<% admin_breadcrumb(t('spree.admin.tab.taxes')) %>
|
5
5
|
<% admin_breadcrumb(plural_resource_name(Spree::TaxRate)) %>
|
6
6
|
|
7
|
-
|
8
7
|
<% content_for :page_actions do %>
|
9
8
|
<% if can?(:create, Spree::TaxRate) %>
|
10
9
|
<li>
|
@@ -19,7 +18,7 @@
|
|
19
18
|
|
20
19
|
<% content_for :table_filter do %>
|
21
20
|
<%= search_form_for [:admin, @search], url: spree.admin_tax_rates_path do |f| %>
|
22
|
-
<div class=
|
21
|
+
<div class="row">
|
23
22
|
<div class="col-md-6">
|
24
23
|
<div class="field">
|
25
24
|
<%= f.label :zone_id_eq, Spree::Zone.model_name.human %>
|
@@ -68,10 +67,10 @@
|
|
68
67
|
</tr>
|
69
68
|
</thead>
|
70
69
|
<tbody>
|
71
|
-
<% @tax_rates.each do |tax_rate
|
70
|
+
<% @tax_rates.each do |tax_rate| %>
|
72
71
|
<tr id="<%= spree_dom_id tax_rate %>" data-hook="rate_row">
|
73
|
-
<td><%=tax_rate.zone.try(:name) || t('spree.not_available') %></td>
|
74
|
-
<td><%=tax_rate.name %></td>
|
72
|
+
<td><%= tax_rate.zone.try(:name) || t('spree.not_available') %></td>
|
73
|
+
<td><%= tax_rate.name %></td>
|
75
74
|
<td>
|
76
75
|
<% if tax_rate.tax_categories.any? %>
|
77
76
|
<%= tax_rate.tax_categories.map(&:name).join(", ") %>
|
@@ -79,11 +78,11 @@
|
|
79
78
|
<%= t('spree.not_available') %>
|
80
79
|
<% end %>
|
81
80
|
</td>
|
82
|
-
<td><%=tax_rate.amount %></td>
|
83
|
-
<td><%=tax_rate.included_in_price? ? t('spree.say_yes') : t('spree.say_no') %></td>
|
84
|
-
<td><%=tax_rate.show_rate_in_label? ? t('spree.say_yes') : t('spree.say_no') %></td>
|
85
|
-
<td><%=tax_rate.expires_at.to_date.to_s(:short_date) if tax_rate.expires_at %></td>
|
86
|
-
<td><%=tax_rate.calculator && tax_rate.calculator.class.model_name.human %></td>
|
81
|
+
<td><%= tax_rate.amount %></td>
|
82
|
+
<td><%= tax_rate.included_in_price? ? t('spree.say_yes') : t('spree.say_no') %></td>
|
83
|
+
<td><%= tax_rate.show_rate_in_label? ? t('spree.say_yes') : t('spree.say_no') %></td>
|
84
|
+
<td><%= tax_rate.expires_at.to_date.to_s(:short_date) if tax_rate.expires_at %></td>
|
85
|
+
<td><%= tax_rate.calculator && tax_rate.calculator.class.model_name.human %></td>
|
87
86
|
<td class="actions">
|
88
87
|
<% if can?(:update, tax_rate) %>
|
89
88
|
<%= link_to_edit tax_rate, no_text: true %>
|
@@ -1,6 +1,6 @@
|
|
1
1
|
<div data-hook="admin_inside_taxonomy_form" class="field align-center">
|
2
2
|
<%= f.field_container :name do %>
|
3
|
-
<%= f.label :name, class: 'required' %><br
|
3
|
+
<%= f.label :name, class: 'required' %><br>
|
4
4
|
<%= error_message_on :taxonomy, :name, class: 'fullwidth title' %>
|
5
5
|
<%= text_field :taxonomy, :name %>
|
6
6
|
<% end %>
|
@@ -2,7 +2,6 @@
|
|
2
2
|
<% admin_breadcrumb(link_to plural_resource_name(Spree::Taxonomy), spree.admin_taxonomies_path) %>
|
3
3
|
<% admin_breadcrumb(@taxonomy.name) %>
|
4
4
|
|
5
|
-
|
6
5
|
<% content_for :page_actions do %>
|
7
6
|
<li>
|
8
7
|
<%= link_to t('spree.add_taxon'), spree.admin_taxonomies_path, class: 'add-taxon-button btn btn-primary' %>
|
@@ -18,6 +17,5 @@
|
|
18
17
|
</div>
|
19
18
|
</fieldset>
|
20
19
|
|
21
|
-
|
22
20
|
<div id="taxonomy_tree" class="tree" data-taxonomy-id="<%= @taxonomy.id %>"></div>
|
23
21
|
<% end %>
|
@@ -1,13 +1,13 @@
|
|
1
1
|
<div data-hook="admin_inside_taxon_form" class="row">
|
2
2
|
<div class="col-5">
|
3
3
|
<%= f.field_container :name do %>
|
4
|
-
<%= f.label :name, class: 'required' %><br
|
4
|
+
<%= f.label :name, class: 'required' %><br>
|
5
5
|
<%= text_field :taxon, :name, class: 'fullwidth' %>
|
6
6
|
<%= error_message_on :taxon, :name, class: 'fullwidth title' %>
|
7
7
|
<% end %>
|
8
8
|
|
9
9
|
<%= f.field_container :permalink_part do %>
|
10
|
-
<%= label_tag :permalink_part, Spree::Taxon.human_attribute_name(:permalink), class: 'required' %><br
|
10
|
+
<%= label_tag :permalink_part, Spree::Taxon.human_attribute_name(:permalink), class: 'required' %><br>
|
11
11
|
<div class="input-group">
|
12
12
|
<% if @taxon.parent %>
|
13
13
|
<div class="input-group-prepend">
|
@@ -16,7 +16,7 @@
|
|
16
16
|
</span>
|
17
17
|
</div>
|
18
18
|
<% end %>
|
19
|
-
<%= text_field_tag :permalink_part, @permalink_part, class: 'fullwidth form-control' %><br
|
19
|
+
<%= text_field_tag :permalink_part, @permalink_part, class: 'fullwidth form-control' %><br>
|
20
20
|
</div>
|
21
21
|
<% end %>
|
22
22
|
|
@@ -38,24 +38,24 @@
|
|
38
38
|
|
39
39
|
<div class="col-5">
|
40
40
|
<%= f.field_container :description do %>
|
41
|
-
<%= f.label :description %><br
|
41
|
+
<%= f.label :description %><br>
|
42
42
|
<%= f.text_area :description, class: 'fullwidth', rows: 6 %>
|
43
43
|
<% end %>
|
44
44
|
</div>
|
45
45
|
|
46
46
|
<div class="col-10">
|
47
47
|
<%= f.field_container :meta_title do %>
|
48
|
-
<%= f.label :meta_title %><br
|
48
|
+
<%= f.label :meta_title %><br>
|
49
49
|
<%= f.text_field :meta_title, class: 'fullwidth' %>
|
50
50
|
<% end %>
|
51
51
|
|
52
52
|
<%= f.field_container :meta_description do %>
|
53
|
-
<%= f.label :meta_description %><br
|
53
|
+
<%= f.label :meta_description %><br>
|
54
54
|
<%= f.text_field :meta_description, class: 'fullwidth' %>
|
55
55
|
<% end %>
|
56
56
|
|
57
57
|
<%= f.field_container :meta_keywords do %>
|
58
|
-
<%= f.label :meta_keywords %><br
|
58
|
+
<%= f.label :meta_keywords %><br>
|
59
59
|
<%= f.text_field :meta_keywords, class: 'fullwidth' %>
|
60
60
|
<% end %>
|
61
61
|
</div>
|
@@ -1,26 +1,26 @@
|
|
1
1
|
<% content_for :tabs do %>
|
2
2
|
<nav>
|
3
3
|
<ul class='tabs' data-hook="admin_user_tab_options">
|
4
|
-
<li
|
4
|
+
<li class="<%= 'active' if current == :account %>">
|
5
5
|
<%= link_to t("spree.admin.user.account"), spree.edit_admin_user_path(@user) %>
|
6
6
|
</li>
|
7
7
|
<% if can?(:addresses, @user) %>
|
8
|
-
<li
|
8
|
+
<li class="<%= 'active' if current == :address %>">
|
9
9
|
<%= link_to t("spree.admin.user.addresses"), spree.addresses_admin_user_path(@user) %>
|
10
10
|
</li>
|
11
11
|
<% end %>
|
12
12
|
<% if can?(:orders, @user) %>
|
13
|
-
<li
|
13
|
+
<li class="<%= 'active' if current == :orders %>">
|
14
14
|
<%= link_to t("spree.admin.user.order_history"), spree.orders_admin_user_path(@user) %>
|
15
15
|
</li>
|
16
16
|
<% end %>
|
17
17
|
<% if can?(:items, @user) %>
|
18
|
-
<li
|
18
|
+
<li class="<%= 'active' if current == :items %>">
|
19
19
|
<%= link_to t("spree.admin.user.items"), spree.items_admin_user_path(@user) %>
|
20
20
|
</li>
|
21
21
|
<% end %>
|
22
22
|
<% if can?(:show, @user.store_credits.new) %>
|
23
|
-
<li
|
23
|
+
<li class="<%= 'active' if current == :store_credits %>">
|
24
24
|
<%= link_to t("spree.admin.user.store_credit"), spree.admin_user_store_credits_path(@user) %>
|
25
25
|
</li>
|
26
26
|
<% end %>
|
@@ -2,7 +2,6 @@
|
|
2
2
|
<% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
|
3
3
|
<% admin_breadcrumb(plural_resource_name(Spree::Address)) %>
|
4
4
|
|
5
|
-
|
6
5
|
<%= render 'spree/admin/users/sidebar' %>
|
7
6
|
<%= render 'spree/admin/users/tabs', current: :address %>
|
8
7
|
<%= render partial: 'spree/admin/users/user_page_actions' %>
|
@@ -78,9 +78,9 @@
|
|
78
78
|
</tr>
|
79
79
|
</thead>
|
80
80
|
<tbody>
|
81
|
-
<% @users.each do |user
|
81
|
+
<% @users.each do |user| %>
|
82
82
|
<tr id="<%= spree_dom_id user %>" data-hook="admin_users_index_rows">
|
83
|
-
<td class='user_email'><%=link_to user.email, edit_admin_user_url(user) %></td>
|
83
|
+
<td class='user_email'><%= link_to user.email, edit_admin_user_url(user) %></td>
|
84
84
|
<td><%= user.spree_roles.map(&:name).to_sentence %></td>
|
85
85
|
<td class="align-center"><%= link_to user.order_count, spree.orders_admin_user_path(user) %></td>
|
86
86
|
<td class="align-center"><%= link_to user.display_lifetime_value, spree.items_admin_user_path(user) %></td>
|
@@ -2,7 +2,6 @@
|
|
2
2
|
<% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
|
3
3
|
<% admin_breadcrumb(t('spree.admin.user.items_purchased')) %>
|
4
4
|
|
5
|
-
|
6
5
|
<%= render 'spree/admin/users/sidebar' %>
|
7
6
|
<%= render 'spree/admin/users/tabs', current: :items %>
|
8
7
|
<%= render partial: 'spree/admin/users/user_page_actions' %>
|
@@ -16,13 +15,13 @@
|
|
16
15
|
<%# TODO add search interface %>
|
17
16
|
<table class="stock-contents index" id="listing_items" data-hook="stock-contents">
|
18
17
|
<colgroup>
|
19
|
-
<col style="width: 10%;"
|
20
|
-
<col style="width: 10%;"
|
21
|
-
<col style="width: 30%;"
|
22
|
-
<col style="width: 8%;"
|
23
|
-
<col style="width: 8%;"
|
24
|
-
<col style="width: 10%;"
|
25
|
-
<col style="width: 14%;"
|
18
|
+
<col style="width: 10%;">
|
19
|
+
<col style="width: 10%;">
|
20
|
+
<col style="width: 30%;">
|
21
|
+
<col style="width: 8%;">
|
22
|
+
<col style="width: 8%;">
|
23
|
+
<col style="width: 10%;">
|
24
|
+
<col style="width: 14%;">
|
26
25
|
</colgroup>
|
27
26
|
|
28
27
|
<thead>
|
@@ -69,6 +68,7 @@
|
|
69
68
|
</tr>
|
70
69
|
<% end %>
|
71
70
|
<% end %>
|
71
|
+
</tbody>
|
72
72
|
</table>
|
73
73
|
<% else %>
|
74
74
|
<div class="no-objects-found">
|
@@ -2,7 +2,6 @@
|
|
2
2
|
<% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
|
3
3
|
<% admin_breadcrumb(t('spree.admin.user.order_history')) %>
|
4
4
|
|
5
|
-
|
6
5
|
<%= render 'spree/admin/users/sidebar' %>
|
7
6
|
<%= render 'spree/admin/users/tabs', current: :orders %>
|
8
7
|
<%= render partial: 'spree/admin/users/user_page_actions' %>
|
@@ -50,7 +49,7 @@
|
|
50
49
|
</span>
|
51
50
|
</td>
|
52
51
|
<td>
|
53
|
-
<% if order.payment_state
|
52
|
+
<% if order.payment_state %>
|
54
53
|
<span class="pill pill-<%= order.payment_state %>">
|
55
54
|
<%= t(order.payment_state, scope: 'spree.payment_states') %>
|
56
55
|
</span>
|
@@ -2,11 +2,11 @@
|
|
2
2
|
|
3
3
|
<table class="index sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
|
4
4
|
<colgroup>
|
5
|
-
<col style="width: 5%"
|
6
|
-
<col style="width: 35%"
|
7
|
-
<col style="width: 20%"
|
8
|
-
<col style="width: 25%"
|
9
|
-
<col style="width: 15%"
|
5
|
+
<col style="width: 5%">
|
6
|
+
<col style="width: 35%">
|
7
|
+
<col style="width: 20%">
|
8
|
+
<col style="width: 25%">
|
9
|
+
<col style="width: 15%">
|
10
10
|
</colgroup>
|
11
11
|
<thead data-hook="variants_header">
|
12
12
|
<tr>
|
@@ -3,10 +3,8 @@
|
|
3
3
|
<% admin_breadcrumb(link_to plural_resource_name(Spree::Variant), admin_product_variants_path(@product)) %>
|
4
4
|
<% admin_breadcrumb(@variant.options_text) %>
|
5
5
|
|
6
|
-
|
7
6
|
<%= render partial: 'spree/shared/error_messages', locals: { target: @variant } %>
|
8
7
|
|
9
|
-
|
10
8
|
<%= form_for [:admin, @product, @variant] do |f| %>
|
11
9
|
<fieldset>
|
12
10
|
<legend><%= t('.edit_variant') %></legend>
|
@@ -22,7 +22,7 @@
|
|
22
22
|
<p class='first_add_option_types no-objects-found' data-hook="first_add_option_types">
|
23
23
|
<%= t('spree.to_add_variants_you_must_first_define') %>
|
24
24
|
<% if can?(:show, Spree::OptionType) %>
|
25
|
-
<%= link_to plural_resource_name(Spree::OptionType), admin_option_types_path%>
|
25
|
+
<%= link_to plural_resource_name(Spree::OptionType), admin_option_types_path %>
|
26
26
|
<% else %>
|
27
27
|
<%= plural_resource_name(Spree::OptionType) %>
|
28
28
|
<% end %>
|
@@ -3,15 +3,15 @@
|
|
3
3
|
|
4
4
|
<div data-hook="admin_zone_form_fields">
|
5
5
|
<fieldset class="no-border-bottom">
|
6
|
-
<legend align="center"><%= t('spree.general_settings')%></legend>
|
6
|
+
<legend align="center"><%= t('spree.general_settings') %></legend>
|
7
7
|
|
8
8
|
<%= zone_form.field_container :name do %>
|
9
|
-
<%= zone_form.label :name %><br
|
9
|
+
<%= zone_form.label :name %><br>
|
10
10
|
<%= zone_form.text_field :name, class: 'fullwidth' %>
|
11
11
|
<% end %>
|
12
12
|
|
13
13
|
<%= zone_form.field_container :description do %>
|
14
|
-
<%= zone_form.label :description %><br
|
14
|
+
<%= zone_form.label :description %><br>
|
15
15
|
<%= zone_form.text_field :description, class: 'fullwidth' %>
|
16
16
|
<% end %>
|
17
17
|
|
@@ -37,7 +37,7 @@
|
|
37
37
|
</div>
|
38
38
|
<div class="col-5">
|
39
39
|
|
40
|
-
<%= render partial: 'state_members', locals: { zone_form: zone_form }%>
|
40
|
+
<%= render partial: 'state_members', locals: { zone_form: zone_form } %>
|
41
41
|
<%= render partial: 'country_members', locals: { zone_form: zone_form } %>
|
42
42
|
</div>
|
43
43
|
|
@@ -14,10 +14,10 @@
|
|
14
14
|
<% if @zones.any? %>
|
15
15
|
<table class="index" id='listing_zones' data-hook>
|
16
16
|
<colgroup>
|
17
|
-
<col style="width: 30%"
|
18
|
-
<col style="width: 40%"
|
19
|
-
<col style="width: 15%"
|
20
|
-
<col style="width: 15%"
|
17
|
+
<col style="width: 30%">
|
18
|
+
<col style="width: 40%">
|
19
|
+
<col style="width: 15%">
|
20
|
+
<col style="width: 15%">
|
21
21
|
</colgroup>
|
22
22
|
<thead>
|
23
23
|
<tr data-hook="zones_header">
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<!doctype html>
|
2
2
|
<html lang="<%= I18n.locale %>">
|
3
3
|
<head>
|
4
|
-
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type"
|
4
|
+
<meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
|
5
5
|
<title>Solidus Style Guide</title>
|
6
6
|
|
7
7
|
<%= stylesheet_link_tag "spree/backend/all", data: {turbolinks_track: 'reload'} %>
|
data/config/routes.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: solidus_backend
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.
|
4
|
+
version: 3.4.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Solidus Team
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-
|
11
|
+
date: 2023-04-27 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: solidus_api
|
@@ -16,28 +16,28 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 3.
|
19
|
+
version: 3.4.1
|
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.
|
26
|
+
version: 3.4.1
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: solidus_core
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
31
|
- - '='
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: 3.
|
33
|
+
version: 3.4.1
|
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.
|
40
|
+
version: 3.4.1
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: font-awesome-rails
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -896,7 +896,7 @@ licenses:
|
|
896
896
|
- BSD-3-Clause
|
897
897
|
metadata:
|
898
898
|
rubygems_mfa_required: 'true'
|
899
|
-
post_install_message:
|
899
|
+
post_install_message:
|
900
900
|
rdoc_options: []
|
901
901
|
require_paths:
|
902
902
|
- lib
|
@@ -911,8 +911,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
911
911
|
- !ruby/object:Gem::Version
|
912
912
|
version: 1.8.23
|
913
913
|
requirements: []
|
914
|
-
rubygems_version: 3.
|
915
|
-
signing_key:
|
914
|
+
rubygems_version: 3.4.6
|
915
|
+
signing_key:
|
916
916
|
specification_version: 4
|
917
917
|
summary: Admin interface for the Solidus e-commerce framework.
|
918
918
|
test_files: []
|