solidus_backend 3.3.1 → 3.4.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (150) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend/datepicker.js +2 -1
  3. data/app/assets/javascripts/spree/backend/navigation.js +13 -3
  4. data/app/assets/javascripts/spree/backend/shipments.js +1 -1
  5. data/app/assets/javascripts/spree/backend/templates/orders/line_item.hbs +1 -1
  6. data/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs +2 -2
  7. data/app/controllers/spree/admin/orders_controller.rb +4 -0
  8. data/app/controllers/spree/admin/payments_controller.rb +2 -0
  9. data/app/controllers/spree/admin/resource_controller.rb +3 -1
  10. data/app/helpers/spree/admin/adjustments_helper.rb +2 -2
  11. data/app/helpers/spree/admin/base_helper.rb +1 -1
  12. data/app/helpers/spree/admin/orders_helper.rb +18 -0
  13. data/app/helpers/spree/admin/stock_movements_helper.rb +1 -1
  14. data/app/views/spree/admin/adjustment_reasons/index.html.erb +3 -3
  15. data/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb +2 -2
  16. data/app/views/spree/admin/adjustments/_form.html.erb +1 -1
  17. data/app/views/spree/admin/adjustments/index.html.erb +2 -2
  18. data/app/views/spree/admin/adjustments/new.html.erb +0 -1
  19. data/app/views/spree/admin/cancellations/index.html.erb +6 -6
  20. data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +1 -1
  21. data/app/views/spree/admin/customer_returns/new.html.erb +0 -1
  22. data/app/views/spree/admin/images/_image_row.html.erb +1 -2
  23. data/app/views/spree/admin/images/edit.html.erb +0 -1
  24. data/app/views/spree/admin/images/index.html.erb +0 -1
  25. data/app/views/spree/admin/option_types/_form.html.erb +2 -2
  26. data/app/views/spree/admin/option_types/_option_value_fields.html.erb +1 -1
  27. data/app/views/spree/admin/option_types/edit.html.erb +0 -1
  28. data/app/views/spree/admin/option_types/index.html.erb +0 -1
  29. data/app/views/spree/admin/orders/_adjustments.html.erb +2 -2
  30. data/app/views/spree/admin/orders/_carton.html.erb +5 -5
  31. data/app/views/spree/admin/orders/_carton_manifest.html.erb +1 -1
  32. data/app/views/spree/admin/orders/_form.html.erb +2 -2
  33. data/app/views/spree/admin/orders/_line_items.html.erb +6 -6
  34. data/app/views/spree/admin/orders/_risk_analysis.html.erb +20 -44
  35. data/app/views/spree/admin/orders/_shipment.html.erb +6 -6
  36. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +1 -1
  37. data/app/views/spree/admin/orders/cart.html.erb +2 -3
  38. data/app/views/spree/admin/orders/confirm/_customer_details.html.erb +1 -1
  39. data/app/views/spree/admin/orders/confirm/_line_items.html.erb +1 -1
  40. data/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb +1 -1
  41. data/app/views/spree/admin/orders/confirm.html.erb +0 -1
  42. data/app/views/spree/admin/orders/confirm_advance.html.erb +1 -2
  43. data/app/views/spree/admin/orders/customer_details/edit.html.erb +0 -1
  44. data/app/views/spree/admin/orders/customer_details/show.html.erb +0 -2
  45. data/app/views/spree/admin/orders/edit.html.erb +2 -2
  46. data/app/views/spree/admin/orders/index.html.erb +1 -2
  47. data/app/views/spree/admin/payment_methods/index.html.erb +2 -3
  48. data/app/views/spree/admin/payment_methods/new.html.erb +0 -1
  49. data/app/views/spree/admin/payments/_form.html.erb +1 -1
  50. data/app/views/spree/admin/payments/_list.html.erb +11 -8
  51. data/app/views/spree/admin/payments/_log_entries.html.erb +3 -3
  52. data/app/views/spree/admin/payments/credit.html.erb +0 -1
  53. data/app/views/spree/admin/payments/new.html.erb +0 -1
  54. data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +1 -1
  55. data/app/views/spree/admin/payments/source_views/_gateway.html.erb +46 -3
  56. data/app/views/spree/admin/payments/source_views/_store_credit.html.erb +1 -1
  57. data/app/views/spree/admin/products/_form.html.erb +60 -63
  58. data/app/views/spree/admin/products/index.html.erb +1 -1
  59. data/app/views/spree/admin/promotion_categories/edit.html.erb +0 -1
  60. data/app/views/spree/admin/promotion_categories/index.html.erb +0 -1
  61. data/app/views/spree/admin/promotion_categories/new.html.erb +0 -1
  62. data/app/views/spree/admin/promotions/_actions.html.erb +1 -1
  63. data/app/views/spree/admin/promotions/_form.html.erb +4 -4
  64. data/app/views/spree/admin/promotions/_rules.html.erb +1 -2
  65. data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb +1 -1
  66. data/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb +1 -2
  67. data/app/views/spree/admin/promotions/index.html.erb +0 -1
  68. data/app/views/spree/admin/properties/_form.html.erb +2 -2
  69. data/app/views/spree/admin/properties/edit.html.erb +0 -1
  70. data/app/views/spree/admin/properties/filtered.html.erb +1 -1
  71. data/app/views/spree/admin/properties/index.html.erb +0 -1
  72. data/app/views/spree/admin/refund_reasons/index.html.erb +3 -4
  73. data/app/views/spree/admin/refund_reasons/new.html.erb +0 -1
  74. data/app/views/spree/admin/refund_reasons/shared/_form.html.erb +2 -2
  75. data/app/views/spree/admin/refunds/edit.html.erb +2 -2
  76. data/app/views/spree/admin/refunds/new.html.erb +3 -4
  77. data/app/views/spree/admin/reimbursement_types/index.html.erb +0 -1
  78. data/app/views/spree/admin/reimbursements/edit.html.erb +1 -2
  79. data/app/views/spree/admin/reimbursements/show.html.erb +0 -1
  80. data/app/views/spree/admin/return_authorizations/edit.html.erb +4 -4
  81. data/app/views/spree/admin/return_authorizations/index.html.erb +0 -1
  82. data/app/views/spree/admin/return_authorizations/new.html.erb +0 -1
  83. data/app/views/spree/admin/shared/_head.html.erb +5 -5
  84. data/app/views/spree/admin/shared/_js_locale_data.html.erb +1 -1
  85. data/app/views/spree/admin/shared/_order_summary.html.erb +1 -1
  86. data/app/views/spree/admin/shared/_order_tabs.html.erb +0 -1
  87. data/app/views/spree/admin/shared/named_types/_edit.html.erb +0 -1
  88. data/app/views/spree/admin/shared/named_types/_form.html.erb +1 -1
  89. data/app/views/spree/admin/shared/named_types/_index.html.erb +3 -4
  90. data/app/views/spree/admin/shared/named_types/_new.html.erb +0 -1
  91. data/app/views/spree/admin/shipping_categories/edit.html.erb +0 -1
  92. data/app/views/spree/admin/shipping_categories/index.html.erb +1 -2
  93. data/app/views/spree/admin/shipping_categories/new.html.erb +0 -1
  94. data/app/views/spree/admin/shipping_methods/edit.html.erb +0 -1
  95. data/app/views/spree/admin/shipping_methods/index.html.erb +1 -2
  96. data/app/views/spree/admin/shipping_methods/new.html.erb +0 -1
  97. data/app/views/spree/admin/stock_items/_stock_management.html.erb +5 -5
  98. data/app/views/spree/admin/stock_locations/_form.html.erb +1 -1
  99. data/app/views/spree/admin/stock_locations/edit.html.erb +1 -2
  100. data/app/views/spree/admin/stock_locations/index.html.erb +9 -9
  101. data/app/views/spree/admin/stock_locations/new.html.erb +0 -1
  102. data/app/views/spree/admin/stock_movements/index.html.erb +8 -13
  103. data/app/views/spree/admin/store_credit_reasons/index.html.erb +3 -3
  104. data/app/views/spree/admin/store_credit_reasons/shared/_form.html.erb +1 -1
  105. data/app/views/spree/admin/store_credits/edit_amount.html.erb +1 -2
  106. data/app/views/spree/admin/store_credits/edit_validity.html.erb +0 -1
  107. data/app/views/spree/admin/store_credits/index.html.erb +0 -1
  108. data/app/views/spree/admin/store_credits/new.html.erb +0 -1
  109. data/app/views/spree/admin/store_credits/show.html.erb +10 -11
  110. data/app/views/spree/admin/stores/_form.html.erb +6 -5
  111. data/app/views/spree/admin/style_guide/topics/components/_modals.html.erb +12 -14
  112. data/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb +0 -1
  113. data/app/views/spree/admin/style_guide/topics/forms/_helper_text.html.erb +0 -6
  114. data/app/views/spree/admin/style_guide/topics/forms/_inputs.html.erb +1 -1
  115. data/app/views/spree/admin/style_guide/topics/layout/_full_width_table_layout.html.erb +0 -4
  116. data/app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb +1 -1
  117. data/app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb +2 -2
  118. data/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb +0 -1
  119. data/app/views/spree/admin/style_guide/topics/typography/_lists.html.erb +1 -1
  120. data/app/views/spree/admin/tax_categories/edit.html.erb +0 -1
  121. data/app/views/spree/admin/tax_categories/index.html.erb +11 -10
  122. data/app/views/spree/admin/tax_categories/new.html.erb +0 -2
  123. data/app/views/spree/admin/tax_rates/_form.html.erb +1 -1
  124. data/app/views/spree/admin/tax_rates/edit.html.erb +0 -1
  125. data/app/views/spree/admin/tax_rates/index.html.erb +9 -10
  126. data/app/views/spree/admin/tax_rates/new.html.erb +0 -1
  127. data/app/views/spree/admin/taxonomies/_form.html.erb +1 -1
  128. data/app/views/spree/admin/taxonomies/edit.html.erb +0 -2
  129. data/app/views/spree/admin/taxonomies/index.html.erb +0 -1
  130. data/app/views/spree/admin/taxonomies/new.html.erb +0 -1
  131. data/app/views/spree/admin/taxons/_form.html.erb +7 -7
  132. data/app/views/spree/admin/taxons/edit.html.erb +0 -1
  133. data/app/views/spree/admin/taxons/index.html.erb +1 -1
  134. data/app/views/spree/admin/users/_form.html.erb +0 -1
  135. data/app/views/spree/admin/users/_tabs.html.erb +5 -5
  136. data/app/views/spree/admin/users/addresses.html.erb +0 -1
  137. data/app/views/spree/admin/users/index.html.erb +2 -2
  138. data/app/views/spree/admin/users/items.html.erb +8 -8
  139. data/app/views/spree/admin/users/orders.html.erb +1 -2
  140. data/app/views/spree/admin/variants/_form.html.erb +0 -2
  141. data/app/views/spree/admin/variants/_table.html.erb +5 -5
  142. data/app/views/spree/admin/variants/edit.html.erb +0 -2
  143. data/app/views/spree/admin/variants/index.html.erb +1 -1
  144. data/app/views/spree/admin/zones/_form.html.erb +4 -4
  145. data/app/views/spree/admin/zones/edit.html.erb +0 -1
  146. data/app/views/spree/admin/zones/index.html.erb +4 -4
  147. data/app/views/spree/admin/zones/new.html.erb +0 -1
  148. data/app/views/spree/layouts/admin_style_guide.html.erb +1 -1
  149. data/config/routes.rb +1 -1
  150. metadata +10 -10
@@ -2,7 +2,6 @@
2
2
 
3
3
  <% admin_breadcrumb("#{t('spree.editing_reimbursement')} #{@reimbursement.number}") %>
4
4
 
5
-
6
5
  <% content_for :page_actions do %>
7
6
  <li><%= link_to t('spree.back_to_customer_return'), url_for([:edit, :admin, @order, @reimbursement.customer_return]), class: 'btn btn-primary' %></li>
8
7
  <% end %>
@@ -67,7 +66,7 @@
67
66
  <%= t('spree.update') %>
68
67
  <% end %>
69
68
  </div>
70
- <br/>
69
+ <br>
71
70
  <% end %>
72
71
 
73
72
  <fieldset>
@@ -2,7 +2,6 @@
2
2
 
3
3
  <% admin_breadcrumb("#{Spree::Reimbursement.model_name.human} #{@reimbursement.number}") %>
4
4
 
5
-
6
5
  <% content_for :page_actions do %>
7
6
  <li><%= link_to t('spree.back_to_customer_return'), url_for([:edit, :admin, @order, @reimbursement.customer_return]), class: 'btn btn-primary' %></li>
8
7
  <% end %>
@@ -22,14 +22,14 @@
22
22
  <%= render partial: 'spree/shared/error_messages', locals: { target: @return_authorization } %>
23
23
 
24
24
  <div data-hook="return-authorization-form-wrapper">
25
- <%= form_for [:admin, @order, @return_authorization] do |f| %>
26
- <fieldset class="no-border-top">
27
- <%= render partial: 'form', locals: { f: f } %>
25
+ <%= form_for [:admin, @order, @return_authorization] do |f| %>
26
+ <fieldset class="no-border-top">
27
+ <%= render partial: 'form', locals: { f: f } %>
28
28
 
29
29
  <div class="form-buttons filter-actions actions" data-hook="buttons">
30
30
  <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
31
31
  <%= link_to t('spree.actions.cancel'), admin_order_return_authorizations_url(@order), class: 'btn btn-primary' %>
32
32
  </div>
33
33
  </fieldset>
34
- <% end %>
34
+ <% end %>
35
35
  </div>
@@ -12,7 +12,6 @@
12
12
 
13
13
  <% admin_breadcrumb(plural_resource_name(Spree::ReturnAuthorization)) %>
14
14
 
15
-
16
15
  <% if @order.shipments.any?(&:shipped?) || @order.return_authorizations.any? %>
17
16
  <table class="index">
18
17
  <thead data-hook="rma_header">
@@ -3,7 +3,6 @@
3
3
  <% admin_breadcrumb(link_to plural_resource_name(Spree::ReturnAuthorization), spree.admin_order_return_authorizations_url) %>
4
4
  <% admin_breadcrumb(t('spree.new_return_authorization')) %>
5
5
 
6
-
7
6
  <% content_for :page_actions do %>
8
7
  <% end %>
9
8
 
@@ -1,4 +1,4 @@
1
- <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
1
+ <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
2
2
  <meta name="turbolinks-cache-control" content="no-cache">
3
3
 
4
4
  <%= csrf_meta_tags %>
@@ -31,18 +31,18 @@
31
31
  }
32
32
  </style>
33
33
 
34
- <%= javascript_tag do %>
34
+ <script>
35
35
  Spree.ready(function(){
36
36
  $('.translation_missing').tooltip();
37
37
  });
38
- <% end %>
38
+ </script>
39
39
  <%- end %>
40
40
 
41
41
  <%= render "spree/admin/shared/js_locale_data" %>
42
42
 
43
- <%= javascript_tag do -%>
43
+ <script>
44
44
  Spree.api_key = "<%= spree_current_user.try(:spree_api_key) %>";
45
45
  Spree.env = "<%= Rails.env %>";
46
- <% end %>
46
+ </script>
47
47
 
48
48
  <%= yield :head %>
@@ -11,7 +11,7 @@
11
11
  currency_delimiter: I18n.t('number.currency.format.delimiter'),
12
12
  activerecord: I18n.t('activerecord')
13
13
  }))
14
- %>;
14
+ %>;
15
15
 
16
16
  Spree.currencyInfo = <%==
17
17
  JSON.dump(
@@ -15,7 +15,7 @@
15
15
  <dt data-hook='admin_order_tab_subtotal_title'><%= Spree::Order.human_attribute_name(:item_total) %>:</dt>
16
16
  <dd id='item_total'><%= @order.display_item_total.to_html %></dd>
17
17
 
18
- <% if checkout_steps.include?("delivery") %>
18
+ <% if checkout_steps.include?("delivery") %>
19
19
  <dt class="order-shipment_total <%= "hidden" if @order.ship_total.zero? %>" data-hook='admin_order_tab_ship_total_title'><%= Spree::Order.human_attribute_name(:shipment_total) %>:</dt>
20
20
  <dd class="order-shipment_total <%= "hidden" if @order.ship_total.zero? %>" id='ship_total'><%= @order.display_ship_total.to_html %></dd>
21
21
  <% end %>
@@ -1,7 +1,6 @@
1
1
  <% admin_breadcrumb(link_to plural_resource_name(Spree::Order), spree.admin_orders_path) %>
2
2
  <% admin_breadcrumb(link_to @order.number, spree.edit_admin_order_path(@order)) %>
3
3
 
4
-
5
4
  <% content_for :sidebar_title do %>
6
5
  <%= t('spree.order_information') %>
7
6
  <% end %>
@@ -5,7 +5,6 @@
5
5
  <% admin_breadcrumb(index_link) %>
6
6
  <% admin_breadcrumb(@object.name) %>
7
7
 
8
-
9
8
  <% content_for :page_actions do %>
10
9
  <% end %>
11
10
 
@@ -1,7 +1,7 @@
1
1
  <div data-hook="admin_named_type_form_fields" class="row">
2
2
  <div class="col-4">
3
3
  <%= f.field_container :name do %>
4
- <%= f.label :name, class: 'required' %><br />
4
+ <%= f.label :name, class: 'required' %><br>
5
5
  <%= f.text_field :name, class: 'fullwidth' %>
6
6
  <% end %>
7
7
  <div class="checkbox">
@@ -4,7 +4,6 @@
4
4
  <% admin_breadcrumb(sub_tab) %>
5
5
  <% admin_breadcrumb(page_title) %>
6
6
 
7
-
8
7
  <% content_for :page_actions do %>
9
8
  <ul class="actions inline-menu">
10
9
  <% if can?(:create, Spree::ReturnReason) %>
@@ -18,9 +17,9 @@
18
17
  <% if @collection.any? %>
19
18
  <table class="index" id='listing_named_types' data-hook>
20
19
  <colgroup>
21
- <col style="width: 65%" />
22
- <col style="width: 20%" />
23
- <col style="width: 15%" />
20
+ <col style="width: 65%">
21
+ <col style="width: 20%">
22
+ <col style="width: 15%">
24
23
  </colgroup>
25
24
  <thead>
26
25
  <tr data-hook="named_types_header">
@@ -5,7 +5,6 @@
5
5
  <% admin_breadcrumb(index_link) %>
6
6
  <% admin_breadcrumb(new_object) %>
7
7
 
8
-
9
8
  <% content_for :page_actions do %>
10
9
  <% end %>
11
10
 
@@ -5,7 +5,6 @@
5
5
  <% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingCategory), spree.admin_shipping_categories_path) %>
6
6
  <% admin_breadcrumb(t('spree.editing_shipping_category')) %>
7
7
 
8
-
9
8
  <% content_for :page_actions do %>
10
9
  <% end %>
11
10
 
@@ -4,7 +4,6 @@
4
4
  <% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
5
5
  <% admin_breadcrumb(plural_resource_name(Spree::ShippingCategory)) %>
6
6
 
7
-
8
7
  <% content_for :page_actions do %>
9
8
  <% if can?(:create, Spree::ShippingCategory) %>
10
9
  <li>
@@ -26,7 +25,7 @@
26
25
  </tr>
27
26
  </thead>
28
27
  <tbody>
29
- <% @shipping_categories.each do |shipping_category|%>
28
+ <% @shipping_categories.each do |shipping_category| %>
30
29
  <tr id="<%= spree_dom_id shipping_category %>" data-hook="category_row">
31
30
  <td><%= shipping_category.name %></td>
32
31
  <td class="actions">
@@ -5,7 +5,6 @@
5
5
  <% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingCategory), spree.admin_shipping_categories_path) %>
6
6
  <% admin_breadcrumb(t('spree.new_shipping_category')) %>
7
7
 
8
-
9
8
  <% content_for :page_actions do %>
10
9
  <% end %>
11
10
 
@@ -5,7 +5,6 @@
5
5
  <% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingMethod), spree.admin_shipping_methods_path) %>
6
6
  <% admin_breadcrumb(@shipping_method.name) %>
7
7
 
8
-
9
8
  <% content_for :page_actions do %>
10
9
  <% end %>
11
10
 
@@ -4,7 +4,6 @@
4
4
  <% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
5
5
  <% admin_breadcrumb(plural_resource_name(Spree::ShippingMethod)) %>
6
6
 
7
-
8
7
  <% content_for :page_actions do %>
9
8
  <% if can?(:create, Spree::ShippingMethod) %>
10
9
  <li>
@@ -32,7 +31,7 @@
32
31
  </tr>
33
32
  </thead>
34
33
  <tbody>
35
- <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method|%>
34
+ <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method| %>
36
35
  <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows">
37
36
  <td><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
38
37
  <td><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>
@@ -5,7 +5,6 @@
5
5
  <% admin_breadcrumb(link_to plural_resource_name(Spree::ShippingMethod), spree.admin_shipping_methods_path) %>
6
6
  <% admin_breadcrumb(t('spree.new_shipping_method')) %>
7
7
 
8
-
9
8
  <% content_for :page_actions do %>
10
9
  <% end %>
11
10
 
@@ -64,11 +64,11 @@
64
64
  <td class="stock-location-items-cell" colspan="5">
65
65
  <table class="stock-location-items-table">
66
66
  <colgroup>
67
- <col style="width: 25%" />
68
- <col style="width: 20%" />
69
- <col style="width: 20%" />
70
- <col style="width: 20%" />
71
- <col style="width: 15%" />
67
+ <col style="width: 25%">
68
+ <col style="width: 20%">
69
+ <col style="width: 20%">
70
+ <col style="width: 20%">
71
+ <col style="width: 15%">
72
72
  </colgroup>
73
73
  <% variant.stock_items.each do |item| %>
74
74
  <% if @stock_item_stock_locations.include?(item.stock_location) %>
@@ -4,7 +4,7 @@
4
4
  <legend><%= t('.general') %></legend>
5
5
 
6
6
  <%= f.field_container :name do %>
7
- <%= f.label :name, class: 'required' %><br />
7
+ <%= f.label :name, class: 'required' %><br>
8
8
  <%= f.text_field :name, class: 'fullwidth', required: true %>
9
9
  <% end %>
10
10
 
@@ -5,12 +5,11 @@
5
5
  <% admin_breadcrumb(link_to plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path) %>
6
6
  <% admin_breadcrumb(@stock_location.name) %>
7
7
 
8
-
9
8
  <% content_for :page_actions do %>
10
9
  <ul class="actions inline-menu">
11
10
  <% if can?(:show, Spree::StockMovement) %>
12
11
  <li>
13
- <%= link_to plural_resource_name(Spree::StockMovement), admin_stock_location_stock_movements_path(@stock_location.id), class: 'btn btn-primary' %>
12
+ <%= link_to plural_resource_name(Spree::StockMovement), admin_stock_location_stock_movements_path(@stock_location.id), class: 'btn btn-primary' %>
14
13
  </li>
15
14
  <% end %>
16
15
  </ul>
@@ -4,7 +4,6 @@
4
4
  <% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
5
5
  <% admin_breadcrumb(plural_resource_name(Spree::StockLocation)) %>
6
6
 
7
-
8
7
  <% content_for :page_actions do %>
9
8
  <ul class="actions inline-menu">
10
9
  <% if can?(:create, Spree::StockLocation) %>
@@ -20,10 +19,10 @@
20
19
  <table class="index sortable" id='listing_stock_locations' data-hook data-sortable-link="<%= update_positions_admin_stock_locations_url %>">
21
20
  <colgroup>
22
21
  <col style="width: 10%">
23
- <col style="width: 30%" />
24
- <col style="width: 15%" />
25
- <col style="width: 30%" />
26
- <col style="width: 15%" />
22
+ <col style="width: 30%">
23
+ <col style="width: 15%">
24
+ <col style="width: 30%">
25
+ <col style="width: 15%">
27
26
  </colgroup>
28
27
  <thead>
29
28
  <tr data-hook="stock_locations_header">
@@ -35,10 +34,11 @@
35
34
  </tr>
36
35
  </thead>
37
36
  <tbody>
38
- <% @stock_locations.each do |stock_location|
39
- @edit_url = edit_admin_stock_location_path(stock_location)
40
- @delete_url = admin_stock_location_path(stock_location)
41
- %>
37
+ <% @stock_locations.each do |stock_location| %>
38
+ <%
39
+ @edit_url = edit_admin_stock_location_path(stock_location)
40
+ @delete_url = admin_stock_location_path(stock_location)
41
+ %>
42
42
  <tr id="<%= spree_dom_id stock_location %>" data-hook="stock_location_row">
43
43
  <td>
44
44
  <% if can?(:update_positions, Spree::StockLocation) %>
@@ -5,7 +5,6 @@
5
5
  <% admin_breadcrumb(link_to plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path) %>
6
6
  <% admin_breadcrumb(t('spree.new_stock_location')) %>
7
7
 
8
-
9
8
  <% content_for :page_actions do %>
10
9
  <% end %>
11
10
 
@@ -17,14 +17,11 @@
17
17
  <% end %>
18
18
 
19
19
  <% content_for :table_filter do %>
20
- <%=
21
- search_form_for(
22
- [:admin, @search],
23
- url: admin_stock_location_stock_movements_path(
24
- params[:stock_location_id]
25
- )) do |f|
26
- %>
27
- <div class ="row">
20
+ <%= search_form_for(
21
+ [:admin, @search],
22
+ url: admin_stock_location_stock_movements_path(params[:stock_location_id])
23
+ ) do |f| %>
24
+ <div class="row">
28
25
  <div class="field-block col-12 col-md-6 col-lg-4 col-xl-3">
29
26
  <div class="field">
30
27
  <%= label_tag :q_variant_sku_eq, "#{t('spree.variant')} #{t('spree.sku')}" %>
@@ -50,17 +47,15 @@
50
47
  </colgroup>
51
48
  <thead>
52
49
  <tr data-hook="admin_stock_movements_index_headers">
53
- <th><%= Spree::StockMovement.human_attribute_name(:variant) %>
50
+ <th><%= Spree::StockMovement.human_attribute_name(:variant) %></th>
54
51
  <th><%= Spree::StockMovement.human_attribute_name(:quantity) %></th>
55
52
  <th><%= Spree::StockMovement.human_attribute_name(:originated_by) %></th>
56
53
  </tr>
57
54
  </thead>
58
55
  <tbody>
59
- <% @stock_movements.each do |stock_movement|%>
56
+ <% @stock_movements.each do |stock_movement| %>
60
57
  <tr id="<%= spree_dom_id stock_movement %>" data-hook="admin_stock_movements_index_rows">
61
- <td>
62
- <%= display_variant(stock_movement) %>
63
- </td>
58
+ <td><%= display_variant(stock_movement) %></td>
64
59
  <td><%= stock_movement.quantity %></td>
65
60
  <td><%= pretty_originator(stock_movement) %></td>
66
61
  </tr>
@@ -17,9 +17,9 @@
17
17
  <% if @collection.any? %>
18
18
  <table class='index' id='listing_store_credit_reasons'>
19
19
  <colgroup>
20
- <col style='width: 65%' />
21
- <col style='width: 20%' />
22
- <col style='width: 15%' />
20
+ <col style='width: 65%'>
21
+ <col style='width: 20%'>
22
+ <col style='width: 15%'>
23
23
  </colgroup>
24
24
  <thead>
25
25
  <tr data-hook='store_credit_reasons_header'>
@@ -1,7 +1,7 @@
1
1
  <div data-hook='admin_named_type_form_fields' class='row'>
2
2
  <div class='col-3'>
3
3
  <%= f.field_container :name do %>
4
- <%= f.label :name, class: 'required' %><br />
4
+ <%= f.label :name, class: 'required' %><br>
5
5
  <%= f.text_field :name, class: 'fullwidth' %>
6
6
  <% end %>
7
7
 
@@ -4,7 +4,6 @@
4
4
  <% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, admin_user_store_credit_path(@user, @store_credit)) %>
5
5
  <% admin_breadcrumb(t('spree.edit')) %>
6
6
 
7
-
8
7
  <%= render 'spree/admin/users/sidebar' %>
9
8
  <%= render 'spree/admin/users/tabs', current: :store_credits %>
10
9
  <% content_for :page_actions do %>
@@ -16,7 +15,7 @@
16
15
  <div data-hook="admin_store_credit_form_fields" class="row">
17
16
  <div class="col-6">
18
17
  <%= f.field_container :amount do %>
19
- <%= f.label :amount, class: 'required' %><br />
18
+ <%= f.label :amount, class: 'required' %><br>
20
19
  <%= render "spree/admin/shared/number_with_currency", f: f,
21
20
  amount_attr: :amount, currency: @store_credit.currency, required: true %>
22
21
  <%= f.error_message_on :amount %>
@@ -4,7 +4,6 @@
4
4
  <% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, admin_user_store_credit_path(@user, @store_credit)) %>
5
5
  <% admin_breadcrumb(t('spree.edit')) %>
6
6
 
7
-
8
7
  <%= render 'spree/admin/users/sidebar' %>
9
8
  <%= render 'spree/admin/users/tabs', current: :store_credits %>
10
9
  <% content_for :page_actions do %>
@@ -2,7 +2,6 @@
2
2
  <% admin_breadcrumb(link_to @user.email, edit_admin_user_url(@user)) %>
3
3
  <% admin_breadcrumb(Spree::StoreCredit.model_name.human) %>
4
4
 
5
-
6
5
  <%= render 'spree/admin/users/sidebar' %>
7
6
  <%= render 'spree/admin/users/tabs', current: :store_credits %>
8
7
  <% content_for :page_actions do %>
@@ -3,7 +3,6 @@
3
3
  <% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, spree.admin_user_store_credits_path(@user)) %>
4
4
  <% admin_breadcrumb(t('spree.new_store_credit')) %>
5
5
 
6
-
7
6
  <%= render 'spree/admin/users/sidebar' %>
8
7
  <%= render 'spree/admin/users/tabs', current: :store_credits %>
9
8
  <% content_for :page_actions do %>
@@ -3,7 +3,6 @@
3
3
  <% admin_breadcrumb(link_to Spree::StoreCredit.model_name.human, spree.admin_user_store_credits_path(@user)) %>
4
4
  <% admin_breadcrumb(@store_credit.display_amount.to_html) %>
5
5
 
6
-
7
6
  <%= render 'spree/admin/users/sidebar' %>
8
7
  <%= render 'spree/admin/users/tabs', current: :store_credits %>
9
8
  <% content_for :page_actions do %>
@@ -17,9 +16,9 @@
17
16
 
18
17
  <table id='sc-detail-table'>
19
18
  <colgroup>
20
- <col style="width: 20%;" />
21
- <col style="width: 65%;" />
22
- <col style="width: 15%;" />
19
+ <col style="width: 20%;">
20
+ <col style="width: 65%;">
21
+ <col style="width: 15%;">
23
22
  </colgroup>
24
23
  <tr>
25
24
  <td>
@@ -69,13 +68,13 @@
69
68
  <legend align='center'><%= t('spree.admin.store_credits.history') %></legend>
70
69
  <table>
71
70
  <colgroup>
72
- <col style="width: 20%;" />
73
- <col style="width: 10%;" />
74
- <col style="width: 10%;" />
75
- <col style="width: 20%;" />
76
- <col style="width: 10%;" />
77
- <col style="width: 10%;" />
78
- <col style="width: 20%;" />
71
+ <col style="width: 20%;">
72
+ <col style="width: 10%;">
73
+ <col style="width: 10%;">
74
+ <col style="width: 20%;">
75
+ <col style="width: 10%;">
76
+ <col style="width: 10%;">
77
+ <col style="width: 20%;">
79
78
  </colgroup>
80
79
  <thead>
81
80
  <tr>
@@ -15,32 +15,32 @@
15
15
 
16
16
  <%= f.field_container :seo_title do %>
17
17
  <%= f.label :seo_title %>
18
- <%= f.text_field :seo_title, class: 'fullwidth' %>
18
+ <%= f.text_field :seo_title, class: 'fullwidth' %>
19
19
  <%= f.error_message_on :seo_title %>
20
20
  <% end %>
21
21
 
22
22
  <%= f.field_container :meta_keywords do %>
23
23
  <%= f.label :meta_keywords %>
24
- <%= f.text_field :meta_keywords, class: 'fullwidth' %>
24
+ <%= f.text_field :meta_keywords, class: 'fullwidth' %>
25
25
  <%= f.error_message_on :meta_keywords %>
26
26
  <% end %>
27
27
 
28
28
  <%= f.field_container :meta_description do %>
29
29
  <%= f.label :meta_description %>
30
- <%= f.text_area :meta_description, class: 'fullwidth' %>
30
+ <%= f.text_area :meta_description, class: 'fullwidth' %>
31
31
  <%= f.error_message_on :meta_description %>
32
32
  <% end %>
33
33
  </div>
34
34
  <div class="col-12 col-md-6">
35
35
  <%= f.field_container :url do %>
36
36
  <%= f.label :url, class: 'required' %>
37
- <%= f.text_field :url, required: true, class: 'fullwidth' %>
37
+ <%= f.text_field :url, required: true, class: 'fullwidth' %>
38
38
  <%= f.error_message_on :url %>
39
39
  <% end %>
40
40
 
41
41
  <%= f.field_container :mail_from_address do %>
42
42
  <%= f.label :mail_from_address, class: 'required' %>
43
- <%= f.text_field :mail_from_address, required: true, class: 'fullwidth' %>
43
+ <%= f.text_field :mail_from_address, required: true, class: 'fullwidth' %>
44
44
  <%= f.error_message_on :mail_from_address %>
45
45
  <% end %>
46
46
 
@@ -52,6 +52,7 @@
52
52
 
53
53
  <%= f.field_container :default_currency do %>
54
54
  <%= f.label :default_currency %>
55
+ <%= f.field_hint :default_currency %>
55
56
  <%= f.select :default_currency,
56
57
  Spree::Config.available_currencies.map(&:iso_code),
57
58
  { include_blank: true },
@@ -19,21 +19,19 @@
19
19
  </li>
20
20
  </ul>
21
21
 
22
- <%- snippet = capture do %>
23
- <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#your-target">
24
- Launch demo modal
25
- </button>
26
-
27
- &lt;%= render(
28
- "spree/admin/shared/modal",
29
- target: "your-target",
30
- title: "Your Title",
31
- content: "The modal's content, could be another partial"
32
- ) %&gt;
33
- <%- end %>
34
-
35
22
  <div class="style-guide-code half">
36
- <pre><code class="language-html"><%= escape_once snippet %></code></pre>
23
+ <pre><code class="language-html"><%= %{
24
+ <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#your-target">
25
+ Launch demo modal
26
+ </button>
27
+
28
+ \<\%= render(
29
+ "spree/admin/shared/modal",
30
+ target: "your-target",
31
+ title: "Your Title",
32
+ content: "The modal's content, could be another partial"
33
+ ) \%\>
34
+ }.strip_heredoc %></code></pre>
37
35
  </div>
38
36
 
39
37
  <div class="style-guide-result half">
@@ -71,7 +71,6 @@
71
71
  </form>
72
72
  <%- end %>
73
73
 
74
-
75
74
  <div class="style-guide-result">
76
75
  <%= snippet %>
77
76
  </div>
@@ -5,9 +5,3 @@
5
5
  <li>Don't display placeholder text inside text fields and boxes.</li>
6
6
  <li>Display a progress/loading message or graphic if it takes a long time to submit a form.</li>
7
7
  </ul>
8
-
9
-
10
-
11
-
12
-
13
-
@@ -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 &amp; secondary content, small screen)</th>
32
32
  </tr>
33
33
  <tr>
34
34
  <td>text field - 'normal'</td>
@@ -4,7 +4,3 @@
4
4
  <li>Use this for forms that have minimal fields and have many equal priority items in them.</li>
5
5
  <li>Try to use this form layout first before using the next one.</li>
6
6
  </ul>
7
-
8
-
9
-
10
-
@@ -7,7 +7,7 @@
7
7
  type = $(this).data('flashType');
8
8
 
9
9
  if (!$('.flash.' + type).is('*')) {
10
- flash = $("<div class='flash'>")
10
+ flash = $("<div class='flash'></div>")
11
11
  .text(type)
12
12
  .addClass(type)
13
13
  .appendTo('.js-flash-wrapper')
@@ -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" href="#"></a>
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>