solidus_backend 2.5.2 → 2.6.0.rc1

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 (274) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +5 -3
  3. data/app/assets/javascripts/spree/backend.js +1 -0
  4. data/app/assets/javascripts/spree/backend/admin.js +1 -0
  5. data/app/assets/javascripts/spree/backend/highlight_negative_numbers.js +14 -0
  6. data/app/assets/javascripts/spree/backend/locale_selection.js +18 -0
  7. data/app/assets/javascripts/spree/backend/templates/products/sortable.hbs +1 -1
  8. data/app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs +11 -2
  9. data/app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js +3 -1
  10. data/app/assets/stylesheets/spree/backend/components/_navigation.scss +6 -2
  11. data/app/assets/stylesheets/spree/backend/globals/_functions.scss +1 -2
  12. data/app/assets/stylesheets/spree/backend/shared/_typography.scss +3 -0
  13. data/app/controllers/spree/admin/adjustment_reasons_controller.rb +2 -0
  14. data/app/controllers/spree/admin/adjustments_controller.rb +2 -0
  15. data/app/controllers/spree/admin/base_controller.rb +2 -0
  16. data/app/controllers/spree/admin/cancellations_controller.rb +2 -0
  17. data/app/controllers/spree/admin/customer_returns_controller.rb +2 -0
  18. data/app/controllers/spree/admin/dashboards_controller.rb +2 -0
  19. data/app/controllers/spree/admin/general_settings_controller.rb +2 -0
  20. data/app/controllers/spree/admin/images_controller.rb +2 -0
  21. data/app/controllers/spree/admin/locale_controller.rb +24 -0
  22. data/app/controllers/spree/admin/log_entries_controller.rb +2 -0
  23. data/app/controllers/spree/admin/option_types_controller.rb +2 -0
  24. data/app/controllers/spree/admin/option_values_controller.rb +2 -0
  25. data/app/controllers/spree/admin/orders/customer_details_controller.rb +2 -0
  26. data/app/controllers/spree/admin/orders_controller.rb +4 -2
  27. data/app/controllers/spree/admin/payment_methods_controller.rb +2 -0
  28. data/app/controllers/spree/admin/payments_controller.rb +2 -0
  29. data/app/controllers/spree/admin/prices_controller.rb +2 -0
  30. data/app/controllers/spree/admin/product_properties_controller.rb +2 -0
  31. data/app/controllers/spree/admin/products_controller.rb +2 -0
  32. data/app/controllers/spree/admin/promotion_actions_controller.rb +2 -0
  33. data/app/controllers/spree/admin/promotion_categories_controller.rb +2 -0
  34. data/app/controllers/spree/admin/promotion_code_batches_controller.rb +2 -0
  35. data/app/controllers/spree/admin/promotion_codes_controller.rb +2 -0
  36. data/app/controllers/spree/admin/promotion_rules_controller.rb +6 -0
  37. data/app/controllers/spree/admin/promotions_controller.rb +2 -0
  38. data/app/controllers/spree/admin/properties_controller.rb +2 -0
  39. data/app/controllers/spree/admin/refund_reasons_controller.rb +2 -0
  40. data/app/controllers/spree/admin/refunds_controller.rb +2 -0
  41. data/app/controllers/spree/admin/reimbursement_types_controller.rb +2 -0
  42. data/app/controllers/spree/admin/reimbursements_controller.rb +2 -0
  43. data/app/controllers/spree/admin/reports_controller.rb +2 -0
  44. data/app/controllers/spree/admin/resource_controller.rb +2 -0
  45. data/app/controllers/spree/admin/return_authorizations_controller.rb +2 -0
  46. data/app/controllers/spree/admin/return_items_controller.rb +2 -0
  47. data/app/controllers/spree/admin/return_reasons_controller.rb +2 -0
  48. data/app/controllers/spree/admin/root_controller.rb +2 -0
  49. data/app/controllers/spree/admin/search_controller.rb +2 -0
  50. data/app/controllers/spree/admin/shipping_categories_controller.rb +2 -0
  51. data/app/controllers/spree/admin/shipping_methods_controller.rb +2 -0
  52. data/app/controllers/spree/admin/stock_items_controller.rb +2 -0
  53. data/app/controllers/spree/admin/stock_locations_controller.rb +2 -1
  54. data/app/controllers/spree/admin/stock_movements_controller.rb +2 -0
  55. data/app/controllers/spree/admin/store_credits_controller.rb +2 -0
  56. data/app/controllers/spree/admin/stores_controller.rb +2 -0
  57. data/app/controllers/spree/admin/style_guide_controller.rb +2 -0
  58. data/app/controllers/spree/admin/tax_categories_controller.rb +2 -0
  59. data/app/controllers/spree/admin/tax_rates_controller.rb +2 -0
  60. data/app/controllers/spree/admin/taxonomies_controller.rb +2 -0
  61. data/app/controllers/spree/admin/taxons_controller.rb +2 -0
  62. data/app/controllers/spree/admin/users_controller.rb +4 -1
  63. data/app/controllers/spree/admin/variant_property_rule_values_controller.rb +2 -0
  64. data/app/controllers/spree/admin/variants_controller.rb +2 -0
  65. data/app/controllers/spree/admin/variants_including_master_controller.rb +2 -0
  66. data/app/controllers/spree/admin/zones_controller.rb +2 -0
  67. data/app/helpers/spree/admin/adjustments_helper.rb +2 -0
  68. data/app/helpers/spree/admin/base_helper.rb +6 -3
  69. data/app/helpers/spree/admin/customer_returns_helper.rb +2 -0
  70. data/app/helpers/spree/admin/navigation_helper.rb +11 -7
  71. data/app/helpers/spree/admin/orders_helper.rb +5 -3
  72. data/app/helpers/spree/admin/payments_helper.rb +4 -3
  73. data/app/helpers/spree/admin/products_helper.rb +2 -0
  74. data/app/helpers/spree/admin/reimbursement_type_helper.rb +2 -0
  75. data/app/helpers/spree/admin/stock_locations_helper.rb +2 -0
  76. data/app/helpers/spree/admin/stock_movements_helper.rb +2 -0
  77. data/app/helpers/spree/admin/store_credit_events_helper.rb +2 -0
  78. data/app/helpers/spree/promotion_rules_helper.rb +2 -0
  79. data/app/models/spree/backend_configuration.rb +2 -0
  80. data/app/views/spree/admin/adjustment_reasons/index.html.erb +1 -1
  81. data/app/views/spree/admin/adjustments/edit.html.erb +1 -1
  82. data/app/views/spree/admin/adjustments/index.html.erb +2 -2
  83. data/app/views/spree/admin/adjustments/new.html.erb +2 -2
  84. data/app/views/spree/admin/customer_returns/index.html.erb +1 -1
  85. data/app/views/spree/admin/customer_returns/new.html.erb +2 -2
  86. data/app/views/spree/admin/images/_image_row.html.erb +1 -1
  87. data/app/views/spree/admin/images/_new.html.erb +1 -1
  88. data/app/views/spree/admin/images/edit.html.erb +2 -2
  89. data/app/views/spree/admin/log_entries/index.html.erb +2 -2
  90. data/app/views/spree/admin/option_types/index.html.erb +1 -1
  91. data/app/views/spree/admin/orders/_carton_manifest.html.erb +1 -1
  92. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +1 -1
  93. data/app/views/spree/admin/orders/cart.html.erb +2 -2
  94. data/app/views/spree/admin/orders/confirm/_payments.html.erb +1 -1
  95. data/app/views/spree/admin/orders/customer_details/_form.html.erb +1 -1
  96. data/app/views/spree/admin/orders/customer_details/show.html.erb +1 -1
  97. data/app/views/spree/admin/orders/edit.html.erb +1 -1
  98. data/app/views/spree/admin/orders/index.html.erb +2 -2
  99. data/app/views/spree/admin/payment_methods/edit.html.erb +1 -1
  100. data/app/views/spree/admin/payment_methods/index.html.erb +1 -1
  101. data/app/views/spree/admin/payment_methods/new.html.erb +1 -1
  102. data/app/views/spree/admin/payments/_list.html.erb +2 -2
  103. data/app/views/spree/admin/payments/credit.html.erb +1 -1
  104. data/app/views/spree/admin/payments/index.html.erb +1 -1
  105. data/app/views/spree/admin/payments/new.html.erb +1 -1
  106. data/app/views/spree/admin/payments/show.html.erb +2 -2
  107. data/app/views/spree/admin/prices/_form.html.erb +1 -1
  108. data/app/views/spree/admin/prices/index.html.erb +2 -2
  109. data/app/views/spree/admin/product_properties/index.html.erb +1 -1
  110. data/app/views/spree/admin/products/_form.html.erb +4 -1
  111. data/app/views/spree/admin/products/edit.html.erb +1 -1
  112. data/app/views/spree/admin/products/index.html.erb +2 -2
  113. data/app/views/spree/admin/promotion_categories/_form.html.erb +1 -1
  114. data/app/views/spree/admin/promotion_categories/index.html.erb +37 -29
  115. data/app/views/spree/admin/promotion_code_batches/download.csv.ruby +2 -0
  116. data/app/views/spree/admin/promotion_code_batches/index.html.erb +1 -1
  117. data/app/views/spree/admin/promotion_code_batches/new.html.erb +6 -1
  118. data/app/views/spree/admin/promotion_codes/index.csv.ruby +2 -0
  119. data/app/views/spree/admin/promotion_codes/index.html.erb +1 -1
  120. data/app/views/spree/admin/promotions/_actions.html.erb +2 -2
  121. data/app/views/spree/admin/promotions/_activations_new.html.erb +4 -0
  122. data/app/views/spree/admin/promotions/_rules.html.erb +2 -2
  123. data/app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb +5 -2
  124. data/app/views/spree/admin/promotions/edit.html.erb +2 -2
  125. data/app/views/spree/admin/promotions/index.html.erb +2 -2
  126. data/app/views/spree/admin/promotions/rules/_store.html.erb +6 -0
  127. data/app/views/spree/admin/properties/index.html.erb +2 -2
  128. data/app/views/spree/admin/refund_reasons/index.html.erb +1 -1
  129. data/app/views/spree/admin/refunds/edit.html.erb +2 -2
  130. data/app/views/spree/admin/refunds/new.html.erb +2 -2
  131. data/app/views/spree/admin/reimbursements/edit.html.erb +2 -2
  132. data/app/views/spree/admin/reimbursements/index.html.erb +1 -1
  133. data/app/views/spree/admin/reimbursements/show.html.erb +1 -1
  134. data/app/views/spree/admin/return_authorizations/edit.html.erb +3 -3
  135. data/app/views/spree/admin/return_authorizations/index.html.erb +1 -1
  136. data/app/views/spree/admin/return_authorizations/new.html.erb +2 -2
  137. data/app/views/spree/admin/search/products.json.jbuilder +2 -0
  138. data/app/views/spree/admin/search/users.json.jbuilder +2 -0
  139. data/app/views/spree/admin/shared/_datepicker.html.erb +8 -0
  140. data/app/views/spree/admin/shared/_edit_resource_links.html.erb +2 -2
  141. data/app/views/spree/admin/shared/_locale_selection.html.erb +15 -0
  142. data/app/views/spree/admin/shared/_navigation.html.erb +1 -0
  143. data/app/views/spree/admin/shared/_new_resource_links.html.erb +1 -1
  144. data/app/views/spree/admin/shared/_no_objects_found.html.erb +1 -1
  145. data/app/views/spree/admin/shared/_order_summary.html.erb +1 -1
  146. data/app/views/spree/admin/shared/_refunds.html.erb +1 -1
  147. data/app/views/spree/admin/shared/_report_order_criteria.html.erb +1 -1
  148. data/app/views/spree/admin/shared/_variant_search.html.erb +1 -1
  149. data/app/views/spree/admin/shared/named_types/_index.html.erb +1 -1
  150. data/app/views/spree/admin/shipping_categories/index.html.erb +1 -1
  151. data/app/views/spree/admin/shipping_methods/_form.html.erb +8 -0
  152. data/app/views/spree/admin/shipping_methods/index.html.erb +1 -1
  153. data/app/views/spree/admin/stock_locations/_form.html.erb +1 -1
  154. data/app/views/spree/admin/stock_locations/edit.html.erb +7 -0
  155. data/app/views/spree/admin/stock_locations/index.html.erb +1 -1
  156. data/app/views/spree/admin/stock_movements/index.html.erb +15 -15
  157. data/app/views/spree/admin/store_credits/edit_validity.html.erb +2 -2
  158. data/app/views/spree/admin/store_credits/show.html.erb +2 -0
  159. data/app/views/spree/admin/stores/_form.html.erb +77 -60
  160. data/app/views/spree/admin/stores/edit.html.erb +1 -1
  161. data/app/views/spree/admin/stores/index.html.erb +3 -3
  162. data/app/views/spree/admin/tax_categories/index.html.erb +1 -1
  163. data/app/views/spree/admin/tax_rates/index.html.erb +1 -1
  164. data/app/views/spree/admin/taxonomies/{edit.erb → edit.html.erb} +3 -3
  165. data/app/views/spree/admin/taxonomies/index.html.erb +1 -1
  166. data/app/views/spree/admin/taxonomies/new.html.erb +1 -1
  167. data/app/views/spree/admin/taxons/edit.html.erb +3 -3
  168. data/app/views/spree/admin/taxons/search.json.jbuilder +2 -0
  169. data/app/views/spree/admin/users/_user_page_actions.html.erb +1 -1
  170. data/app/views/spree/admin/users/edit.html.erb +3 -3
  171. data/app/views/spree/admin/users/index.html.erb +2 -2
  172. data/app/views/spree/admin/zones/index.html.erb +1 -1
  173. data/config/initializers/assets.rb +2 -0
  174. data/config/initializers/form_builder.rb +2 -0
  175. data/config/routes.rb +4 -0
  176. data/lib/solidus_backend.rb +2 -0
  177. data/lib/spree/backend.rb +2 -0
  178. data/lib/spree/backend/action_callbacks.rb +2 -0
  179. data/lib/spree/backend/callbacks.rb +2 -0
  180. data/lib/spree/backend/engine.rb +2 -0
  181. data/lib/spree_backend.rb +2 -0
  182. data/script/rails +4 -2
  183. data/solidus_backend.gemspec +6 -5
  184. data/spec/controllers/spree/admin/base_controller_spec.rb +2 -0
  185. data/spec/controllers/spree/admin/cancellations_controller_spec.rb +2 -0
  186. data/spec/controllers/spree/admin/customer_returns_controller_spec.rb +2 -0
  187. data/spec/controllers/spree/admin/missing_products_controller_spec.rb +2 -0
  188. data/spec/controllers/spree/admin/orders/customer_details_controller_spec.rb +2 -1
  189. data/spec/controllers/spree/admin/orders_controller_spec.rb +2 -9
  190. data/spec/controllers/spree/admin/payment_methods_controller_spec.rb +2 -0
  191. data/spec/controllers/spree/admin/payments_controller_spec.rb +2 -0
  192. data/spec/controllers/spree/admin/prices_controller_spec.rb +2 -0
  193. data/spec/controllers/spree/admin/product_properties_controller_spec.rb +2 -0
  194. data/spec/controllers/spree/admin/products_controller_spec.rb +2 -0
  195. data/spec/controllers/spree/admin/promotion_actions_controller_spec.rb +2 -0
  196. data/spec/controllers/spree/admin/promotion_codes_controller_spec.rb +2 -0
  197. data/spec/controllers/spree/admin/promotion_rules_controller_spec.rb +27 -12
  198. data/spec/controllers/spree/admin/promotions_controller_spec.rb +2 -0
  199. data/spec/controllers/spree/admin/refunds_controller_spec.rb +2 -0
  200. data/spec/controllers/spree/admin/reimbursements_controller_spec.rb +2 -0
  201. data/spec/controllers/spree/admin/reports_controller_spec.rb +2 -0
  202. data/spec/controllers/spree/admin/resource_controller_spec.rb +2 -0
  203. data/spec/controllers/spree/admin/return_authorizations_controller_spec.rb +2 -0
  204. data/spec/controllers/spree/admin/return_items_controller_spec.rb +2 -0
  205. data/spec/controllers/spree/admin/root_controller_spec.rb +2 -0
  206. data/spec/controllers/spree/admin/search_controller_spec.rb +2 -0
  207. data/spec/controllers/spree/admin/shipping_methods_controller_spec.rb +2 -0
  208. data/spec/controllers/spree/admin/stock_items_controller_spec.rb +2 -0
  209. data/spec/controllers/spree/admin/stock_locations_controller_spec.rb +2 -0
  210. data/spec/controllers/spree/admin/store_credits_controller_spec.rb +2 -0
  211. data/spec/controllers/spree/admin/users_controller_spec.rb +2 -1
  212. data/spec/controllers/spree/admin/variants_controller_spec.rb +2 -0
  213. data/spec/features/admin/configuration/payment_methods_spec.rb +2 -0
  214. data/spec/features/admin/configuration/shipping_methods_spec.rb +2 -0
  215. data/spec/features/admin/configuration/stock_locations_spec.rb +2 -0
  216. data/spec/features/admin/configuration/store_spec.rb +2 -0
  217. data/spec/features/admin/configuration/tax_categories_spec.rb +2 -0
  218. data/spec/features/admin/configuration/tax_rates_spec.rb +2 -0
  219. data/spec/features/admin/configuration/taxonomies_spec.rb +2 -0
  220. data/spec/features/admin/configuration/zones_spec.rb +2 -0
  221. data/spec/features/admin/homepage_spec.rb +2 -0
  222. data/spec/features/admin/javascript_format_money_spec.rb +2 -0
  223. data/spec/features/admin/locale_spec.rb +3 -0
  224. data/spec/features/admin/orders/adjustments_promotions_spec.rb +2 -0
  225. data/spec/features/admin/orders/adjustments_spec.rb +2 -0
  226. data/spec/features/admin/orders/cancelling_and_resuming_spec.rb +2 -0
  227. data/spec/features/admin/orders/cancelling_inventory_spec.rb +2 -0
  228. data/spec/features/admin/orders/customer_details_spec.rb +3 -1
  229. data/spec/features/admin/orders/line_items_spec.rb +2 -0
  230. data/spec/features/admin/orders/listing_spec.rb +2 -0
  231. data/spec/features/admin/orders/log_entries_spec.rb +2 -0
  232. data/spec/features/admin/orders/new_order_spec.rb +3 -1
  233. data/spec/features/admin/orders/order_details_spec.rb +3 -2
  234. data/spec/features/admin/orders/payments_spec.rb +5 -6
  235. data/spec/features/admin/orders/return_authorizations_spec.rb +2 -0
  236. data/spec/features/admin/orders/return_payment_state_spec.rb +2 -0
  237. data/spec/features/admin/orders/risk_analysis_spec.rb +2 -0
  238. data/spec/features/admin/orders/shipments_spec.rb +2 -0
  239. data/spec/features/admin/payments/store_credits_spec.rb +2 -0
  240. data/spec/features/admin/products/edit/images_spec.rb +2 -0
  241. data/spec/features/admin/products/edit/products_spec.rb +2 -1
  242. data/spec/features/admin/products/edit/taxons_spec.rb +3 -1
  243. data/spec/features/admin/products/edit/variants_spec.rb +2 -0
  244. data/spec/features/admin/products/option_types_spec.rb +2 -0
  245. data/spec/features/admin/products/pricing_spec.rb +2 -0
  246. data/spec/features/admin/products/products_spec.rb +2 -1
  247. data/spec/features/admin/products/properties_spec.rb +2 -0
  248. data/spec/features/admin/products/stock_management_spec.rb +2 -0
  249. data/spec/features/admin/products/variant_spec.rb +2 -1
  250. data/spec/features/admin/promotion_adjustments_spec.rb +2 -0
  251. data/spec/features/admin/promotions/option_value_rule_spec.rb +2 -0
  252. data/spec/features/admin/promotions/product_rule_spec.rb +2 -0
  253. data/spec/features/admin/promotions/promotion_categories_spec.rb +83 -0
  254. data/spec/features/admin/promotions/tiered_calculator_spec.rb +3 -1
  255. data/spec/features/admin/promotions/user_rule_spec.rb +2 -0
  256. data/spec/features/admin/reimbursements_spec.rb +2 -0
  257. data/spec/features/admin/reports_spec.rb +2 -0
  258. data/spec/features/admin/store_credits_spec.rb +2 -0
  259. data/spec/features/admin/stores_spec.rb +2 -0
  260. data/spec/features/admin/style_guide_spec.rb +2 -0
  261. data/spec/features/admin/taxons_spec.rb +2 -0
  262. data/spec/features/admin/users_spec.rb +2 -0
  263. data/spec/helpers/admin/base_helper_spec.rb +2 -0
  264. data/spec/helpers/admin/navigation_helper_spec.rb +2 -1
  265. data/spec/helpers/admin/stock_movements_helper_spec.rb +2 -0
  266. data/spec/helpers/admin/store_credit_events_helper_spec.rb +2 -0
  267. data/spec/helpers/promotion_rules_helper_spec.rb +2 -0
  268. data/spec/spec_helper.rb +3 -1
  269. data/spec/support/appear_before_matcher.rb +2 -0
  270. data/spec/support/feature/base_feature_helper.rb +2 -0
  271. data/spec/support/feature/order_feature_helper.rb +2 -0
  272. data/spec/teaspoon_env.rb +3 -1
  273. data/spec/views/spree/admin/shared/navigation_footer_spec.rb +2 -1
  274. metadata +43 -35
@@ -40,8 +40,8 @@
40
40
  </div>
41
41
 
42
42
  <div class="form-buttons filter-actions actions" data-hook="buttons">
43
- <%= button t('spree.actions.create') %>
44
- <%= button_link_to t('spree.actions.cancel'), admin_order_customer_returns_url(@order) %>
43
+ <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
44
+ <%= link_to t('spree.actions.cancel'), admin_order_customer_returns_url(@order), class: 'btn btn-primary' %>
45
45
  </div>
46
46
  </fieldset>
47
47
  <% end %>
@@ -38,7 +38,7 @@
38
38
 
39
39
  <td class="actions">
40
40
  <% if can?(:update, image) %>
41
- <%= link_to_with_icon 'check', t('spree.actions.save'), api_variant_image_path(@product, image), no_text: true, data: {action: 'save'} %>
41
+ <%= link_to_with_icon 'check', t('spree.actions.save'), api_product_image_path(@product, image), no_text: true, data: {action: 'save'} %>
42
42
 
43
43
  <%= link_to_with_icon 'cancel', t('spree.actions.cancel'), nil, no_text: true, data: {action: 'cancel'} %>
44
44
 
@@ -5,7 +5,7 @@
5
5
  <%= render partial: 'form', locals: { f: f } %>
6
6
 
7
7
  <div class="form-buttons filter-actions actions" data-hook="buttons">
8
- <%= button t('spree.actions.update') %>
8
+ <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
9
9
  <%= link_to t('spree.actions.cancel'), admin_product_images_url(@product), id: 'cancel_link', class: 'button' %>
10
10
  </div>
11
11
  </fieldset>
@@ -7,7 +7,7 @@
7
7
 
8
8
 
9
9
  <% content_for :page_actions do %>
10
- <li><%= button_link_to t('spree.back_to_images_list'), admin_product_images_url(@product) %></li>
10
+ <li><%= link_to t('spree.back_to_images_list'), admin_product_images_url(@product), class: 'btn btn-primary' %></li>
11
11
  <% end %>
12
12
 
13
13
  <%= form_for [:admin, @product, @image], html: { multipart: true } do |f| %>
@@ -26,7 +26,7 @@
26
26
  </div>
27
27
 
28
28
  <div class="form-buttons filter-actions actions" data-hook="buttons">
29
- <%= button t('spree.actions.update') %>
29
+ <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
30
30
  <%= link_to t('spree.actions.cancel'), admin_product_images_url(@product), id: 'cancel_link', class: 'button' %>
31
31
  </div>
32
32
  </fieldset>
@@ -4,8 +4,8 @@
4
4
  <% admin_breadcrumb(plural_resource_name(Spree::LogEntry)) %>
5
5
 
6
6
  <% content_for :page_actions do %>
7
- <li><%= button_link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment) %></li>
8
- <li><%= button_link_to t('spree.back_to_payment'), spree.admin_order_payment_url(@order, @payment) %></li>
7
+ <li><%= link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment), class: 'btn btn-primary' %></li>
8
+ <li><%= link_to t('spree.back_to_payment'), spree.admin_order_payment_url(@order, @payment), class: 'btn btn-primary' %></li>
9
9
  <% end %>
10
10
 
11
11
  <table class='index' id='listing_log_entries'>
@@ -5,7 +5,7 @@
5
5
  <% content_for :page_actions do %>
6
6
  <% if can?(:create, Spree::OptionType) %>
7
7
  <li id="new_ot_link">
8
- <%= button_link_to t('spree.new_option_type'), new_admin_option_type_url, { remote: true, id: 'new_option_type_link' } %>
8
+ <%= link_to t('spree.new_option_type'), new_admin_option_type_url, remote: true, id: 'new_option_type_link', class: 'btn btn-primary' %>
9
9
  </li>
10
10
  <% end %>
11
11
  <% end %>
@@ -4,7 +4,7 @@
4
4
  <%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
5
5
  </td>
6
6
  <td class="item-name">
7
- <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
7
+ <%= link_to item.variant.product.name, edit_admin_product_path(item.variant.product) %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
8
8
  <% if item.variant.sku.present? %>
9
9
  <strong><%= Spree::Variant.human_attribute_name(:sku) %>:</strong>
10
10
  <%= item.variant.sku %>
@@ -7,7 +7,7 @@
7
7
  <%= render 'spree/admin/shared/image', image: item.variant.display_image, size: :mini %>
8
8
  </td>
9
9
  <td class="item-name">
10
- <%= item.variant.product.name %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
10
+ <%= link_to item.variant.product.name, edit_admin_product_path(item.variant.product) %><br><%= "(" + variant_options(item.variant) + ")" unless item.variant.option_values.empty? %>
11
11
  <% if item.variant.sku.present? %>
12
12
  <strong><%= Spree::Variant.human_attribute_name(:sku) %>:</strong> <%= item.variant.sku %>
13
13
  <% end %>
@@ -1,9 +1,9 @@
1
1
  <% content_for :page_actions do %>
2
2
  <% if can?(:fire, @order) %>
3
- <li><%= event_links %></li>
3
+ <li><%= event_links %></li>
4
4
  <% end %>
5
5
  <% if can?(:resend, @order) && @order.completed? %>
6
- <li><%= button_link_to t('spree.resend'), resend_admin_order_url(@order), method: :post %></li>
6
+ <li><%= button_to t('spree.resend'), resend_admin_order_url(@order), method: :post %></li>
7
7
  <% end %>
8
8
  <% end %>
9
9
 
@@ -24,7 +24,7 @@
24
24
  <%= payment.display_amount.to_html %>
25
25
  </td>
26
26
  <td>
27
- <%= payment_method_name(payment) %>
27
+ <%= payment.payment_method.name %>
28
28
  </td>
29
29
  <td>
30
30
  <%= payment.transaction_id %>
@@ -80,6 +80,6 @@
80
80
  <div class="clear"></div>
81
81
 
82
82
  <div class="form-buttons filter-actions actions" data-hook="buttons">
83
- <%= button t('spree.actions.update') %>
83
+ <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
84
84
  </div>
85
85
  </fieldset>
@@ -4,7 +4,7 @@
4
4
 
5
5
 
6
6
  <% content_for :page_actions do %>
7
- <li><%= button_link_to t('spree.back_to_orders_list'), admin_orders_path %></li>
7
+ <li><%= link_to t('spree.back_to_orders_list'), admin_orders_path, class: 'btn btn-primary' %></li>
8
8
  <% end %>
9
9
 
10
10
 
@@ -3,7 +3,7 @@
3
3
  <li><%= event_links %></li>
4
4
  <% end %>
5
5
  <% if can?(:resend, @order) && @order.completed? %>
6
- <li><%= button_link_to t('spree.resend'), resend_admin_order_url(@order), method: :post %></li>
6
+ <li><%= button_to t('spree.resend'), resend_admin_order_url(@order), method: :post, class: 'btn btn-primary' %></li>
7
7
  <% end %>
8
8
  <% end %>
9
9
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  <% content_for :page_actions do %>
7
7
  <li>
8
- <%= button_link_to t('spree.new_order'), new_admin_order_url, id: 'admin_new_order' %>
8
+ <%= link_to t('spree.new_order'), new_admin_order_url, id: 'admin_new_order', class: 'btn btn-primary' %>
9
9
  </li>
10
10
  <% end if can? :create, Spree::Order %>
11
11
 
@@ -106,7 +106,7 @@
106
106
 
107
107
  <div class="actions filter-actions">
108
108
  <div data-hook="admin_orders_index_search_buttons">
109
- <%= button t('spree.filter_results') %>
109
+ <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
110
110
  </div>
111
111
  </div>
112
112
  <% end %>
@@ -14,7 +14,7 @@
14
14
  <fieldset class="no-border-top">
15
15
  <%= render partial: 'form', locals: { f: f } %>
16
16
  <div data-hook="buttons" class="filter-actions actions">
17
- <%= button t('spree.actions.update') %>
17
+ <%= button_tag t('spree.actions.update'), class: 'btn btn-primary' %>
18
18
  </div>
19
19
  </fieldset>
20
20
 
@@ -8,7 +8,7 @@
8
8
  <% content_for :page_actions do %>
9
9
  <% if can?(:create, Spree::PaymentMethod) %>
10
10
  <li>
11
- <%= button_link_to t('spree.new_payment_method'), new_object_url, id: 'admin_new_payment_methods_link' %>
11
+ <%= link_to t('spree.new_payment_method'), new_object_url, id: 'admin_new_payment_methods_link', class: 'btn btn-primary' %>
12
12
  </li>
13
13
  <% end %>
14
14
  <% end %>
@@ -15,7 +15,7 @@
15
15
  <fieldset class="no-border-top">
16
16
  <%= render partial: 'form', locals: { f: f } %>
17
17
  <div data-hook="buttons" class="filter-actions actions">
18
- <%= button t('spree.actions.create') %>
18
+ <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
19
19
  </div>
20
20
  </fieldset>
21
21
  <% end %>
@@ -1,4 +1,4 @@
1
- <table class="index" id='payments' data-order-id='<%= @order.number %>'>
1
+ <table class="index table-responsive" id='payments' data-order-id='<%= @order.number %>'>
2
2
  <colgroup>
3
3
  <col style="width: 15%"/>
4
4
  <col style="width: 15%"/>
@@ -24,7 +24,7 @@
24
24
  <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="payment vertical-middle" data-payment-id="<%= payment.id %>">
25
25
  <td><%= link_to payment.number, spree.admin_order_payment_path(@order, payment) %></td>
26
26
  <td><%= l(payment.created_at, format: :short) %></td>
27
- <td><%= payment_method_name(payment) %></td>
27
+ <td><%= payment.payment_method.name %></td>
28
28
  <td><%= payment.transaction_id %></td>
29
29
  <td>
30
30
  <span class="pill pill-<%= payment.state %>">
@@ -12,7 +12,7 @@
12
12
  <%= text_field_tag :amount, @payment.amount %>
13
13
  </p>
14
14
  <p class="form-buttons">
15
- <%= button t('spree.make_refund') %>
15
+ <%= button_tag t('spree.make_refund'), class: 'btn btn-primary' %>
16
16
  </p>
17
17
  </fieldset>
18
18
  <% end %>
@@ -3,7 +3,7 @@
3
3
  <% content_for :page_actions do %>
4
4
  <% if @order.outstanding_balance? %>
5
5
  <li id="new_payment_section">
6
- <%= button_link_to t('spree.new_payment'), new_admin_order_payment_url(@order) %>
6
+ <%= link_to t('spree.new_payment'), new_admin_order_payment_url(@order), class: 'btn btn-primary' %>
7
7
  </li>
8
8
  <% end %>
9
9
  <% end %>
@@ -15,7 +15,7 @@
15
15
  <%= render partial: 'form', locals: { f: f } %>
16
16
 
17
17
  <div class="filter-actions actions" data-hook="buttons">
18
- <%= button @order.cart? ? t('spree.actions.continue') : t('spree.actions.update') %>
18
+ <%= button_tag @order.cart? ? t('spree.actions.continue') : t('spree.actions.update'), class: 'btn btn-primary' %>
19
19
  </div>
20
20
  </fieldset>
21
21
  <% end %>
@@ -2,7 +2,7 @@
2
2
 
3
3
  <% admin_breadcrumb(link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_path(@order)) %>
4
4
  <% admin_breadcrumb do %>
5
- <%= payment_method_name(@payment) %>
5
+ <%= @payment.payment_method.name %>
6
6
  <span class="pill pill-<%= @payment.state %>">
7
7
  <%= t(@payment.state, scope: 'spree.payment_states') %>
8
8
  </span>
@@ -10,7 +10,7 @@
10
10
 
11
11
 
12
12
  <% content_for :page_actions do %>
13
- <li><%= button_link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment) %></li>
13
+ <li><%= link_to t('spree.logs'), spree.admin_order_payment_log_entries_url(@order, @payment), class: 'btn btn-primary' %></li>
14
14
  <% end %>
15
15
 
16
16
  <%= render partial: "spree/admin/payments/source_views/#{@payment.payment_method.partial_name}", locals: { payment: @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %>
@@ -15,7 +15,7 @@
15
15
  <%= f.field_container :country do %>
16
16
  <%= f.label :country %>
17
17
  <%= f.field_hint :country %>
18
- <%= f.collection_select :country_iso, available_countries, :iso, :name,
18
+ <%= f.collection_select :country_iso, available_countries(restrict_to_zone: nil), :iso, :name,
19
19
  {
20
20
  include_blank: t(:any_country, scope: [:spree, :admin, :prices])
21
21
  },
@@ -3,7 +3,7 @@
3
3
 
4
4
  <% content_for :page_actions do %>
5
5
  <li id="new_price_link">
6
- <%= button_link_to t(".new_price"), new_object_url %>
6
+ <%= link_to t(".new_price"), new_object_url, class: 'btn btn-primary' %>
7
7
  </li>
8
8
  <% end if can?(:create, Spree::Product) %>
9
9
 
@@ -64,7 +64,7 @@
64
64
 
65
65
  <div class="actions filter-actions">
66
66
  <div data-hook="admin_orders_index_search_buttons">
67
- <%= button t('spree.filter_results') %>
67
+ <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
68
68
  </div>
69
69
  </div>
70
70
 
@@ -53,7 +53,7 @@
53
53
  </div>
54
54
  <% end %>
55
55
  <div class="form-buttons filter-actions actions">
56
- <%= button t('spree.filter_results') %>
56
+ <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
57
57
  <% if @option_value_ids.present? %>
58
58
  <%= link_to_add_fields t('spree.add_variant_properties'), 'tbody#variant_property_values', class: 'plus button' %>
59
59
  <% end %>
@@ -64,8 +64,11 @@
64
64
  <div data-hook="admin_product_form_available_on">
65
65
  <%= f.field_container :available_on do %>
66
66
  <%= f.label :available_on %>
67
+ <%= f.field_hint :available_on %>
68
+
69
+ <%= render "spree/admin/shared/datepicker", f: f, date_attr: :available_on %>
70
+
67
71
  <%= f.error_message_on :available_on %>
68
- <%= f.text_field :available_on, value: datepicker_field_value(@product.available_on), class: 'datepicker' %>
69
72
  <% end %>
70
73
  </div>
71
74
 
@@ -1,7 +1,7 @@
1
1
  <% content_for :page_actions do %>
2
2
  <% if can?(:create, Spree::Product) %>
3
3
  <li id="new_product_link">
4
- <%= button_link_to t('spree.new_product'), new_object_url, { id: 'admin_new_product' } %>
4
+ <%= link_to t('spree.new_product'), new_object_url, id: 'admin_new_product', class: 'btn btn-primary' %>
5
5
  </li>
6
6
  <% end %>
7
7
  <% end %>
@@ -4,7 +4,7 @@
4
4
 
5
5
  <% content_for :page_actions do %>
6
6
  <li>
7
- <%= button_link_to t('spree.new_product'), new_object_url %>
7
+ <%= link_to t('spree.new_product'), new_object_url, class: 'btn btn-primary' %>
8
8
  </li>
9
9
  <% end if can?(:create, Spree::Product) %>
10
10
 
@@ -42,7 +42,7 @@
42
42
  </div>
43
43
 
44
44
  <div class="actions filter-actions" data-hook="admin_products_index_search_buttons">
45
- <%= button t('spree.search') %>
45
+ <%= button_tag t('spree.search'), class: 'btn btn-primary' %>
46
46
  </div>
47
47
  <% end %>
48
48
  </div>
@@ -1,4 +1,4 @@
1
- <%= render partial: 'spree/shared/error_messages', locals: { target: @promotion } %>
1
+ <%= render partial: 'spree/shared/error_messages', locals: { target: @promotion_category } %>
2
2
 
3
3
  <div class='row'>
4
4
  <div class='col-4'>
@@ -5,36 +5,44 @@
5
5
  <% content_for :page_actions do %>
6
6
  <% if can?(:create, Spree::PromotionCategory) %>
7
7
  <li>
8
- <%= button_link_to t('spree.new_promotion_category'), spree.new_admin_promotion_category_path %>
8
+ <%= link_to t('spree.new_promotion_category'), spree.new_admin_promotion_category_path, class: 'btn btn-primary' %>
9
9
  </li>
10
10
  <% end %>
11
11
  <% end %>
12
12
 
13
- <table>
14
- <colgroup>
15
- <col style="width: 40%">
16
- <col style="width: 40%">
17
- <col style="width: 20%">
18
- </colgroup>
19
- <thead>
20
- <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
21
- <th><%= Spree::PromotionCategory.human_attribute_name :code %></th>
22
- <th class='actions'></th>
23
- </thead>
24
- <tbody>
25
- <% @promotion_categories.each do |promotion_category| %>
26
- <tr>
27
- <td><%= promotion_category.name %></td>
28
- <td><%= promotion_category.code%></td>
29
- <td class="actions">
30
- <% if can?(:update, promotion_category) %>
31
- <%= link_to_edit promotion_category, no_text: true %>
32
- <% end %>
33
- <% if can?(:destroy, promotion_category) %>
34
- <%= link_to_delete promotion_category, no_text: true %>
35
- <% end %>
36
- </td>
37
- </tr>
38
- <% end %>
39
- </tbody>
40
- </table>
13
+ <% if @promotion_categories.any? %>
14
+ <table class="index">
15
+ <colgroup>
16
+ <col style="width: 40%">
17
+ <col style="width: 40%">
18
+ <col style="width: 20%">
19
+ </colgroup>
20
+ <thead>
21
+ <th><%= Spree::PromotionCategory.human_attribute_name :name %></th>
22
+ <th><%= Spree::PromotionCategory.human_attribute_name :code %></th>
23
+ <th class='actions'></th>
24
+ </thead>
25
+ <tbody>
26
+ <% @promotion_categories.each do |promotion_category| %>
27
+ <tr>
28
+ <td><%= promotion_category.name %></td>
29
+ <td><%= promotion_category.code %></td>
30
+ <td class="actions">
31
+ <% if can?(:update, promotion_category) %>
32
+ <%= link_to_edit promotion_category, no_text: true %>
33
+ <% end %>
34
+ <% if can?(:destroy, promotion_category) %>
35
+ <%= link_to_delete promotion_category, no_text: true %>
36
+ <% end %>
37
+ </td>
38
+ </tr>
39
+ <% end %>
40
+ </tbody>
41
+ </table>
42
+ <% else %>
43
+ <div class="no-objects-found">
44
+ <%= render 'spree/admin/shared/no_objects_found',
45
+ resource: Spree::PromotionCategory,
46
+ new_resource_url: new_object_url %>
47
+ </div>
48
+ <% end %>
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  CSV.generate do |csv|
2
4
  csv << ['Code']
3
5
  @promotion_code_batch.promotion_codes.order(:id).pluck(:value).each do |value|
@@ -5,7 +5,7 @@
5
5
  <% content_for :page_actions do %>
6
6
  <li>
7
7
  <% if can?(:create, Spree::PromotionCodeBatch) %>
8
- <%= button_link_to t('spree.new_promotion_code_batch'), new_object_url %>
8
+ <%= link_to t('spree.new_promotion_code_batch'), new_object_url, class: 'btn btn-primary' %>
9
9
  <% end %>
10
10
  </li>
11
11
  <% end %>
@@ -10,6 +10,11 @@
10
10
  <%= f.text_field :base_code, class: "fullwidth" %>
11
11
  <% end %>
12
12
 
13
+ <%= f.field_container :join_characters do %>
14
+ <%= f.label :join_characters %>
15
+ <%= f.text_field :join_characters, class: "fullwidth" %>
16
+ <% end %>
17
+
13
18
  <%= f.field_container :number_of_codes do %>
14
19
  <%= f.label :number_of_codes %>
15
20
  <%= f.text_field :number_of_codes, class: "fullwidth" %>
@@ -19,5 +24,5 @@
19
24
  <%= f.label :email %>
20
25
  <%= f.text_field :email, class: "fullwidth", value: spree_current_user.email %>
21
26
  <% end %>
22
- <%= button t('spree.actions.create') %>
27
+ <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
23
28
  <% end %>