solidus_backend 2.10.2 → 2.11.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of solidus_backend might be problematic. Click here for more details.

Files changed (233) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend.js +4 -1
  3. data/app/assets/javascripts/spree/backend/adjustments.js +1 -1
  4. data/app/assets/javascripts/spree/backend/admin.js +18 -29
  5. data/app/assets/javascripts/spree/backend/collections/states.js +1 -1
  6. data/app/assets/javascripts/spree/backend/components/selectable_table.js +5 -0
  7. data/app/assets/javascripts/spree/backend/components/selectable_table/return_items.js +5 -0
  8. data/app/assets/javascripts/spree/backend/components/selectable_table/summary.js +7 -0
  9. data/app/assets/javascripts/spree/backend/components/sortable_table.js +31 -25
  10. data/app/assets/javascripts/spree/backend/models/order.js +3 -3
  11. data/app/assets/javascripts/spree/backend/models/payment.js +1 -1
  12. data/app/assets/javascripts/spree/backend/models/shipment.js +1 -1
  13. data/app/assets/javascripts/spree/backend/models/stock_item.js +1 -1
  14. data/app/assets/javascripts/spree/backend/option_type_autocomplete.js +2 -2
  15. data/app/assets/javascripts/spree/backend/option_value_picker.js +2 -2
  16. data/app/assets/javascripts/spree/backend/product_picker.js +2 -2
  17. data/app/assets/javascripts/spree/backend/routes.js +40 -21
  18. data/app/assets/javascripts/spree/backend/shipments.js +5 -5
  19. data/app/assets/javascripts/spree/backend/shipping_methods/stock_locations_picker.js +18 -0
  20. data/app/assets/javascripts/spree/backend/stock_management.js +4 -2
  21. data/app/assets/javascripts/spree/backend/taxon_autocomplete.js +2 -2
  22. data/app/assets/javascripts/spree/backend/taxons.js +3 -3
  23. data/app/assets/javascripts/spree/backend/templates/index.js +2 -0
  24. data/app/assets/javascripts/spree/backend/templates/orders/customer_details/autocomplete.hbs +2 -2
  25. data/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs +5 -1
  26. data/app/assets/javascripts/spree/backend/templates/tables/return_item_sum_amount.hbs +7 -0
  27. data/app/assets/javascripts/spree/backend/templates/tables/selectable_label.hbs +6 -0
  28. data/app/assets/javascripts/spree/backend/user_picker.js +3 -4
  29. data/app/assets/javascripts/spree/backend/variant_autocomplete.js +2 -2
  30. data/app/assets/javascripts/spree/backend/views/cart/empty_cart_button.js +2 -2
  31. data/app/assets/javascripts/spree/backend/views/index.js +4 -0
  32. data/app/assets/javascripts/spree/backend/views/order/address.js +1 -1
  33. data/app/assets/javascripts/spree/backend/views/order/customer_select.js +2 -3
  34. data/app/assets/javascripts/spree/backend/views/order/details_adjustments.js +4 -1
  35. data/app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js +4 -0
  36. data/app/assets/javascripts/spree/backend/views/tables/return_items.js +9 -0
  37. data/app/assets/javascripts/spree/backend/views/tables/selectable_table.js +70 -0
  38. data/app/assets/javascripts/spree/backend/views/tables/selectable_table/sum_return_item_amount.js +32 -0
  39. data/app/assets/javascripts/spree/backend/views/tables/selectable_table/summary.js +45 -0
  40. data/app/assets/stylesheets/spree/backend/components/_navigation.scss +4 -5
  41. data/app/assets/stylesheets/spree/backend/sections/_orders.scss +5 -1
  42. data/app/assets/stylesheets/spree/backend/sections/_style_guide.scss +4 -0
  43. data/app/assets/stylesheets/spree/backend/shared/_forms.scss +1 -0
  44. data/app/controllers/spree/admin/base_controller.rb +6 -0
  45. data/app/controllers/spree/admin/cancellations_controller.rb +2 -0
  46. data/app/controllers/spree/admin/customer_returns_controller.rb +4 -4
  47. data/app/controllers/spree/admin/images_controller.rb +2 -1
  48. data/app/controllers/spree/admin/orders/customer_details_controller.rb +2 -0
  49. data/app/controllers/spree/admin/orders_controller.rb +7 -2
  50. data/app/controllers/spree/admin/payments_controller.rb +3 -1
  51. data/app/controllers/spree/admin/product_properties_controller.rb +1 -1
  52. data/app/controllers/spree/admin/products_controller.rb +18 -24
  53. data/app/controllers/spree/admin/promotion_codes_controller.rb +9 -4
  54. data/app/controllers/spree/admin/refunds_controller.rb +19 -0
  55. data/app/controllers/spree/admin/resource_controller.rb +27 -7
  56. data/app/controllers/spree/admin/return_authorizations_controller.rb +1 -1
  57. data/app/controllers/spree/admin/root_controller.rb +1 -1
  58. data/app/controllers/spree/admin/search_controller.rb +1 -2
  59. data/app/controllers/spree/admin/stock_items_controller.rb +6 -5
  60. data/app/controllers/spree/admin/stock_locations_controller.rb +4 -0
  61. data/app/controllers/spree/admin/stock_movements_controller.rb +7 -0
  62. data/app/controllers/spree/admin/taxons_controller.rb +12 -1
  63. data/app/controllers/spree/admin/users/api_key_controller.rb +29 -0
  64. data/app/controllers/spree/admin/users_controller.rb +37 -20
  65. data/app/controllers/spree/admin/variants_controller.rb +4 -2
  66. data/app/controllers/spree/admin/zones_controller.rb +1 -1
  67. data/app/helpers/spree/admin/base_helper.rb +4 -0
  68. data/app/helpers/spree/admin/customer_returns_helper.rb +1 -1
  69. data/app/helpers/spree/admin/navigation_helper.rb +1 -1
  70. data/app/helpers/spree/admin/orders_helper.rb +8 -4
  71. data/app/helpers/spree/admin/stock_movements_helper.rb +8 -4
  72. data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +2 -3
  73. data/app/views/spree/admin/images/index.html.erb +25 -21
  74. data/app/views/spree/admin/option_types/_option_value_fields.html.erb +8 -1
  75. data/app/views/spree/admin/option_types/edit.html.erb +3 -1
  76. data/app/views/spree/admin/orders/customer_details/_form.html.erb +13 -13
  77. data/app/views/spree/admin/orders/index.html.erb +23 -13
  78. data/app/views/spree/admin/payment_methods/_form.html.erb +7 -2
  79. data/app/views/spree/admin/payments/index.html.erb +3 -1
  80. data/app/views/spree/admin/prices/_master_variant_table.html.erb +3 -3
  81. data/app/views/spree/admin/prices/_table.html.erb +3 -3
  82. data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +7 -2
  83. data/app/views/spree/admin/product_properties/index.html.erb +14 -2
  84. data/app/views/spree/admin/products/_form.html.erb +13 -2
  85. data/app/views/spree/admin/products/index.html.erb +1 -1
  86. data/app/views/spree/admin/promotion_codes/index.html.erb +1 -1
  87. data/app/views/spree/admin/promotions/_actions.html.erb +1 -1
  88. data/app/views/spree/admin/promotions/_activations_new.html.erb +1 -1
  89. data/app/views/spree/admin/promotions/_rules.html.erb +1 -1
  90. data/app/views/spree/admin/promotions/edit.html.erb +2 -2
  91. data/app/views/spree/admin/promotions/index.html.erb +12 -5
  92. data/app/views/spree/admin/return_authorizations/_form.html.erb +3 -10
  93. data/app/views/spree/admin/return_authorizations/index.html.erb +1 -1
  94. data/app/views/spree/admin/search/users.json.jbuilder +15 -1
  95. data/app/views/spree/admin/shared/_address.html.erb +6 -6
  96. data/app/views/spree/admin/shared/_address_form.html.erb +15 -8
  97. data/app/views/spree/admin/shared/_order_submenu.html.erb +4 -4
  98. data/app/views/spree/admin/shared/_payments_tabs.html.erb +1 -1
  99. data/app/views/spree/admin/shared/_settings_checkout_tabs.html.erb +5 -5
  100. data/app/views/spree/admin/shared/_settings_sub_menu.html.erb +6 -6
  101. data/app/views/spree/admin/shared/_shipping_tabs.html.erb +3 -3
  102. data/app/views/spree/admin/shared/_taxes_tabs.html.erb +2 -2
  103. data/app/views/spree/admin/shared/preference_fields/_encrypted_string.html.erb +12 -0
  104. data/app/views/spree/admin/shipping_methods/_form.html.erb +18 -0
  105. data/app/views/spree/admin/stock_items/_stock_management.html.erb +1 -1
  106. data/app/views/spree/admin/stock_locations/edit.html.erb +1 -1
  107. data/app/views/spree/admin/stock_locations/index.html.erb +3 -1
  108. data/app/views/spree/admin/stock_movements/index.html.erb +30 -1
  109. data/app/views/spree/admin/stores/_form.html.erb +6 -0
  110. data/app/views/spree/admin/style_guide/topics/tables/_building_tables.html.erb +27 -3
  111. data/app/views/spree/admin/tax_categories/_form.html.erb +1 -0
  112. data/app/views/spree/admin/users/_form.html.erb +2 -2
  113. data/app/views/spree/admin/users/_tabs.html.erb +1 -1
  114. data/app/views/spree/admin/users/edit.html.erb +4 -4
  115. data/app/views/spree/admin/users/items.html.erb +5 -3
  116. data/app/views/spree/admin/users/orders.html.erb +5 -3
  117. data/app/views/spree/admin/variants/_table_filter.html.erb +1 -1
  118. data/app/views/spree/admin/variants/index.html.erb +2 -2
  119. data/config/initializers/form_builder.rb +2 -2
  120. data/lib/spree/backend/engine.rb +0 -2
  121. data/lib/spree/backend_configuration.rb +14 -1
  122. data/solidus_backend.gemspec +4 -4
  123. metadata +23 -122
  124. data/app/assets/javascripts/spree/backend/returns/return_item_selection.js +0 -35
  125. data/script/rails +0 -10
  126. data/spec/controllers/spree/admin/base_controller_spec.rb +0 -26
  127. data/spec/controllers/spree/admin/cancellations_controller_spec.rb +0 -83
  128. data/spec/controllers/spree/admin/customer_returns_controller_spec.rb +0 -235
  129. data/spec/controllers/spree/admin/locale_controller_spec.rb +0 -45
  130. data/spec/controllers/spree/admin/missing_products_controller_spec.rb +0 -18
  131. data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb +0 -128
  132. data/spec/controllers/spree/admin/orders_controller_spec.rb +0 -408
  133. data/spec/controllers/spree/admin/payment_methods_controller_spec.rb +0 -95
  134. data/spec/controllers/spree/admin/payments_controller_spec.rb +0 -194
  135. data/spec/controllers/spree/admin/prices_controller_spec.rb +0 -45
  136. data/spec/controllers/spree/admin/product_properties_controller_spec.rb +0 -71
  137. data/spec/controllers/spree/admin/products_controller_spec.rb +0 -270
  138. data/spec/controllers/spree/admin/promotion_actions_controller_spec.rb +0 -23
  139. data/spec/controllers/spree/admin/promotion_codes_controller_spec.rb +0 -32
  140. data/spec/controllers/spree/admin/promotion_rules_controller_spec.rb +0 -36
  141. data/spec/controllers/spree/admin/promotions_controller_spec.rb +0 -122
  142. data/spec/controllers/spree/admin/refunds_controller_spec.rb +0 -35
  143. data/spec/controllers/spree/admin/reimbursements_controller_spec.rb +0 -137
  144. data/spec/controllers/spree/admin/resource_controller_spec.rb +0 -201
  145. data/spec/controllers/spree/admin/return_authorizations_controller_spec.rb +0 -291
  146. data/spec/controllers/spree/admin/return_items_controller_spec.rb +0 -29
  147. data/spec/controllers/spree/admin/root_controller_spec.rb +0 -43
  148. data/spec/controllers/spree/admin/search_controller_spec.rb +0 -106
  149. data/spec/controllers/spree/admin/shipping_methods_controller_spec.rb +0 -16
  150. data/spec/controllers/spree/admin/stock_items_controller_spec.rb +0 -52
  151. data/spec/controllers/spree/admin/stock_locations_controller_spec.rb +0 -44
  152. data/spec/controllers/spree/admin/store_credits_controller_spec.rb +0 -311
  153. data/spec/controllers/spree/admin/users_controller_spec.rb +0 -287
  154. data/spec/controllers/spree/admin/variants_controller_spec.rb +0 -71
  155. data/spec/features/admin/configuration/payment_methods_spec.rb +0 -176
  156. data/spec/features/admin/configuration/shipping_methods_spec.rb +0 -126
  157. data/spec/features/admin/configuration/stock_locations_spec.rb +0 -54
  158. data/spec/features/admin/configuration/store_spec.rb +0 -62
  159. data/spec/features/admin/configuration/tax_categories_spec.rb +0 -58
  160. data/spec/features/admin/configuration/tax_rates_spec.rb +0 -31
  161. data/spec/features/admin/configuration/taxonomies_spec.rb +0 -61
  162. data/spec/features/admin/configuration/zones_spec.rb +0 -41
  163. data/spec/features/admin/homepage_spec.rb +0 -86
  164. data/spec/features/admin/javascript_format_money_spec.rb +0 -22
  165. data/spec/features/admin/locale_spec.rb +0 -34
  166. data/spec/features/admin/orders/adjustments_promotions_spec.rb +0 -55
  167. data/spec/features/admin/orders/adjustments_spec.rb +0 -130
  168. data/spec/features/admin/orders/cancelling_and_resuming_spec.rb +0 -45
  169. data/spec/features/admin/orders/cancelling_inventory_spec.rb +0 -50
  170. data/spec/features/admin/orders/customer_details_spec.rb +0 -203
  171. data/spec/features/admin/orders/customer_returns_spec.rb +0 -41
  172. data/spec/features/admin/orders/line_items_spec.rb +0 -52
  173. data/spec/features/admin/orders/listing_spec.rb +0 -186
  174. data/spec/features/admin/orders/log_entries_spec.rb +0 -56
  175. data/spec/features/admin/orders/new_order_spec.rb +0 -379
  176. data/spec/features/admin/orders/new_refund_spec.rb +0 -35
  177. data/spec/features/admin/orders/order_details_spec.rb +0 -591
  178. data/spec/features/admin/orders/payments_spec.rb +0 -330
  179. data/spec/features/admin/orders/return_authorizations_spec.rb +0 -56
  180. data/spec/features/admin/orders/return_payment_state_spec.rb +0 -65
  181. data/spec/features/admin/orders/risk_analysis_spec.rb +0 -49
  182. data/spec/features/admin/orders/shipments_spec.rb +0 -145
  183. data/spec/features/admin/payments/store_credits_spec.rb +0 -23
  184. data/spec/features/admin/products/edit/images_spec.rb +0 -76
  185. data/spec/features/admin/products/edit/products_spec.rb +0 -92
  186. data/spec/features/admin/products/edit/taxons_spec.rb +0 -57
  187. data/spec/features/admin/products/edit/variants_spec.rb +0 -63
  188. data/spec/features/admin/products/option_types_spec.rb +0 -116
  189. data/spec/features/admin/products/pricing_spec.rb +0 -127
  190. data/spec/features/admin/products/products_spec.rb +0 -348
  191. data/spec/features/admin/products/properties_spec.rb +0 -141
  192. data/spec/features/admin/products/stock_management_spec.rb +0 -101
  193. data/spec/features/admin/products/variant_spec.rb +0 -89
  194. data/spec/features/admin/promotion_adjustments_spec.rb +0 -286
  195. data/spec/features/admin/promotions/option_value_rule_spec.rb +0 -90
  196. data/spec/features/admin/promotions/product_rule_spec.rb +0 -35
  197. data/spec/features/admin/promotions/promotion_categories_spec.rb +0 -83
  198. data/spec/features/admin/promotions/promotion_code_batches_spec.rb +0 -37
  199. data/spec/features/admin/promotions/promotion_code_spec.rb +0 -31
  200. data/spec/features/admin/promotions/promotion_spec.rb +0 -52
  201. data/spec/features/admin/promotions/tiered_calculator_spec.rb +0 -76
  202. data/spec/features/admin/promotions/user_rule_spec.rb +0 -42
  203. data/spec/features/admin/reimbursements_spec.rb +0 -18
  204. data/spec/features/admin/store_credits_spec.rb +0 -132
  205. data/spec/features/admin/stores_spec.rb +0 -37
  206. data/spec/features/admin/style_guide_spec.rb +0 -14
  207. data/spec/features/admin/taxons_spec.rb +0 -90
  208. data/spec/features/admin/users_spec.rb +0 -412
  209. data/spec/fixtures/files/ror_ringer.jpeg +0 -0
  210. data/spec/helpers/admin/base_helper_spec.rb +0 -49
  211. data/spec/helpers/admin/navigation_helper_spec.rb +0 -139
  212. data/spec/helpers/admin/stock_movements_helper_spec.rb +0 -29
  213. data/spec/helpers/admin/store_credit_events_helper_spec.rb +0 -97
  214. data/spec/helpers/promotion_rules_helper_spec.rb +0 -14
  215. data/spec/javascripts/fixtures/_boot.html.erb +0 -8
  216. data/spec/javascripts/fixtures/number_with_currency/with_currency_select.html.erb +0 -3
  217. data/spec/javascripts/fixtures/number_with_currency/without_select.html.erb +0 -3
  218. data/spec/javascripts/format_money_spec.js +0 -48
  219. data/spec/javascripts/spec_helper.js +0 -13
  220. data/spec/javascripts/support/show_errors.js +0 -8
  221. data/spec/javascripts/support/with_translations.js +0 -11
  222. data/spec/javascripts/translation_spec.js +0 -58
  223. data/spec/javascripts/views/number_with_currency_spec.js +0 -72
  224. data/spec/lib/spree/backend_configuration/menu_item_spec.rb +0 -17
  225. data/spec/lib/spree/backend_configuration_spec.rb +0 -22
  226. data/spec/spec_helper.rb +0 -123
  227. data/spec/support/appear_before_matcher.rb +0 -10
  228. data/spec/support/feature/base_feature_helper.rb +0 -17
  229. data/spec/support/feature/order_feature_helper.rb +0 -27
  230. data/spec/teaspoon_env.rb +0 -51
  231. data/spec/test_views/spree/admin/widgets/edit.html.erb +0 -1
  232. data/spec/test_views/spree/admin/widgets/new.html.erb +0 -1
  233. data/spec/views/spree/admin/shared/navigation_footer_spec.rb +0 -67
@@ -3,24 +3,24 @@
3
3
  <%= tab :stores, label: :stores, url: spree.admin_stores_path %>
4
4
  <% end %>
5
5
 
6
- <% if can?(:display, Spree::PaymentMethod) %>
6
+ <% if can?(:show, Spree::PaymentMethod) %>
7
7
  <%= tab :payments, url: spree.admin_payment_methods_path %>
8
8
  <% end %>
9
9
 
10
- <% if can?(:display, Spree::TaxCategory) || can?(:display, Spree::TaxRate) %>
10
+ <% if can?(:show, Spree::TaxCategory) || can?(:show, Spree::TaxRate) %>
11
11
  <%= tab :taxes, url: spree.admin_tax_categories_path, match_path: %r(tax_categories|tax_rates) %>
12
12
  <% end %>
13
13
 
14
- <% if can?(:display, Spree::RefundReason) || can?(:display, Spree::ReimbursementType) ||
15
- can?(:display, Spree::ReturnReason) || can?(:display, Spree::AdjustmentReason) %>
14
+ <% if can?(:show, Spree::RefundReason) || can?(:show, Spree::ReimbursementType) ||
15
+ can?(:show, Spree::ReturnReason) || can?(:show, Spree::AdjustmentReason) %>
16
16
  <%= tab :checkout, url: spree.admin_refund_reasons_path, match_path: %r(refund_reasons|reimbursement_types|return_reasons|adjustment_reasons|store_credit_reasons) %>
17
17
  <% end %>
18
18
 
19
- <% if can?(:display, Spree::ShippingMethod) || can?(:display, Spree::ShippingCategory) || can?(:display, Spree::StockLocation) %>
19
+ <% if can?(:show, Spree::ShippingMethod) || can?(:show, Spree::ShippingCategory) || can?(:show, Spree::StockLocation) %>
20
20
  <%= tab :shipping, url: spree.admin_shipping_methods_path, match_path: %r(shipping_methods|shipping_categories|stock_locations) %>
21
21
  <% end %>
22
22
 
23
- <% if can?(:display, Spree::Zone) %>
23
+ <% if can?(:show, Spree::Zone) %>
24
24
  <%= tab :zones, url: spree.admin_zones_path %>
25
25
  <% end %>
26
26
  </ul>
@@ -1,16 +1,16 @@
1
1
  <% content_for :tabs do %>
2
2
  <nav>
3
3
  <ul class="tabs" data-hook="admin_settings_shipping_tabs">
4
- <% if can?(:display, Spree::ShippingMethod) %>
4
+ <% if can?(:show, Spree::ShippingMethod) %>
5
5
  <%= settings_tab_item plural_resource_name(Spree::ShippingMethod), spree.admin_shipping_methods_path %>
6
6
  <% end %>
7
7
 
8
- <% if can?(:display, Spree::ShippingCategory) %>
8
+ <% if can?(:show, Spree::ShippingCategory) %>
9
9
  <%= settings_tab_item plural_resource_name(Spree::ShippingCategory), spree.admin_shipping_categories_path %>
10
10
 
11
11
  <% end %>
12
12
 
13
- <% if can?(:display, Spree::StockLocation) %>
13
+ <% if can?(:show, Spree::StockLocation) %>
14
14
  <%= settings_tab_item plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path %>
15
15
  <% end %>
16
16
  </ul>
@@ -1,11 +1,11 @@
1
1
  <% content_for :tabs do %>
2
2
  <nav>
3
3
  <ul class="tabs" data-hook="admin_settings_taxes_tabs">
4
- <% if can? :display, Spree::TaxCategory %>
4
+ <% if can? :show, Spree::TaxCategory %>
5
5
  <%= settings_tab_item plural_resource_name(Spree::TaxCategory), spree.admin_tax_categories_path %>
6
6
  <% end %>
7
7
 
8
- <% if can? :display, Spree::TaxRate %>
8
+ <% if can? :show, Spree::TaxRate %>
9
9
  <%= settings_tab_item plural_resource_name(Spree::TaxRate), spree.admin_tax_rates_path %>
10
10
  <% end %>
11
11
  </ul>
@@ -0,0 +1,12 @@
1
+ <% label = local_assigns[:label].presence %>
2
+ <% html_options = {class: 'input_string fullwidth'}.merge(local_assigns[:html_options] || {}) %>
3
+
4
+ <div class="field">
5
+ <% if local_assigns[:form] %>
6
+ <%= form.label attribute, label %>
7
+ <%= form.text_field attribute, html_options %>
8
+ <% else %>
9
+ <%= label_tag name, label %>
10
+ <%= text_field_tag name, value, html_options %>
11
+ <% end %>
12
+ </div>
@@ -54,6 +54,24 @@
54
54
  <%= error_message_on :shipping_method, :tracking_url %>
55
55
  <% end %>
56
56
  </div>
57
+
58
+ <div class="col-5 label-block">
59
+ <%= f.field_container :stock_locations do %>
60
+ <label>
61
+ <%= f.check_box(:available_to_all) %>
62
+ <%= Spree::ShippingMethod.human_attribute_name :available_to_all %>
63
+ <%= f.field_hint :available_to_all %>
64
+ <%= error_message_on :shipping_method, :available_to_all %>
65
+ </label>
66
+ <%= f.collection_select :stock_location_ids,
67
+ Spree::StockLocation.order_default, :id, :name,
68
+ {},
69
+ class: 'fullwidth select2',
70
+ multiple: true,
71
+ placeholder: t('spree.admin.shipping_methods.form.stock_locations_placeholder') %>
72
+ <%= error_message_on :shipping_method, :stock_locations %>
73
+ <% end %>
74
+ </div>
57
75
  </div>
58
76
 
59
77
  <%= f.field_container :available_to_users, class: %w(checkbox) do %>
@@ -72,7 +72,7 @@
72
72
  </colgroup>
73
73
  <% variant.stock_items.each do |item| %>
74
74
  <% if @stock_item_stock_locations.include?(item.stock_location) %>
75
- <tr class="js-edit-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>" data-stock-item="<%= item.to_json %>" data-stock-location-name="<%= item.stock_location.name %>" data-track-inventory="<%= variant.should_track_inventory? %>" data-can-edit="<%= can?(:admin, Spree::StockItem) %>">
75
+ <tr class="js-edit-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>" data-stock-item="<%= item.to_json %>" data-stock-location-name="<%= item.stock_location.name %>" data-track-inventory="<%= variant.should_track_inventory? %>" data-can-edit="<%= can?(:admin, Spree::StockItem) %>" data-variant-sku="<%= variant.sku %>">
76
76
  <%# This is rendered in JS %>
77
77
  </tr>
78
78
  <% end %>
@@ -8,7 +8,7 @@
8
8
 
9
9
  <% content_for :page_actions do %>
10
10
  <ul class="actions inline-menu">
11
- <% if can?(:display, Spree::StockMovement) %>
11
+ <% if can?(:show, Spree::StockMovement) %>
12
12
  <li>
13
13
  <%= link_to plural_resource_name(Spree::StockMovement), admin_stock_location_stock_movements_path(@stock_location.id), class: 'btn btn-primary' %>
14
14
  </li>
@@ -16,6 +16,7 @@
16
16
  <% end %>
17
17
 
18
18
  <% if @stock_locations.any? %>
19
+ <%= paginate @stock_locations, theme: "solidus_admin" %>
19
20
  <table class="index sortable" id='listing_stock_locations' data-hook data-sortable-link="<%= update_positions_admin_stock_locations_url %>">
20
21
  <colgroup>
21
22
  <col style="width: 10%">
@@ -51,7 +52,7 @@
51
52
  </span>
52
53
  </td>
53
54
  <td>
54
- <% if can?(:display, Spree::StockMovement) %>
55
+ <% if can?(:show, Spree::StockMovement) %>
55
56
  <%= link_to plural_resource_name(Spree::StockMovement), admin_stock_location_stock_movements_path(stock_location.id) %>
56
57
  <% else %>
57
58
  Stock Movements
@@ -69,6 +70,7 @@
69
70
  <% end %>
70
71
  </tbody>
71
72
  </table>
73
+ <%= paginate @stock_locations, theme: "solidus_admin" %>
72
74
  <% else %>
73
75
  <div class="no-objects-found">
74
76
  <%= render 'spree/admin/shared/no_objects_found',
@@ -1,6 +1,6 @@
1
1
  <% admin_breadcrumb(t('spree.settings')) %>
2
2
  <% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
3
- <% if can?(:display, Spree::StockLocation) %>
3
+ <% if can?(:show, Spree::StockLocation) %>
4
4
  <% admin_breadcrumb(link_to plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path) %>
5
5
  <% else %>
6
6
  <% admin_breadcrumb(plural_resource_name(Spree::StockLocation)) %>
@@ -12,6 +12,35 @@
12
12
  <% end %>
13
13
  <% admin_breadcrumb(plural_resource_name(Spree::StockMovement)) %>
14
14
 
15
+ <% content_for :table_filter_title do %>
16
+ <%= t('spree.filter') %>
17
+ <% end %>
18
+
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">
28
+ <div class="field-block col-12 col-md-6 col-lg-4 col-xl-3">
29
+ <div class="field">
30
+ <%= label_tag :q_variant_sku_eq, "#{t('spree.variant')} #{t('spree.sku')}" %>
31
+ <%= f.text_field :variant_sku_eq, value: params[:q][:variant_sku_eq] %>
32
+ </div>
33
+ </div>
34
+ </div>
35
+
36
+ <div class="clearfix"></div>
37
+
38
+ <div class="actions filter-actions">
39
+ <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
40
+ </div>
41
+ <% end %>
42
+ <% end %>
43
+
15
44
  <% if @stock_movements.any? %>
16
45
  <table class="index" id='listing_stock_movements'>
17
46
  <colgroup>
@@ -44,6 +44,12 @@
44
44
  <%= f.error_message_on :mail_from_address %>
45
45
  <% end %>
46
46
 
47
+ <%= f.field_container :bcc_email do %>
48
+ <%= f.label :bcc_email %>
49
+ <%= f.text_field :bcc_email, class: 'fullwidth' %>
50
+ <%= f.error_message_on :bcc_email %>
51
+ <% end %>
52
+
47
53
  <%= f.field_container :default_currency do %>
48
54
  <%= f.label :default_currency %>
49
55
  <%= f.select :default_currency,
@@ -1,7 +1,8 @@
1
1
  <%- snippet = capture do %>
2
- <table>
2
+ <table class='selectable-table'>
3
3
  <thead>
4
4
  <tr>
5
+ <th></th>
5
6
  <th colspan="2">Item Description</th>
6
7
  <th>Long Item Text</th>
7
8
  <th>Price</th>
@@ -12,6 +13,7 @@
12
13
 
13
14
  <tbody>
14
15
  <tr>
16
+ <td><%= check_box_tag 'selected_ids[]', 1, false, class: 'selectable' %></td>
15
17
  <td class="item-image">
16
18
  <img src="http://placehold.it/50x50">
17
19
  </td>
@@ -33,13 +35,35 @@
33
35
  <td>$22.99</td>
34
36
  </tr>
35
37
  <tr>
36
- <td colspan="5">UPS Ground (USD)</td>
38
+ <td><%= check_box_tag 'selected_ids[]', 1, false, class: 'selectable' %></td>
39
+ <td class="item-image">
40
+ <img src="http://placehold.it/50x50">
41
+ </td>
42
+ <td class="no-wrap">
43
+ Ruby on Rails Bag<br>
44
+ SKU: ROR-00012
45
+ </td>
46
+ <td>
47
+ Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nihil illinc huc pervenit.
48
+ Sed quae tandem ista ratio est? Ergo ita: non posse honeste vivi, nisi honeste vivatur?
49
+ Scisse enim te quis coarguere possit? Duo Reges: constructio interrete.
50
+ Sic, et quidem diligentius saepiusque ista loquemur inter nos agemusque communiter.
51
+ Sed in rebus apertissimis nimium longi sumus.
52
+ Quod si ita se habeat, non possit beatam praestare vitam sapientia.
53
+ Etenim nec iustitia nec amicitia esse omnino poterunt, nisi ipsae per se expetuntur.
54
+ </td>
55
+ <td>$22.99</td>
56
+ <td class="no-wrap">1 x on hand</td>
57
+ <td>$22.99</td>
58
+ </tr>
59
+ <tr>
60
+ <td colspan="6">UPS Ground (USD)</td>
37
61
  <td>
38
62
  <span>$5.00</span>
39
63
  </td>
40
64
  </tr>
41
65
  <tr>
42
- <td colspan="6">No tracking details provided.</td>
66
+ <td colspan="7">No tracking details provided.</td>
43
67
  </tr>
44
68
  </tbody>
45
69
  </table>
@@ -18,6 +18,7 @@
18
18
  <label>
19
19
  <%= f.check_box :is_default %>
20
20
  <%= Spree::TaxCategory.human_attribute_name(:is_default) %>
21
+ <%= f.field_hint :is_default %>
21
22
  </label>
22
23
  <% end %>
23
24
  </div>
@@ -11,7 +11,7 @@
11
11
  <%= error_message_on :user, :email %>
12
12
  <% end %>
13
13
 
14
- <% if can? :display, Spree::Role %>
14
+ <% if can? :show, Spree::Role %>
15
15
  <div data-hook="admin_user_form_roles" class="field">
16
16
  <%= label_tag nil, plural_resource_name(Spree::Role) %>
17
17
  <ul>
@@ -35,7 +35,7 @@
35
35
  </div>
36
36
  <% end %>
37
37
 
38
- <% if Spree::Config[:can_restrict_stock_management] && can?(:display, Spree::StockLocation) %>
38
+ <% if Spree::Config[:can_restrict_stock_management] && can?(:show, Spree::StockLocation) %>
39
39
  <div data-hook="admin_user_form_stock_locations" class="field">
40
40
  <%= label_tag nil, plural_resource_name(Spree::StockLocation) %>
41
41
  <ul>
@@ -19,7 +19,7 @@
19
19
  <%= link_to t("spree.admin.user.items"), spree.items_admin_user_path(@user) %>
20
20
  </li>
21
21
  <% end %>
22
- <% if can?(:display, @user.store_credits.new) %>
22
+ <% if can?(:show, @user.store_credits.new) %>
23
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>
@@ -25,7 +25,7 @@
25
25
  </div>
26
26
  </fieldset>
27
27
 
28
- <% if can?(:update, @user) %>
28
+ <% if can?(:update, @user) && can?(:manage, :api_key) %>
29
29
  <fieldset data-hook="admin_user_api_key" id="admin_user_edit_api_key">
30
30
  <legend><%= t('.api_access') %></legend>
31
31
 
@@ -40,8 +40,8 @@
40
40
 
41
41
  </div>
42
42
  <div class="filter-actions actions">
43
- <%= button_to t('.clear_key'), spree.clear_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_clear_key') }, class: 'btn btn-default' %>
44
- <%= button_to t('.regenerate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, data: { confirm: t('.confirm_regenerate_key') }, class: 'btn btn-default' %>
43
+ <%= button_to t('.clear_key'), spree.admin_user_api_key_path(@user), method: :delete, data: { confirm: t('.confirm_clear_key') }, class: 'btn btn-default' %>
44
+ <%= button_to t('.regenerate_key'), spree.admin_user_api_key_path(@user), method: :post, data: { confirm: t('.confirm_regenerate_key') }, class: 'btn btn-default' %>
45
45
  </div>
46
46
 
47
47
  <% else %>
@@ -49,7 +49,7 @@
49
49
  <div class="no-objects-found"><%= t('.no_key') %></div>
50
50
 
51
51
  <div class="filter-actions actions">
52
- <%= button_to t('.generate_key'), spree.generate_api_key_admin_user_path(@user), method: :put, class: 'btn btn-primary' %>
52
+ <%= button_to t('.generate_key'), spree.admin_user_api_key_path(@user), method: :post, class: 'btn btn-primary' %>
53
53
  </div>
54
54
  <% end %>
55
55
  </fieldset>
@@ -72,9 +72,11 @@
72
72
  </table>
73
73
  <% else %>
74
74
  <div class="no-objects-found">
75
- <%= render 'spree/admin/shared/no_objects_found',
76
- resource: Spree::Order,
77
- new_resource_url: spree.new_admin_order_path %>
75
+ <% if can? :manage, Spree::Order %>
76
+ <%= render 'spree/admin/shared/no_objects_found',
77
+ resource: Spree::Order,
78
+ new_resource_url: spree.new_admin_order_path(user_id: @user.id) %>
79
+ <% end %>
78
80
  </div>
79
81
  <% end %>
80
82
  <%= paginate @orders, theme: "solidus_admin" %>
@@ -72,9 +72,11 @@
72
72
  </table>
73
73
  <% else %>
74
74
  <div class="no-objects-found">
75
- <%= render 'spree/admin/shared/no_objects_found',
76
- resource: Spree::Order,
77
- new_resource_url: spree.new_admin_order_path(user_id: @user.id) %>
75
+ <% if can? :manage, Spree::Order %>
76
+ <%= render 'spree/admin/shared/no_objects_found',
77
+ resource: Spree::Order,
78
+ new_resource_url: spree.new_admin_order_path(user_id: @user.id) %>
79
+ <% end %>
78
80
  </div>
79
81
  <% end %>
80
82
 
@@ -11,7 +11,7 @@
11
11
  </div>
12
12
  </div>
13
13
 
14
- <% if product.variants.only_deleted.any? %>
14
+ <% if product.variants.discarded.any? %>
15
15
  <div class="col-2">
16
16
  <div class="field checkbox">
17
17
  <label>
@@ -14,14 +14,14 @@
14
14
  <% end %>
15
15
  <% end %>
16
16
 
17
- <% if @variants.any? || @product.variants.only_deleted.any?%>
17
+ <% if @variants.any? || @product.variants.discarded.any? %>
18
18
  <%= render "table_filter", product: @product %>
19
19
  <%= render "table", variants: @variants %>
20
20
  <% else %>
21
21
  <% if !Spree::OptionType.any? %>
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
- <% if can?(:display, Spree::OptionType) %>
24
+ <% if can?(:show, Spree::OptionType) %>
25
25
  <%= link_to plural_resource_name(Spree::OptionType), admin_option_types_path%>
26
26
  <% else %>
27
27
  <%= plural_resource_name(Spree::OptionType) %>
@@ -13,8 +13,8 @@ class ActionView::Helpers::FormBuilder
13
13
  end
14
14
 
15
15
  def field_hint(method, options = {})
16
- title = options[:title] || @object.class.human_attribute_name(method)
17
- text = options[:text] || I18n.t(method, scope: [:spree, :hints, @object.class.model_name.i18n_key])
16
+ title = options.delete(:title) || @object.class.human_attribute_name(method)
17
+ text = options.delete(:text) || I18n.t(method, scope: [:spree, :hints, @object.class.model_name.i18n_key], **options)
18
18
  @template.admin_hint(title, text)
19
19
  end
20
20
  end
@@ -5,8 +5,6 @@ require 'spree/backend/config'
5
5
  module Spree
6
6
  module Backend
7
7
  class Engine < ::Rails::Engine
8
- config.middleware.use "Spree::Backend::Middleware::SeoAssist"
9
-
10
8
  # Leave initializer empty for backwards-compatability. Other apps
11
9
  # might still rely on this event.
12
10
  initializer "spree.backend.environment", before: :load_config_initializers do; end
@@ -131,7 +131,20 @@ module Spree
131
131
  MenuItem.new(
132
132
  CONFIGURATION_TABS,
133
133
  'wrench',
134
- condition: -> { can?(:admin, Spree::Store) },
134
+ condition: -> {
135
+ can?(:admin, Spree::Store) ||
136
+ can?(:show, Spree::AdjustmentReason) ||
137
+ can?(:show, Spree::PaymentMethod) ||
138
+ can?(:show, Spree::RefundReason) ||
139
+ can?(:show, Spree::ReimbursementType) ||
140
+ can?(:show, Spree::ShippingCategory) ||
141
+ can?(:show, Spree::ShippingMethod) ||
142
+ can?(:show, Spree::StockLocation) ||
143
+ can?(:show, Spree::TaxCategory) ||
144
+ can?(:show, Spree::TaxRate) ||
145
+ can?(:show, Spree::ReturnReason) ||
146
+ can?(:show, Spree::Zone)
147
+ },
135
148
  label: :settings,
136
149
  partial: 'spree/admin/shared/settings_sub_menu',
137
150
  url: :admin_stores_path,
@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
14
14
  s.homepage = 'http://solidus.io'
15
15
  s.license = 'BSD-3-Clause'
16
16
 
17
- s.files = `git ls-files`.split("\n")
18
- s.require_path = 'lib'
19
- s.requirements << 'none'
17
+ s.files = `git ls-files -z`.split("\x0").reject do |f|
18
+ f.match(%r{^(spec|script)/})
19
+ end
20
20
 
21
- s.required_ruby_version = '>= 2.4.0'
21
+ s.required_ruby_version = '>= 2.5.0'
22
22
  s.required_rubygems_version = '>= 1.8.23'
23
23
 
24
24
  s.add_dependency 'solidus_api', s.version