spree_backend 2.4.10 → 3.0.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (405) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/spree/backend/adjustments.js.coffee +1 -2
  3. data/app/assets/javascripts/spree/backend/admin.js.erb +136 -53
  4. data/app/assets/javascripts/spree/backend/checkouts/edit.js +1 -4
  5. data/app/assets/javascripts/spree/backend/index.html +15 -0
  6. data/app/assets/javascripts/spree/backend/line_items.js.coffee +1 -4
  7. data/app/assets/javascripts/spree/backend/line_items_on_order_edit.js.erb +3 -16
  8. data/app/assets/javascripts/spree/backend/option_type_autocomplete.js.erb +2 -4
  9. data/app/assets/javascripts/spree/backend/option_value_picker.js +44 -0
  10. data/app/assets/javascripts/spree/backend/orders/edit_form.js +2 -3
  11. data/app/assets/javascripts/spree/backend/payments/edit.js.coffee +8 -12
  12. data/app/assets/javascripts/spree/backend/product_picker.js +10 -8
  13. data/app/assets/javascripts/spree/backend/progress.coffee +0 -21
  14. data/app/assets/javascripts/spree/backend/promotions.js +50 -1
  15. data/app/assets/javascripts/spree/backend/select_payments.js.coffee +7 -0
  16. data/app/assets/javascripts/spree/backend/shipments.js.erb +10 -41
  17. data/app/assets/javascripts/spree/backend/spree-select2.js.erb +0 -15
  18. data/app/assets/javascripts/spree/backend/states.js +3 -3
  19. data/app/assets/javascripts/spree/backend/stock_movement.js.coffee +1 -2
  20. data/app/assets/javascripts/spree/backend/stock_transfer.js.coffee +3 -2
  21. data/app/assets/javascripts/spree/backend/taxon_autocomplete.js.erb +2 -4
  22. data/app/assets/javascripts/spree/backend/taxon_tree_menu.js.coffee +4 -4
  23. data/app/assets/javascripts/spree/backend/taxonomy.js.coffee +15 -34
  24. data/app/assets/javascripts/spree/backend/taxons.js.coffee +27 -8
  25. data/app/assets/javascripts/spree/backend/user_picker.js +2 -3
  26. data/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee.erb +1 -2
  27. data/app/assets/javascripts/spree/backend/variant_management.js.coffee +1 -2
  28. data/app/assets/javascripts/spree/backend.js +13 -15
  29. data/app/assets/stylesheets/spree/backend/components/_buttons.scss +37 -0
  30. data/app/assets/stylesheets/spree/backend/components/_filters.scss +25 -0
  31. data/app/assets/stylesheets/spree/backend/components/_icons.scss +257 -0
  32. data/app/assets/stylesheets/spree/backend/components/_labels.scss +49 -0
  33. data/app/assets/stylesheets/spree/backend/components/_main.scss +5 -0
  34. data/app/assets/stylesheets/spree/backend/components/_navigation.scss +10 -165
  35. data/app/assets/stylesheets/spree/backend/components/_page_header.scss +17 -0
  36. data/app/assets/stylesheets/spree/backend/components/_panels.scss +3 -0
  37. data/app/assets/stylesheets/spree/backend/components/_sidebar.scss +116 -20
  38. data/app/assets/stylesheets/spree/backend/components/_tables.scss +51 -0
  39. data/app/assets/stylesheets/spree/backend/components/_taxon_products_view.scss +70 -0
  40. data/app/assets/stylesheets/spree/backend/components/_variables.scss +12 -0
  41. data/app/assets/stylesheets/spree/backend/components/_wells.scss +3 -0
  42. data/app/assets/stylesheets/spree/backend/global/_variables.scss +37 -0
  43. data/app/assets/stylesheets/spree/backend/plugins/_jquery_ui.scss +109 -0
  44. data/app/{views/spree/admin/payments/source_forms/_check.html.erb → assets/stylesheets/spree/backend/plugins/_js_tree.scss} +0 -0
  45. data/app/assets/stylesheets/spree/backend/plugins/_select2.scss +84 -155
  46. data/app/assets/stylesheets/spree/backend/sections/_account.scss +16 -0
  47. data/app/assets/stylesheets/spree/backend/shared/_base.scss +15 -0
  48. data/app/assets/stylesheets/spree/backend/shared/_forms.scss +25 -287
  49. data/app/assets/stylesheets/spree/backend/shared/_typography.scss +5 -138
  50. data/app/assets/stylesheets/spree/backend/spree_admin.css.scss +26 -0
  51. data/app/assets/stylesheets/spree/backend.css +1 -7
  52. data/app/controllers/spree/admin/base_controller.rb +0 -2
  53. data/app/controllers/spree/admin/customer_returns_controller.rb +1 -1
  54. data/app/controllers/spree/admin/general_settings_controller.rb +5 -12
  55. data/app/controllers/spree/admin/images_controller.rb +33 -17
  56. data/app/controllers/spree/admin/log_entries_controller.rb +2 -2
  57. data/app/controllers/spree/admin/option_types_controller.rb +5 -3
  58. data/app/controllers/spree/admin/orders/customer_details_controller.rb +8 -8
  59. data/app/controllers/spree/admin/orders_controller.rb +4 -5
  60. data/app/controllers/spree/admin/payments_controller.rb +3 -3
  61. data/app/controllers/spree/admin/products_controller.rb +3 -6
  62. data/app/controllers/spree/admin/resource_controller.rb +1 -1
  63. data/app/controllers/spree/admin/root_controller.rb +1 -0
  64. data/app/controllers/spree/admin/search_controller.rb +12 -0
  65. data/app/controllers/spree/admin/state_changes_controller.rb +18 -0
  66. data/app/controllers/spree/admin/stock_locations_controller.rb +4 -13
  67. data/app/controllers/spree/admin/stock_transfers_controller.rb +6 -6
  68. data/app/controllers/spree/admin/tax_categories_controller.rb +0 -13
  69. data/app/controllers/spree/admin/taxonomies_controller.rb +1 -1
  70. data/app/controllers/spree/admin/taxons_controller.rb +53 -36
  71. data/app/controllers/spree/admin/users_controller.rb +44 -41
  72. data/app/controllers/spree/admin/variants_controller.rb +1 -1
  73. data/app/helpers/spree/admin/adjustments_helper.rb +0 -5
  74. data/app/helpers/spree/admin/base_helper.rb +41 -71
  75. data/app/helpers/spree/admin/navigation_helper.rb +96 -28
  76. data/app/helpers/spree/admin/orders_helper.rb +2 -2
  77. data/app/views/kaminari/_first_page.html.erb +11 -0
  78. data/app/views/kaminari/_gap.html.erb +8 -0
  79. data/app/views/kaminari/_last_page.html.erb +11 -0
  80. data/app/views/kaminari/_next_page.html.erb +15 -0
  81. data/app/views/kaminari/_page.html.erb +12 -0
  82. data/app/views/kaminari/_paginator.html.erb +21 -0
  83. data/app/views/kaminari/_prev_page.html.erb +15 -0
  84. data/app/views/spree/admin/adjustments/_adjustment.html.erb +10 -9
  85. data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +19 -15
  86. data/app/views/spree/admin/adjustments/_form.html.erb +11 -15
  87. data/app/views/spree/admin/adjustments/edit.html.erb +9 -12
  88. data/app/views/spree/admin/adjustments/index.html.erb +19 -7
  89. data/app/views/spree/admin/adjustments/new.html.erb +7 -11
  90. data/app/views/spree/admin/countries/_form.html.erb +15 -19
  91. data/app/views/spree/admin/countries/edit.html.erb +4 -12
  92. data/app/views/spree/admin/countries/index.html.erb +6 -18
  93. data/app/views/spree/admin/countries/new.html.erb +3 -5
  94. data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb +4 -4
  95. data/app/views/spree/admin/customer_returns/_return_item_decision.html.erb +9 -10
  96. data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +5 -3
  97. data/app/views/spree/admin/customer_returns/edit.html.erb +17 -21
  98. data/app/views/spree/admin/customer_returns/index.html.erb +12 -16
  99. data/app/views/spree/admin/customer_returns/new.html.erb +29 -20
  100. data/app/views/spree/admin/general_settings/edit.html.erb +101 -90
  101. data/app/views/spree/admin/images/_form.html.erb +12 -12
  102. data/app/views/spree/admin/images/edit.html.erb +23 -21
  103. data/app/views/spree/admin/images/index.html.erb +25 -30
  104. data/app/views/spree/admin/images/new.html.erb +13 -11
  105. data/app/views/spree/admin/inventory_units/adjust.html.erb +29 -0
  106. data/app/views/spree/admin/log_entries/index.html.erb +9 -7
  107. data/app/views/spree/admin/option_types/_form.html.erb +10 -10
  108. data/app/views/spree/admin/option_types/_option_value_fields.html.erb +8 -10
  109. data/app/views/spree/admin/option_types/edit.html.erb +28 -23
  110. data/app/views/spree/admin/option_types/index.html.erb +16 -22
  111. data/app/views/spree/admin/option_types/new.html.erb +4 -3
  112. data/app/views/spree/admin/orders/_add_line_item.html.erb +9 -10
  113. data/app/views/spree/admin/orders/_add_product.html.erb +11 -9
  114. data/app/views/spree/admin/orders/_adjustments.html.erb +21 -7
  115. data/app/views/spree/admin/orders/_form.html.erb +23 -10
  116. data/app/views/spree/admin/orders/_line_item.html.erb +18 -6
  117. data/app/views/spree/admin/orders/_line_items.html.erb +45 -45
  118. data/app/views/spree/admin/orders/_line_items_edit_form.html.erb +10 -11
  119. data/app/views/spree/admin/orders/_risk_analysis.html.erb +13 -13
  120. data/app/views/spree/admin/orders/_shipment.html.erb +31 -39
  121. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +23 -17
  122. data/app/views/spree/admin/orders/cart.html.erb +14 -15
  123. data/app/views/spree/admin/orders/customer_details/_form.html.erb +73 -52
  124. data/app/views/spree/admin/orders/customer_details/edit.html.erb +19 -15
  125. data/app/views/spree/admin/orders/edit.html.erb +12 -9
  126. data/app/views/spree/admin/orders/index.html.erb +145 -84
  127. data/app/views/spree/admin/payment_methods/_form.html.erb +26 -30
  128. data/app/views/spree/admin/payment_methods/edit.html.erb +5 -14
  129. data/app/views/spree/admin/payment_methods/index.html.erb +14 -29
  130. data/app/views/spree/admin/payment_methods/new.html.erb +4 -12
  131. data/app/views/spree/admin/payments/_capture_events.html.erb +2 -2
  132. data/app/views/spree/admin/payments/_form.html.erb +27 -30
  133. data/app/views/spree/admin/payments/_list.html.erb +20 -16
  134. data/app/views/spree/admin/payments/credit.html.erb +2 -2
  135. data/app/views/spree/admin/payments/index.html.erb +15 -13
  136. data/app/views/spree/admin/payments/new.html.erb +10 -11
  137. data/app/views/spree/admin/payments/show.html.erb +12 -9
  138. data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +43 -47
  139. data/app/views/spree/admin/payments/source_views/_gateway.html.erb +19 -19
  140. data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +5 -5
  141. data/app/views/spree/admin/product_properties/index.html.erb +5 -17
  142. data/app/views/spree/admin/products/_add_stock_form.html.erb +34 -25
  143. data/app/views/spree/admin/products/_autocomplete.js.erb +18 -7
  144. data/app/views/spree/admin/products/_form.html.erb +145 -150
  145. data/app/views/spree/admin/products/_properties_form.erb +2 -2
  146. data/app/views/spree/admin/products/edit.html.erb +3 -8
  147. data/app/views/spree/admin/products/index.html.erb +42 -63
  148. data/app/views/spree/admin/products/new.html.erb +29 -33
  149. data/app/views/spree/admin/products/stock.html.erb +67 -82
  150. data/app/views/spree/admin/promotion_actions/create.js.erb +1 -2
  151. data/app/views/spree/admin/promotion_actions/destroy.js.erb +1 -1
  152. data/app/views/spree/admin/promotion_categories/_form.html.erb +9 -9
  153. data/app/views/spree/admin/promotion_categories/edit.html.erb +2 -4
  154. data/app/views/spree/admin/promotion_categories/index.html.erb +27 -26
  155. data/app/views/spree/admin/promotion_categories/new.html.erb +1 -3
  156. data/app/views/spree/admin/promotion_rules/create.js.erb +1 -1
  157. data/app/views/spree/admin/promotion_rules/destroy.js.erb +1 -1
  158. data/app/views/spree/admin/promotions/_actions.html.erb +20 -17
  159. data/app/views/spree/admin/promotions/_form.html.erb +40 -39
  160. data/app/views/spree/admin/promotions/_promotion_action.html.erb +6 -6
  161. data/app/views/spree/admin/promotions/_promotion_rule.html.erb +7 -6
  162. data/app/views/spree/admin/promotions/_rules.html.erb +36 -35
  163. data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb +25 -23
  164. data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb +23 -21
  165. data/app/views/spree/admin/promotions/actions/_create_line_items.html.erb +16 -16
  166. data/app/views/spree/admin/promotions/calculators/_default_fields.html.erb +8 -6
  167. data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb +29 -24
  168. data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb +29 -23
  169. data/app/views/spree/admin/promotions/edit.html.erb +16 -11
  170. data/app/views/spree/admin/promotions/index.html.erb +34 -58
  171. data/app/views/spree/admin/promotions/new.html.erb +4 -6
  172. data/app/views/spree/admin/promotions/rules/_item_total.html.erb +11 -7
  173. data/app/views/spree/admin/promotions/rules/_landing_page.html.erb +9 -5
  174. data/app/views/spree/admin/promotions/rules/_option_value.html.erb +42 -0
  175. data/app/views/spree/admin/promotions/rules/_product.html.erb +9 -8
  176. data/app/views/spree/admin/promotions/rules/_taxon.html.erb +9 -8
  177. data/app/views/spree/admin/promotions/rules/_user.html.erb +5 -3
  178. data/app/views/spree/admin/properties/_form.html.erb +9 -9
  179. data/app/views/spree/admin/properties/edit.html.erb +3 -9
  180. data/app/views/spree/admin/properties/index.html.erb +42 -52
  181. data/app/views/spree/admin/properties/new.html.erb +10 -9
  182. data/app/views/spree/admin/prototypes/_form.html.erb +25 -28
  183. data/app/views/spree/admin/prototypes/_prototypes.html.erb +4 -8
  184. data/app/views/spree/admin/prototypes/available.js.erb +1 -1
  185. data/app/views/spree/admin/prototypes/edit.html.erb +3 -11
  186. data/app/views/spree/admin/prototypes/index.html.erb +23 -36
  187. data/app/views/spree/admin/prototypes/new.html.erb +8 -7
  188. data/app/views/spree/admin/prototypes/show.html.erb +15 -18
  189. data/app/views/spree/admin/refund_reasons/edit.html.erb +2 -2
  190. data/app/views/spree/admin/refund_reasons/index.html.erb +2 -2
  191. data/app/views/spree/admin/refund_reasons/new.html.erb +1 -1
  192. data/app/views/spree/admin/refunds/edit.html.erb +14 -18
  193. data/app/views/spree/admin/refunds/new.html.erb +19 -27
  194. data/app/views/spree/admin/reimbursement_types/index.html.erb +6 -7
  195. data/app/views/spree/admin/reimbursements/edit.html.erb +25 -31
  196. data/app/views/spree/admin/reimbursements/index.html.erb +4 -10
  197. data/app/views/spree/admin/reimbursements/show.html.erb +32 -36
  198. data/app/views/spree/admin/reports/index.html.erb +4 -4
  199. data/app/views/spree/admin/reports/sales_total.html.erb +6 -11
  200. data/app/views/spree/admin/return_authorization_reasons/edit.html.erb +0 -0
  201. data/app/views/spree/admin/return_authorization_reasons/index.html.erb +2 -2
  202. data/app/views/spree/admin/return_authorization_reasons/new.html.erb +0 -0
  203. data/app/views/spree/admin/return_authorizations/_form.html.erb +20 -20
  204. data/app/views/spree/admin/return_authorizations/edit.html.erb +6 -6
  205. data/app/views/spree/admin/return_authorizations/index.html.erb +12 -12
  206. data/app/views/spree/admin/return_authorizations/new.html.erb +6 -10
  207. data/app/views/spree/admin/search/products.rabl +9 -0
  208. data/app/views/spree/admin/search/users.rabl +21 -21
  209. data/app/views/spree/admin/shared/_address_form.html.erb +22 -22
  210. data/app/views/spree/admin/shared/_alert.html.erb +8 -5
  211. data/app/views/spree/admin/shared/_calculator_fields.html.erb +13 -8
  212. data/app/views/spree/admin/shared/_content_header.html.erb +19 -16
  213. data/app/views/spree/admin/shared/_edit_resource_links.html.erb +3 -3
  214. data/app/views/spree/admin/shared/_error_messages.html.erb +12 -0
  215. data/app/views/spree/admin/shared/_head.html.erb +4 -8
  216. data/app/views/spree/admin/shared/_header.html.erb +27 -8
  217. data/app/views/spree/admin/shared/_index_table_options.html.erb +23 -0
  218. data/app/views/spree/admin/shared/_main_menu.html.erb +35 -0
  219. data/app/views/spree/admin/shared/_new_resource_links.html.erb +3 -3
  220. data/app/views/spree/admin/shared/_order_summary.html.erb +121 -48
  221. data/app/views/spree/admin/shared/_order_tabs.html.erb +55 -7
  222. data/app/views/spree/admin/shared/_product_tabs.html.erb +19 -25
  223. data/app/views/spree/admin/shared/_refunds.html.erb +9 -9
  224. data/app/views/spree/admin/shared/_report_criteria.html.erb +4 -4
  225. data/app/views/spree/admin/shared/_report_order_criteria.html.erb +12 -12
  226. data/app/views/spree/admin/shared/_sidebar.html.erb +1 -6
  227. data/app/views/spree/admin/shared/_table_filter.html.erb +21 -5
  228. data/app/views/spree/admin/shared/named_types/_edit.html.erb +6 -7
  229. data/app/views/spree/admin/shared/named_types/_form.html.erb +10 -14
  230. data/app/views/spree/admin/shared/named_types/_index.html.erb +6 -17
  231. data/app/views/spree/admin/shared/named_types/_new.html.erb +5 -5
  232. data/app/views/spree/admin/shared/sub_menu/_configuration.html.erb +21 -0
  233. data/app/views/spree/admin/shared/sub_menu/_product.html.erb +8 -0
  234. data/app/views/spree/admin/shared/sub_menu/_promotion.html.erb +4 -0
  235. data/app/views/spree/admin/shipping_categories/_form.html.erb +2 -2
  236. data/app/views/spree/admin/shipping_categories/edit.html.erb +4 -14
  237. data/app/views/spree/admin/shipping_categories/index.html.erb +24 -32
  238. data/app/views/spree/admin/shipping_categories/new.html.erb +2 -10
  239. data/app/views/spree/admin/shipping_methods/_form.html.erb +88 -67
  240. data/app/views/spree/admin/shipping_methods/edit.html.erb +6 -19
  241. data/app/views/spree/admin/shipping_methods/index.html.erb +13 -25
  242. data/app/views/spree/admin/shipping_methods/new.html.erb +2 -12
  243. data/app/views/spree/admin/state_changes/index.html.erb +42 -0
  244. data/app/views/spree/admin/states/_form.html.erb +6 -6
  245. data/app/views/spree/admin/states/_state_list.html.erb +6 -11
  246. data/app/views/spree/admin/states/edit.html.erb +3 -11
  247. data/app/views/spree/admin/states/index.html.erb +5 -9
  248. data/app/views/spree/admin/states/new.html.erb +1 -4
  249. data/app/views/spree/admin/states/new.js.erb +2 -2
  250. data/app/views/spree/admin/stock_locations/_form.html.erb +51 -45
  251. data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb +15 -15
  252. data/app/views/spree/admin/stock_locations/edit.html.erb +4 -6
  253. data/app/views/spree/admin/stock_locations/index.html.erb +12 -26
  254. data/app/views/spree/admin/stock_locations/new.html.erb +3 -5
  255. data/app/views/spree/admin/stock_movements/_form.html.erb +10 -12
  256. data/app/views/spree/admin/stock_movements/edit.html.erb +4 -4
  257. data/app/views/spree/admin/stock_movements/index.html.erb +9 -15
  258. data/app/views/spree/admin/stock_movements/new.html.erb +3 -3
  259. data/app/views/spree/admin/stock_transfers/_stock_movements.html.erb +17 -22
  260. data/app/views/spree/admin/stock_transfers/index.html.erb +36 -49
  261. data/app/views/spree/admin/stock_transfers/new.html.erb +73 -77
  262. data/app/views/spree/admin/stock_transfers/show.html.erb +21 -29
  263. data/app/views/spree/admin/tax_categories/_form.html.erb +19 -27
  264. data/app/views/spree/admin/tax_categories/edit.html.erb +4 -6
  265. data/app/views/spree/admin/tax_categories/index.html.erb +13 -26
  266. data/app/views/spree/admin/tax_categories/new.html.erb +3 -6
  267. data/app/views/spree/admin/tax_categories/show.html.erb +1 -1
  268. data/app/views/spree/admin/tax_rates/_form.html.erb +34 -25
  269. data/app/views/spree/admin/tax_rates/edit.html.erb +4 -15
  270. data/app/views/spree/admin/tax_rates/index.html.erb +18 -32
  271. data/app/views/spree/admin/tax_rates/new.html.erb +2 -14
  272. data/app/views/spree/admin/taxonomies/_form.html.erb +5 -5
  273. data/app/views/spree/admin/taxonomies/_js_head.html.erb +0 -0
  274. data/app/views/spree/admin/taxonomies/_list.html.erb +9 -12
  275. data/app/views/spree/admin/taxonomies/edit.erb +11 -22
  276. data/app/views/spree/admin/taxonomies/index.html.erb +9 -15
  277. data/app/views/spree/admin/taxonomies/new.html.erb +4 -16
  278. data/app/views/spree/admin/taxons/_form.html.erb +38 -38
  279. data/app/views/spree/admin/taxons/_taxon_table.html.erb +2 -2
  280. data/app/views/spree/admin/taxons/edit.html.erb +5 -13
  281. data/app/views/spree/admin/taxons/index.html.erb +6 -13
  282. data/app/views/spree/admin/trackers/_form.html.erb +17 -23
  283. data/app/views/spree/admin/trackers/edit.html.erb +4 -14
  284. data/app/views/spree/admin/trackers/index.html.erb +9 -15
  285. data/app/views/spree/admin/trackers/new.html.erb +2 -10
  286. data/app/views/spree/admin/users/_addresses_form.html.erb +33 -17
  287. data/app/views/spree/admin/users/_form.html.erb +17 -17
  288. data/app/views/spree/admin/users/_lifetime_stats.html.erb +26 -0
  289. data/app/views/spree/admin/users/_sidebar.html.erb +14 -34
  290. data/app/views/spree/admin/users/_user_page_actions.html.erb +2 -6
  291. data/app/views/spree/admin/users/addresses.html.erb +8 -7
  292. data/app/views/spree/admin/users/edit.html.erb +55 -38
  293. data/app/views/spree/admin/users/index.html.erb +44 -30
  294. data/app/views/spree/admin/users/items.html.erb +13 -24
  295. data/app/views/spree/admin/users/new.html.erb +1 -7
  296. data/app/views/spree/admin/users/orders.html.erb +11 -17
  297. data/app/views/spree/admin/variants/_autocomplete.js.erb +13 -15
  298. data/app/views/spree/admin/variants/_autocomplete_line_items_stock.js.erb +41 -44
  299. data/app/views/spree/admin/variants/_autocomplete_stock.js.erb +46 -51
  300. data/app/views/spree/admin/variants/_form.html.erb +34 -34
  301. data/app/views/spree/admin/variants/_split.js.erb +8 -4
  302. data/app/views/spree/admin/variants/edit.html.erb +2 -4
  303. data/app/views/spree/admin/variants/index.html.erb +14 -33
  304. data/app/views/spree/admin/variants/new.html.erb +8 -6
  305. data/app/views/spree/admin/variants/new.js.erb +1 -1
  306. data/app/views/spree/admin/zones/_country_members.html.erb +14 -8
  307. data/app/views/spree/admin/zones/_form.html.erb +42 -31
  308. data/app/views/spree/admin/zones/_state_members.html.erb +14 -8
  309. data/app/views/spree/admin/zones/edit.html.erb +3 -11
  310. data/app/views/spree/admin/zones/index.html.erb +9 -19
  311. data/app/views/spree/admin/zones/new.html.erb +2 -13
  312. data/app/views/spree/layouts/admin.html.erb +63 -36
  313. data/config/initializers/assets.rb +1 -1
  314. data/config/routes.rb +4 -1
  315. data/lib/spree/backend/engine.rb +3 -0
  316. data/lib/spree_backend.rb +2 -0
  317. data/vendor/assets/javascripts/jquery.cookie.js +115 -39
  318. data/vendor/assets/javascripts/modernizr.js +3 -3
  319. data/vendor/assets/javascripts/underscore-min.js +6 -0
  320. data/vendor/assets/javascripts/underscore-min.map +1 -0
  321. data/vendor/assets/javascripts/velocity.js +3831 -0
  322. data/vendor/assets/stylesheets/animate.css +3158 -0
  323. metadata +85 -96
  324. data/app/assets/javascripts/spree/backend/images/index.js.coffee +0 -16
  325. data/app/assets/javascripts/spree/backend/images/new.js.coffee +0 -7
  326. data/app/assets/javascripts/spree/backend/underscore-min.js +0 -1227
  327. data/app/assets/stylesheets/spree/backend/components/_actions.scss +0 -31
  328. data/app/assets/stylesheets/spree/backend/components/_date-picker.scss +0 -159
  329. data/app/assets/stylesheets/spree/backend/components/_messages.scss +0 -54
  330. data/app/assets/stylesheets/spree/backend/components/_pagination.scss +0 -17
  331. data/app/assets/stylesheets/spree/backend/components/_product_autocomplete.scss +0 -29
  332. data/app/assets/stylesheets/spree/backend/components/_progress.scss +0 -35
  333. data/app/assets/stylesheets/spree/backend/components/_states.scss +0 -34
  334. data/app/assets/stylesheets/spree/backend/components/_table-filter.scss +0 -14
  335. data/app/assets/stylesheets/spree/backend/globals/_functions.scss +0 -25
  336. data/app/assets/stylesheets/spree/backend/globals/_mixins.scss +0 -25
  337. data/app/assets/stylesheets/spree/backend/globals/_variables.scss +0 -171
  338. data/app/assets/stylesheets/spree/backend/globals/_variables_override.scss +0 -7
  339. data/app/assets/stylesheets/spree/backend/hacks/_ie.scss +0 -72
  340. data/app/assets/stylesheets/spree/backend/hacks/_mozilla.scss +0 -33
  341. data/app/assets/stylesheets/spree/backend/hacks/_opera.scss +0 -17
  342. data/app/assets/stylesheets/spree/backend/plugins/_jstree.scss +0 -135
  343. data/app/assets/stylesheets/spree/backend/plugins/_powertip.scss +0 -86
  344. data/app/assets/stylesheets/spree/backend/plugins/_token-input.scss +0 -110
  345. data/app/assets/stylesheets/spree/backend/sections/_adjustments_table.scss +0 -8
  346. data/app/assets/stylesheets/spree/backend/sections/_alerts.scss +0 -27
  347. data/app/assets/stylesheets/spree/backend/sections/_bulk_transfer.scss +0 -8
  348. data/app/assets/stylesheets/spree/backend/sections/_edit_checkouts.scss +0 -72
  349. data/app/assets/stylesheets/spree/backend/sections/_image_settings.scss +0 -3
  350. data/app/assets/stylesheets/spree/backend/sections/_log_entries.scss +0 -17
  351. data/app/assets/stylesheets/spree/backend/sections/_orders.scss +0 -64
  352. data/app/assets/stylesheets/spree/backend/sections/_overview.scss +0 -86
  353. data/app/assets/stylesheets/spree/backend/sections/_products.scss +0 -123
  354. data/app/assets/stylesheets/spree/backend/sections/_promotions.scss +0 -119
  355. data/app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss +0 -24
  356. data/app/assets/stylesheets/spree/backend/sections/_tax_zones.scss +0 -15
  357. data/app/assets/stylesheets/spree/backend/sections/_taxons.scss +0 -21
  358. data/app/assets/stylesheets/spree/backend/sections/_users.scss +0 -5
  359. data/app/assets/stylesheets/spree/backend/shared/_icons.scss +0 -53
  360. data/app/assets/stylesheets/spree/backend/shared/_layout.scss +0 -99
  361. data/app/assets/stylesheets/spree/backend/shared/_tables.scss +0 -214
  362. data/app/assets/stylesheets/spree/backend/spree_admin.scss +0 -45
  363. data/app/views/spree/admin/line_items/create.js.erb +0 -1
  364. data/app/views/spree/admin/line_items/destroy.js.erb +0 -1
  365. data/app/views/spree/admin/option_types/new.js.erb +0 -2
  366. data/app/views/spree/admin/payments/_bill_address_form.html.erb +0 -9
  367. data/app/views/spree/admin/payments/source_views/_check.html.erb +0 -0
  368. data/app/views/spree/admin/products/new.js.erb +0 -7
  369. data/app/views/spree/admin/promotions/_tab.html.erb +0 -1
  370. data/app/views/spree/admin/promotions/rules/_first_order.html.erb +0 -0
  371. data/app/views/spree/admin/promotions/rules/_one_use_per_user.html.erb +0 -0
  372. data/app/views/spree/admin/promotions/rules/_user_logged_in.html.erb +0 -0
  373. data/app/views/spree/admin/properties/filtered.html.erb +0 -1
  374. data/app/views/spree/admin/properties/new.js.erb +0 -2
  375. data/app/views/spree/admin/prototypes/new.js.erb +0 -5
  376. data/app/views/spree/admin/shared/_address.html.erb +0 -6
  377. data/app/views/spree/admin/shared/_configuration_menu.html.erb +0 -28
  378. data/app/views/spree/admin/shared/_menu.html.erb +0 -9
  379. data/app/views/spree/admin/shared/_order_submenu.html.erb +0 -49
  380. data/app/views/spree/admin/shared/_product_sub_menu.html.erb +0 -10
  381. data/app/views/spree/admin/shared/_promotion_sub_menu.html.erb +0 -6
  382. data/app/views/spree/admin/shared/_show_resource_links.html.erb +0 -5
  383. data/app/views/spree/admin/shared/_sub_menu.html.erb +0 -9
  384. data/app/views/spree/admin/shared/_tabs.html.erb +0 -21
  385. data/app/views/spree/admin/taxonomies/_taxon.html.erb +0 -12
  386. data/app/views/spree/admin/taxons/search.rabl +0 -5
  387. data/app/views/spree/admin/variants/update.js.erb +0 -1
  388. data/vendor/assets/images/jquery.alerts/images/help.gif +0 -0
  389. data/vendor/assets/images/jquery.alerts/images/important.gif +0 -0
  390. data/vendor/assets/images/jquery.alerts/images/info.gif +0 -0
  391. data/vendor/assets/images/jquery.alerts/images/title.gif +0 -0
  392. data/vendor/assets/javascripts/css_browser_selector_dev.js +0 -129
  393. data/vendor/assets/javascripts/equalize.js +0 -41
  394. data/vendor/assets/javascripts/jquery.adaptivemenu.js +0 -60
  395. data/vendor/assets/javascripts/jquery.alerts/jquery.alerts.js +0 -235
  396. data/vendor/assets/javascripts/jquery.delayedobserver.js +0 -35
  397. data/vendor/assets/javascripts/jquery.powertip.js +0 -796
  398. data/vendor/assets/javascripts/jquery.vAlign.js +0 -11
  399. data/vendor/assets/javascripts/responsive-tables.js +0 -42
  400. data/vendor/assets/javascripts/spin.js +0 -379
  401. data/vendor/assets/javascripts/trunk8.js +0 -369
  402. data/vendor/assets/stylesheets/jquery.alerts/jquery.alerts.css.erb +0 -57
  403. data/vendor/assets/stylesheets/jquery.alerts/jquery.alerts.spree.css +0 -29
  404. data/vendor/assets/stylesheets/jquery.powertip.css +0 -85
  405. data/vendor/assets/stylesheets/responsive-tables.css +0 -21
@@ -1,30 +1,34 @@
1
- <table class="index" id='payments' data-order-id='<%= @order.number %>'>
1
+ <table class="table table-bordered" id='payments' data-order-id='<%= @order.number %>'>
2
2
  <thead>
3
3
  <tr data-hook="payments_header">
4
- <th><%= Spree.t(:identifier) %></th>
4
+ <th><%= Spree::Payment.human_attribute_name(:number) %></th>
5
5
  <th><%= "#{Spree.t('date')}/#{Spree.t('time')}" %></th>
6
- <th><%= Spree.t(:amount) %></th>
7
- <th><%= Spree.t(:payment_method) %></th>
8
- <th><%= Spree.t(:transaction_id) %></th>
9
- <th><%= Spree.t(:payment_state) %></th>
10
- <th class="actions"></th>
6
+ <th class="text-center"><%= Spree.t(:amount) %></th>
7
+ <th class="text-center"><%= Spree.t(:payment_method) %></th>
8
+ <th class="text-center"><%= Spree.t(:transaction_id) %></th>
9
+ <th class="text-center"><%= Spree.t(:payment_state) %></th>
10
+ <th class="actions text-center"></th>
11
11
  </tr>
12
12
  </thead>
13
13
  <tbody>
14
14
  <% payments.each do |payment| %>
15
- <tr id="<%= dom_id(payment) %>" data-hook="payments_row" class="<%= cycle('odd', 'even', name: 'payment_table_cycle')%>">
16
- <td><%= link_to payment.identifier, spree.admin_order_payment_path(@order, payment) %></td>
15
+ <tr id="<%= dom_id(payment) %>" data-hook="payments_row">
16
+ <td><%= link_to payment.number, spree.admin_order_payment_path(@order, payment) %></td>
17
17
  <td><%= pretty_time(payment.created_at) %></td>
18
- <td class="align-center amount"><%= payment.display_amount.to_html %></td>
19
- <td class="align-center"><%= payment_method_name(payment) %></td>
20
- <td class="align-center"><%= payment.transaction_id %></td>
21
- <td class="align-center"> <span class="state <%= payment.state %>"><%= Spree.t(payment.state, :scope => :payment_states, :default => payment.state.capitalize) %></span></td>
22
- <td class="actions">
18
+ <td class="amount text-center"><%= payment.display_amount %></td>
19
+ <td class="text-center"><%= payment_method_name(payment) %></td>
20
+ <td class="text-center"><%= payment.transaction_id %></td>
21
+ <td class="text-center">
22
+ <span class="label label-<%= payment.state %>">
23
+ <%= Spree.t(payment.state, scope: :payment_states, default: payment.state.capitalize) %>
24
+ </span>
25
+ </td>
26
+ <td class="actions actions-2 text-center">
23
27
  <% payment.actions.each do |action| %>
24
28
  <% if action == 'credit' %>
25
- <%= link_to_with_icon 'reply', Spree.t(:refund), new_admin_order_payment_refund_path(@order, payment), no_text: true %>
29
+ <%= link_to_with_icon 'refund', Spree.t(:refund), new_admin_order_payment_refund_path(@order, payment), no_text: true, class: "btn btn-default btn-sm" %>
26
30
  <% else %>
27
- <%= link_to_with_icon action, Spree.t(action), fire_admin_order_payment_path(@order, payment, :e => action), :method => :put, :no_text => true, :data => {:action => action} %>
31
+ <%= link_to_with_icon action, Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: { action: action }, class: "btn btn-default btn-sm" %>
28
32
  <% end %>
29
33
  <% end %>
30
34
  </td>
@@ -1,7 +1,7 @@
1
1
  <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Creditcards' } %>
2
2
 
3
3
  <% content_for :page_title do %>
4
- <i class="fa fa-arrow-right"></i> <%= Spree.t(:refund) %>
4
+ / <%= Spree.t(:refund) %>
5
5
  <% end %>
6
6
 
7
7
  <%= form_tag do %>
@@ -11,7 +11,7 @@
11
11
  <%= label_tag :amount, Spree.t(:amount) %>
12
12
  <%= text_field_tag :amount, @payment.amount %>
13
13
  </p>
14
- <p class="form-buttons">
14
+ <p class="form-actions">
15
15
  <%= button Spree.t(:make_refund) %>
16
16
  </p>
17
17
  </fieldset>
@@ -2,35 +2,37 @@
2
2
 
3
3
  <% content_for :page_actions do %>
4
4
  <% if @order.outstanding_balance? %>
5
- <li id="new_payment_section">
6
- <%= button_link_to Spree.t(:new_payment), new_admin_order_payment_url(@order), :icon => 'plus' %>
7
- </li>
5
+ <span id="new_payment_section">
6
+ <%= button_link_to Spree.t(:new_payment), new_admin_order_payment_url(@order), class: "btn-success", icon: 'add' %>
7
+ </span>
8
8
  <% end %>
9
- <li><%= button_link_to Spree.t(:back_to_orders_list), admin_orders_path, :icon => 'arrow-left' %></li>
10
9
  <% end %>
11
10
 
12
11
  <% content_for :page_title do %>
13
- <i class="fa fa-arrow-right"></i> <%= Spree.t(:payments) %>
12
+ / <%= Spree.t(:payments) %>
14
13
  <% end %>
15
14
 
16
15
  <% if @order.outstanding_balance? %>
17
- <h5 class="outstanding-balance"><%= @order.outstanding_balance < 0 ? Spree.t(:credit_owed) : Spree.t(:balance_due) %>: <strong><%= @order.display_outstanding_balance %></strong></h5>
16
+ <div class="alert alert-info outstanding-balance">
17
+ <%= @order.outstanding_balance < 0 ? Spree.t(:credit_owed) : Spree.t(:balance_due) %>: <strong><%= @order.display_outstanding_balance %></strong>
18
+ </div>
18
19
  <% end %>
19
20
 
20
21
  <% if @payments.any? %>
21
22
 
22
- <fieldset data-hook="payment_list" class="no-border-bottom">
23
- <legend align="center"><%= Spree.t(:payments) %></legend>
24
- <%= render :partial => 'list', :locals => { :payments => @payments } %>
25
- </fieldset>
23
+ <div data-hook="payment_list" class="panel panel-default no-border-bottom">
24
+ <%= render partial: 'list', locals: { payments: @payments } %>
25
+ </div>
26
26
 
27
27
  <% if @refunds.any? %>
28
28
  <fieldset data-hook="payment_list" class="no-border-bottom">
29
- <legend align="center"><%= Spree.t(:refunds) %></legend>
30
- <%= render :partial => 'spree/admin/shared/refunds', :locals => { :refunds => @refunds, show_actions: true } %>
29
+ <legend><%= Spree.t(:refunds) %></legend>
30
+ <%= render partial: 'spree/admin/shared/refunds', locals: { refunds: @refunds, show_actions: true } %>
31
31
  </fieldset>
32
32
  <% end %>
33
33
 
34
34
  <% else %>
35
- <div class="alpha twelve columns no-objects-found"><%= Spree.t(:order_has_no_payments) %></div>
35
+ <div class="alert alert-info no-objects-found"><%= Spree.t(:order_has_no_payments) %></div>
36
36
  <% end %>
37
+
38
+ <%= render partial: 'spree/admin/shared/order_summary' %>
@@ -1,26 +1,25 @@
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> <%= Spree.t(:new_payment) %>
5
- <% end %>
6
-
7
- <% content_for :page_actions do %>
8
- <li><%= button_link_to Spree.t(:back_to_payments_list), spree.admin_order_payments_url(@order), :icon => 'arrow-left' %></li>
4
+ / <%= Spree.t(:new_payment) %>
9
5
  <% end %>
10
6
 
11
7
  <% if @payment_methods.any? %>
12
- <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @payment } %>
8
+ <%= render :partial => 'spree/admin/shared/error_messages', :locals => { :target => @payment } %>
13
9
 
14
10
  <%= form_for @payment, :url => admin_order_payments_path(@order) do |f| %>
15
- <fieldset class="no-border-top">
11
+ <fieldset>
16
12
  <%= render :partial => 'form', :locals => { :f => f } %>
17
13
 
18
- <div class="filter-actions actions" data-hook="buttons">
19
- <%= button @order.cart? ? Spree.t('actions.continue') : Spree.t('actions.update'), @order.cart? ? 'arrow-right' : 'refresh' %>
14
+ <div class="form-actions" data-hook="buttons">
15
+ <%= button @order.cart? ? Spree.t('actions.continue') : Spree.t('actions.update'), @order.cart? ? 'arrow-right' : 'save' %>
20
16
  </div>
21
17
  </fieldset>
22
18
  <% end %>
19
+
23
20
  <% else %>
24
- <%= Spree.t(:cannot_create_payment_without_payment_methods) %>
25
- <%= link_to Spree.t(:please_define_payment_methods), admin_payment_methods_url %>
21
+ <div class="alert alert-info">
22
+ <%= Spree.t(:cannot_create_payment_without_payment_methods) %>
23
+ <%= link_to Spree.t(:please_define_payment_methods), admin_payment_methods_url %>
24
+ </div>
26
25
  <% end %>
@@ -1,25 +1,28 @@
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>
4
+ /
5
5
  <%= I18n.t(:one, scope: "activerecord.models.spree/payment") %>
6
- <i class="fa fa-arrow-right"></i>
6
+ /
7
7
  <%= payment_method_name(@payment) %>
8
- &nbsp;
8
+ /
9
9
  <span class="state <%= @payment.state %>">
10
10
  <%= Spree.t(@payment.state, :scope => :payment_states, :default => @payment.state.capitalize) %>
11
11
  </span>
12
12
  <% end %>
13
13
 
14
14
  <% content_for :page_actions do %>
15
- <li><%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'archive' %></li>
16
- <li><%= button_link_to Spree.t(:back_to_payments_list), spree.admin_order_payments_url(@order), :icon => 'arrow-left' %></li>
15
+ <%= button_link_to Spree.t(:logs), spree.admin_order_payment_log_entries_url(@order, @payment), :icon => 'file' %>
17
16
  <% end %>
18
17
 
19
- <%= render :partial => "spree/admin/payments/source_views/#{@payment.payment_method.method_type}", :locals => { :payment => @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment } %>
18
+ <%= render :partial => "spree/admin/payments/source_views/#{@payment.payment_method.method_type}",
19
+ :locals => {
20
+ :payment => @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment
21
+ }
22
+ %>
20
23
 
21
- <div data-hook="amount" class="align-center">
22
- <h5><%= label_tag nil, Spree.t(:amount) %>: <span class="green"><%= @payment.display_amount.to_html %></span> </h5>
24
+ <div class="alert alert-success" data-hook="amount">
25
+ <%= Spree.t(:amount) %>: <%= @payment.display_amount.to_html %>
23
26
  </div>
24
27
 
25
- <%= render 'spree/admin/payments/capture_events' %>
28
+ <%= render 'spree/admin/payments/capture_events' %>
@@ -1,60 +1,56 @@
1
- <fieldset data-id='credit-card' class="no-border-bottom">
2
- <div class="field" data-hook="previous_cards">
3
- <% if previous_cards.any? %>
4
- <% previous_cards.each do |card| %>
5
- <label><%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %><br /></label>
1
+ <fieldset data-id="credit-card">
2
+ <div class="form-group" data-hook="previous_cards">
3
+ <ul>
4
+ <% if previous_cards.any? %>
5
+ <% previous_cards.each do |card| %>
6
+ <li>
7
+ <label>
8
+ <%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_number %>
9
+ </label>
10
+ </li>
11
+ <% end %>
12
+ <li>
13
+ <label>
14
+ <%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= Spree.t(:use_new_cc) %>
15
+ </label>
16
+ </li>
6
17
  <% end %>
7
- <label><%= radio_button_tag :card, 'new', false, { id: "card_new#{payment_method.id}" } %> <%= Spree.t(:use_new_cc) %></label>
8
- <% end %>
18
+ </ul>
9
19
  </div>
10
20
 
11
- <div id="card_form<%= payment_method.id %>" data-hook>
21
+ <div id="card_form<%= payment_method.id %>" class="margint" data-hook>
12
22
  <% param_prefix = "payment_source[#{payment_method.id}]" %>
13
23
 
14
- <div class="clear"></div>
15
-
16
- <div class="alpha four columns">
17
- <div data-hook="card_number">
18
- <div class="field">
19
- <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {class: 'ccType'} %>
20
- <%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + content_tag(:span, ' *', :class => 'required')) %>
21
- <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required fullwidth cardNumber', :id => "card_number#{payment_method.id}", :maxlength => 19 %>
22
- <span id="card_type" style="display:none;">
23
- ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
24
- <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
25
- )
26
- </span>
27
- </div>
28
- </div>
29
- </div>
30
- <div class="alpha four columns">
31
- <div data-hook="card_name">
32
- <div class="field">
33
- <%= label_tag "card_name#{payment_method.id}", raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
34
- <%= text_field_tag "#{param_prefix}[name]", '', id: "card_name#{payment_method.id}", class: 'required fullwidth', maxlength: 19 %>
35
- </div>
36
- </div>
24
+ <div data-hook="card_number" class="form-group">
25
+ <%= hidden_field_tag "#{param_prefix}[cc_type]", '', {class: 'ccType'} %>
26
+ <%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + content_tag(:span, ' *', :class => 'required')) %>
27
+ <%= text_field_tag "#{param_prefix}[number]", '', :class => 'required form-control cardNumber', :id => "card_number#{payment_method.id}", :maxlength => 19 %>
28
+ <span id="card_type" style="display:none;">
29
+ ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
30
+ <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
31
+ )
32
+ </span>
37
33
  </div>
38
- <div class="three columns">
39
- <div data-hook="card_expiration" class="field">
40
- <%= label_tag "card_expiry#{payment_method.id}", raw(Spree.t(:expiration) + content_tag(:span, ' *', :class => 'required')) %><br>
41
- <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry", placeholder: "MM / YY" %>
42
- </div>
34
+
35
+ <div data-hook="card_name" class="form-group">
36
+ <%= label_tag "card_name#{payment_method.id}", raw(Spree.t(:name) + content_tag(:span, ' *', :class => 'required')) %>
37
+ <%= text_field_tag "#{param_prefix}[name]", '', id: "card_name#{payment_method.id}", class: 'required form-control', maxlength: 19 %>
43
38
  </div>
44
- <div class="omega two columns">
45
- <div data-hook="card_code" class="field">
46
- <%= label_tag "card_code#{payment_method.id}", raw(Spree.t(:card_code) + content_tag(:span, ' *', :class => "required")) %>
47
- <%= text_field_tag "#{param_prefix}[verification_value]", '', id: "card_code#{payment_method.id}", class: 'required fullwidth cardCode', size: 5 %>
48
- <a href="/content/cvv" class="info cvvLink" target="_blank">
49
- (<%= Spree.t(:what_is_this) %>)
50
- </a>
51
- </div>
39
+
40
+ <div data-hook="card_expiration" class="form-group">
41
+ <%= label_tag "card_expiry#{payment_method.id}", raw(Spree.t(:expiration) + content_tag(:span, ' *', :class => 'required')) %><br>
42
+ <%= text_field_tag "#{param_prefix}[expiry]", '', id: "card_expiry#{payment_method.id}", class: "required cardExpiry form-control", placeholder: "MM / YY" %>
52
43
  </div>
53
44
 
54
- <div class="nine columns">
55
- <%= image_tag 'credit_cards/credit_card.gif', :class => 'credit-card-image' %>
45
+ <div data-hook="card_code" class="form-group">
46
+ <%= label_tag "card_code#{payment_method.id}", raw(Spree.t(:card_code) + content_tag(:span, ' *', :class => "required")) %>
47
+ <%= text_field_tag "#{param_prefix}[verification_value]", '', id: "card_code#{payment_method.id}", class: 'required form-control cardCode', size: 5 %>
48
+ <a href="/content/cvv" class="info cvvLink" target="_blank">
49
+ (<%= Spree.t(:what_is_this) %>)
50
+ </a>
56
51
  </div>
57
52
 
58
- <div class="clear"></div>
53
+ <%= image_tag 'credit_cards/credit_card.gif', :class => 'credit-card-image' %>
54
+
59
55
  </div>
60
56
  </fieldset>
@@ -1,21 +1,21 @@
1
1
  <fieldset data-hook="credit_card">
2
- <legend align="center"><%= Spree.t(:credit_card) %></legend>
3
-
4
- <div class="row">
5
- <div class="alpha six columns">
6
- <dl>
7
- <dt><%= Spree.t(:name_on_card) %>:</dt>
8
- <dd><%= payment.source.name %></dd>
9
-
10
- <dt><%= Spree.t(:card_type) %>:</dt>
11
- <dd><%= payment.source.cc_type %></dd>
12
-
13
- <dt><%= Spree.t(:card_number) %>:</dt>
14
- <dd><%= payment.source.display_number %></dd>
15
-
16
- <dt><%= Spree.t(:expiration) %>:</dt>
17
- <dd><%= payment.source.month %>/<%= payment.source.year %></dd>
18
- </dl>
19
- </div>
20
- </div>
2
+ <legend><%= Spree.t(:credit_card) %></legend>
3
+ <table class="table table-condensed table-bordered">
4
+ <tr>
5
+ <th width="20%"><%= Spree.t(:name_on_card) %>:</th>
6
+ <td><%= payment.source.name %></td>
7
+ </tr>
8
+ <tr>
9
+ <th><%= Spree.t(:card_type) %>:</th>
10
+ <td><%= payment.source.cc_type %></td>
11
+ </tr>
12
+ <tr>
13
+ <th><%= Spree.t(:card_number) %>:</th>
14
+ <td><%= payment.source.display_number %></td>
15
+ </tr>
16
+ <tr>
17
+ <th><%= Spree.t(:expiration) %>:</th>
18
+ <td><%= payment.source.month %>/<%= payment.source.year %></td>
19
+ </tr>
20
+ </table>
21
21
  </fieldset>
@@ -1,17 +1,17 @@
1
1
  <tr class="product_property fields" id="spree_<%= dom_id(f.object) %>" data-hook="product_property">
2
- <td class="no-border">
2
+ <td class="move-handle">
3
3
  <% if f.object.persisted? %>
4
- <span class="handle"></span>
4
+ <span class="icon icon-move handle"></span>
5
5
  <%= f.hidden_field :id %>
6
6
  <% end %>
7
7
  </td>
8
8
  <td class='property_name'>
9
- <%= f.text_field :property_name, class: 'autocomplete' %>
9
+ <%= f.text_field :property_name, class: 'autocomplete form-control' %>
10
10
  </td>
11
11
  <td class='value'>
12
- <%= f.text_field :value %>
12
+ <%= f.text_field :value, class: 'form-control' %>
13
13
  </td>
14
- <td class="actions">
14
+ <td class="actions actions-1">
15
15
  <% if f.object.persisted? %>
16
16
  <%= link_to_delete f.object, no_text: true %>
17
17
  <% end %>
@@ -1,28 +1,16 @@
1
- <%= render 'spree/admin/shared/product_sub_menu' %>
2
1
  <%= render 'spree/admin/shared/product_tabs', :current => 'Product Properties' %>
3
- <%= render 'spree/shared/error_messages', :target => @product %>
2
+ <%= render 'spree/admin/shared/error_messages', :target => @product %>
4
3
 
5
4
  <% content_for :page_actions do %>
6
- <ul class="tollbar inline-menu">
7
- <li>
8
- <%= link_to_add_fields Spree.t(:add_product_properties), 'tbody#product_properties', :class => 'plus button' %>
9
- </li>
10
- <li>
11
- <span id="new_ptype_link">
12
- <%= link_to Spree.t(:select_from_prototype), available_admin_prototypes_url, :remote => true, 'data-update' => 'prototypes', :class => 'button fa fa-copy' %>
13
- </span>
14
- </li>
15
- </ul>
5
+ <%= button_link_to Spree.t(:add_product_properties), "javascript:;", { :icon => 'add', :'data-target' => "tbody#product_properties", :class => 'btn-success spree_add_fields' } %>
6
+ <span class="js-new-ptype-link"><%= button_link_to Spree.t(:select_from_prototype), available_admin_prototypes_url, { :icon => 'properties', :remote => true, 'data-update' => 'prototypes', :class => 'btn-default' } %></span>
16
7
  <% end %>
17
8
 
18
9
  <%= form_for @product, :url => admin_product_url(@product), :method => :put do |f| %>
19
- <fieldset class="no-border-top">
20
- <div class="add_product_properties" data-hook="add_product_properties"></div>
21
-
10
+ <fieldset>
22
11
  <div id="prototypes" data-hook></div>
23
- <%= image_tag 'select2-spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
24
12
 
25
- <table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
13
+ <table class="table sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
26
14
  <thead>
27
15
  <tr data-hook="product_properties_header">
28
16
  <th colspan="2"><%= Spree.t(:property) %></th>
@@ -1,35 +1,44 @@
1
- <%= form_for [:admin, Spree::StockMovement.new], url: admin_stock_items_path do |f| %>
2
- <fieldset>
3
- <legend align="center"><%= Spree.t(:add_stock_management) %></legend>
4
-
1
+ <div class="panel-heading">
2
+ <h1 class="panel-title">
3
+ <%= Spree.t(:add_stock_management) %>
4
+ </h1>
5
+ </div>
6
+ <div class="panel-body">
7
+ <%= form_for [:admin, Spree::StockMovement.new], url: admin_stock_items_path do |f| %>
5
8
  <div data-hook="admin_stock_movements_form_fields" class="row">
6
- <div class="alpha two columns">
7
- <%= f.field_container :quantity do %>
8
- <%= f.label :quantity, Spree.t(:quantity) %>
9
- <%= f.number_field :quantity, class: 'fullwidth', value: 1 %>
10
- <% end %>
9
+ <div class="col-md-2">
10
+ <div class="form-group">
11
+ <%= f.field_container :quantity do %>
12
+ <%= f.label :quantity, Spree.t(:quantity) %>
13
+ <%= f.number_field :quantity, class: 'form-control', value: 1 %>
14
+ <% end %>
15
+ </div>
11
16
  </div>
12
- <div class="five columns">
13
- <%= f.field_container :stock_location do %>
14
- <%= label_tag :stock_location_id, Spree.t(:stock_location) %>
15
- <%= select_tag 'stock_location_id', options_from_collection_for_select(@stock_locations, :id, :name),
16
- class: 'select2 fullwidth' %>
17
- <% end %>
17
+ <div class="col-md-5">
18
+ <div class="form-group">
19
+ <%= f.field_container :stock_location do %>
20
+ <%= label_tag :stock_location_id, Spree.t(:stock_location) %>
21
+ <%= select_tag 'stock_location_id', options_from_collection_for_select(@stock_locations, :id, :name),
22
+ class: 'select2' %>
23
+ <% end %>
24
+ </div>
18
25
  </div>
19
26
 
20
- <div class="five columns omega">
21
- <%= f.field_container :variant_id do %>
22
- <%= label_tag 'variant_id', Spree.t(:variant) %>
23
- <%= select_tag 'variant_id', options_from_collection_for_select(@variants, :id, :sku_and_options_text),
24
- class: 'select2 fullwidth' %>
25
- <% end %>
27
+ <div class="col-md-5">
28
+ <div class="form-group">
29
+ <%= f.field_container :variant_id do %>
30
+ <%= label_tag 'variant_id', Spree.t(:variant) %>
31
+ <%= select_tag 'variant_id', options_from_collection_for_select(@variants, :id, :sku_and_options_text),
32
+ class: 'select2' %>
33
+ <% end %>
34
+ </div>
26
35
  </div>
27
36
  </div>
28
37
 
29
- <div class="form-buttons filter-actions actions" data-hook="buttons">
38
+ <div class="form-actions text-center" data-hook="buttons">
30
39
  <%= button Spree.t(:add_stock), 'plus' %>
31
40
  <span class="or"><%= Spree.t(:or) %></span>
32
- <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
41
+ <%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => 'delete' %>
33
42
  </div>
34
- </fieldset>
35
- <% end %>
43
+ <% end %>
44
+ </div>
@@ -1,14 +1,25 @@
1
1
  <script type='text/template' id='product_template'>
2
- <li id="product_{{ product.id }}" data-product-id="{{product.id }}" class="columns three alpha small_product">
3
- <div class="product-image">
2
+ <li id='product_{{ product.id }}' data-product-id='{{ product.id }}' data-taxons="{{ product.taxon_ids }}" class='product'>
3
+ <a class="sort-handle js-sort-handle"><span class="icon icon-move"></span></a>
4
+ <div class="btn-group">
5
+ <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
6
+ <span class="caret"></span>
7
+ </button>
8
+ <ul class="dropdown-menu" role="menu" data-hook="taxon_product_dropdown">
9
+ <li><a href="javascript:;" class="edit-product js-edit-product"><%= Spree.t(:edit_product) %></a></li>
10
+ <li><a href="javascript:;" class="delete-product js-delete-product"><%= Spree.t(:delete_from_taxon) %></a></li>
11
+ </ul>
12
+ </div>
13
+ <div class='image'>
4
14
  {{#if product.image }}
5
- <img src='{{product.image}}' alt='{{ product.name }}' />
15
+ <img src='{{product.image}}' alt='{{ product.name }}' class='thumbnail' />
6
16
  {{ else }}
7
- <img src='<%= image_path("noimage/small.png") %>' alt='{{product.name }}' />
17
+ <img src='<%= image_path("noimage/small.png") %>' alt='{{product.name }}' class='thumbnail' />
8
18
  {{/if}}
9
19
  </div>
10
- <a class="name">{{ product.name }}</a><br>
11
- <span class="price">{{ product.display_price }}</span>
20
+ <div class="product-info">
21
+ <div class="name">{{ product.name }}</div>
22
+ <div class="price">{{ product.display_price }}</div>
23
+ </div>
12
24
  </li>
13
25
  </script>
14
-