solidus_backend 2.10.0 → 2.11.1

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 +24 -123
  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
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: 2.10.0
4
+ version: 2.11.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: 2020-01-15 00:00:00.000000000 Z
11
+ date: 2020-11-06 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: 2.10.0
19
+ version: 2.11.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: 2.10.0
26
+ version: 2.11.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: 2.10.0
33
+ version: 2.11.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: 2.10.0
40
+ version: 2.11.1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: coffee-rails
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,9 @@ files:
189
189
  - app/assets/javascripts/spree/backend/components/admin_nav.js
190
190
  - app/assets/javascripts/spree/backend/components/editable_table.js
191
191
  - app/assets/javascripts/spree/backend/components/number_with_currency.js
192
+ - app/assets/javascripts/spree/backend/components/selectable_table.js
193
+ - app/assets/javascripts/spree/backend/components/selectable_table/return_items.js
194
+ - app/assets/javascripts/spree/backend/components/selectable_table/summary.js
192
195
  - app/assets/javascripts/spree/backend/components/sortable_table.js
193
196
  - app/assets/javascripts/spree/backend/components/tabs.js
194
197
  - app/assets/javascripts/spree/backend/components/tooltips.js
@@ -223,9 +226,9 @@ files:
223
226
  - app/assets/javascripts/spree/backend/progress.js
224
227
  - app/assets/javascripts/spree/backend/promotions.js
225
228
  - app/assets/javascripts/spree/backend/promotions/activation.js
226
- - app/assets/javascripts/spree/backend/returns/return_item_selection.js
227
229
  - app/assets/javascripts/spree/backend/routes.js
228
230
  - app/assets/javascripts/spree/backend/shipments.js
231
+ - app/assets/javascripts/spree/backend/shipping_methods/stock_locations_picker.js
229
232
  - app/assets/javascripts/spree/backend/spree-select2.js
230
233
  - app/assets/javascripts/spree/backend/stock_management.js
231
234
  - app/assets/javascripts/spree/backend/store_credits.js
@@ -246,6 +249,8 @@ files:
246
249
  - app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_percent.hbs
247
250
  - app/assets/javascripts/spree/backend/templates/promotions/rules/option_values.hbs
248
251
  - app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs
252
+ - app/assets/javascripts/spree/backend/templates/tables/return_item_sum_amount.hbs
253
+ - app/assets/javascripts/spree/backend/templates/tables/selectable_label.hbs
249
254
  - app/assets/javascripts/spree/backend/templates/taxons/_tree.hbs
250
255
  - app/assets/javascripts/spree/backend/templates/taxons/tree.hbs
251
256
  - app/assets/javascripts/spree/backend/templates/variants/autocomplete.hbs
@@ -281,6 +286,10 @@ files:
281
286
  - app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js
282
287
  - app/assets/javascripts/spree/backend/views/tables/editable_table.js
283
288
  - app/assets/javascripts/spree/backend/views/tables/editable_table_row.js
289
+ - app/assets/javascripts/spree/backend/views/tables/return_items.js
290
+ - app/assets/javascripts/spree/backend/views/tables/selectable_table.js
291
+ - app/assets/javascripts/spree/backend/views/tables/selectable_table/sum_return_item_amount.js
292
+ - app/assets/javascripts/spree/backend/views/tables/selectable_table/summary.js
284
293
  - app/assets/javascripts/spree/backend/views/zones/form.js
285
294
  - app/assets/javascripts/spree/backend/zone.js
286
295
  - app/assets/stylesheets/spree/backend.css
@@ -389,6 +398,7 @@ files:
389
398
  - app/controllers/spree/admin/taxonomies_controller.rb
390
399
  - app/controllers/spree/admin/taxons/attachment_controller.rb
391
400
  - app/controllers/spree/admin/taxons_controller.rb
401
+ - app/controllers/spree/admin/users/api_key_controller.rb
392
402
  - app/controllers/spree/admin/users_controller.rb
393
403
  - app/controllers/spree/admin/variant_property_rule_values_controller.rb
394
404
  - app/controllers/spree/admin/variants_controller.rb
@@ -616,6 +626,7 @@ files:
616
626
  - app/views/spree/admin/shared/named_types/_new.html.erb
617
627
  - app/views/spree/admin/shared/preference_fields/_boolean.html.erb
618
628
  - app/views/spree/admin/shared/preference_fields/_decimal.html.erb
629
+ - app/views/spree/admin/shared/preference_fields/_encrypted_string.html.erb
619
630
  - app/views/spree/admin/shared/preference_fields/_integer.html.erb
620
631
  - app/views/spree/admin/shared/preference_fields/_password.html.erb
621
632
  - app/views/spree/admin/shared/preference_fields/_string.html.erb
@@ -731,116 +742,7 @@ files:
731
742
  - lib/spree/backend/engine.rb
732
743
  - lib/spree/backend_configuration.rb
733
744
  - lib/spree_backend.rb
734
- - script/rails
735
745
  - solidus_backend.gemspec
736
- - spec/controllers/spree/admin/base_controller_spec.rb
737
- - spec/controllers/spree/admin/cancellations_controller_spec.rb
738
- - spec/controllers/spree/admin/customer_returns_controller_spec.rb
739
- - spec/controllers/spree/admin/locale_controller_spec.rb
740
- - spec/controllers/spree/admin/missing_products_controller_spec.rb
741
- - spec/controllers/spree/admin/orders/customer_details_controller_spec.rb
742
- - spec/controllers/spree/admin/orders_controller_spec.rb
743
- - spec/controllers/spree/admin/payment_methods_controller_spec.rb
744
- - spec/controllers/spree/admin/payments_controller_spec.rb
745
- - spec/controllers/spree/admin/prices_controller_spec.rb
746
- - spec/controllers/spree/admin/product_properties_controller_spec.rb
747
- - spec/controllers/spree/admin/products_controller_spec.rb
748
- - spec/controllers/spree/admin/promotion_actions_controller_spec.rb
749
- - spec/controllers/spree/admin/promotion_codes_controller_spec.rb
750
- - spec/controllers/spree/admin/promotion_rules_controller_spec.rb
751
- - spec/controllers/spree/admin/promotions_controller_spec.rb
752
- - spec/controllers/spree/admin/refunds_controller_spec.rb
753
- - spec/controllers/spree/admin/reimbursements_controller_spec.rb
754
- - spec/controllers/spree/admin/resource_controller_spec.rb
755
- - spec/controllers/spree/admin/return_authorizations_controller_spec.rb
756
- - spec/controllers/spree/admin/return_items_controller_spec.rb
757
- - spec/controllers/spree/admin/root_controller_spec.rb
758
- - spec/controllers/spree/admin/search_controller_spec.rb
759
- - spec/controllers/spree/admin/shipping_methods_controller_spec.rb
760
- - spec/controllers/spree/admin/stock_items_controller_spec.rb
761
- - spec/controllers/spree/admin/stock_locations_controller_spec.rb
762
- - spec/controllers/spree/admin/store_credits_controller_spec.rb
763
- - spec/controllers/spree/admin/users_controller_spec.rb
764
- - spec/controllers/spree/admin/variants_controller_spec.rb
765
- - spec/features/admin/configuration/payment_methods_spec.rb
766
- - spec/features/admin/configuration/shipping_methods_spec.rb
767
- - spec/features/admin/configuration/stock_locations_spec.rb
768
- - spec/features/admin/configuration/store_spec.rb
769
- - spec/features/admin/configuration/tax_categories_spec.rb
770
- - spec/features/admin/configuration/tax_rates_spec.rb
771
- - spec/features/admin/configuration/taxonomies_spec.rb
772
- - spec/features/admin/configuration/zones_spec.rb
773
- - spec/features/admin/homepage_spec.rb
774
- - spec/features/admin/javascript_format_money_spec.rb
775
- - spec/features/admin/locale_spec.rb
776
- - spec/features/admin/orders/adjustments_promotions_spec.rb
777
- - spec/features/admin/orders/adjustments_spec.rb
778
- - spec/features/admin/orders/cancelling_and_resuming_spec.rb
779
- - spec/features/admin/orders/cancelling_inventory_spec.rb
780
- - spec/features/admin/orders/customer_details_spec.rb
781
- - spec/features/admin/orders/customer_returns_spec.rb
782
- - spec/features/admin/orders/line_items_spec.rb
783
- - spec/features/admin/orders/listing_spec.rb
784
- - spec/features/admin/orders/log_entries_spec.rb
785
- - spec/features/admin/orders/new_order_spec.rb
786
- - spec/features/admin/orders/new_refund_spec.rb
787
- - spec/features/admin/orders/order_details_spec.rb
788
- - spec/features/admin/orders/payments_spec.rb
789
- - spec/features/admin/orders/return_authorizations_spec.rb
790
- - spec/features/admin/orders/return_payment_state_spec.rb
791
- - spec/features/admin/orders/risk_analysis_spec.rb
792
- - spec/features/admin/orders/shipments_spec.rb
793
- - spec/features/admin/payments/store_credits_spec.rb
794
- - spec/features/admin/products/edit/images_spec.rb
795
- - spec/features/admin/products/edit/products_spec.rb
796
- - spec/features/admin/products/edit/taxons_spec.rb
797
- - spec/features/admin/products/edit/variants_spec.rb
798
- - spec/features/admin/products/option_types_spec.rb
799
- - spec/features/admin/products/pricing_spec.rb
800
- - spec/features/admin/products/products_spec.rb
801
- - spec/features/admin/products/properties_spec.rb
802
- - spec/features/admin/products/stock_management_spec.rb
803
- - spec/features/admin/products/variant_spec.rb
804
- - spec/features/admin/promotion_adjustments_spec.rb
805
- - spec/features/admin/promotions/option_value_rule_spec.rb
806
- - spec/features/admin/promotions/product_rule_spec.rb
807
- - spec/features/admin/promotions/promotion_categories_spec.rb
808
- - spec/features/admin/promotions/promotion_code_batches_spec.rb
809
- - spec/features/admin/promotions/promotion_code_spec.rb
810
- - spec/features/admin/promotions/promotion_spec.rb
811
- - spec/features/admin/promotions/tiered_calculator_spec.rb
812
- - spec/features/admin/promotions/user_rule_spec.rb
813
- - spec/features/admin/reimbursements_spec.rb
814
- - spec/features/admin/store_credits_spec.rb
815
- - spec/features/admin/stores_spec.rb
816
- - spec/features/admin/style_guide_spec.rb
817
- - spec/features/admin/taxons_spec.rb
818
- - spec/features/admin/users_spec.rb
819
- - spec/fixtures/files/ror_ringer.jpeg
820
- - spec/helpers/admin/base_helper_spec.rb
821
- - spec/helpers/admin/navigation_helper_spec.rb
822
- - spec/helpers/admin/stock_movements_helper_spec.rb
823
- - spec/helpers/admin/store_credit_events_helper_spec.rb
824
- - spec/helpers/promotion_rules_helper_spec.rb
825
- - spec/javascripts/fixtures/_boot.html.erb
826
- - spec/javascripts/fixtures/number_with_currency/with_currency_select.html.erb
827
- - spec/javascripts/fixtures/number_with_currency/without_select.html.erb
828
- - spec/javascripts/format_money_spec.js
829
- - spec/javascripts/spec_helper.js
830
- - spec/javascripts/support/show_errors.js
831
- - spec/javascripts/support/with_translations.js
832
- - spec/javascripts/translation_spec.js
833
- - spec/javascripts/views/number_with_currency_spec.js
834
- - spec/lib/spree/backend_configuration/menu_item_spec.rb
835
- - spec/lib/spree/backend_configuration_spec.rb
836
- - spec/spec_helper.rb
837
- - spec/support/appear_before_matcher.rb
838
- - spec/support/feature/base_feature_helper.rb
839
- - spec/support/feature/order_feature_helper.rb
840
- - spec/teaspoon_env.rb
841
- - spec/test_views/spree/admin/widgets/edit.html.erb
842
- - spec/test_views/spree/admin/widgets/new.html.erb
843
- - spec/views/spree/admin/shared/navigation_footer_spec.rb
844
746
  - vendor/assets/fonts/inter/Inter-Regular.woff
845
747
  - vendor/assets/fonts/inter/Inter-Regular.woff2
846
748
  - vendor/assets/fonts/inter/Inter-SemiBold.woff
@@ -998,7 +900,7 @@ homepage: http://solidus.io
998
900
  licenses:
999
901
  - BSD-3-Clause
1000
902
  metadata: {}
1001
- post_install_message:
903
+ post_install_message:
1002
904
  rdoc_options: []
1003
905
  require_paths:
1004
906
  - lib
@@ -1006,16 +908,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
1006
908
  requirements:
1007
909
  - - ">="
1008
910
  - !ruby/object:Gem::Version
1009
- version: 2.4.0
911
+ version: 2.5.0
1010
912
  required_rubygems_version: !ruby/object:Gem::Requirement
1011
913
  requirements:
1012
914
  - - ">="
1013
915
  - !ruby/object:Gem::Version
1014
916
  version: 1.8.23
1015
- requirements:
1016
- - none
1017
- rubygems_version: 3.0.3
1018
- signing_key:
917
+ requirements: []
918
+ rubygems_version: 3.1.4
919
+ signing_key:
1019
920
  specification_version: 4
1020
921
  summary: Admin interface for the Solidus e-commerce framework.
1021
922
  test_files: []
@@ -1,35 +0,0 @@
1
- Spree.ready(function() {
2
- function checkAddItemBox() {
3
- $(this).closest('tr').find('input.add-item').attr('checked', 'checked');
4
- updateSuggestedAmount();
5
- }
6
-
7
- function updateSuggestedAmount() {
8
- var totalPretaxRefund = 0;
9
- var checkedItems = formFields.find('input.add-item:checked');
10
- $.each(checkedItems, function(i, checkbox) {
11
- totalPretaxRefund += parseFloat($(checkbox).parents('tr').find('.refund-amount-input').val());
12
- });
13
-
14
- var displayTotal = isNaN(totalPretaxRefund) ? '' : totalPretaxRefund.toFixed(2);
15
- formFields.find('span#total_pre_tax_refund').html(displayTotal);
16
- }
17
-
18
- var formFields = $("[data-hook='admin_customer_return_form_fields'], \
19
- [data-hook='admin_return_authorization_form_fields']");
20
-
21
- if(formFields.length > 0) {
22
- updateSuggestedAmount();
23
-
24
- formFields.find('input#select-all').on('change', function(ev) {
25
- var checkBoxes = $(ev.currentTarget).parents('table:first').find('input.add-item');
26
- checkBoxes.prop('checked', this.checked);
27
- updateSuggestedAmount();
28
- });
29
-
30
- formFields.find('input.add-item').on('change', updateSuggestedAmount);
31
- formFields.find('.refund-amount-input').on('keyup', updateSuggestedAmount);
32
-
33
- formFields.find('input, select').not('.add-item').on('change', checkAddItemBox);
34
- }
35
- });
@@ -1,10 +0,0 @@
1
- #!/usr/bin/env ruby
2
- # frozen_string_literal: true
3
-
4
- # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
5
-
6
- ENGINE_ROOT = File.expand_path('..', __dir__)
7
- ENGINE_PATH = File.expand_path('../lib/spree/backend/engine', __dir__)
8
-
9
- require 'rails/all'
10
- require 'rails/engine/commands'
@@ -1,26 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- # Spree's rpsec controller tests get the Spree::ControllerHacks
4
- # we don't need those for the anonymous controller here, so
5
- # we call process directly instead of get
6
- require 'spec_helper'
7
-
8
- describe Spree::Admin::BaseController, type: :controller do
9
- controller(Spree::Admin::BaseController) do
10
- def index
11
- authorize! :update, Spree::Order
12
- render plain: 'test'
13
- end
14
- end
15
-
16
- context "unauthorized request" do
17
- before do
18
- allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(nil)
19
- end
20
-
21
- it "redirects to unauthorized" do
22
- get :index
23
- expect(response).to redirect_to '/unauthorized'
24
- end
25
- end
26
- end
@@ -1,83 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- require 'spec_helper'
4
-
5
- describe Spree::Admin::CancellationsController do
6
- stub_authorization!
7
-
8
- describe "#index" do
9
- subject { get :index, params: { order_id: order.number } }
10
-
11
- let(:order) { create(:order_ready_to_ship, line_items_count: 1) }
12
-
13
- context "for an order with inventory" do
14
- render_views
15
-
16
- it "succeeds" do
17
- expect(response).to be_ok
18
- end
19
- end
20
- end
21
-
22
- describe "#cancel" do
23
- subject { post :short_ship, params: { order_id: order.number, inventory_unit_ids: inventory_units.map(&:id) } }
24
-
25
- let(:order) { create(:order_with_line_items, line_items_attributes: [{ quantity: 4 }]) }
26
- let(:referer) { "order_admin_page" }
27
-
28
- context "no inventory unit ids are provided" do
29
- subject { post :short_ship, params: { order_id: order.number } }
30
-
31
- it "redirects back" do
32
- subject
33
- expect(response).to redirect_to(spree.admin_order_cancellations_path(order))
34
- end
35
-
36
- it "sets an error message" do
37
- subject
38
- expect(flash[:error]).to eq I18n.t('spree.no_inventory_selected')
39
- end
40
- end
41
-
42
- context "unable to find all the inventory" do
43
- let(:inventory_units) { [Spree::InventoryUnit.new(id: -1)] }
44
-
45
- it "redirects back" do
46
- subject
47
- expect(response).to redirect_to(spree.admin_order_cancellations_path(order))
48
- end
49
-
50
- it "sets an error message" do
51
- subject
52
- expect(flash[:error]).to eq I18n.t('spree.unable_to_find_all_inventory_units')
53
- end
54
- end
55
-
56
- context "successfully cancels inventory" do
57
- let(:inventory_units) { order.inventory_units.not_canceled }
58
-
59
- it "redirects to admin order edit" do
60
- subject
61
- expect(response).to redirect_to(spree.edit_admin_order_path(order))
62
- end
63
-
64
- it "sets an success message" do
65
- subject
66
- expect(flash[:success]).to eq I18n.t('spree.inventory_canceled')
67
- end
68
-
69
- it "creates a unit cancel" do
70
- expect { subject }.to change { Spree::UnitCancel.count }.by(4)
71
- end
72
-
73
- it "cancels the inventory" do
74
- subject
75
- expect(order.reload.inventory_units.map(&:state).uniq).to match_array(['canceled'])
76
- end
77
-
78
- it "adjusts the order" do
79
- expect { subject }.to change { order.reload.total }.by(-40.0)
80
- end
81
- end
82
- end
83
- end
@@ -1,235 +0,0 @@
1
- # frozen_string_literal: true
2
-
3
- require 'spec_helper'
4
-
5
- module Spree
6
- module Admin
7
- describe CustomerReturnsController, type: :controller do
8
- stub_authorization!
9
-
10
- describe "#index" do
11
- let(:order) { customer_return.order }
12
- let(:customer_return) { create(:customer_return) }
13
-
14
- subject do
15
- get :index, params: { order_id: customer_return.order.to_param }
16
- end
17
-
18
- before { subject }
19
-
20
- it "loads the order" do
21
- expect(assigns(:order)).to eq order
22
- end
23
-
24
- it "loads the customer return" do
25
- expect(assigns(:customer_returns)).to include(customer_return)
26
- end
27
- end
28
-
29
- describe "#new" do
30
- let(:order) { create(:shipped_order, line_items_count: 1) }
31
- let!(:inactive_reimbursement_type) { create(:reimbursement_type, active: false) }
32
- let!(:first_active_reimbursement_type) { create(:reimbursement_type) }
33
- let!(:second_active_reimbursement_type) { create(:reimbursement_type) }
34
-
35
- subject do
36
- get :new, params: { order_id: order.to_param }
37
- end
38
-
39
- it "loads the order" do
40
- subject
41
- expect(assigns(:order)).to eq order
42
- end
43
-
44
- it "builds a new customer return" do
45
- subject
46
- expect(assigns(:customer_return)).to_not be_persisted
47
- end
48
-
49
- context "with previous customer return" do
50
- let(:return_reason_1) { create(:return_reason) }
51
- let(:return_reason_2) { create(:return_reason) }
52
- let(:return_reason_3) { create(:return_reason) }
53
- let!(:inactive_rma_reason) { create(:return_reason, active: false) }
54
-
55
- let(:order) { create(:shipped_order, line_items_count: 4) }
56
- let(:rma) { create(:return_authorization, order: order, reason: return_reason_1) }
57
-
58
- let!(:rma_return_item) { create(:return_item, return_authorization: rma, inventory_unit: order.inventory_units.first, return_reason: return_reason_2) }
59
- let!(:customer_return_return_item) { create(:return_item, return_authorization: nil, inventory_unit: order.inventory_units.last, return_reason: return_reason_3) }
60
-
61
- context "all return items are associated with a customer return" do
62
- let!(:previous_customer_return) { create(:customer_return_without_return_items, return_items: [rma_return_item, customer_return_return_item]) }
63
-
64
- before { subject }
65
-
66
- it "loads the possible return items" do
67
- total_inventory_count = 4
68
- rma_return_items_count = 1
69
- customer_return_return_items_count = 1
70
- expect(assigns(:new_return_items).length).to eq(total_inventory_count - rma_return_items_count - customer_return_return_items_count)
71
- end
72
-
73
- it "builds new return items" do
74
- expect(assigns(:new_return_items).all? { |return_item| !return_item.persisted? }).to eq true
75
- end
76
-
77
- it "does not have any rma return items" do
78
- expect(assigns(:rma_return_items)).to eq []
79
- end
80
-
81
- it "loads the correct return authorization reasons" do
82
- expect(assigns(:reasons)).to match_array([return_reason_1, return_reason_2, return_reason_3])
83
- end
84
- end
85
-
86
- context "there is a return item associated with an rma but not a customer return" do
87
- let!(:previous_customer_return) { create(:customer_return_without_return_items, return_items: [customer_return_return_item]) }
88
-
89
- before do
90
- subject
91
- end
92
-
93
- it "loads the possible return items" do
94
- rma_return_item_count = rma.return_items.count
95
- total_unit_count = order.inventory_units.count
96
- customer_returned_count = previous_customer_return.return_items.count
97
- expected_total = total_unit_count - customer_returned_count - rma_return_item_count
98
- expect(assigns(:new_return_items).length).to eq expected_total
99
- end
100
-
101
- it "builds new return items" do
102
- expect(assigns(:new_return_items).all? { |return_item| !return_item.persisted? }).to eq true
103
- end
104
-
105
- it "loads the persisted rma return items" do
106
- expect(assigns(:rma_return_items).all?(&:persisted?)).to eq true
107
- end
108
-
109
- it "has one rma return item" do
110
- expect(assigns(:rma_return_items)).to include(rma_return_item)
111
- end
112
-
113
- it "loads the correct return authorization reasons" do
114
- expect(assigns(:reasons)).to match_array([return_reason_1, return_reason_2, return_reason_3])
115
- end
116
- end
117
- end
118
- end
119
-
120
- describe "#edit" do
121
- let(:order) { customer_return.order }
122
- let(:customer_return) { create(:customer_return, line_items_count: 3) }
123
-
124
- let!(:inactive_rma_reason) { create(:return_reason, active: false) }
125
-
126
- let!(:accepted_return_item) { customer_return.return_items.order('id').first.tap(&:accept!) }
127
- let!(:rejected_return_item) { customer_return.return_items.order('id').second.tap(&:reject!) }
128
- let!(:manual_intervention_return_item) { customer_return.return_items.order('id').third.tap(&:require_manual_intervention!) }
129
-
130
- subject do
131
- get :edit, params: { order_id: order.to_param, id: customer_return.to_param }
132
- end
133
-
134
- it "loads the order" do
135
- subject
136
- expect(assigns(:order)).to eq order
137
- end
138
-
139
- it "loads the customer return" do
140
- subject
141
- expect(assigns(:customer_return)).to eq customer_return
142
- end
143
-
144
- it "loads the accepted return items" do
145
- subject
146
- expect(assigns(:accepted_return_items)).to eq [accepted_return_item]
147
- end
148
-
149
- it "loads the rejected return items" do
150
- subject
151
- expect(assigns(:rejected_return_items)).to eq [rejected_return_item]
152
- end
153
-
154
- it "loads the return items that require manual intervention" do
155
- subject
156
- expect(assigns(:manual_intervention_return_items)).to eq [manual_intervention_return_item]
157
- end
158
-
159
- it "loads the return items that are still pending" do
160
- subject
161
- expect(assigns(:pending_return_items)).to eq []
162
- end
163
-
164
- it "loads the reimbursements that are still pending" do
165
- subject
166
- expect(assigns(:pending_reimbursements)).to eq []
167
- end
168
-
169
- it "loads the correct return authorization reasons" do
170
- subject
171
- expect(assigns(:reasons)).to match(Spree::ReturnReason.active)
172
- end
173
-
174
- context "a return item has an inactive return authorization reason" do
175
- before(:each) do
176
- accepted_return_item.update(return_reason_id: inactive_rma_reason.id)
177
- end
178
-
179
- it "includes the inactive return authorization reason" do
180
- subject
181
- expect(assigns(:reasons)).to match(Spree::ReturnReason.active + [inactive_rma_reason])
182
- end
183
- end
184
- end
185
-
186
- describe "#create" do
187
- let(:order) { create(:shipped_order, line_items_count: 1) }
188
- let(:reception_status_event) { 'receive' }
189
- let(:stock_location_id) { order.shipments.last.stock_location.id }
190
- let(:customer_return_params) do
191
- {
192
- order_id: order.to_param,
193
- customer_return: {
194
- stock_location_id: stock_location_id,
195
- return_items_attributes: {
196
- "0" => {
197
- returned: "1",
198
- amount: "15.99",
199
- inventory_unit_id: order.inventory_units.shipped.last.id,
200
- reception_status_event: reception_status_event
201
- }
202
- }
203
- }
204
- }
205
- end
206
-
207
- subject { post :create, params: customer_return_params }
208
-
209
- it { expect { subject }.to change { Spree::CustomerReturn.count }.by(1) }
210
- it do
211
- subject
212
- expect(response).to redirect_to spree.edit_admin_order_customer_return_path(order, id: Spree::CustomerReturn.last.id)
213
- end
214
-
215
- it 'executes the reception status event on the return items' do
216
- subject
217
- customer_return = Spree::CustomerReturn.last
218
- expect(customer_return.return_items.map(&:reception_status).uniq).to eq ['received']
219
- end
220
-
221
- context "missing stock location" do
222
- let(:stock_location_id) { '' }
223
- it { expect{ subject }.to_not change { Spree::CustomerReturn.count } }
224
- it { subject; expect(response).to render_template(:new) }
225
- end
226
-
227
- context "missing reception status event" do
228
- let(:reception_status_event) { '' }
229
- it { expect{ subject }.to_not change { Spree::CustomerReturn.count } }
230
- it { subject; expect(response).to redirect_to spree.new_admin_order_customer_return_path(order) }
231
- end
232
- end
233
- end
234
- end
235
- end