solidus_backend 1.2.3 → 1.3.0.beta1

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 (507) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +3 -3
  3. data/Rakefile +1 -1
  4. data/app/assets/javascripts/spree/backend.js +5 -4
  5. data/app/assets/javascripts/spree/backend/adjustments.js.coffee +1 -1
  6. data/app/assets/javascripts/spree/backend/{admin.js.erb → admin.js} +13 -44
  7. data/app/assets/javascripts/spree/backend/checkouts/edit.js +36 -25
  8. data/app/assets/javascripts/spree/backend/components/tabs.coffee +79 -0
  9. data/app/assets/javascripts/spree/backend/components/tooltips.js +31 -0
  10. data/app/assets/javascripts/spree/backend/images/index.js.coffee +0 -3
  11. data/app/assets/javascripts/spree/backend/{line_items_on_order_edit.js.erb → line_items_on_order_edit.js} +3 -10
  12. data/app/assets/javascripts/spree/backend/{option_type_autocomplete.js.erb → option_type_autocomplete.js} +0 -0
  13. data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +32 -147
  14. data/app/assets/javascripts/spree/backend/routes.js +1 -0
  15. data/app/assets/javascripts/spree/backend/shipments.js +314 -0
  16. data/app/assets/javascripts/spree/backend/{spree-select2.js.erb → spree-select2.js} +2 -11
  17. data/app/assets/javascripts/spree/backend/stock_management/index_add_forms.coffee +52 -73
  18. data/app/assets/javascripts/spree/backend/stock_management/index_update_forms.coffee +54 -52
  19. data/app/assets/javascripts/spree/backend/stock_management/stock_item.coffee +4 -37
  20. data/app/assets/javascripts/spree/backend/stock_movement.js.coffee +1 -1
  21. data/app/assets/javascripts/spree/backend/stock_transfers/edit.coffee +0 -10
  22. data/app/assets/javascripts/spree/backend/stock_transfers/receive.coffee +0 -10
  23. data/app/assets/javascripts/spree/backend/{taxon_autocomplete.js.erb → taxon_autocomplete.js} +10 -6
  24. data/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs +25 -19
  25. data/app/assets/javascripts/spree/backend/user_picker.js +8 -5
  26. data/app/assets/javascripts/spree/backend/{variant_autocomplete.js.coffee.erb → variant_autocomplete.js.coffee} +2 -4
  27. data/app/assets/stylesheets/spree/backend.css +0 -3
  28. data/app/assets/stylesheets/spree/backend/_bootstrap_custom.scss +666 -0
  29. data/app/assets/stylesheets/spree/backend/components/_navigation.scss +17 -0
  30. data/app/assets/stylesheets/spree/backend/components/_progress.scss +1 -0
  31. data/app/assets/stylesheets/spree/backend/components/_tabs.scss +108 -0
  32. data/app/assets/stylesheets/spree/backend/plugins/_bootstrap_tooltip.scss +47 -0
  33. data/app/assets/stylesheets/spree/backend/sections/_orders.scss +1 -1
  34. data/app/assets/stylesheets/spree/backend/sections/_payments.scss +14 -0
  35. data/app/assets/stylesheets/spree/backend/sections/_stock_management.scss +11 -9
  36. data/app/assets/stylesheets/spree/backend/sections/_stock_transfers.scss +0 -49
  37. data/app/assets/stylesheets/spree/backend/shared/_forms.scss +11 -14
  38. data/app/assets/stylesheets/spree/backend/shared/_header.scss +30 -0
  39. data/app/assets/stylesheets/spree/backend/shared/_layout.scss +0 -105
  40. data/app/assets/stylesheets/spree/backend/shared/_skeleton.scss +242 -0
  41. data/app/assets/stylesheets/spree/backend/shared/_tables.scss +2 -0
  42. data/app/assets/stylesheets/spree/backend/shared/_typography.scss +5 -1
  43. data/app/assets/stylesheets/spree/backend/shared/_utilities.scss +35 -0
  44. data/app/assets/stylesheets/spree/backend/spree_admin.scss +9 -5
  45. data/app/controllers/spree/admin/adjustments_controller.rb +2 -3
  46. data/app/controllers/spree/admin/base_controller.rb +46 -56
  47. data/app/controllers/spree/admin/cancellations_controller.rb +1 -1
  48. data/app/controllers/spree/admin/countries_controller.rb +0 -2
  49. data/app/controllers/spree/admin/customer_returns_controller.rb +1 -1
  50. data/app/controllers/spree/admin/general_settings_controller.rb +6 -8
  51. data/app/controllers/spree/admin/images_controller.rb +16 -17
  52. data/app/controllers/spree/admin/log_entries_controller.rb +1 -2
  53. data/app/controllers/spree/admin/option_types_controller.rb +17 -21
  54. data/app/controllers/spree/admin/option_values_controller.rb +1 -1
  55. data/app/controllers/spree/admin/orders/customer_details_controller.rb +21 -22
  56. data/app/controllers/spree/admin/orders_controller.rb +41 -42
  57. data/app/controllers/spree/admin/payment_methods_controller.rb +18 -18
  58. data/app/controllers/spree/admin/payments_controller.rb +11 -11
  59. data/app/controllers/spree/admin/product_properties_controller.rb +13 -13
  60. data/app/controllers/spree/admin/products_controller.rb +4 -4
  61. data/app/controllers/spree/admin/promotion_actions_controller.rb +15 -11
  62. data/app/controllers/spree/admin/promotion_codes_controller.rb +0 -1
  63. data/app/controllers/spree/admin/promotion_rules_controller.rb +15 -15
  64. data/app/controllers/spree/admin/promotions_controller.rb +35 -35
  65. data/app/controllers/spree/admin/prototypes_controller.rb +2 -3
  66. data/app/controllers/spree/admin/reports_controller.rb +11 -5
  67. data/app/controllers/spree/admin/resource_controller.rb +130 -133
  68. data/app/controllers/spree/admin/return_authorizations_controller.rb +2 -2
  69. data/app/controllers/spree/admin/return_items_controller.rb +0 -1
  70. data/app/controllers/spree/admin/search_controller.rb +1 -3
  71. data/app/controllers/spree/admin/shipping_methods_controller.rb +3 -3
  72. data/app/controllers/spree/admin/states_controller.rb +10 -10
  73. data/app/controllers/spree/admin/stock_items_controller.rb +42 -42
  74. data/app/controllers/spree/admin/stock_locations_controller.rb +4 -12
  75. data/app/controllers/spree/admin/stock_movements_controller.rb +1 -1
  76. data/app/controllers/spree/admin/stock_transfers_controller.rb +7 -4
  77. data/app/controllers/spree/admin/store_credits_controller.rb +4 -4
  78. data/app/controllers/spree/admin/style_guide_controller.rb +3 -0
  79. data/app/controllers/spree/admin/taxonomies_controller.rb +0 -6
  80. data/app/controllers/spree/admin/taxons_controller.rb +13 -36
  81. data/app/controllers/spree/admin/users_controller.rb +54 -72
  82. data/app/controllers/spree/admin/variants_controller.rb +22 -35
  83. data/app/controllers/spree/admin/variants_including_master_controller.rb +0 -2
  84. data/app/controllers/spree/admin/zones_controller.rb +11 -11
  85. data/app/helpers/spree/admin/adjustments_helper.rb +4 -5
  86. data/app/helpers/spree/admin/base_helper.rb +32 -34
  87. data/app/helpers/spree/admin/general_settings_helper.rb +1 -1
  88. data/app/helpers/spree/admin/images_helper.rb +0 -1
  89. data/app/helpers/spree/admin/navigation_helper.rb +41 -35
  90. data/app/helpers/spree/admin/orders_helper.rb +5 -6
  91. data/app/helpers/spree/admin/payments_helper.rb +1 -1
  92. data/app/helpers/spree/admin/products_helper.rb +7 -7
  93. data/app/helpers/spree/admin/stock_locations_helper.rb +1 -1
  94. data/app/helpers/spree/admin/store_credit_events_helper.rb +6 -6
  95. data/app/helpers/spree/admin/tables_helper.rb +0 -2
  96. data/app/helpers/spree/admin/taxons_helper.rb +1 -1
  97. data/app/helpers/spree/promotion_rules_helper.rb +1 -4
  98. data/app/models/spree/backend_configuration.rb +1 -0
  99. data/app/views/kaminari/solidus_admin/_first_page.html.erb +3 -0
  100. data/app/views/kaminari/solidus_admin/_gap.html.erb +3 -0
  101. data/app/views/kaminari/solidus_admin/_last_page.html.erb +3 -0
  102. data/app/views/kaminari/solidus_admin/_next_page.html.erb +3 -0
  103. data/app/views/kaminari/solidus_admin/_page.html.erb +9 -0
  104. data/app/views/kaminari/solidus_admin/_paginator.html.erb +15 -0
  105. data/app/views/kaminari/solidus_admin/_prev_page.html.erb +3 -0
  106. data/app/views/spree/admin/adjustment_reasons/edit.html.erb +2 -0
  107. data/app/views/spree/admin/adjustment_reasons/index.html.erb +7 -6
  108. data/app/views/spree/admin/adjustment_reasons/new.html.erb +2 -0
  109. data/app/views/spree/admin/adjustment_reasons/shared/_form.html.erb +3 -3
  110. data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +4 -4
  111. data/app/views/spree/admin/adjustments/_form.html.erb +5 -5
  112. data/app/views/spree/admin/adjustments/edit.html.erb +1 -2
  113. data/app/views/spree/admin/adjustments/new.html.erb +0 -1
  114. data/app/views/spree/admin/cancellations/index.html.erb +6 -6
  115. data/app/views/spree/admin/countries/_form.html.erb +3 -3
  116. data/app/views/spree/admin/countries/edit.html.erb +1 -1
  117. data/app/views/spree/admin/countries/index.html.erb +4 -4
  118. data/app/views/spree/admin/countries/new.html.erb +1 -1
  119. data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb +4 -4
  120. data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +10 -10
  121. data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +11 -11
  122. data/app/views/spree/admin/customer_returns/edit.html.erb +2 -2
  123. data/app/views/spree/admin/customer_returns/index.html.erb +9 -10
  124. data/app/views/spree/admin/customer_returns/new.html.erb +2 -3
  125. data/app/views/spree/admin/general_settings/edit.html.erb +37 -26
  126. data/app/views/spree/admin/images/_form.html.erb +2 -2
  127. data/app/views/spree/admin/images/edit.html.erb +0 -1
  128. data/app/views/spree/admin/images/index.html.erb +2 -2
  129. data/app/views/spree/admin/images/new.html.erb +0 -3
  130. data/app/views/spree/admin/log_entries/index.html.erb +2 -2
  131. data/app/views/spree/admin/option_types/_form.html.erb +3 -3
  132. data/app/views/spree/admin/option_types/_option_value_fields.html.erb +1 -1
  133. data/app/views/spree/admin/option_types/edit.html.erb +7 -5
  134. data/app/views/spree/admin/option_types/index.html.erb +6 -7
  135. data/app/views/spree/admin/orders/_add_product.html.erb +1 -1
  136. data/app/views/spree/admin/orders/_adjustments.html.erb +4 -2
  137. data/app/views/spree/admin/orders/_carton.html.erb +7 -7
  138. data/app/views/spree/admin/orders/_carton_manifest.html.erb +3 -5
  139. data/app/views/spree/admin/orders/_form.html.erb +0 -1
  140. data/app/views/spree/admin/orders/_line_items.html.erb +10 -8
  141. data/app/views/spree/admin/orders/_line_items_edit_form.html.erb +0 -2
  142. data/app/views/spree/admin/orders/_risk_analysis.html.erb +3 -1
  143. data/app/views/spree/admin/orders/_shipment.html.erb +99 -100
  144. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +4 -9
  145. data/app/views/spree/admin/orders/confirm/_line_items.html.erb +4 -4
  146. data/app/views/spree/admin/orders/confirm/_payments.html.erb +7 -7
  147. data/app/views/spree/admin/orders/confirm/_shipment.html.erb +10 -7
  148. data/app/views/spree/admin/orders/confirm/_shipment_manifest.html.erb +2 -2
  149. data/app/views/spree/admin/orders/customer_details/_form.html.erb +1 -5
  150. data/app/views/spree/admin/orders/index.html.erb +15 -14
  151. data/app/views/spree/admin/payment_methods/_form.html.erb +9 -10
  152. data/app/views/spree/admin/payment_methods/edit.html.erb +1 -1
  153. data/app/views/spree/admin/payment_methods/index.html.erb +18 -17
  154. data/app/views/spree/admin/payment_methods/new.html.erb +2 -2
  155. data/app/views/spree/admin/payments/_capture_events.html.erb +2 -2
  156. data/app/views/spree/admin/payments/_form.html.erb +3 -3
  157. data/app/views/spree/admin/payments/_list.html.erb +29 -17
  158. data/app/views/spree/admin/payments/credit.html.erb +3 -3
  159. data/app/views/spree/admin/payments/index.html.erb +3 -3
  160. data/app/views/spree/admin/payments/new.html.erb +2 -2
  161. data/app/views/spree/admin/payments/show.html.erb +3 -3
  162. data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +4 -4
  163. data/app/views/spree/admin/payments/source_views/_gateway.html.erb +4 -4
  164. data/app/views/spree/admin/payments/source_views/_storecredit.html.erb +5 -5
  165. data/app/views/spree/admin/product_properties/index.html.erb +6 -8
  166. data/app/views/spree/admin/products/_form.html.erb +33 -33
  167. data/app/views/spree/admin/products/_properties_form.erb +1 -1
  168. data/app/views/spree/admin/products/index.html.erb +10 -9
  169. data/app/views/spree/admin/products/new.html.erb +6 -5
  170. data/app/views/spree/admin/promotion_codes/index.csv.ruby +2 -2
  171. data/app/views/spree/admin/promotions/_actions.html.erb +2 -2
  172. data/app/views/spree/admin/promotions/_form.html.erb +2 -2
  173. data/app/views/spree/admin/promotions/_rules.html.erb +1 -1
  174. data/app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb +1 -1
  175. data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb +1 -1
  176. data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb +1 -1
  177. data/app/views/spree/admin/promotions/index.html.erb +15 -16
  178. data/app/views/spree/admin/promotions/rules/_item_total.html.erb +5 -2
  179. data/app/views/spree/admin/promotions/rules/_option_value.html.erb +3 -3
  180. data/app/views/spree/admin/properties/_form.html.erb +2 -2
  181. data/app/views/spree/admin/properties/index.html.erb +8 -9
  182. data/app/views/spree/admin/prototypes/_form.html.erb +4 -4
  183. data/app/views/spree/admin/prototypes/_prototypes.html.erb +2 -2
  184. data/app/views/spree/admin/prototypes/index.html.erb +7 -10
  185. data/app/views/spree/admin/prototypes/new.js.erb +1 -1
  186. data/app/views/spree/admin/prototypes/show.html.erb +1 -1
  187. data/app/views/spree/admin/refund_reasons/edit.html.erb +2 -0
  188. data/app/views/spree/admin/refund_reasons/index.html.erb +7 -8
  189. data/app/views/spree/admin/refund_reasons/new.html.erb +2 -0
  190. data/app/views/spree/admin/refund_reasons/shared/_form.html.erb +2 -2
  191. data/app/views/spree/admin/refunds/edit.html.erb +3 -4
  192. data/app/views/spree/admin/refunds/new.html.erb +4 -5
  193. data/app/views/spree/admin/reimbursement_types/index.html.erb +4 -4
  194. data/app/views/spree/admin/reimbursements/edit.html.erb +10 -11
  195. data/app/views/spree/admin/reimbursements/index.html.erb +4 -6
  196. data/app/views/spree/admin/reimbursements/show.html.erb +12 -12
  197. data/app/views/spree/admin/return_authorizations/_form.html.erb +15 -15
  198. data/app/views/spree/admin/return_authorizations/edit.html.erb +1 -2
  199. data/app/views/spree/admin/return_authorizations/index.html.erb +5 -5
  200. data/app/views/spree/admin/return_authorizations/new.html.erb +1 -2
  201. data/app/views/spree/admin/return_reasons/index.html.erb +2 -2
  202. data/app/views/spree/admin/shared/_address_form.html.erb +10 -10
  203. data/app/views/spree/admin/shared/_areas_tabs.html.erb +19 -0
  204. data/app/views/spree/admin/shared/_calculator_fields.html.erb +2 -2
  205. data/app/views/spree/admin/shared/_configuration_menu.html.erb +9 -64
  206. data/app/views/spree/admin/shared/_destroy.js.erb +0 -2
  207. data/app/views/spree/admin/shared/_edit_resource_links.html.erb +0 -1
  208. data/app/views/spree/admin/shared/_flash.html.erb +11 -0
  209. data/app/views/spree/admin/shared/_general_tabs.html.erb +2 -0
  210. data/app/views/spree/admin/shared/_head.html.erb +10 -1
  211. data/app/views/spree/admin/shared/_header.html.erb +13 -5
  212. data/app/views/spree/admin/shared/_navigation.html.erb +1 -1
  213. data/app/views/spree/admin/shared/_navigation_header.html.erb +5 -0
  214. data/app/views/spree/admin/shared/_new_resource_links.html.erb +0 -1
  215. data/app/views/spree/admin/shared/_no_objects_found.html.erb +4 -0
  216. data/app/views/spree/admin/shared/_order_submenu.html.erb +18 -18
  217. data/app/views/spree/admin/shared/_order_summary.html.erb +12 -12
  218. data/app/views/spree/admin/shared/_order_tabs.html.erb +4 -1
  219. data/app/views/spree/admin/shared/_payments_tabs.html.erb +9 -0
  220. data/app/views/spree/admin/shared/_product_sub_menu.html.erb +2 -2
  221. data/app/views/spree/admin/shared/_product_tabs.html.erb +9 -14
  222. data/app/views/spree/admin/shared/_promotion_sub_menu.html.erb +1 -1
  223. data/app/views/spree/admin/shared/_refunds.html.erb +6 -6
  224. data/app/views/spree/admin/shared/_settings_checkout_tabs.html.erb +21 -0
  225. data/app/views/spree/admin/shared/_settings_sub_menu.html.erb +26 -0
  226. data/app/views/spree/admin/shared/_shipping_tabs.html.erb +17 -0
  227. data/app/views/spree/admin/shared/_spinner.html.erb +6 -0
  228. data/app/views/spree/admin/shared/_stock_sub_menu.html.erb +3 -3
  229. data/app/views/spree/admin/shared/_table_filter.html.erb +1 -1
  230. data/app/views/spree/admin/shared/_tabs.html.erb +4 -2
  231. data/app/views/spree/admin/shared/_taxes_tabs.html.erb +13 -0
  232. data/app/views/spree/admin/shared/_variant_search.html.erb +2 -2
  233. data/app/views/spree/admin/shared/named_types/_edit.html.erb +2 -0
  234. data/app/views/spree/admin/shared/named_types/_form.html.erb +3 -5
  235. data/app/views/spree/admin/shared/named_types/_index.html.erb +4 -5
  236. data/app/views/spree/admin/shared/named_types/_new.html.erb +2 -0
  237. data/app/views/spree/admin/shipping_categories/_form.html.erb +2 -2
  238. data/app/views/spree/admin/shipping_categories/edit.html.erb +1 -1
  239. data/app/views/spree/admin/shipping_categories/index.html.erb +6 -7
  240. data/app/views/spree/admin/shipping_categories/new.html.erb +1 -1
  241. data/app/views/spree/admin/shipping_methods/_form.html.erb +26 -8
  242. data/app/views/spree/admin/shipping_methods/edit.html.erb +1 -1
  243. data/app/views/spree/admin/shipping_methods/index.html.erb +10 -11
  244. data/app/views/spree/admin/shipping_methods/new.html.erb +1 -1
  245. data/app/views/spree/admin/states/_form.html.erb +2 -2
  246. data/app/views/spree/admin/states/_state_list.html.erb +3 -3
  247. data/app/views/spree/admin/states/edit.html.erb +1 -1
  248. data/app/views/spree/admin/states/index.html.erb +3 -3
  249. data/app/views/spree/admin/states/new.html.erb +1 -1
  250. data/app/views/spree/admin/stock_items/_stock_management.html.erb +15 -27
  251. data/app/views/spree/admin/stock_items/index.html.erb +1 -3
  252. data/app/views/spree/admin/stock_locations/_form.html.erb +17 -18
  253. data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +2 -3
  254. data/app/views/spree/admin/stock_locations/edit.html.erb +1 -1
  255. data/app/views/spree/admin/stock_locations/index.html.erb +9 -10
  256. data/app/views/spree/admin/stock_locations/new.html.erb +1 -1
  257. data/app/views/spree/admin/stock_movements/_form.html.erb +2 -2
  258. data/app/views/spree/admin/stock_movements/index.html.erb +8 -9
  259. data/app/views/spree/admin/stock_transfers/_stock_movements.html.erb +4 -4
  260. data/app/views/spree/admin/stock_transfers/_transfer_item_actions.html.erb +1 -1
  261. data/app/views/spree/admin/stock_transfers/_transfer_item_table.html.erb +1 -1
  262. data/app/views/spree/admin/stock_transfers/edit.html.erb +8 -21
  263. data/app/views/spree/admin/stock_transfers/index.html.erb +8 -6
  264. data/app/views/spree/admin/stock_transfers/new.html.erb +2 -3
  265. data/app/views/spree/admin/stock_transfers/receive.html.erb +6 -21
  266. data/app/views/spree/admin/stock_transfers/show.html.erb +8 -8
  267. data/app/views/spree/admin/stock_transfers/tracking_info.html.erb +10 -23
  268. data/app/views/spree/admin/store_credits/_form.html.erb +3 -3
  269. data/app/views/spree/admin/store_credits/_update_reason_field.html.erb +1 -1
  270. data/app/views/spree/admin/store_credits/edit_amount.html.erb +1 -1
  271. data/app/views/spree/admin/store_credits/edit_validity.html.erb +0 -1
  272. data/app/views/spree/admin/store_credits/index.html.erb +11 -12
  273. data/app/views/spree/admin/store_credits/show.html.erb +11 -11
  274. data/app/views/spree/admin/style_guide/topics/components/_tabs.html.erb +17 -0
  275. data/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb +2 -2
  276. data/app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb +1 -1
  277. data/app/views/spree/admin/tax_categories/_form.html.erb +5 -7
  278. data/app/views/spree/admin/tax_categories/edit.html.erb +1 -1
  279. data/app/views/spree/admin/tax_categories/index.html.erb +8 -9
  280. data/app/views/spree/admin/tax_categories/new.html.erb +1 -1
  281. data/app/views/spree/admin/tax_categories/show.html.erb +1 -1
  282. data/app/views/spree/admin/tax_rates/_form.html.erb +4 -4
  283. data/app/views/spree/admin/tax_rates/edit.html.erb +1 -1
  284. data/app/views/spree/admin/tax_rates/index.html.erb +12 -13
  285. data/app/views/spree/admin/tax_rates/new.html.erb +2 -2
  286. data/app/views/spree/admin/taxonomies/_form.html.erb +1 -1
  287. data/app/views/spree/admin/taxonomies/_list.html.erb +1 -1
  288. data/app/views/spree/admin/taxonomies/edit.erb +0 -3
  289. data/app/views/spree/admin/taxonomies/index.html.erb +4 -7
  290. data/app/views/spree/admin/taxonomies/new.html.erb +1 -3
  291. data/app/views/spree/admin/taxons/_form.html.erb +8 -7
  292. data/app/views/spree/admin/taxons/_taxon_table.html.erb +1 -1
  293. data/app/views/spree/admin/taxons/edit.html.erb +1 -4
  294. data/app/views/spree/admin/taxons/index.html.erb +1 -1
  295. data/app/views/spree/admin/trackers/_form.html.erb +3 -3
  296. data/app/views/spree/admin/trackers/edit.html.erb +1 -1
  297. data/app/views/spree/admin/trackers/index.html.erb +7 -8
  298. data/app/views/spree/admin/trackers/new.html.erb +1 -1
  299. data/app/views/spree/admin/users/_addresses_form.html.erb +2 -4
  300. data/app/views/spree/admin/users/_form.html.erb +6 -6
  301. data/app/views/spree/admin/users/_sidebar.html.erb +5 -5
  302. data/app/views/spree/admin/users/addresses.html.erb +1 -1
  303. data/app/views/spree/admin/users/edit.html.erb +0 -2
  304. data/app/views/spree/admin/users/index.html.erb +2 -2
  305. data/app/views/spree/admin/users/items.html.erb +11 -12
  306. data/app/views/spree/admin/users/orders.html.erb +9 -10
  307. data/app/views/spree/admin/variants/_form.html.erb +60 -34
  308. data/app/views/spree/admin/variants/_table.html.erb +47 -0
  309. data/app/views/spree/admin/variants/_table_filter.html.erb +25 -0
  310. data/app/views/spree/admin/variants/edit.html.erb +6 -1
  311. data/app/views/spree/admin/variants/index.html.erb +28 -112
  312. data/app/views/spree/admin/variants/new.html.erb +1 -1
  313. data/app/views/spree/admin/variants/new.js.erb +2 -3
  314. data/app/views/spree/admin/zones/_country_members.html.erb +2 -2
  315. data/app/views/spree/admin/zones/_form.html.erb +3 -3
  316. data/app/views/spree/admin/zones/_state_members.html.erb +2 -2
  317. data/app/views/spree/admin/zones/edit.html.erb +1 -1
  318. data/app/views/spree/admin/zones/index.html.erb +9 -10
  319. data/app/views/spree/admin/zones/new.html.erb +1 -1
  320. data/app/views/spree/layouts/admin.html.erb +15 -33
  321. data/config/initializers/assets.rb +7 -1
  322. data/config/initializers/form_builder.rb +2 -3
  323. data/config/routes.rb +12 -11
  324. data/lib/spree/backend.rb +1 -0
  325. data/lib/spree/backend/action_callbacks.rb +0 -1
  326. data/lib/spree/backend/callbacks.rb +3 -5
  327. data/lib/spree/backend/engine.rb +1 -14
  328. data/script/rails +0 -1
  329. data/solidus_backend.gemspec +1 -0
  330. data/spec/controllers/spree/admin/base_controller_spec.rb +2 -2
  331. data/spec/controllers/spree/admin/cancellations_controller_spec.rb +2 -2
  332. data/spec/controllers/spree/admin/customer_returns_controller_spec.rb +6 -7
  333. data/spec/controllers/spree/admin/general_settings_controller_spec.rb +1 -1
  334. data/spec/controllers/spree/admin/missing_products_controller_spec.rb +2 -4
  335. data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb +0 -1
  336. data/spec/controllers/spree/admin/orders_controller_spec.rb +27 -91
  337. data/spec/controllers/spree/admin/payment_methods_controller_spec.rb +38 -13
  338. data/spec/controllers/spree/admin/payments_controller_spec.rb +108 -104
  339. data/spec/controllers/spree/admin/products_controller_spec.rb +7 -7
  340. data/spec/controllers/spree/admin/promotion_actions_controller_spec.rb +3 -3
  341. data/spec/controllers/spree/admin/promotion_codes_controller_spec.rb +1 -1
  342. data/spec/controllers/spree/admin/promotion_rules_controller_spec.rb +3 -3
  343. data/spec/controllers/spree/admin/promotions_controller_spec.rb +6 -9
  344. data/spec/controllers/spree/admin/refunds_controller_spec.rb +0 -1
  345. data/spec/controllers/spree/admin/reimbursements_controller_spec.rb +3 -3
  346. data/spec/controllers/spree/admin/reports_controller_spec.rb +14 -9
  347. data/spec/controllers/spree/admin/resource_controller_spec.rb +6 -6
  348. data/spec/controllers/spree/admin/return_authorizations_controller_spec.rb +13 -13
  349. data/spec/controllers/spree/admin/return_items_controller_spec.rb +2 -2
  350. data/spec/controllers/spree/admin/search_controller_spec.rb +2 -2
  351. data/spec/controllers/spree/admin/shipping_methods_controller_spec.rb +3 -3
  352. data/spec/controllers/spree/admin/stock_items_controller_spec.rb +1 -1
  353. data/spec/controllers/spree/admin/stock_locations_controller_spec.rb +8 -7
  354. data/spec/controllers/spree/admin/stock_transfers_controller_spec.rb +13 -25
  355. data/spec/controllers/spree/admin/store_credits_controller_spec.rb +3 -4
  356. data/spec/controllers/spree/admin/users_controller_spec.rb +19 -19
  357. data/spec/controllers/spree/admin/variants_controller_spec.rb +7 -6
  358. data/spec/features/admin/configuration/analytics_tracker_spec.rb +3 -3
  359. data/spec/features/admin/configuration/countries_spec.rb +1 -1
  360. data/spec/features/admin/configuration/general_settings_spec.rb +12 -2
  361. data/spec/features/admin/configuration/payment_methods_spec.rb +13 -12
  362. data/spec/features/admin/configuration/shipping_methods_spec.rb +7 -7
  363. data/spec/features/admin/configuration/states_spec.rb +12 -12
  364. data/spec/features/admin/configuration/stock_locations_spec.rb +5 -4
  365. data/spec/features/admin/configuration/tax_categories_spec.rb +6 -6
  366. data/spec/features/admin/configuration/tax_rates_spec.rb +4 -4
  367. data/spec/features/admin/configuration/taxonomies_spec.rb +6 -6
  368. data/spec/features/admin/configuration/zones_spec.rb +6 -6
  369. data/spec/features/admin/homepage_spec.rb +2 -5
  370. data/spec/features/admin/locale_spec.rb +9 -7
  371. data/spec/features/admin/orders/adjustments_promotions_spec.rb +15 -15
  372. data/spec/features/admin/orders/adjustments_spec.rb +17 -18
  373. data/spec/features/admin/orders/cancelling_and_resuming_spec.rb +1 -2
  374. data/spec/features/admin/orders/cancelling_inventory_spec.rb +1 -1
  375. data/spec/features/admin/orders/customer_details_spec.rb +12 -12
  376. data/spec/features/admin/orders/line_items_spec.rb +3 -3
  377. data/spec/features/admin/orders/listing_spec.rb +21 -1
  378. data/spec/features/admin/orders/log_entries_spec.rb +7 -7
  379. data/spec/features/admin/orders/new_order_spec.rb +7 -7
  380. data/spec/features/admin/orders/order_details_spec.rb +41 -29
  381. data/spec/features/admin/orders/payments_spec.rb +20 -28
  382. data/spec/features/admin/orders/risk_analysis_spec.rb +2 -2
  383. data/spec/features/admin/orders/shipments_spec.rb +11 -6
  384. data/spec/features/admin/products/edit/images_spec.rb +14 -14
  385. data/spec/features/admin/products/edit/products_spec.rb +10 -10
  386. data/spec/features/admin/products/edit/taxons_spec.rb +2 -2
  387. data/spec/features/admin/products/edit/variants_spec.rb +9 -9
  388. data/spec/features/admin/products/option_types_spec.rb +11 -12
  389. data/spec/features/admin/products/products_spec.rb +66 -68
  390. data/spec/features/admin/products/properties_spec.rb +14 -14
  391. data/spec/features/admin/products/prototypes_spec.rb +3 -3
  392. data/spec/features/admin/products/stock_management_spec.rb +16 -11
  393. data/spec/features/admin/products/variant_spec.rb +4 -4
  394. data/spec/features/admin/promotion_adjustments_spec.rb +41 -41
  395. data/spec/features/admin/reports_spec.rb +9 -9
  396. data/spec/features/admin/stock_transfer_spec.rb +8 -22
  397. data/spec/features/admin/store_credits_spec.rb +0 -1
  398. data/spec/features/admin/taxons_spec.rb +5 -6
  399. data/spec/features/admin/users_spec.rb +6 -9
  400. data/spec/helpers/admin/base_helper_spec.rb +1 -2
  401. data/spec/helpers/admin/navigation_helper_spec.rb +15 -18
  402. data/spec/helpers/admin/reimbursements_helper_spec.rb +3 -3
  403. data/spec/helpers/admin/stock_movements_helper_spec.rb +1 -3
  404. data/spec/helpers/admin/store_credit_events_helper_spec.rb +3 -3
  405. data/spec/helpers/promotion_rules_helper_spec.rb +1 -1
  406. data/spec/spec_helper.rb +7 -4
  407. data/spec/support/feature/base_feature_helper.rb +3 -3
  408. data/vendor/assets/javascripts/{backbone.js → solidus_admin/backbone.js} +764 -452
  409. data/vendor/assets/javascripts/solidus_admin/bind-polyfill.js +28 -0
  410. data/vendor/assets/javascripts/solidus_admin/bootstrap.js +3560 -0
  411. data/vendor/assets/javascripts/solidus_admin/tether.js +1726 -0
  412. data/vendor/assets/javascripts/solidus_admin/underscore.js +1548 -0
  413. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_alert.scss +65 -0
  414. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_animation.scss +27 -0
  415. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_breadcrumb.scss +23 -0
  416. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_button-group.scss +224 -0
  417. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_buttons.scss +173 -0
  418. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_card.scss +292 -0
  419. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_carousel.scss +252 -0
  420. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_close.scss +28 -0
  421. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_code.scss +58 -0
  422. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_custom-forms.scss +226 -0
  423. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_dropdown.scss +193 -0
  424. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_forms.scss +452 -0
  425. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_grid.scss +76 -0
  426. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_images.scss +53 -0
  427. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_input-group.scss +189 -0
  428. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_jumbotron.scss +20 -0
  429. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_labels.scss +77 -0
  430. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_list-group.scss +140 -0
  431. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_media.scss +90 -0
  432. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_mixins.scss +55 -0
  433. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_modal.scss +146 -0
  434. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_nav.scss +162 -0
  435. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_navbar.scss +230 -0
  436. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_normalize.scss +428 -0
  437. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_pager.scss +57 -0
  438. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_pagination.scss +73 -0
  439. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_popover.scss +140 -0
  440. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_print.scss +88 -0
  441. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_progress.scss +156 -0
  442. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_reboot.scss +347 -0
  443. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_responsive-embed.scss +39 -0
  444. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_tables.scss +193 -0
  445. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_tooltip.scss +85 -0
  446. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_type.scss +157 -0
  447. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_utilities-background.scss +24 -0
  448. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_utilities-responsive.scss +49 -0
  449. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_utilities-spacing.scss +39 -0
  450. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_utilities.scss +95 -0
  451. data/vendor/assets/stylesheets/solidus_admin/bootstrap/_variables.scss +666 -0
  452. data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-flex.scss +8 -0
  453. data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-grid.scss +62 -0
  454. data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap-reboot.scss +10 -0
  455. data/vendor/assets/stylesheets/solidus_admin/bootstrap/bootstrap.scss +56 -0
  456. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_alert.scss +14 -0
  457. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_background-variant.scss +13 -0
  458. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_border-radius.scss +35 -0
  459. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_breakpoints.scss +86 -0
  460. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_buttons.scss +100 -0
  461. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_cards.scss +38 -0
  462. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_center-block.scss +7 -0
  463. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_clearfix.scss +7 -0
  464. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_forms.scss +89 -0
  465. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_gradients.scss +43 -0
  466. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_grid-framework.scss +44 -0
  467. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_grid.scss +75 -0
  468. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_hover.scss +59 -0
  469. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_image.scss +34 -0
  470. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_label.scss +11 -0
  471. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_list-group.scss +30 -0
  472. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_lists.scss +7 -0
  473. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_nav-divider.scss +10 -0
  474. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_navbar-align.scss +9 -0
  475. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_pagination.scss +22 -0
  476. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_progress.scss +18 -0
  477. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_pulls.scss +6 -0
  478. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_reset-filter.scss +8 -0
  479. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_reset-text.scss +18 -0
  480. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_resize.scss +6 -0
  481. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_screen-reader.scss +32 -0
  482. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_size.scss +6 -0
  483. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_tab-focus.scss +9 -0
  484. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_table-row.scss +30 -0
  485. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_text-emphasis.scss +12 -0
  486. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_text-hide.scss +8 -0
  487. data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_text-truncate.scss +8 -0
  488. metadata +140 -35
  489. data/app/assets/javascripts/spree/backend/orders/edit_form.js +0 -20
  490. data/app/assets/javascripts/spree/backend/shipments.js.erb +0 -353
  491. data/app/assets/javascripts/spree/backend/stock_management/index.coffee +0 -4
  492. data/app/assets/javascripts/spree/backend/stock_transfers/ship.js.coffee +0 -10
  493. data/app/assets/javascripts/spree/backend/taxon_tree_menu.js.coffee +0 -21
  494. data/app/assets/javascripts/spree/frontend/backend.js +0 -1
  495. data/app/assets/stylesheets/spree/backend/components/_pagination.scss +0 -17
  496. data/app/assets/stylesheets/spree/backend/plugins/_powertip.scss +0 -87
  497. data/app/assets/stylesheets/spree/backend/plugins/_token-input.scss +0 -110
  498. data/app/assets/stylesheets/spree/frontend/backend.css +0 -1
  499. data/app/views/spree/admin/orders/_line_item.html.erb +0 -9
  500. data/app/views/spree/admin/shared/_content_header.html.erb +0 -23
  501. data/app/views/spree/admin/shared/_show_resource_links.html.erb +0 -5
  502. data/app/views/spree/admin/shared/_update_order_state.js +0 -7
  503. data/vendor/assets/javascripts/jquery.cookie.js +0 -41
  504. data/vendor/assets/javascripts/jquery.powertip.js +0 -1165
  505. data/vendor/assets/javascripts/underscore-min.js +0 -1227
  506. data/vendor/assets/stylesheets/bootstrap/components/_media.scss +0 -61
  507. data/vendor/assets/stylesheets/jquery.powertip.css +0 -85
@@ -1,6 +1,9 @@
1
- <div class="field alpha four columns">
1
+ <div class="field alpha three columns">
2
2
  <%= select_tag "#{param_prefix}[preferred_operator]", options_for_select(Spree::Promotion::Rules::ItemTotal::OPERATORS.map{|o| [Spree.t("item_total_rule.operators.#{o}"),o]}, promotion_rule.preferred_operator), {:class => 'select2 select_item_total fullwidth'} %>
3
3
  </div>
4
- <div class="field omega four columns">
4
+ <div class="field three columns">
5
5
  <%= text_field_tag "#{param_prefix}[preferred_amount]", promotion_rule.preferred_amount, :class => 'fullwidth' %>
6
6
  </div>
7
+ <div class="field omega two columns">
8
+ <%= text_field_tag "#{param_prefix}[preferred_currency]", promotion_rule.preferred_currency, :class => 'fullwidth' %>
9
+ </div>
@@ -1,12 +1,12 @@
1
1
  <div class="field alpha omega eight columns promo-rule-option-values">
2
2
  <div class="param-prefix hidden" data-param-prefix="<%= param_prefix %>"></div>
3
- <div class="four columns alpha"><%= label_tag nil, Spree.t(:product) %></div>
4
- <div class="three columns omega"><%= label_tag nil, Spree.t(:option_values) %></div>
3
+ <div class="four columns alpha"><%= label_tag nil, Spree::Product.model_name.human %></div>
4
+ <div class="three columns omega"><%= label_tag nil, Spree::OptionValue.model_name.human(count: :other) %></div>
5
5
  <div class="clear"></div>
6
6
 
7
7
  <div class="js-promo-rule-option-values"></div>
8
8
 
9
- <button class="fa fa-plus button js-add-promo-rule-option-value"><%= Spree.t(:add) %></button>
9
+ <button class="fa fa-plus button js-add-promo-rule-option-value"><%= Spree.t('actions.add') %></button>
10
10
  </div>
11
11
 
12
12
  <%= content_tag :div, nil, class: "hidden js-original-promo-rule-option-values",
@@ -1,14 +1,14 @@
1
1
  <div data-hook="admin_property_form" class="align-center row">
2
2
  <div class="alpha eight columns">
3
3
  <%= f.field_container :name do %>
4
- <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
4
+ <%= f.label :name, class: 'required' %><br />
5
5
  <%= f.text_field :name, :class => 'fullwidth' %>
6
6
  <%= f.error_message_on :name %>
7
7
  <% end %>
8
8
  </div>
9
9
  <div class="eight columns omega">
10
10
  <%= f.field_container :presentation do %>
11
- <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span><br />
11
+ <%= f.label :presentation, class: 'required' %><br />
12
12
  <%= f.text_field :presentation, :class => 'fullwidth' %>
13
13
  <%= f.error_message_on :presentation %>
14
14
  <% end %>
@@ -1,11 +1,11 @@
1
1
  <% content_for :page_title do %>
2
- <%= Spree.t(:properties) %>
2
+ <%= Spree::Property.model_name.human(count: :other) %>
3
3
  <% end %>
4
4
 
5
5
  <% content_for :page_actions do %>
6
6
  <% if can?(:create, Spree::Property) %>
7
7
  <li id="new_property_link">
8
- <%= button_link_to Spree.t(:new_property), new_admin_property_url, { :remote => true, :icon => 'plus', 'data-update' => 'new_property_container', :id => 'new_property_link' } %>
8
+ <%= button_link_to Spree.t(:new_property), new_admin_property_url, { :remote => true, :icon => 'plus', :id => 'new_property_link' } %>
9
9
  </li>
10
10
  <% end %>
11
11
  <% end %>
@@ -50,8 +50,8 @@
50
50
  </colgroup>
51
51
  <thead>
52
52
  <tr data-hook="listing_properties_header">
53
- <th><%= Spree.t(:name) %></th>
54
- <th><%= Spree.t(:presentation) %></th>
53
+ <th><%= Spree::Property.human_attribute_name(:name) %></th>
54
+ <th><%= Spree::Property.human_attribute_name(:presentation) %></th>
55
55
  <th class="actions"></th>
56
56
  </tr>
57
57
  </thead>
@@ -74,11 +74,10 @@
74
74
  </table>
75
75
  <% else %>
76
76
  <div class="alpha twelve columns no-objects-found">
77
- <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/property')) %>
78
- <% if can?(:create, Spree::Property) %>
79
- <%= link_to Spree.t(:add_one), spree.new_admin_property_path %>!
80
- <% end %>
77
+ <%= render 'spree/admin/shared/no_objects_found',
78
+ resource: Spree::Property,
79
+ new_resource_url: new_object_url %>
81
80
  </div>
82
81
  <% end %>
83
82
 
84
- <%= paginate @collection %>
83
+ <%= paginate @collection, theme: "solidus_admin" %>
@@ -1,7 +1,7 @@
1
1
  <div data-hook="admin_prototype_form_fields" class="row">
2
2
  <div class="alpha four columns">
3
3
  <%= f.field_container :name do %>
4
- <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
4
+ <%= f.label :name, class: 'required' %><br />
5
5
  <%= f.text_field :name, class: 'fullwidth' %>
6
6
  <%= f.error_message_on :name %>
7
7
  <% end %>
@@ -10,7 +10,7 @@
10
10
  <div class="four columns">
11
11
  <div id='properties' data-hook>
12
12
  <%= f.field_container :property_ids do %>
13
- <%= f.label :property_ids, Spree.t(:properties) %><br>
13
+ <%= f.label :property_ids, Spree::Property.model_name.human(count: :other) %><br>
14
14
  <%= f.select :property_ids, Spree::Property.all.map { |p| ["#{p.presentation} (#{p.name})", p.id] }, {}, { multiple: true, class: "select2 fullwidth" } %>
15
15
  <% end %>
16
16
  </div>
@@ -19,7 +19,7 @@
19
19
  <div class="four columns">
20
20
  <div id="option_types" data-hook>
21
21
  <%= f.field_container :option_type_ids do %>
22
- <%= f.label :option_type_ids, Spree.t(:option_types) %><br>
22
+ <%= f.label :option_type_ids, Spree::OptionType.model_name.human(count: :other) %><br>
23
23
  <%= f.select :option_type_ids, Spree::OptionType.all.map { |ot| ["#{ot.presentation} (#{ot.name})", ot.id] }, {}, { multiple: true, class: "select2 fullwidth" } %>
24
24
  <% end %>
25
25
  </div>
@@ -28,7 +28,7 @@
28
28
  <div class="four columns omega">
29
29
  <div id='taxons' data-hook>
30
30
  <%= f.field_container :taxon_ids do %>
31
- <%= f.label :taxon_ids, Spree.t(:taxons) %><br>
31
+ <%= f.label :taxon_ids, Spree::Taxon.model_name.human(count: :other) %><br>
32
32
  <%= f.select :taxon_ids, Spree::Taxon.all.map { |t| [t.name, t.id] }, {}, { multiple: true, class: "select2 fullwidth" } %>
33
33
  <% end %>
34
34
  </div>
@@ -5,7 +5,7 @@
5
5
  </colgroup>
6
6
  <thead>
7
7
  <tr data-hook="available_header">
8
- <th><%= Spree.t(:name) %></th>
8
+ <th><%= Spree::Prototype.human_attribute_name(:name) %></th>
9
9
  <th class="actions"></th>
10
10
  </tr>
11
11
  </thead>
@@ -14,7 +14,7 @@
14
14
  <tr id="row_<%= prototype.id %>" data-hook="available_row" class="<%= cycle('odd', 'even')%>">
15
15
  <td><%= prototype.name %></td>
16
16
  <td class="actions">
17
- <%= link_to Spree.t(:select), select_admin_prototype_url(prototype), :class => 'ajax button select_properties_from_prototype fa fa-ok' %>
17
+ <%= link_to Spree.t(:select), select_admin_prototype_url(prototype), class: 'ajax button select_properties_from_prototype fa fa-ok', data: { remote: true } %>
18
18
  </td>
19
19
  </tr>
20
20
  <% end %>
@@ -1,19 +1,17 @@
1
1
  <% content_for :page_title do %>
2
- <%= Spree.t(:prototypes) %>
2
+ <%= Spree::Prototype.model_name.human(count: :other) %>
3
3
  <% end %>
4
4
 
5
5
  <% content_for :page_actions do %>
6
6
  <% if can?(:create, Spree::Prototype) %>
7
7
  <li id="new_prototype_link">
8
- <%= button_link_to Spree.t(:new_prototype), new_admin_prototype_url, {:remote => true, :icon => 'plus', 'data-update' => 'new_prototype', :id => 'new_prototype_link'} %>
8
+ <%= button_link_to Spree.t(:new_prototype), new_admin_prototype_url, {:remote => true, :icon => 'plus', :id => 'new_prototype_link'} %>
9
9
  </li>
10
10
  <% end %>
11
11
  <% end %>
12
12
 
13
- <%= image_tag 'select2-spinner.gif', :plugin => 'spree', :style => 'display: none', :id => 'busy_indicator' %>
14
-
15
13
  <%# Placeholder for new prototype form %>
16
- <div id="new_prototype"></div>
14
+ <div id="new_prototype_container"></div>
17
15
 
18
16
  <% if @prototypes.any? %>
19
17
  <table class="index" id='listing_prototypes' data-hook>
@@ -23,7 +21,7 @@
23
21
  </colgroup>
24
22
  <thead>
25
23
  <tr data-hook="prototypes_header">
26
- <th><%= Spree.t(:name) %></th>
24
+ <th><%= Spree::Prototype.human_attribute_name(:name) %></th>
27
25
  <th class="actions"></th>
28
26
  </tr>
29
27
  </thead>
@@ -45,9 +43,8 @@
45
43
  </table>
46
44
  <% else %>
47
45
  <div class="alpha twelve columns no-objects-found">
48
- <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/prototype')) %>
49
- <% if can?(:create, Spree::Prototype) %>
50
- <%= link_to Spree.t(:add_one), spree.new_admin_prototype_path %>!
51
- <% end %>
46
+ <%= render 'spree/admin/shared/no_objects_found',
47
+ resource: Spree::Prototype,
48
+ new_resource_url: new_object_url %>
52
49
  </div>
53
50
  <% end %>
@@ -1,4 +1,4 @@
1
- $("#new_prototype").html('<%= escape_javascript(render :template => "spree/admin/prototypes/new", :formats=>[:html], :handlers=>[:erb]) %>');
1
+ $("#new_prototype_container").html('<%= escape_javascript(render :template => "spree/admin/prototypes/new", :formats=>[:html], :handlers=>[:erb]) %>');
2
2
  <% unless Rails.env.test? %>
3
3
  $('.select2').select2();
4
4
  <% end %>
@@ -1,5 +1,5 @@
1
1
  <% if @prototype.option_types.present? %>
2
- <h2><%= Spree.t(:variants) %></h2>
2
+ <h2><%= Spree::Variant.model_name.human(count: :other) %></h2>
3
3
 
4
4
  <ul class="product-prototype-options">
5
5
  <% @prototype.option_types.each do |ot| %>
@@ -1,3 +1,5 @@
1
+ <%= render 'spree/admin/shared/settings_checkout_tabs' %>
2
+
1
3
  <% content_for :page_title do %>
2
4
  <%= Spree.t(:editing_refund_reason) %>
3
5
  <% end %>
@@ -1,7 +1,7 @@
1
- <%= render partial: 'spree/admin/shared/configuration_menu' %>
1
+ <%= render 'spree/admin/shared/settings_checkout_tabs' %>
2
2
 
3
3
  <% content_for :page_title do %>
4
- <%= Spree.t(:refund_reasons) %>
4
+ <%= Spree::RefundReason.model_name.human(count: :other) %>
5
5
  <% end %>
6
6
 
7
7
  <% content_for :page_actions do %>
@@ -23,8 +23,8 @@
23
23
  </colgroup>
24
24
  <thead>
25
25
  <tr data-hook="named_types_header">
26
- <th><%= Spree.t(:name) %></th>
27
- <th><%= Spree.t(:active) %></th>
26
+ <th><%= Spree::RefundReason.human_attribute_name(:name) %></th>
27
+ <th><%= Spree::RefundReason.human_attribute_name(:active) %></th>
28
28
  <th class="actions"></th>
29
29
  </tr>
30
30
  </thead>
@@ -48,9 +48,8 @@
48
48
  </table>
49
49
  <% else %>
50
50
  <div class="alpha twelve columns no-objects-found">
51
- <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/refund_reason')) %>
52
- <% if can?(:create, Spree::RefundReason) %>
53
- <%= link_to Spree.t(:add_one), new_object_url %>!
54
- <% end %>
51
+ <%= render 'spree/admin/shared/no_objects_found',
52
+ resource: Spree::RefundReason,
53
+ new_resource_url: new_object_url %>
55
54
  </div>
56
55
  <% end %>
@@ -1,3 +1,5 @@
1
+ <%= render 'spree/admin/shared/settings_checkout_tabs' %>
2
+
1
3
  <% content_for :page_title do %>
2
4
  <%= Spree.t(:new_refund_reason) %>
3
5
  <% end %>
@@ -2,12 +2,12 @@
2
2
  <div class="row">
3
3
  <div class="alpha four columns">
4
4
  <%= f.field_container :name do %>
5
- <%= f.label :name, Spree.t(:name) %> <span class="required">*</span><br />
5
+ <%= f.label :name, class: 'required' %><br />
6
6
  <%= f.text_field :name, :class => 'fullwidth' %>
7
7
  <% end %>
8
8
 
9
9
  <%= f.field_container :code do %>
10
- <%= f.label :code, Spree.t(:code) %> <span class="required">*</span><br />
10
+ <%= f.label :code, class: 'required' %><br />
11
11
  <%= f.text_field :code, :class => 'fullwidth' %>
12
12
 
13
13
  <% end %>
@@ -1,7 +1,7 @@
1
1
  <%= render partial: 'spree/admin/shared/order_tabs', locals: {current: 'Payments'} %>
2
2
 
3
3
  <% content_for :page_title do %>
4
- <i class="fa fa-arrow-right"></i> <%= link_to "#{Spree.t(:payment)} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
4
+ <i class="fa fa-arrow-right"></i> <%= link_to "#{Spree::Payment.model_name.human} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
5
5
  <i class="fa fa-arrow-right"></i> <%= Spree.t(:editing_refund) %> <%= @refund.id %>
6
6
  <% end %>
7
7
 
@@ -10,13 +10,13 @@
10
10
  <div data-hook="admin_refund_form_fields" class="row">
11
11
  <div class="alpha three columns">
12
12
  <div class="field">
13
- <%= Spree.t(:amount) %><br/>
13
+ <%= f.label :amount %><br/>
14
14
  <%= @refund.amount %>
15
15
  </div>
16
16
  </div>
17
17
  <div class="alpha three columns">
18
18
  <div class="field">
19
- <%= f.label :refund_reason_id, Spree.t(:reason) %><br/>
19
+ <%= f.label :refund_reason_id %><br/>
20
20
  <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {}, {class: 'select2 fullwidth'}) %>
21
21
  </div>
22
22
  </div>
@@ -24,7 +24,6 @@
24
24
 
25
25
  <div class="form-buttons filter-actions actions" data-hook="buttons">
26
26
  <%= button Spree.t('actions.save'), 'ok' %>
27
- <span class="or"><%= Spree.t(:or) %></span>
28
27
  <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order), icon: 'remove' %>
29
28
  </div>
30
29
  </fieldset>
@@ -1,7 +1,7 @@
1
1
  <%= render partial: 'spree/admin/shared/order_tabs', locals: {current: 'Payments'} %>
2
2
 
3
3
  <% content_for :page_title do %>
4
- <i class="fa fa-arrow-right"></i> <%= link_to "#{Spree.t(:payment)} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
4
+ <i class="fa fa-arrow-right"></i> <%= link_to "#{Spree::Payment.model_name.human} #{@refund.payment.id}", admin_order_payment_path(@refund.payment.order, @refund.payment) %>
5
5
  <i class="fa fa-arrow-right"></i> <%= Spree.t(:new_refund) %>
6
6
  <% end %>
7
7
 
@@ -22,21 +22,20 @@
22
22
  </div>
23
23
  <div class="alpha three columns">
24
24
  <div class="field">
25
- <%= f.label :amount, Spree.t(:amount) %><br/>
25
+ <%= f.label :amount %><br/>
26
26
  <%= f.text_field :amount, class: 'fullwidth' %>
27
27
  </div>
28
28
  </div>
29
29
  <div class="alpha three columns">
30
30
  <div class="field">
31
- <%= f.label :refund_reason_id, Spree.t(:reason) %><br/>
31
+ <%= f.label :refund_reason_id %><br/>
32
32
  <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'select2 fullwidth'}) %>
33
33
  </div>
34
34
  </div>
35
35
  </div>
36
36
 
37
37
  <div class="form-buttons filter-actions actions" data-hook="buttons">
38
- <%= button Spree.t(:refund), 'ok' %>
39
- <span class="or"><%= Spree.t(:or) %></span>
38
+ <%= button Spree::Refund.model_name.human, 'ok' %>
40
39
  <%= button_link_to Spree.t('actions.cancel'), admin_order_payments_url(@refund.payment.order), icon: 'remove' %>
41
40
  </div>
42
41
  </fieldset>
@@ -1,14 +1,14 @@
1
- <%= render partial: 'spree/admin/shared/configuration_menu' %>
1
+ <%= render 'spree/admin/shared/settings_checkout_tabs' %>
2
2
 
3
3
  <% content_for :page_title do %>
4
- <%= Spree.t(:reimbursement_types) %>
4
+ <%= Spree::ReimbursementType.model_name.human(count: :other) %>
5
5
  <% end %>
6
6
 
7
7
  <table class="index" id='listing_reimbursement_types' data-hook>
8
8
  <thead>
9
9
  <tr data-hook="reimbursement_types_header">
10
- <th><%= Spree.t(:name) %></th>
11
- <th><%= Spree.t(:type) %></th>
10
+ <th><%= Spree::ReimbursementType.human_attribute_name(:name) %></th>
11
+ <th><%= Spree::ReimbursementType.human_attribute_name(:type) %></th>
12
12
  </tr>
13
13
  </thead>
14
14
  <tbody>
@@ -16,12 +16,12 @@
16
16
  <table class="index reimbursement-return-items">
17
17
  <thead>
18
18
  <tr>
19
- <th><%= Spree.t(:product) %></th>
20
- <th><%= Spree.t(:preferred_reimbursement_type) %></th>
21
- <th><%= Spree.t(:reimbursement_type_override) %></th>
22
- <th><%= Spree.t(:pre_tax_refund_amount) %></th>
23
- <th><%= Spree.t(:total) %></th>
24
- <th><%= Spree.t(:exchange_for) %></th>
19
+ <th><%= Spree::Product.model_name.human %></th>
20
+ <th><%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type_id) %></th>
21
+ <th><%= Spree::ReturnItem.human_attribute_name(:override_reimbursement_type_id) %></th>
22
+ <th><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
23
+ <th><%= Spree::ReturnItem.human_attribute_name(:total) %></th>
24
+ <th><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
25
25
  </tr>
26
26
  </thead>
27
27
  <tbody>
@@ -44,7 +44,7 @@
44
44
  ) %>
45
45
  </td>
46
46
  <td class="align-center">
47
- <%= item_fields.text_field :pre_tax_amount, { class: 'refund-amount-input' } %>
47
+ <%= item_fields.text_field :amount, { class: 'refund-amount-input' } %>
48
48
  </td>
49
49
  <td class="align-center">
50
50
  <%= return_item.display_total %>
@@ -76,9 +76,9 @@
76
76
  <table class="index calculated-reimbursements">
77
77
  <thead data-hook="customer_return_header">
78
78
  <tr>
79
- <th><%= Spree.t(:reimbursement_type) %></th>
79
+ <th><%= Spree::ReimbursementType.model_name.human %></th>
80
80
  <th><%= Spree.t(:description) %></th>
81
- <th><%= Spree.t(:amount) %></th>
81
+ <th><%= Spree::Reimbursement.human_attribute_name(:total) %></th>
82
82
  </tr>
83
83
  </thead>
84
84
  <tbody>
@@ -93,7 +93,7 @@
93
93
  </table>
94
94
  <% if @order.has_non_reimbursement_related_refunds? %>
95
95
  <span class="red">
96
- <%= "#{Spree.t('note')}: #{Spree.t('this_order_has_already_received_a_refund')}. #{Spree.t('make_sure_the_above_reimbursement_amount_is_correct')}." %>
96
+ <%= Spree.t(:note_already_received_a_refund) %>
97
97
  </span>
98
98
  <% end %>
99
99
  <div class="form-buttons filter-actions actions" data-hook="reimburse-buttons">
@@ -101,7 +101,6 @@
101
101
  <%= button_to [:perform, :admin, @order, @reimbursement], {class: 'button fa fa-reply', method: 'post'} do %>
102
102
  <%= Spree.t(:reimburse) %>
103
103
  <% end %>
104
- <span class="or"><%= Spree.t(:or) %></span>
105
104
  <%= button_link_to Spree.t('actions.cancel'), url_for([:admin, @order, @reimbursement.customer_return]), :icon => 'remove' %>
106
105
  <% end %>
107
106
  </div>
@@ -1,7 +1,7 @@
1
1
  <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Reimbursements' } %>
2
2
 
3
3
  <% content_for :page_title do %>
4
- <i class="fa fa-arrow-right"></i> <%= Spree.t(:edit_reimbursement) %>
4
+ <i class="fa fa-arrow-right"></i> <%= Spree::Reimbursement.model_name.human(count: :other) %>
5
5
  <% end %>
6
6
 
7
7
  <% content_for :page_actions do %>
@@ -14,10 +14,9 @@
14
14
  <thead data-hook="customer_return_header">
15
15
  <tr>
16
16
  <th><%= Spree.t(:id) %></th>
17
- <th><%= Spree.t(:total) %></th>
18
- <th><%= Spree.t(:status) %></th>
19
- <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
20
- <th class="actions"></th>
17
+ <th><%= Spree::Reimbursement.human_attribute_name(:total) %></th>
18
+ <th><%= Spree::Reimbursement.human_attribute_name(:reimbursement_status) %></th>
19
+ <th><%= Spree::Reimbursement.human_attribute_name(:created_at) %></th>
21
20
  </tr>
22
21
  </thead>
23
22
  <tbody>
@@ -27,7 +26,6 @@
27
26
  <td><%= reimbursement.total %></td>
28
27
  <td><%= reimbursement.reimbursement_status %></td>
29
28
  <td><%= pretty_time(reimbursement.created_at) %></td>
30
- <td></td>
31
29
  </tr>
32
30
  <% end %>
33
31
  </tbody>
@@ -1,7 +1,7 @@
1
1
  <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Customer Returns' } %>
2
2
 
3
3
  <% content_for :page_title do %>
4
- <i class="fa fa-arrow-right"></i> <%= Spree.t(:reimbursement) %> #<%= @reimbursement.number %>
4
+ <i class="fa fa-arrow-right"></i> <%= Spree::Reimbursement.model_name.human %> #<%= @reimbursement.number %>
5
5
  <% end %>
6
6
 
7
7
  <% content_for :page_actions do %>
@@ -15,12 +15,12 @@
15
15
  <table class="index reimbursement-reimbursement-items">
16
16
  <thead>
17
17
  <tr>
18
- <th><%= Spree.t(:product) %></th>
19
- <th><%= Spree.t(:preferred_reimbursement_type) %></th>
20
- <th><%= Spree.t(:reimbursement_type_override) %></th>
21
- <th><%= Spree.t(:exchange_for) %></th>
22
- <th><%= Spree.t(:pre_tax_amount) %></th>
23
- <th><%= Spree.t(:total) %></th>
18
+ <th><%= Spree::Product.model_name.human %></th>
19
+ <th><%= Spree::ReturnItem.human_attribute_name(:preferred_reimbursement_type_id) %></th>
20
+ <th><%= Spree::ReturnItem.human_attribute_name(:override_reimbursement_type_id) %></th>
21
+ <th><%= Spree::ReturnItem.human_attribute_name(:exchange_variant) %></th>
22
+ <th><%= Spree::ReturnItem.human_attribute_name(:amount) %></th>
23
+ <th><%= Spree::ReturnItem.human_attribute_name(:total) %></th>
24
24
  </tr>
25
25
  </thead>
26
26
  <tbody>
@@ -41,7 +41,7 @@
41
41
  <%= return_item.exchange_variant.try(:exchange_name) %>
42
42
  </td>
43
43
  <td class="align-center">
44
- <%= return_item.display_pre_tax_amount %>
44
+ <%= return_item.display_amount %>
45
45
  </td>
46
46
  <td class="align-center">
47
47
  <%= return_item.display_total %>
@@ -54,12 +54,12 @@
54
54
  </fieldset>
55
55
 
56
56
  <fieldset class="no-border-bottom">
57
- <legend align='center'><%= Spree.t(:refunds) %></legend>
57
+ <legend align='center'><%= Spree::Refund.model_name.human %></legend>
58
58
  <table class="index reimbursement-refunds">
59
59
  <thead data-hook="customer_return_header">
60
60
  <tr>
61
- <th><%= Spree.t(:description) %></th>
62
- <th><%= Spree.t(:amount) %></th>
61
+ <th><%= Spree::Refund.human_attribute_name(:description) %></th>
62
+ <th><%= Spree::Refund.human_attribute_name(:amount) %></th>
63
63
  </tr>
64
64
  </thead>
65
65
  <tbody>
@@ -79,7 +79,7 @@
79
79
  <thead data-hook="customer_return_header">
80
80
  <tr>
81
81
  <th><%= Spree.t(:description) %></th>
82
- <th><%= Spree.t(:amount) %></th>
82
+ <th><%= Spree::ReimbursementCredit.human_attribute_name(:amount) %></th>
83
83
  </tr>
84
84
  </thead>
85
85
  <tbody>