spree_core 1.2.5 → 1.3.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (817) hide show
  1. data/app/assets/javascripts/admin/address_states.js +5 -4
  2. data/app/assets/javascripts/admin/admin.js.erb +106 -58
  3. data/app/assets/javascripts/admin/calculator.js +2 -2
  4. data/app/assets/javascripts/admin/checkouts/edit.js +5 -5
  5. data/app/assets/javascripts/admin/image_settings.js.erb +62 -0
  6. data/app/assets/javascripts/admin/images/index.js.coffee +3 -0
  7. data/app/assets/javascripts/admin/images/new.js.coffee +3 -0
  8. data/app/assets/javascripts/admin/orders/edit.js +1 -1
  9. data/app/assets/javascripts/admin/progress.coffee +27 -0
  10. data/app/assets/javascripts/admin/shipping_methods.js.coffee +1 -1
  11. data/app/assets/javascripts/admin/spree-select2.js.erb +24 -0
  12. data/app/assets/javascripts/admin/spree_core.js +10 -0
  13. data/app/assets/javascripts/admin/taxon_autocomplete.js.erb +1 -1
  14. data/app/assets/javascripts/admin/taxonomy.js +9 -9
  15. data/app/assets/javascripts/admin/variant_autocomplete.js.erb +40 -0
  16. data/app/assets/javascripts/store/checkout.js.coffee +23 -5
  17. data/app/assets/javascripts/store/product.js.coffee +15 -8
  18. data/app/assets/javascripts/store/spree_core.js +0 -1
  19. data/app/assets/stylesheets/admin/components/_actions.scss +31 -0
  20. data/app/assets/stylesheets/admin/components/_date-picker.scss +154 -0
  21. data/app/assets/stylesheets/admin/components/_messages.scss +43 -0
  22. data/app/assets/stylesheets/admin/components/_navigation.scss +150 -0
  23. data/app/assets/stylesheets/admin/components/_pagination.scss +17 -0
  24. data/app/assets/stylesheets/admin/components/_product_autocomplete.scss +29 -0
  25. data/app/assets/stylesheets/admin/components/_progress.scss +35 -0
  26. data/app/assets/stylesheets/admin/components/_sidebar.scss +23 -0
  27. data/app/assets/stylesheets/admin/components/_states.scss +30 -0
  28. data/app/assets/stylesheets/admin/components/_table-filter.scss +14 -0
  29. data/app/assets/stylesheets/admin/globals/_functions.scss +25 -0
  30. data/app/assets/stylesheets/admin/globals/_mixins.scss +25 -0
  31. data/app/assets/stylesheets/admin/globals/_variables.scss +134 -0
  32. data/app/assets/stylesheets/admin/globals/_variables_override.scss +7 -0
  33. data/app/assets/stylesheets/admin/hacks/_ie.scss +73 -0
  34. data/app/assets/stylesheets/admin/hacks/_mozilla.scss +32 -0
  35. data/app/assets/stylesheets/admin/hacks/_opera.scss +17 -0
  36. data/app/assets/stylesheets/admin/plugins/_jstree.scss +132 -0
  37. data/app/assets/stylesheets/admin/plugins/_powertip.scss +86 -0
  38. data/app/assets/stylesheets/admin/plugins/_select2.scss +176 -0
  39. data/app/assets/stylesheets/admin/{token-input.css → plugins/_token-input.scss} +9 -8
  40. data/app/assets/stylesheets/admin/plugins/font-awesome.scss +303 -0
  41. data/app/assets/stylesheets/admin/{edit_checkouts.css → sections/_edit_checkouts.scss} +1 -1
  42. data/app/assets/stylesheets/admin/sections/_image_settings.scss +3 -0
  43. data/app/assets/stylesheets/admin/sections/_orders.scss +38 -0
  44. data/app/assets/stylesheets/admin/sections/_overview.scss +86 -0
  45. data/app/assets/stylesheets/admin/sections/_products.scss +26 -0
  46. data/app/assets/stylesheets/admin/sections/_promotions.scss +100 -0
  47. data/app/assets/stylesheets/admin/shared/_forms.scss +250 -0
  48. data/app/assets/stylesheets/admin/shared/_icons.scss +21 -0
  49. data/app/assets/stylesheets/admin/shared/_layout.scss +84 -0
  50. data/app/assets/stylesheets/admin/shared/_tables.scss +180 -0
  51. data/app/assets/stylesheets/admin/shared/_typography.scss +132 -0
  52. data/app/assets/stylesheets/admin/spree_admin.scss +38 -0
  53. data/app/assets/stylesheets/admin/spree_core.css +7 -7
  54. data/app/assets/stylesheets/store/screen.css.scss +57 -49
  55. data/app/assets/stylesheets/store/spree_core.css +2 -3
  56. data/app/assets/stylesheets/store/variables.css.scss +2 -0
  57. data/app/controllers/spree/admin/adjustments_controller.rb +3 -7
  58. data/app/controllers/spree/admin/base_controller.rb +1 -1
  59. data/app/controllers/spree/admin/countries_controller.rb +11 -0
  60. data/app/controllers/spree/admin/general_settings_controller.rb +7 -8
  61. data/app/controllers/spree/admin/image_settings_controller.rb +2 -7
  62. data/app/controllers/spree/admin/inventory_settings_controller.rb +2 -6
  63. data/app/controllers/spree/admin/mail_methods_controller.rb +1 -1
  64. data/app/controllers/spree/admin/orders/customer_details_controller.rb +3 -4
  65. data/app/controllers/spree/admin/orders_controller.rb +3 -9
  66. data/app/controllers/spree/admin/payment_methods_controller.rb +5 -2
  67. data/app/controllers/spree/admin/payments_controller.rb +4 -4
  68. data/app/controllers/spree/admin/product_properties_controller.rb +0 -12
  69. data/app/controllers/spree/admin/products_controller.rb +19 -42
  70. data/app/controllers/spree/admin/properties_controller.rb +2 -2
  71. data/app/controllers/spree/admin/prototypes_controller.rb +0 -8
  72. data/app/controllers/spree/admin/reports_controller.rb +7 -4
  73. data/app/controllers/spree/admin/resource_controller.rb +3 -3
  74. data/app/controllers/spree/admin/return_authorizations_controller.rb +1 -1
  75. data/app/controllers/spree/admin/shipments_controller.rb +3 -3
  76. data/app/controllers/spree/admin/shipping_methods_controller.rb +1 -1
  77. data/app/controllers/spree/admin/tax_categories_controller.rb +1 -1
  78. data/app/controllers/spree/admin/taxons_controller.rb +4 -4
  79. data/app/controllers/spree/admin/variants_controller.rb +11 -15
  80. data/app/controllers/spree/base_controller.rb +4 -1
  81. data/app/controllers/spree/checkout_controller.rb +3 -3
  82. data/app/controllers/spree/content_controller.rb +1 -1
  83. data/app/controllers/spree/countries_controller.rb +12 -0
  84. data/app/controllers/spree/home_controller.rb +2 -1
  85. data/app/controllers/spree/locale_controller.rb +3 -3
  86. data/app/controllers/spree/orders_controller.rb +7 -9
  87. data/app/controllers/spree/products_controller.rb +5 -4
  88. data/app/controllers/spree/states_controller.rb +1 -1
  89. data/app/controllers/spree/store_controller.rb +11 -0
  90. data/app/controllers/spree/taxons_controller.rb +2 -1
  91. data/app/helpers/spree/admin/base_helper.rb +16 -15
  92. data/app/helpers/spree/admin/navigation_helper.rb +38 -28
  93. data/app/helpers/spree/admin/orders_helper.rb +1 -7
  94. data/app/helpers/spree/admin/tables_helper.rb +15 -0
  95. data/app/helpers/spree/admin/taxons_helper.rb +0 -13
  96. data/app/helpers/spree/base_helper.rb +14 -28
  97. data/app/helpers/spree/checkout_helper.rb +0 -15
  98. data/app/helpers/spree/products_helper.rb +23 -10
  99. data/app/mailers/spree/order_mailer.rb +6 -17
  100. data/app/mailers/spree/shipment_mailer.rb +3 -8
  101. data/app/mailers/spree/test_mailer.rb +0 -5
  102. data/app/models/spree/address.rb +2 -1
  103. data/app/models/spree/adjustment.rb +5 -1
  104. data/app/models/spree/app_configuration.rb +2 -7
  105. data/app/models/spree/calculator/default_tax.rb +2 -6
  106. data/app/models/spree/calculator/flat_rate.rb +3 -1
  107. data/app/models/spree/calculator/flexi_rate.rb +2 -1
  108. data/app/models/spree/calculator/per_item.rb +3 -4
  109. data/app/models/spree/calculator/price_sack.rb +3 -1
  110. data/app/models/spree/country.rb +11 -0
  111. data/app/models/spree/credit_card.rb +5 -1
  112. data/app/models/spree/gateway.rb +2 -8
  113. data/app/models/spree/image.rb +1 -1
  114. data/app/models/spree/inventory_unit.rb +7 -3
  115. data/app/models/spree/line_item.rb +16 -2
  116. data/app/models/spree/order.rb +64 -137
  117. data/app/models/spree/order/checkout.rb +1 -8
  118. data/app/models/spree/order_updater.rb +134 -0
  119. data/app/models/spree/payment.rb +8 -19
  120. data/app/models/spree/payment/processing.rb +3 -3
  121. data/app/models/spree/payment_method.rb +6 -4
  122. data/app/models/spree/preference.rb +1 -1
  123. data/app/models/spree/preferences/preferable_class_methods.rb +9 -6
  124. data/app/models/spree/preferences/store.rb +11 -26
  125. data/app/models/spree/price.rb +51 -0
  126. data/app/models/spree/product.rb +22 -14
  127. data/app/models/spree/product/scopes.rb +20 -28
  128. data/app/models/spree/prototype.rb +1 -1
  129. data/app/models/spree/return_authorization.rb +8 -0
  130. data/app/models/spree/shipment.rb +13 -5
  131. data/app/models/spree/shipping_method.rb +10 -1
  132. data/app/models/spree/shipping_rate.rb +2 -2
  133. data/app/models/spree/taxon.rb +0 -5
  134. data/app/models/spree/variant.rb +75 -25
  135. data/app/models/spree/zone.rb +1 -1
  136. data/app/views/spree/address/_form.html.erb +75 -0
  137. data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +23 -22
  138. data/app/views/spree/admin/adjustments/_form.html.erb +15 -12
  139. data/app/views/spree/admin/adjustments/edit.html.erb +15 -6
  140. data/app/views/spree/admin/adjustments/index.html.erb +12 -2
  141. data/app/views/spree/admin/adjustments/new.html.erb +15 -6
  142. data/app/views/spree/admin/banners/_gateway.html.erb +3 -1
  143. data/app/views/spree/admin/countries/_form.html.erb +22 -0
  144. data/app/views/spree/admin/countries/edit.html.erb +21 -0
  145. data/app/views/spree/admin/countries/index.html.erb +33 -0
  146. data/app/views/spree/admin/general_settings/edit.html.erb +75 -27
  147. data/app/views/spree/admin/image_settings/edit.html.erb +112 -99
  148. data/app/views/spree/admin/images/_form.html.erb +16 -12
  149. data/app/views/spree/admin/images/edit.html.erb +20 -11
  150. data/app/views/spree/admin/images/index.html.erb +70 -46
  151. data/app/views/spree/admin/images/new.html.erb +11 -8
  152. data/app/views/spree/admin/inventory_settings/edit.html.erb +16 -18
  153. data/app/views/spree/admin/inventory_settings/show.html.erb +14 -4
  154. data/app/views/spree/admin/line_items/create.js.erb +0 -3
  155. data/app/views/spree/admin/mail_methods/_form.html.erb +46 -47
  156. data/app/views/spree/admin/mail_methods/edit.html.erb +12 -3
  157. data/app/views/spree/admin/mail_methods/index.html.erb +37 -33
  158. data/app/views/spree/admin/mail_methods/new.html.erb +16 -4
  159. data/app/views/spree/admin/option_types/_form.html.erb +16 -12
  160. data/app/views/spree/admin/option_types/_option_value_fields.html.erb +7 -3
  161. data/app/views/spree/admin/option_types/edit.html.erb +45 -27
  162. data/app/views/spree/admin/option_types/index.html.erb +31 -26
  163. data/app/views/spree/admin/option_types/new.html.erb +1 -1
  164. data/app/views/spree/admin/orders/_add_product.html.erb +13 -10
  165. data/app/views/spree/admin/orders/_form.html.erb +53 -42
  166. data/app/views/spree/admin/orders/_line_item.html.erb +7 -9
  167. data/app/views/spree/admin/orders/customer_details/_form.html.erb +59 -41
  168. data/app/views/spree/admin/orders/customer_details/edit.html.erb +11 -2
  169. data/app/views/spree/admin/orders/edit.html.erb +5 -8
  170. data/app/views/spree/admin/orders/index.html.erb +105 -67
  171. data/app/views/spree/admin/orders/new.html.erb +16 -5
  172. data/app/views/spree/admin/orders/show.html.erb +23 -14
  173. data/app/views/spree/admin/payment_methods/_form.html.erb +46 -45
  174. data/app/views/spree/admin/payment_methods/edit.html.erb +19 -6
  175. data/app/views/spree/admin/payment_methods/index.html.erb +33 -27
  176. data/app/views/spree/admin/payment_methods/new.html.erb +16 -5
  177. data/app/views/spree/admin/payments/_form.html.erb +27 -16
  178. data/app/views/spree/admin/payments/_list.html.erb +23 -19
  179. data/app/views/spree/admin/payments/credit.html.erb +4 -0
  180. data/app/views/spree/admin/payments/index.html.erb +12 -11
  181. data/app/views/spree/admin/payments/new.html.erb +13 -7
  182. data/app/views/spree/admin/payments/show.html.erb +13 -5
  183. data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +36 -26
  184. data/app/views/spree/admin/payments/source_views/_gateway.html.erb +26 -31
  185. data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +3 -1
  186. data/app/views/spree/admin/product_properties/index.html.erb +37 -30
  187. data/app/views/spree/admin/products/_form.html.erb +115 -87
  188. data/app/views/spree/admin/products/_properties_form.erb +6 -3
  189. data/app/views/spree/admin/products/edit.html.erb +8 -2
  190. data/app/views/spree/admin/products/index.html.erb +88 -55
  191. data/app/views/spree/admin/products/new.html.erb +24 -20
  192. data/app/views/spree/admin/products/new.js.erb +4 -0
  193. data/app/views/spree/admin/properties/_form.html.erb +15 -12
  194. data/app/views/spree/admin/properties/edit.html.erb +11 -3
  195. data/app/views/spree/admin/properties/index.html.erb +18 -17
  196. data/app/views/spree/admin/properties/new.html.erb +4 -2
  197. data/app/views/spree/admin/prototypes/_form.html.erb +22 -43
  198. data/app/views/spree/admin/prototypes/_prototypes.html.erb +7 -3
  199. data/app/views/spree/admin/prototypes/edit.html.erb +14 -3
  200. data/app/views/spree/admin/prototypes/index.html.erb +19 -16
  201. data/app/views/spree/admin/prototypes/new.html.erb +1 -1
  202. data/app/views/spree/admin/prototypes/new.js.erb +3 -0
  203. data/app/views/spree/admin/reports/index.html.erb +3 -1
  204. data/app/views/spree/admin/reports/sales_total.html.erb +31 -17
  205. data/app/views/spree/admin/return_authorizations/_form.html.erb +36 -27
  206. data/app/views/spree/admin/return_authorizations/edit.html.erb +16 -17
  207. data/app/views/spree/admin/return_authorizations/index.html.erb +47 -40
  208. data/app/views/spree/admin/return_authorizations/new.html.erb +5 -3
  209. data/app/views/spree/admin/shared/_address.html.erb +2 -2
  210. data/app/views/spree/admin/shared/_address_form.html.erb +58 -78
  211. data/app/views/spree/admin/shared/_calculator_fields.html.erb +16 -13
  212. data/app/views/spree/admin/shared/_configuration_menu.html.erb +23 -19
  213. data/app/views/spree/admin/shared/_edit_resource_links.html.erb +5 -4
  214. data/app/views/spree/admin/shared/_head.html.erb +10 -2
  215. data/app/views/spree/admin/shared/_new_resource_links.html.erb +5 -4
  216. data/app/views/spree/admin/shared/_order_details.html.erb +16 -15
  217. data/app/views/spree/admin/shared/_order_tabs.html.erb +65 -51
  218. data/app/views/spree/admin/shared/_product_sub_menu.html.erb +2 -2
  219. data/app/views/spree/admin/shared/_product_tabs.html.erb +23 -20
  220. data/app/views/spree/admin/shared/_report_criteria.html.erb +13 -11
  221. data/app/views/spree/admin/shared/_routes.html.erb +1 -2
  222. data/app/views/spree/admin/shared/_tabs.html.erb +5 -4
  223. data/app/views/spree/admin/shared/_translations.html.erb +22 -18
  224. data/app/views/spree/admin/shipments/_form.html.erb +54 -58
  225. data/app/views/spree/admin/shipments/edit.html.erb +20 -15
  226. data/app/views/spree/admin/shipments/index.html.erb +40 -33
  227. data/app/views/spree/admin/shipments/new.html.erb +4 -0
  228. data/app/views/spree/admin/shipping_categories/_form.html.erb +4 -6
  229. data/app/views/spree/admin/shipping_categories/edit.html.erb +17 -3
  230. data/app/views/spree/admin/shipping_categories/index.html.erb +18 -14
  231. data/app/views/spree/admin/shipping_categories/new.html.erb +15 -3
  232. data/app/views/spree/admin/shipping_methods/_form.html.erb +36 -24
  233. data/app/views/spree/admin/shipping_methods/edit.html.erb +18 -5
  234. data/app/views/spree/admin/shipping_methods/index.html.erb +21 -15
  235. data/app/views/spree/admin/shipping_methods/new.html.erb +18 -6
  236. data/app/views/spree/admin/states/_form.html.erb +13 -10
  237. data/app/views/spree/admin/states/_state_list.html.erb +10 -14
  238. data/app/views/spree/admin/states/edit.html.erb +13 -3
  239. data/app/views/spree/admin/states/index.html.erb +12 -4
  240. data/app/views/spree/admin/states/new.html.erb +9 -3
  241. data/app/views/spree/admin/tax_categories/_form.html.erb +23 -15
  242. data/app/views/spree/admin/tax_categories/edit.html.erb +11 -3
  243. data/app/views/spree/admin/tax_categories/index.html.erb +20 -15
  244. data/app/views/spree/admin/tax_categories/new.html.erb +12 -3
  245. data/app/views/spree/admin/tax_rates/_form.html.erb +38 -27
  246. data/app/views/spree/admin/tax_rates/edit.html.erb +18 -3
  247. data/app/views/spree/admin/tax_rates/index.html.erb +59 -40
  248. data/app/views/spree/admin/tax_rates/new.html.erb +20 -3
  249. data/app/views/spree/admin/tax_settings/edit.html.erb +10 -9
  250. data/app/views/spree/admin/taxonomies/_form.html.erb +1 -1
  251. data/app/views/spree/admin/taxonomies/_list.html.erb +24 -18
  252. data/app/views/spree/admin/taxonomies/edit.erb +24 -10
  253. data/app/views/spree/admin/taxonomies/get_children.json.erb +1 -1
  254. data/app/views/spree/admin/taxonomies/index.html.erb +8 -9
  255. data/app/views/spree/admin/taxonomies/new.html.erb +15 -5
  256. data/app/views/spree/admin/taxons/_form.html.erb +23 -18
  257. data/app/views/spree/admin/taxons/_taxon_table.html.erb +1 -1
  258. data/app/views/spree/admin/taxons/edit.html.erb +13 -5
  259. data/app/views/spree/admin/trackers/_form.html.erb +29 -24
  260. data/app/views/spree/admin/trackers/edit.html.erb +15 -3
  261. data/app/views/spree/admin/trackers/index.html.erb +43 -31
  262. data/app/views/spree/admin/trackers/new.html.erb +14 -3
  263. data/app/views/spree/admin/variants/_autocomplete.js.erb +30 -0
  264. data/app/views/spree/admin/variants/_form.html.erb +50 -31
  265. data/app/views/spree/admin/variants/index.html.erb +64 -46
  266. data/app/views/spree/admin/variants/new.html.erb +1 -0
  267. data/app/views/spree/admin/variants/new.js.erb +1 -0
  268. data/app/views/spree/admin/variants/search.rabl +15 -0
  269. data/app/views/spree/admin/zones/_country_member.html.erb +1 -1
  270. data/app/views/spree/admin/zones/_form.html.erb +30 -27
  271. data/app/views/spree/admin/zones/_member_type.html.erb +12 -9
  272. data/app/views/spree/admin/zones/_state_member.html.erb +2 -2
  273. data/app/views/spree/admin/zones/edit.html.erb +16 -3
  274. data/app/views/spree/admin/zones/index.html.erb +45 -36
  275. data/app/views/spree/admin/zones/new.html.erb +12 -1
  276. data/app/views/spree/checkout/_address.html.erb +17 -165
  277. data/app/views/spree/checkout/_confirm.html.erb +1 -1
  278. data/app/views/spree/checkout/_delivery.html.erb +1 -1
  279. data/app/views/spree/checkout/_payment.html.erb +1 -1
  280. data/app/views/spree/checkout/_summary.html.erb +4 -4
  281. data/app/views/spree/checkout/edit.html.erb +2 -0
  282. data/app/views/spree/checkout/payment/_gateway.html.erb +2 -2
  283. data/app/views/spree/checkout/registration.html.erb +1 -1
  284. data/app/views/spree/countries/index.js.erb +1 -0
  285. data/app/views/spree/layouts/admin.html.erb +125 -61
  286. data/app/views/spree/layouts/spree_application.html.erb +17 -6
  287. data/app/views/spree/order_mailer/cancel_email.text.erb +4 -4
  288. data/app/views/spree/order_mailer/confirm_email.text.erb +3 -3
  289. data/app/views/spree/orders/_adjustments.html.erb +1 -1
  290. data/app/views/spree/orders/_line_item.html.erb +3 -3
  291. data/app/views/spree/orders/show.html.erb +15 -15
  292. data/app/views/spree/products/_cart_form.html.erb +5 -5
  293. data/app/views/spree/products/_properties.html.erb +4 -3
  294. data/app/views/spree/products/_thumbnails.html.erb +15 -17
  295. data/app/views/spree/products/index.html.erb +1 -1
  296. data/app/views/spree/products/show.html.erb +1 -1
  297. data/app/views/spree/shared/_google_analytics.html.erb +9 -9
  298. data/app/views/spree/shared/_order_details.html.erb +14 -14
  299. data/app/views/spree/shared/_products.html.erb +1 -2
  300. data/app/views/spree/taxons/show.html.erb +1 -1
  301. data/config/locales/en.yml +43 -4
  302. data/config/routes.rb +4 -5
  303. data/db/migrate/20120831092320_spree_one_two.rb +481 -0
  304. data/db/migrate/20120929093553_remove_unused_preference_columns.rb +8 -0
  305. data/db/migrate/20121010142909_add_states_required_to_countries.rb +5 -0
  306. data/db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb +6 -0
  307. data/db/migrate/20121031162139_split_prices_from_variants.rb +30 -0
  308. data/db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb +9 -0
  309. data/db/migrate/20121107184631_add_currency_to_line_items.rb +5 -0
  310. data/db/migrate/20121107194006_add_currency_to_orders.rb +5 -0
  311. data/db/migrate/20121109173623_add_cost_currency_to_variants.rb +5 -0
  312. data/db/migrate/20121111231553_remove_display_on_from_payment_methods.rb +5 -0
  313. data/lib/generators/spree/custom_user/custom_user_generator.rb +1 -1
  314. data/lib/generators/spree/dummy/templates/rails/database.yml +6 -9
  315. data/lib/generators/spree/install/templates/config/initializers/spree.rb +2 -2
  316. data/lib/spree/core.rb +0 -7
  317. data/lib/spree/core/action_callbacks.rb +4 -4
  318. data/lib/spree/core/calculated_adjustments.rb +2 -2
  319. data/lib/spree/core/controller_helpers/auth.rb +65 -0
  320. data/lib/spree/core/controller_helpers/common.rb +90 -0
  321. data/lib/spree/core/controller_helpers/order.rb +71 -0
  322. data/lib/spree/core/{respond_with.rb → controller_helpers/respond_with.rb} +27 -25
  323. data/lib/spree/core/engine.rb +6 -5
  324. data/lib/spree/core/search/base.rb +3 -1
  325. data/lib/spree/core/testing_support/factories/payment_factory.rb +24 -0
  326. data/lib/spree/core/testing_support/factories/payment_method_factory.rb +0 -3
  327. data/lib/spree/core/testing_support/factories/price_factory.rb +8 -0
  328. data/lib/spree/core/testing_support/factories/zone_factory.rb +1 -1
  329. data/lib/spree/core/testing_support/flash.rb +17 -5
  330. data/lib/spree/core/testing_support/preferences.rb +6 -12
  331. data/lib/spree/core/validators/email.rb +1 -1
  332. data/lib/spree/core/version.rb +1 -1
  333. data/lib/spree/money.rb +3 -12
  334. data/lib/spree/product_filters.rb +8 -8
  335. data/lib/tasks/core.rake +3 -3
  336. data/lib/tasks/taxon.rake +1 -1
  337. data/vendor/assets/fonts/fontawesome-webfont.eot +0 -0
  338. data/vendor/assets/fonts/fontawesome-webfont.svg +255 -0
  339. data/vendor/assets/fonts/fontawesome-webfont.ttf +0 -0
  340. data/vendor/assets/fonts/fontawesome-webfont.woff +0 -0
  341. data/vendor/assets/images/flags/ad.png +0 -0
  342. data/vendor/assets/images/flags/ae.png +0 -0
  343. data/vendor/assets/images/flags/af.png +0 -0
  344. data/vendor/assets/images/flags/ag.png +0 -0
  345. data/vendor/assets/images/flags/ai.png +0 -0
  346. data/vendor/assets/images/flags/al.png +0 -0
  347. data/vendor/assets/images/flags/am.png +0 -0
  348. data/vendor/assets/images/flags/an.png +0 -0
  349. data/vendor/assets/images/flags/ao.png +0 -0
  350. data/vendor/assets/images/flags/ar.png +0 -0
  351. data/vendor/assets/images/flags/as.png +0 -0
  352. data/vendor/assets/images/flags/at.png +0 -0
  353. data/vendor/assets/images/flags/au.png +0 -0
  354. data/vendor/assets/images/flags/aw.png +0 -0
  355. data/vendor/assets/images/flags/ax.png +0 -0
  356. data/vendor/assets/images/flags/az.png +0 -0
  357. data/vendor/assets/images/flags/ba.png +0 -0
  358. data/vendor/assets/images/flags/bb.png +0 -0
  359. data/vendor/assets/images/flags/bd.png +0 -0
  360. data/vendor/assets/images/flags/be.png +0 -0
  361. data/vendor/assets/images/flags/bf.png +0 -0
  362. data/vendor/assets/images/flags/bg.png +0 -0
  363. data/vendor/assets/images/flags/bh.png +0 -0
  364. data/vendor/assets/images/flags/bi.png +0 -0
  365. data/vendor/assets/images/flags/bj.png +0 -0
  366. data/vendor/assets/images/flags/bm.png +0 -0
  367. data/vendor/assets/images/flags/bn.png +0 -0
  368. data/vendor/assets/images/flags/bo.png +0 -0
  369. data/vendor/assets/images/flags/br.png +0 -0
  370. data/vendor/assets/images/flags/bs.png +0 -0
  371. data/vendor/assets/images/flags/bt.png +0 -0
  372. data/vendor/assets/images/flags/bv.png +0 -0
  373. data/vendor/assets/images/flags/bw.png +0 -0
  374. data/vendor/assets/images/flags/by.png +0 -0
  375. data/vendor/assets/images/flags/bz.png +0 -0
  376. data/vendor/assets/images/flags/ca.png +0 -0
  377. data/vendor/assets/images/flags/catalonia.png +0 -0
  378. data/vendor/assets/images/flags/cc.png +0 -0
  379. data/vendor/assets/images/flags/cd.png +0 -0
  380. data/vendor/assets/images/flags/cf.png +0 -0
  381. data/vendor/assets/images/flags/cg.png +0 -0
  382. data/vendor/assets/images/flags/ch.png +0 -0
  383. data/vendor/assets/images/flags/ci.png +0 -0
  384. data/vendor/assets/images/flags/ck.png +0 -0
  385. data/vendor/assets/images/flags/cl.png +0 -0
  386. data/vendor/assets/images/flags/cm.png +0 -0
  387. data/vendor/assets/images/flags/cn.png +0 -0
  388. data/vendor/assets/images/flags/co.png +0 -0
  389. data/vendor/assets/images/flags/cr.png +0 -0
  390. data/vendor/assets/images/flags/cs.png +0 -0
  391. data/vendor/assets/images/flags/cu.png +0 -0
  392. data/vendor/assets/images/flags/cv.png +0 -0
  393. data/vendor/assets/images/flags/cx.png +0 -0
  394. data/vendor/assets/images/flags/cy.png +0 -0
  395. data/vendor/assets/images/flags/cz.png +0 -0
  396. data/vendor/assets/images/flags/de.png +0 -0
  397. data/vendor/assets/images/flags/dj.png +0 -0
  398. data/vendor/assets/images/flags/dk.png +0 -0
  399. data/vendor/assets/images/flags/dm.png +0 -0
  400. data/vendor/assets/images/flags/do.png +0 -0
  401. data/vendor/assets/images/flags/dz.png +0 -0
  402. data/vendor/assets/images/flags/ec.png +0 -0
  403. data/vendor/assets/images/flags/ee.png +0 -0
  404. data/vendor/assets/images/flags/eg.png +0 -0
  405. data/vendor/assets/images/flags/eh.png +0 -0
  406. data/vendor/assets/images/flags/england.png +0 -0
  407. data/vendor/assets/images/flags/er.png +0 -0
  408. data/vendor/assets/images/flags/es.png +0 -0
  409. data/vendor/assets/images/flags/et.png +0 -0
  410. data/vendor/assets/images/flags/europeanunion.png +0 -0
  411. data/vendor/assets/images/flags/fam.png +0 -0
  412. data/vendor/assets/images/flags/fi.png +0 -0
  413. data/vendor/assets/images/flags/fj.png +0 -0
  414. data/vendor/assets/images/flags/fk.png +0 -0
  415. data/vendor/assets/images/flags/fm.png +0 -0
  416. data/vendor/assets/images/flags/fo.png +0 -0
  417. data/vendor/assets/images/flags/fr.png +0 -0
  418. data/vendor/assets/images/flags/ga.png +0 -0
  419. data/vendor/assets/images/flags/gb.png +0 -0
  420. data/vendor/assets/images/flags/gd.png +0 -0
  421. data/vendor/assets/images/flags/ge.png +0 -0
  422. data/vendor/assets/images/flags/gf.png +0 -0
  423. data/vendor/assets/images/flags/gh.png +0 -0
  424. data/vendor/assets/images/flags/gi.png +0 -0
  425. data/vendor/assets/images/flags/gl.png +0 -0
  426. data/vendor/assets/images/flags/gm.png +0 -0
  427. data/vendor/assets/images/flags/gn.png +0 -0
  428. data/vendor/assets/images/flags/gp.png +0 -0
  429. data/vendor/assets/images/flags/gq.png +0 -0
  430. data/vendor/assets/images/flags/gr.png +0 -0
  431. data/vendor/assets/images/flags/gs.png +0 -0
  432. data/vendor/assets/images/flags/gt.png +0 -0
  433. data/vendor/assets/images/flags/gu.png +0 -0
  434. data/vendor/assets/images/flags/gw.png +0 -0
  435. data/vendor/assets/images/flags/gy.png +0 -0
  436. data/vendor/assets/images/flags/hk.png +0 -0
  437. data/vendor/assets/images/flags/hm.png +0 -0
  438. data/vendor/assets/images/flags/hn.png +0 -0
  439. data/vendor/assets/images/flags/hr.png +0 -0
  440. data/vendor/assets/images/flags/ht.png +0 -0
  441. data/vendor/assets/images/flags/hu.png +0 -0
  442. data/vendor/assets/images/flags/id.png +0 -0
  443. data/vendor/assets/images/flags/ie.png +0 -0
  444. data/vendor/assets/images/flags/il.png +0 -0
  445. data/vendor/assets/images/flags/in.png +0 -0
  446. data/vendor/assets/images/flags/io.png +0 -0
  447. data/vendor/assets/images/flags/iq.png +0 -0
  448. data/vendor/assets/images/flags/ir.png +0 -0
  449. data/vendor/assets/images/flags/is.png +0 -0
  450. data/vendor/assets/images/flags/it.png +0 -0
  451. data/vendor/assets/images/flags/ja.png +0 -0
  452. data/vendor/assets/images/flags/jm.png +0 -0
  453. data/vendor/assets/images/flags/jo.png +0 -0
  454. data/vendor/assets/images/flags/ke.png +0 -0
  455. data/vendor/assets/images/flags/kg.png +0 -0
  456. data/vendor/assets/images/flags/kh.png +0 -0
  457. data/vendor/assets/images/flags/ki.png +0 -0
  458. data/vendor/assets/images/flags/km.png +0 -0
  459. data/vendor/assets/images/flags/kn.png +0 -0
  460. data/vendor/assets/images/flags/kp.png +0 -0
  461. data/vendor/assets/images/flags/kr.png +0 -0
  462. data/vendor/assets/images/flags/kw.png +0 -0
  463. data/vendor/assets/images/flags/ky.png +0 -0
  464. data/vendor/assets/images/flags/kz.png +0 -0
  465. data/vendor/assets/images/flags/la.png +0 -0
  466. data/vendor/assets/images/flags/lb.png +0 -0
  467. data/vendor/assets/images/flags/lc.png +0 -0
  468. data/vendor/assets/images/flags/li.png +0 -0
  469. data/vendor/assets/images/flags/lk.png +0 -0
  470. data/vendor/assets/images/flags/lr.png +0 -0
  471. data/vendor/assets/images/flags/ls.png +0 -0
  472. data/vendor/assets/images/flags/lt.png +0 -0
  473. data/vendor/assets/images/flags/lu.png +0 -0
  474. data/vendor/assets/images/flags/lv.png +0 -0
  475. data/vendor/assets/images/flags/ly.png +0 -0
  476. data/vendor/assets/images/flags/ma.png +0 -0
  477. data/vendor/assets/images/flags/mc.png +0 -0
  478. data/vendor/assets/images/flags/md.png +0 -0
  479. data/vendor/assets/images/flags/me.png +0 -0
  480. data/vendor/assets/images/flags/mg.png +0 -0
  481. data/vendor/assets/images/flags/mh.png +0 -0
  482. data/vendor/assets/images/flags/mk.png +0 -0
  483. data/vendor/assets/images/flags/ml.png +0 -0
  484. data/vendor/assets/images/flags/mm.png +0 -0
  485. data/vendor/assets/images/flags/mn.png +0 -0
  486. data/vendor/assets/images/flags/mo.png +0 -0
  487. data/vendor/assets/images/flags/mp.png +0 -0
  488. data/vendor/assets/images/flags/mq.png +0 -0
  489. data/vendor/assets/images/flags/mr.png +0 -0
  490. data/vendor/assets/images/flags/ms.png +0 -0
  491. data/vendor/assets/images/flags/mt.png +0 -0
  492. data/vendor/assets/images/flags/mu.png +0 -0
  493. data/vendor/assets/images/flags/mv.png +0 -0
  494. data/vendor/assets/images/flags/mw.png +0 -0
  495. data/vendor/assets/images/flags/mx.png +0 -0
  496. data/vendor/assets/images/flags/my.png +0 -0
  497. data/vendor/assets/images/flags/mz.png +0 -0
  498. data/vendor/assets/images/flags/na.png +0 -0
  499. data/vendor/assets/images/flags/nc.png +0 -0
  500. data/vendor/assets/images/flags/ne.png +0 -0
  501. data/vendor/assets/images/flags/nf.png +0 -0
  502. data/vendor/assets/images/flags/ng.png +0 -0
  503. data/vendor/assets/images/flags/ni.png +0 -0
  504. data/vendor/assets/images/flags/nl.png +0 -0
  505. data/vendor/assets/images/flags/no.png +0 -0
  506. data/vendor/assets/images/flags/np.png +0 -0
  507. data/vendor/assets/images/flags/nr.png +0 -0
  508. data/vendor/assets/images/flags/nu.png +0 -0
  509. data/vendor/assets/images/flags/nz.png +0 -0
  510. data/vendor/assets/images/flags/om.png +0 -0
  511. data/vendor/assets/images/flags/pa.png +0 -0
  512. data/vendor/assets/images/flags/pe.png +0 -0
  513. data/vendor/assets/images/flags/pf.png +0 -0
  514. data/vendor/assets/images/flags/pg.png +0 -0
  515. data/vendor/assets/images/flags/ph.png +0 -0
  516. data/vendor/assets/images/flags/pk.png +0 -0
  517. data/vendor/assets/images/flags/pl.png +0 -0
  518. data/vendor/assets/images/flags/pm.png +0 -0
  519. data/vendor/assets/images/flags/pn.png +0 -0
  520. data/vendor/assets/images/flags/pr.png +0 -0
  521. data/vendor/assets/images/flags/ps.png +0 -0
  522. data/vendor/assets/images/flags/pt.png +0 -0
  523. data/vendor/assets/images/flags/pw.png +0 -0
  524. data/vendor/assets/images/flags/py.png +0 -0
  525. data/vendor/assets/images/flags/qa.png +0 -0
  526. data/vendor/assets/images/flags/re.png +0 -0
  527. data/vendor/assets/images/flags/ro.png +0 -0
  528. data/vendor/assets/images/flags/rs.png +0 -0
  529. data/vendor/assets/images/flags/ru.png +0 -0
  530. data/vendor/assets/images/flags/rw.png +0 -0
  531. data/vendor/assets/images/flags/sa.png +0 -0
  532. data/vendor/assets/images/flags/sb.png +0 -0
  533. data/vendor/assets/images/flags/sc.png +0 -0
  534. data/vendor/assets/images/flags/scotland.png +0 -0
  535. data/vendor/assets/images/flags/sd.png +0 -0
  536. data/vendor/assets/images/flags/se.png +0 -0
  537. data/vendor/assets/images/flags/sg.png +0 -0
  538. data/vendor/assets/images/flags/sh.png +0 -0
  539. data/vendor/assets/images/flags/si.png +0 -0
  540. data/vendor/assets/images/flags/sj.png +0 -0
  541. data/vendor/assets/images/flags/sk.png +0 -0
  542. data/vendor/assets/images/flags/sl.png +0 -0
  543. data/vendor/assets/images/flags/sm.png +0 -0
  544. data/vendor/assets/images/flags/sn.png +0 -0
  545. data/vendor/assets/images/flags/so.png +0 -0
  546. data/vendor/assets/images/flags/sr.png +0 -0
  547. data/vendor/assets/images/flags/st.png +0 -0
  548. data/vendor/assets/images/flags/sv.png +0 -0
  549. data/vendor/assets/images/flags/sy.png +0 -0
  550. data/vendor/assets/images/flags/sz.png +0 -0
  551. data/vendor/assets/images/flags/tc.png +0 -0
  552. data/vendor/assets/images/flags/td.png +0 -0
  553. data/vendor/assets/images/flags/tf.png +0 -0
  554. data/vendor/assets/images/flags/tg.png +0 -0
  555. data/vendor/assets/images/flags/th.png +0 -0
  556. data/vendor/assets/images/flags/tj.png +0 -0
  557. data/vendor/assets/images/flags/tk.png +0 -0
  558. data/vendor/assets/images/flags/tl.png +0 -0
  559. data/vendor/assets/images/flags/tm.png +0 -0
  560. data/vendor/assets/images/flags/tn.png +0 -0
  561. data/vendor/assets/images/flags/to.png +0 -0
  562. data/vendor/assets/images/flags/tr.png +0 -0
  563. data/vendor/assets/images/flags/tt.png +0 -0
  564. data/vendor/assets/images/flags/tv.png +0 -0
  565. data/vendor/assets/images/flags/tw.png +0 -0
  566. data/vendor/assets/images/flags/tz.png +0 -0
  567. data/vendor/assets/images/flags/ua.png +0 -0
  568. data/vendor/assets/images/flags/ug.png +0 -0
  569. data/vendor/assets/images/flags/um.png +0 -0
  570. data/vendor/assets/images/flags/us.png +0 -0
  571. data/vendor/assets/images/flags/uy.png +0 -0
  572. data/vendor/assets/images/flags/uz.png +0 -0
  573. data/vendor/assets/images/flags/va.png +0 -0
  574. data/vendor/assets/images/flags/vc.png +0 -0
  575. data/vendor/assets/images/flags/ve.png +0 -0
  576. data/vendor/assets/images/flags/vg.png +0 -0
  577. data/vendor/assets/images/flags/vi.png +0 -0
  578. data/vendor/assets/images/flags/vn.png +0 -0
  579. data/vendor/assets/images/flags/vu.png +0 -0
  580. data/vendor/assets/images/flags/wales.png +0 -0
  581. data/vendor/assets/images/flags/wf.png +0 -0
  582. data/vendor/assets/images/flags/ws.png +0 -0
  583. data/vendor/assets/images/flags/ye.png +0 -0
  584. data/vendor/assets/images/flags/yt.png +0 -0
  585. data/vendor/assets/images/flags/za.png +0 -0
  586. data/vendor/assets/images/flags/zm.png +0 -0
  587. data/vendor/assets/images/flags/zw.png +0 -0
  588. data/vendor/assets/javascripts/css_browser_selector_dev.js +156 -0
  589. data/vendor/assets/javascripts/equalize.js +41 -0
  590. data/vendor/assets/javascripts/handlebars.js +1920 -0
  591. data/vendor/assets/javascripts/jquery.adaptivemenu.js +60 -0
  592. data/vendor/assets/javascripts/jquery.horizontalNav.js +141 -0
  593. data/vendor/assets/javascripts/jquery.jstree/themes/apple/style.css +3 -3
  594. data/vendor/assets/javascripts/jquery.powertip.js +796 -0
  595. data/vendor/assets/javascripts/jquery.vAlign.js +11 -0
  596. data/vendor/assets/javascripts/modernizr.js +4 -0
  597. data/vendor/assets/javascripts/responsive-tables.js +42 -0
  598. data/vendor/assets/javascripts/spin.js +319 -0
  599. data/vendor/assets/javascripts/trunk8.js +233 -0
  600. data/vendor/assets/stylesheets/font-awesome-ie7.css +645 -0
  601. data/vendor/assets/stylesheets/jquery.powertip.css +85 -0
  602. data/vendor/assets/stylesheets/normalize.css +375 -0
  603. data/vendor/assets/stylesheets/responsive-tables.css +21 -0
  604. data/vendor/assets/stylesheets/skeleton.css +4 -4
  605. metadata +394 -281
  606. checksums.yaml +0 -7
  607. data/app/assets/images/admin/bg/active-tab.png +0 -0
  608. data/app/assets/images/admin/bg/admin_tab_back.png +0 -0
  609. data/app/assets/images/admin/bg/admin_tab_selected_back.png +0 -0
  610. data/app/assets/images/admin/bg/content-back-blue.png +0 -0
  611. data/app/assets/images/admin/bg/content-back-green.png +0 -0
  612. data/app/assets/images/admin/bg/content-back.png +0 -0
  613. data/app/assets/images/admin/bg/flash-error.png +0 -0
  614. data/app/assets/images/admin/bg/flash-notice.png +0 -0
  615. data/app/assets/images/admin/bg/green-stripes.gif +0 -0
  616. data/app/assets/images/admin/bg/green-stripes.png +0 -0
  617. data/app/assets/images/admin/bg/grid_header_back.png +0 -0
  618. data/app/assets/images/admin/bg/grid_header_back_green.png +0 -0
  619. data/app/assets/images/admin/bg/header-bg.png +0 -0
  620. data/app/assets/images/admin/bg/header.png +0 -0
  621. data/app/assets/images/admin/bg/header_bg.jpg +0 -0
  622. data/app/assets/images/admin/bg/menu-current.png +0 -0
  623. data/app/assets/images/admin/bg/red-stripes.gif +0 -0
  624. data/app/assets/images/admin/bg/red-stripes.png +0 -0
  625. data/app/assets/images/admin/bg/subnav-divider.png +0 -0
  626. data/app/assets/images/admin/bg/subnav.png +0 -0
  627. data/app/assets/images/admin/bg/tab-back.png +0 -0
  628. data/app/assets/images/admin/buttons/blue/left_01.png +0 -0
  629. data/app/assets/images/admin/buttons/blue/right_01.png +0 -0
  630. data/app/assets/images/admin/buttons/drag-handle-green.png +0 -0
  631. data/app/assets/images/admin/buttons/green/left_01.png +0 -0
  632. data/app/assets/images/admin/buttons/green/right_01.png +0 -0
  633. data/app/assets/images/admin/buttons/left_01.png +0 -0
  634. data/app/assets/images/admin/buttons/left_01_small.png +0 -0
  635. data/app/assets/images/admin/buttons/orange/left_03.png +0 -0
  636. data/app/assets/images/admin/buttons/orange/right_03.png +0 -0
  637. data/app/assets/images/admin/buttons/right_01.png +0 -0
  638. data/app/assets/images/admin/buttons/right_01_small.png +0 -0
  639. data/app/assets/images/admin/icons/16x16/1.png +0 -0
  640. data/app/assets/images/admin/icons/16x16/10.png +0 -0
  641. data/app/assets/images/admin/icons/16x16/2.png +0 -0
  642. data/app/assets/images/admin/icons/16x16/3.png +0 -0
  643. data/app/assets/images/admin/icons/16x16/4.png +0 -0
  644. data/app/assets/images/admin/icons/16x16/5.png +0 -0
  645. data/app/assets/images/admin/icons/16x16/6.png +0 -0
  646. data/app/assets/images/admin/icons/16x16/7.png +0 -0
  647. data/app/assets/images/admin/icons/16x16/8.png +0 -0
  648. data/app/assets/images/admin/icons/16x16/9.png +0 -0
  649. data/app/assets/images/admin/icons/32x32/1.png +0 -0
  650. data/app/assets/images/admin/icons/32x32/10.png +0 -0
  651. data/app/assets/images/admin/icons/32x32/11.png +0 -0
  652. data/app/assets/images/admin/icons/32x32/2.png +0 -0
  653. data/app/assets/images/admin/icons/32x32/3.png +0 -0
  654. data/app/assets/images/admin/icons/32x32/4.png +0 -0
  655. data/app/assets/images/admin/icons/32x32/5.png +0 -0
  656. data/app/assets/images/admin/icons/32x32/6.png +0 -0
  657. data/app/assets/images/admin/icons/32x32/7.png +0 -0
  658. data/app/assets/images/admin/icons/32x32/8.png +0 -0
  659. data/app/assets/images/admin/icons/32x32/9.png +0 -0
  660. data/app/assets/images/admin/icons/accept.png +0 -0
  661. data/app/assets/images/admin/icons/add.gif +0 -0
  662. data/app/assets/images/admin/icons/add.png +0 -0
  663. data/app/assets/images/admin/icons/arrow-down.gif +0 -0
  664. data/app/assets/images/admin/icons/cross.png +0 -0
  665. data/app/assets/images/admin/icons/delete.gif +0 -0
  666. data/app/assets/images/admin/icons/delete.png +0 -0
  667. data/app/assets/images/admin/icons/drag.gif +0 -0
  668. data/app/assets/images/admin/icons/edit.gif +0 -0
  669. data/app/assets/images/admin/icons/edit.png +0 -0
  670. data/app/assets/images/admin/icons/email.png +0 -0
  671. data/app/assets/images/admin/icons/error.png +0 -0
  672. data/app/assets/images/admin/icons/exclamation.png +0 -0
  673. data/app/assets/images/admin/icons/feed.png +0 -0
  674. data/app/assets/images/admin/icons/pdf.png +0 -0
  675. data/app/assets/images/admin/icons/reorder.gif +0 -0
  676. data/app/assets/images/admin/icons/search.gif +0 -0
  677. data/app/assets/images/admin/icons/send-email.png +0 -0
  678. data/app/assets/images/admin/icons/stop.png +0 -0
  679. data/app/assets/images/admin/icons/switch.png +0 -0
  680. data/app/assets/images/admin/icons/tick.png +0 -0
  681. data/app/assets/images/admin/icons/up.gif +0 -0
  682. data/app/assets/images/admin/icons/xls.png +0 -0
  683. data/app/assets/images/credit_cards/icons/diners_club.png +0 -0
  684. data/app/assets/javascripts/admin/image_settings.js +0 -49
  685. data/app/assets/javascripts/admin/product_autocomplete.js.erb +0 -117
  686. data/app/assets/stylesheets/admin/admin-form.css.erb +0 -167
  687. data/app/assets/stylesheets/admin/admin-reset.css +0 -69
  688. data/app/assets/stylesheets/admin/admin-tables.css.erb +0 -40
  689. data/app/assets/stylesheets/admin/admin-typography.css +0 -117
  690. data/app/assets/stylesheets/admin/admin.css.erb +0 -682
  691. data/app/controllers/spree/admin/configurations_controller.rb +0 -7
  692. data/app/controllers/spree/admin/mail_settings_controller.rb +0 -17
  693. data/app/controllers/spree/admin/option_values_controller.rb +0 -11
  694. data/app/helpers/spree/account_helper.rb +0 -4
  695. data/app/helpers/spree/admin/overview_helper.rb +0 -16
  696. data/app/helpers/spree/admin/users_helper.rb +0 -10
  697. data/app/helpers/spree/admin/zones_helper.rb +0 -15
  698. data/app/helpers/spree/orders_helper.rb +0 -5
  699. data/app/helpers/spree/search_helper.rb +0 -12
  700. data/app/helpers/spree/trackers_helper.rb +0 -4
  701. data/app/views/spree/admin/configurations/index.html.erb +0 -68
  702. data/app/views/spree/admin/general_settings/show.html.erb +0 -40
  703. data/app/views/spree/admin/image_settings/show.html.erb +0 -11
  704. data/app/views/spree/admin/shared/_new_adjustment_button.html.erb +0 -8
  705. data/app/views/spree/admin/shared/_order_sub_menu.html.erb +0 -0
  706. data/app/views/spree/admin/tax_settings/show.html.erb +0 -14
  707. data/config/initializers/rails_3_1.rb +0 -12
  708. data/db/migrate/20090823005402_spree_zero_nine_zero.rb +0 -391
  709. data/db/migrate/20090904192342_create_indexes_for_inventory_units.rb +0 -6
  710. data/db/migrate/20090923100315_add_count_on_hand_to_variants_and_products.rb +0 -49
  711. data/db/migrate/20091007134354_change_taxons_to_nested_set.rb +0 -46
  712. data/db/migrate/20091008091614_move_to_configurable_gateways.rb +0 -54
  713. data/db/migrate/20091015110842_add_open_id_authentication_tables.rb +0 -15
  714. data/db/migrate/20091015153048_add_openid_field_to_users.rb +0 -26
  715. data/db/migrate/20091016174634_change_preference_value_type.rb +0 -10
  716. data/db/migrate/20091017175558_create_billing_integrations.rb +0 -12
  717. data/db/migrate/20091021133257_charge_refactoring.rb +0 -39
  718. data/db/migrate/20091104151730_add_some_indexes.rb +0 -11
  719. data/db/migrate/20091126190904_checkout_state_machine.rb +0 -5
  720. data/db/migrate/20091209153045_state_for_shipments.rb +0 -5
  721. data/db/migrate/20091209202200_make_state_events_polymorphic.rb +0 -12
  722. data/db/migrate/20091211203813_ship_address_id_for_checkouts.rb +0 -5
  723. data/db/migrate/20091212161118_shipping_method_id_for_checkouts.rb +0 -5
  724. data/db/migrate/20091213222815_creditcard_last_four_digits.rb +0 -14
  725. data/db/migrate/20091214183826_populate_legacy_shipment_state.rb +0 -15
  726. data/db/migrate/20100105090147_add_cost_price.rb +0 -5
  727. data/db/migrate/20100105132138_shipment_id_for_inventory_units.rb +0 -25
  728. data/db/migrate/20100111205525_cim_fields_for_creditcards.rb +0 -6
  729. data/db/migrate/20100112151511_create_return_authorizations.rb +0 -12
  730. data/db/migrate/20100113090919_add_return_authorization_to_inventory_units.rb +0 -5
  731. data/db/migrate/20100113203104_create_trackers.rb +0 -10
  732. data/db/migrate/20100121160010_creditcard_id_for_creditcard_txns.rb +0 -5
  733. data/db/migrate/20100121183934_original_creditcard_txn_id_for_creditcard_txns.rb +0 -5
  734. data/db/migrate/20100125145351_add_test_mode_to_billing_integration.rb +0 -6
  735. data/db/migrate/20100209025806_create_payment_methods.rb +0 -16
  736. data/db/migrate/20100209144531_polymorphic_payments.rb +0 -42
  737. data/db/migrate/20100213103131_change_payments_payment_method_to_belongs_to.rb +0 -11
  738. data/db/migrate/20100214212536_assign_creditcard_txns_to_payment.rb +0 -23
  739. data/db/migrate/20100223170312_sti_for_transactions.rb +0 -15
  740. data/db/migrate/20100223183812_drop_billing_integrations.rb +0 -16
  741. data/db/migrate/20100224153127_deleted_at_for_payment_methods.rb +0 -14
  742. data/db/migrate/20100301163454_add_adjustments_index.rb +0 -6
  743. data/db/migrate/20100317120946_add_alt_text_to_images.rb +0 -5
  744. data/db/migrate/20100419194457_fix_existing_coupon_credits.rb +0 -13
  745. data/db/migrate/20100427121301_add_display_to_payment_methods.rb +0 -5
  746. data/db/migrate/20100504142133_add_addresses_checkouts_indexes.rb +0 -8
  747. data/db/migrate/20100506180619_add_icon_to_taxons.rb +0 -17
  748. data/db/migrate/20100506185838_add_description_to_taxons.rb +0 -11
  749. data/db/migrate/20100528155333_index_for_shipments_number.rb +0 -5
  750. data/db/migrate/20100528185820_add_index_on_users_persistence_token.rb +0 -7
  751. data/db/migrate/20100605152042_add_default_to_tax_categories.rb +0 -5
  752. data/db/migrate/20100624110730_add_display_to_shipping_methods.rb +0 -5
  753. data/db/migrate/20100624123336_rename_payment_method_display.rb +0 -5
  754. data/db/migrate/20100624175547_rename_preferences_field.rb +0 -5
  755. data/db/migrate/20100811163637_add_guest_flag.rb +0 -7
  756. data/db/migrate/20100811205836_drop_order_token.rb +0 -9
  757. data/db/migrate/20100812162326_payments_state_and_assigned_to_order_only.rb +0 -14
  758. data/db/migrate/20100813023502_create_address_keys_for_order.rb +0 -6
  759. data/db/migrate/20100813185745_payment_total_for_orders.rb +0 -5
  760. data/db/migrate/20100816212146_shipping_method_id_for_orders.rb +0 -5
  761. data/db/migrate/20100817152723_add_shipment_and_payment_state.rb +0 -6
  762. data/db/migrate/20100819170125_refactor_adjustments.rb +0 -29
  763. data/db/migrate/20100820135707_response_code_and_avs_response_for_payments.rb +0 -6
  764. data/db/migrate/20100901171814_change_guest_flag_to_anonymous.rb +0 -7
  765. data/db/migrate/20100903203949_email_for_orders.rb +0 -5
  766. data/db/migrate/20100923162011_create_mail_methods.rb +0 -10
  767. data/db/migrate/20100929151905_rename_frozen_to_locked.rb +0 -5
  768. data/db/migrate/20101008190536_move_special_instructions_to_orders.rb +0 -10
  769. data/db/migrate/20101026184700_create_log_entries.rb +0 -11
  770. data/db/migrate/20101026184714_migrate_transactions_to_payment_state.rb +0 -98
  771. data/db/migrate/20101026184746_delete_in_progress_orders.rb +0 -19
  772. data/db/migrate/20101026184808_migrate_checkout_to_orders.rb +0 -23
  773. data/db/migrate/20101026184855_remove_shipped_state.rb +0 -12
  774. data/db/migrate/20101026184916_prevent_nil_payment_total.rb +0 -8
  775. data/db/migrate/20101026184932_prevent_nil_email.rb +0 -9
  776. data/db/migrate/20101026184959_generate_anonymous_users.rb +0 -20
  777. data/db/migrate/20101026185022_update_order_state.rb +0 -12
  778. data/db/migrate/20101026192225_cleanup_legacy_tables.rb +0 -11
  779. data/db/migrate/20101028151745_remove_number_and_cvv_from_credicard.rb +0 -11
  780. data/db/migrate/20101103212716_drop_anonymous_field_for_user.rb +0 -11
  781. data/db/migrate/20101111133551_renamed_rma_cancelled_state.rb +0 -9
  782. data/db/migrate/20101117031806_fix_problematic_index_names.rb +0 -13
  783. data/db/migrate/20101223215658_add_position_to_variants.rb +0 -5
  784. data/db/migrate/20110110130847_add_next_state_to_state_events.rb +0 -5
  785. data/db/migrate/20110111122537_add_position_to_option_types.rb +0 -5
  786. data/db/migrate/20110314192118_remove_trailing_slashes_in_taxon_permalinks.rb +0 -19
  787. data/db/migrate/20110329141434_create_activators.rb +0 -14
  788. data/db/migrate/20110418151136_eligible_for_adjustments.rb +0 -5
  789. data/db/migrate/20111007143030_namespace_top_level_models.rb +0 -66
  790. data/db/migrate/20111107143030_migrate_namespaced_polymorphic_models.rb +0 -52
  791. data/db/migrate/20111201024007_make_adjustments_polymorphic.rb +0 -9
  792. data/db/migrate/20111215032408_add_company_to_addresses.rb +0 -5
  793. data/db/migrate/20111216154844_add_inc_tax_to_tax_rates.rb +0 -5
  794. data/db/migrate/20111219203242_rename_inc_price_attribute.rb +0 -5
  795. data/db/migrate/20111219205902_add_default_tax_zone.rb +0 -5
  796. data/db/migrate/20120105193911_associate_shipping_methods_and_shipping_categories.rb +0 -7
  797. data/db/migrate/20120105195817_add_match_rules_to_shipping_methods.rb +0 -7
  798. data/db/migrate/20120119024710_new_preferences.rb +0 -48
  799. data/db/migrate/20120203001428_rename_state_events_to_state_changes.rb +0 -9
  800. data/db/migrate/20120203153759_add_deleted_at_to_tax_category.rb +0 -5
  801. data/db/migrate/20120315064358_migrate_images_from_products_to_variants.rb +0 -37
  802. data/db/migrate/20120416233427_rename_attachment_size_to_attachment_file_size.rb +0 -5
  803. data/db/migrate/20120507232704_increase_scale_of_tax_rate_amount.rb +0 -9
  804. data/db/migrate/20120509055454_create_tokenized_permissions_table.rb +0 -16
  805. data/db/migrate/20120523061241_convert_sales_tax_to_default_tax.rb +0 -9
  806. data/db/migrate/20120530012000_rename_creditcards_to_credit_cards.rb +0 -11
  807. data/db/migrate/20120604030249_add_deleted_at_to_spree_shipping_methods.rb +0 -5
  808. data/db/migrate/20120604203654_remove_credit_total_from_orders.rb +0 -5
  809. data/db/migrate/20120712172620_add_counter_cache_to_zone_members.rb +0 -14
  810. data/db/migrate/20130203232234_add_identifier_to_spree_payments.rb +0 -5
  811. data/db/migrate/20130222032153_add_order_id_index_to_shipments.rb +0 -5
  812. data/lib/spree/core/authorize_net_cim_hack.rb +0 -871
  813. data/lib/spree/core/controller_helpers.rb +0 -185
  814. data/lib/spree/core/current_order.rb +0 -38
  815. data/lib/spree/core/file_utilz.rb +0 -74
  816. data/lib/tasks/assets.rake +0 -58
  817. data/vendor/assets/stylesheets/html5reset.css +0 -177
data/app/views/spree/layouts/spree_application.html.erb CHANGED
@@ -1,25 +1,36 @@
1
1
  <!doctype html>
2
- <!--[if lt IE 7 ]> <html class="ie ie6" lang="en"> <![endif]-->
3
- <!--[if IE 7 ]> <html class="ie ie7" lang="en"> <![endif]-->
4
- <!--[if IE 8 ]> <html class="ie ie8" lang="en"> <![endif]-->
5
- <!--[if IE 9 ]> <html class="ie ie9" lang="en"> <![endif]-->
6
- <!--[if gt IE 9]><!--><html lang="en"><!--<![endif]-->
2
+ <!--[if lt IE 7 ]> <html class="ie ie6" lang="<%= I18n.locale %>"> <![endif]-->
3
+ <!--[if IE 7 ]> <html class="ie ie7" lang="<%= I18n.locale %>"> <![endif]-->
4
+ <!--[if IE 8 ]> <html class="ie ie8" lang="<%= I18n.locale %>"> <![endif]-->
5
+ <!--[if IE 9 ]> <html class="ie ie9" lang="<%= I18n.locale %>"> <![endif]-->
6
+ <!--[if gt IE 9]><!--><html lang="<%= I18n.locale %>"><!--<![endif]-->
7
7
  <head data-hook="inside_head">
8
8
  <%= render :partial => 'spree/shared/head' %>
9
9
  </head>
10
10
  <body class="<%= body_class %>" id="<%= @body_id || 'default' %>" data-hook="body">
11
+
11
12
  <div class="container">
13
+
12
14
  <%= render :partial => 'spree/shared/header' %>
15
+
13
16
  <div id="wrapper" class="row" data-hook>
14
- <%= breadcrumbs(@taxon) %>
17
+
18
+ <%= breadcrumbs(@taxon) %>
19
+
15
20
  <%= render :partial => 'spree/shared/sidebar' if content_for? :sidebar %>
21
+
16
22
  <div id="content" class="columns <%= !content_for?(:sidebar) ? "sixteen" : "twelve" %>" data-hook>
17
23
  <%= flash_messages %>
18
24
  <%= yield %>
19
25
  </div>
26
+
20
27
  </div>
28
+
21
29
  <%= render :partial => 'spree/shared/footer' %>
30
+
22
31
  </div>
32
+
23
33
  <%= render :partial => 'spree/shared/google_analytics' %>
34
+
24
35
  </body>
25
36
  </html>
data/app/views/spree/order_mailer/cancel_email.text.erb CHANGED
@@ -6,11 +6,11 @@
6
6
  <%= t('order_mailer.cancel_email.order_summary_canceled') %>
7
7
  ============================================================
8
8
  <% @order.line_items.each do |item| %>
9
- <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= money item.price %> = <%= money(item.price * item.quantity) %>
9
+ <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.variant.display_amount %> = <%= item.display_amount %>
10
10
  <% end %>
11
11
  ============================================================
12
- <%= t('order_mailer.cancel_email.subtotal') %> <%= money @order.item_total %>
12
+ <%= t('order_mailer.cancel_email.subtotal') %> <%= @order.display_item_total %>
13
13
  <% @order.adjustments.eligible.each do |adjustment| %>
14
- <%= raw(adjustment.label) %> <%= money(adjustment.amount) %>
14
+ <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
15
15
  <% end %>
16
- <%= t('order_mailer.cancel_email.total') %> <%= money(@order.total) %>
16
+ <%= t('order_mailer.cancel_email.total') %> <%= @order.display_total %>
data/app/views/spree/order_mailer/confirm_email.text.erb CHANGED
@@ -6,15 +6,15 @@
6
6
  <%= t('order_mailer.confirm_email.order_summary') %>
7
7
  ============================================================
8
8
  <% @order.line_items.each do |item| %>
9
- <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= Spree::Money.new(item.price) %> = <%= Spree::Money.new(item.price * item.quantity) %>
9
+ <%= item.variant.sku %> <%= raw(item.variant.product.name) %> <%= raw(item.variant.options_text) -%> (<%=item.quantity%>) @ <%= item.variant.display_amount %> = <%= item.display_amount %>
10
10
  <% end %>
11
11
  ============================================================
12
- <%= t('order_mailer.confirm_email.subtotal') %> <%= Spree::Money.new @order.item_total %>
12
+ <%= t('order_mailer.confirm_email.subtotal') %>: <%= @order.display_item_total %>
13
13
 
14
14
  <% @order.adjustments.eligible.each do |adjustment| %>
15
15
  <%= raw(adjustment.label) %> <%= adjustment.display_amount %>
16
16
  <% end %>
17
17
 
18
- <%= t('order_mailer.confirm_email.total') %> <%= @order.display_total.to_s %>
18
+ <%= t('order_mailer.confirm_email.total') %>: <%= @order.display_total %>
19
19
 
20
20
  <%= t('order_mailer.confirm_email.thanks') %>
data/app/views/spree/orders/_adjustments.html.erb CHANGED
@@ -7,7 +7,7 @@
7
7
  <% @order.adjustments.eligible.each do |adjustment| %>
8
8
  <tr>
9
9
  <td colspan="4"><%= adjustment.label %></td>
10
- <td><%= money(adjustment.amount) %></td>
10
+ <td><%= adjustment.display_amount %></td>
11
11
  <td></td>
12
12
  </tr>
13
13
  <% end %>
data/app/views/spree/orders/_line_item.html.erb CHANGED
@@ -11,19 +11,19 @@
11
11
  <%= variant.options_text %>
12
12
  <% if @order.insufficient_stock_lines.include? line_item %>
13
13
  <span class="out-of-stock">
14
- <%= variant.in_stock? ? t(:insufficient_stock, :on_hand => variant.on_hand) : t(:out_of_stock) %>&nbsp;&nbsp;<br />
14
+ <%= variant.in_stock? ? t(:insufficient_stock, :on_hand => variant.on_hand) : t(:out_of_stock) %><br />
15
15
  </span>
16
16
  <% end %>
17
17
  <%= line_item_description(variant) %>
18
18
  </td>
19
19
  <td class="cart-item-price" data-hook="cart_item_price">
20
- <%= money line_item.price %>
20
+ <%= line_item.single_money %>
21
21
  </td>
22
22
  <td class="cart-item-quantity" data-hook="cart_item_quantity">
23
23
  <%= item_form.number_field :quantity, :min => 0, :class => "line_item_quantity", :size => 5 %>
24
24
  </td>
25
25
  <td class="cart-item-total" data-hook="cart_item_total">
26
- <%= money(line_item.price * line_item.quantity) unless line_item.quantity.nil? %>
26
+ <%= line_item.display_amount unless line_item.quantity.nil? %>
27
27
  </td>
28
28
  <td class="cart-item-delete" data-hook="cart_item_delete">
29
29
  <%= link_to image_tag('icons/delete.png'), '#', :class => 'delete', :id => "delete_#{dom_id(line_item)}" %>
data/app/views/spree/orders/show.html.erb CHANGED
@@ -1,22 +1,22 @@
1
1
  <fieldset id="order_summary" data-hook>
2
- <legend><%= t(:order) + " #" + @order.number %></legend>
2
+ <legend align="center"><%= t(:order) + " #" + @order.number %></legend>
3
3
  <h1><%= accurate_title %></h1>
4
4
 
5
- <div id="order" data-hook>
6
- <% if params.has_key? :checkout_complete %>
7
- <h1><%= t(:thank_you_for_your_order) %></h1>
8
- <% end %>
9
- <%= render :partial => 'spree/shared/order_details', :locals => { :order => @order } %>
5
+ <div id="order" data-hook>
6
+ <% if params.has_key? :checkout_complete %>
7
+ <h1><%= t(:thank_you_for_your_order) %></h1>
8
+ <% end %>
9
+ <%= render :partial => 'spree/shared/order_details', :locals => { :order => @order } %>
10
10
 
11
- <br class="clear" />
11
+ <br class="clear" />
12
12
 
13
- <p data-hook="links">
14
- <%= link_to t(:back_to_store), spree.root_path, :class => "button" %>
15
- <% unless params.has_key? :checkout_complete %>
16
- <% if try_spree_current_user && respond_to?(:spree_account_path) %>
17
- <%= link_to t(:my_account), spree_account_path, :class => "button" %>
13
+ <p data-hook="links">
14
+ <%= link_to t(:back_to_store), spree.root_path, :class => "button" %>
15
+ <% unless params.has_key? :checkout_complete %>
16
+ <% if try_spree_current_user && respond_to?(:spree_account_path) %>
17
+ <%= link_to t(:my_account), spree_account_path, :class => "button" %>
18
+ <% end %>
18
19
  <% end %>
19
- <% end %>
20
- </p>
21
- </div>
20
+ </p>
21
+ </div>
22
22
  </fieldset>
data/app/views/spree/products/_cart_form.html.erb CHANGED
@@ -6,18 +6,18 @@
6
6
  <h6 class="product-section-title"><%= t(:variants) %></h6>
7
7
  <ul>
8
8
  <% has_checked = false
9
- @product.variants.active.each_with_index do |v,index|
9
+ @product.variants.active(current_currency).each_with_index do |v,index|
10
10
  next if v.option_values.empty? || (!v.in_stock && !Spree::Config[:show_zero_stock_products])
11
11
  checked = !has_checked && (v.in_stock || Spree::Config[:allow_backorders])
12
12
  has_checked = true if checked %>
13
13
  <li>
14
- <%= radio_button_tag "products[#{@product.id}]", v.id, checked, :disabled => !v.in_stock && !Spree::Config[:allow_backorders] %>
14
+ <%= radio_button_tag "products[#{@product.id}]", v.id, checked, :disabled => !v.in_stock && !Spree::Config[:allow_backorders], 'data-price' => v.price_in(current_currency).display_price %>
15
15
  <label for="<%= ['products', @product.id, v.id].join('_') %>">
16
16
  <span class="variant-description">
17
17
  <%= variant_options v %>
18
18
  </span>
19
- <% if variant_price_diff v %>
20
- <span class="price diff"><%= variant_price_diff v %></span>
19
+ <% if variant_price v %>
20
+ <span class="price diff"><%= variant_price v %></span>
21
21
  <% end %>
22
22
  </label>
23
23
  </li>
@@ -31,7 +31,7 @@
31
31
 
32
32
  <div id="product-price">
33
33
  <h6 class="product-section-title"><%= t(:price) %></h6>
34
- <div><span class="price selling" itemprop="price"><%= money @product.price %></span></div>
34
+ <div><span class="price selling" itemprop="price"><%= @product.price_in(current_currency).display_price %></span></div>
35
35
  </div>
36
36
 
37
37
  <div class="add-to-cart">
data/app/views/spree/products/_properties.html.erb CHANGED
@@ -1,14 +1,15 @@
1
1
  <% unless @product_properties.empty? %>
2
2
  <h6 class="product-section-title"><%= t('properties')%></h6>
3
- <table id="product-properties" class="table-display" data-hook width="100%">
3
+ <table id="product-properties" class="table-display" data-hook>
4
4
  <tbody>
5
- <% for product_property in @product_properties
6
- css_class = cycle('even', 'odd') %>
5
+ <% @product_properties.each do |product_property| %>
6
+ <% css_class = cycle('even', 'odd', :name => "properties") %>
7
7
  <tr class="<%= css_class %>">
8
8
  <td><strong><%= product_property.property.presentation %></strong></td>
9
9
  <td><%= product_property.value %></td>
10
10
  </tr>
11
11
  <% end %>
12
+ <% reset_cycle('properties') %>
12
13
  </tbody>
13
14
  </table>
14
15
  <% end %>
data/app/views/spree/products/_thumbnails.html.erb CHANGED
@@ -1,21 +1,19 @@
1
- <%# no need for thumbnails unless there is more than one image %>
2
- <% if (@product.images + @product.variant_images).uniq.size > 1 %>
1
+ <!-- no need for thumnails unless there is more then one image -->
2
+ <% if product.images.size > 1 || product.variant_images.size > 0 %>
3
3
  <ul id="product-thumbnails" class="thumbnails inline" data-hook>
4
- <% @product.images.each do |i| %>
5
- <li class='tmb-all' id='tmb-<%= i.id %>'>
6
- <%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product), :class => 'tmb-all', :id => "tmb-#{i.id}") %>
7
- </li>
8
- <% end %>
9
-
10
- <% if @product.has_variants? %>
11
- <% @variants.select(&:available?).each do |v| %>
12
- <% v.images.each do |i| %>
13
- <% next if @product.images.include?(i) %>
14
- <li class='vtmb-<%= v.id %> vtmb' id='tmb-<%= i.id %>'>
15
- <%= link_to(image_tag(i.attachment.url(:mini)), i.attachment.url(:product)) %>
16
- </li>
17
- <% end %>
18
- <% end %>
4
+ <% product.images.each do |i| %>
5
+ <li class="tmb-all" id="tmb-<%= i.id.to_s %>"><%= link_to image_tag(i.attachment.url(:mini)), i.attachment.url(:product) %></li>
19
6
  <% end %>
7
+ <% if @product.has_variants?
8
+ @variants.each do |v|
9
+ if v.available?
10
+ v.images.each do |i| %>
11
+ <li class="vtmb-<%= v.id.to_s %> vtmb" id="tmb-<%= i.id.to_s %>"><%= link_to image_tag(i.attachment.url(:mini)), i.attachment.url(:product) %></li>
12
+ <%
13
+ end
14
+ end
15
+ end
16
+ end
17
+ %>
20
18
  </ul>
21
19
  <% end %>
data/app/views/spree/products/index.html.erb CHANGED
@@ -1,6 +1,6 @@
1
1
  <% content_for :sidebar do %>
2
2
  <div data-hook="homepage_sidebar_navigation">
3
- <% if "spree/products" == params[:controller] && @taxon %>
3
+ <% if "products" == params[:controller] && @taxon %>
4
4
  <%= render :partial => 'spree/shared/filters' %>
5
5
  <% else %>
6
6
  <%= render :partial => 'spree/shared/taxonomies' %>
data/app/views/spree/products/show.html.erb CHANGED
@@ -9,7 +9,7 @@
9
9
  <%= render :partial => 'image' %>
10
10
  </div>
11
11
  <div id="thumbnails" data-hook>
12
- <%= render :partial => 'thumbnails' %>
12
+ <%= render :partial => 'thumbnails', :locals => { :product => @product } %>
13
13
  </div>
14
14
  </div>
15
15
 
data/app/views/spree/shared/_google_analytics.html.erb CHANGED
@@ -5,23 +5,23 @@
5
5
  _gaq.push(['_setAccount', '<%= tracker.analytics_id %>']);
6
6
  _gaq.push(['_trackPageview']);
7
7
 
8
- <% if flash[:commerce_tracking] && @order.present? %>
8
+ <% if flash[:commerce_tracking] %>
9
9
  <%# more info: https://developers.google.com/analytics/devguides/collection/gajs/methods/gaJSApiEcommerce %>
10
10
  _gaq.push(['_addTrans',
11
- "<%= j @order.number %>",
11
+ "<%= @order.number %>",
12
12
  "",
13
13
  "<%= @order.total %>",
14
14
  "<%= @order.adjustments.tax.sum(:amount) %>",
15
15
  "<%= @order.adjustments.shipping.sum(:amount) %>",
16
- "<%= j @order.bill_address.city %>",
17
- "<%= j @order.bill_address.state_text %>",
18
- "<%= j @order.bill_address.country.name %>"
16
+ "<%= @order.bill_address.city %>",
17
+ "<%= @order.bill_address.state_text %>",
18
+ "<%= @order.bill_address.country.name %>"
19
19
  ]);
20
20
  <% @order.line_items.each do |line_item| %>
21
21
  _gaq.push(['_addItem',
22
- "<%= j @order.number %>",
23
- "<%= j line_item.variant.sku %>",
24
- "<%= j line_item.variant.product.name %>",
22
+ "<%= @order.number %>",
23
+ "<%= line_item.variant.sku %>",
24
+ "<%= line_item.variant.product.name %>",
25
25
  "",
26
26
  "<%= line_item.price %>",
27
27
  "<%= line_item.quantity %>"
@@ -32,7 +32,7 @@
32
32
 
33
33
  (function() {
34
34
  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
35
- ga.src = '//google-analytics.com/ga.js';
35
+ ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
36
36
  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
37
37
  })();
38
38
  <% end %>
data/app/views/spree/shared/_order_details.html.erb CHANGED
@@ -28,11 +28,11 @@
28
28
  <div class="columns omega four">
29
29
  <h6><%= t(:payment_information) %> <%= link_to "(#{t(:edit)})", checkout_state_path(:payment) unless @order.completed? %></h6>
30
30
  <div class="payment-info">
31
- <% unless order.credit_cards.empty? %>
31
+ <% if order.credit_cards.empty? %>
32
+ <%= content_tag(:span, order.payment.payment_method.name) if order.payment %>
33
+ <% else %>
32
34
  <span class="cc-type">
33
- <% unless (cc_type = order.credit_cards.first.cc_type).blank? %>
34
- <%= image_tag "credit_cards/icons/#{order.credit_cards.first.cc_type}.png" %>
35
- <% end %>
35
+ <%= image_tag "credit_cards/icons/#{order.credit_cards.first.cc_type}.png" %>
36
36
  <%= t(:ending_in)%> <%= order.credit_cards.first.last_digits %>
37
37
  </span>
38
38
  <br />
@@ -48,14 +48,14 @@
48
48
 
49
49
  <hr />
50
50
 
51
- <table id='line-items' class="index columns alpha omega sixteen" data-hook="order_details">
51
+ <table class="index columns alpha omega sixteen" data-hook="order_details">
52
52
  <col width="15%" valign="middle" halign="center">
53
53
  <col width="70%" valign="middle">
54
54
  <col width="5%" valign="middle" halign="center">
55
55
  <col width="5%" valign="middle" halign="center">
56
56
  <col width="5%" valign="middle" halign="center">
57
57
 
58
- <thead data-hook>
58
+ <thead id="line-items" data-hook>
59
59
  <tr data-hook="order_details_line_items_headers">
60
60
  <th colspan="2"><%= t(:item) %></th>
61
61
  <th class="price"><%= t(:price) %></th>
@@ -64,7 +64,7 @@
64
64
  </tr>
65
65
  </thead>
66
66
 
67
- <tbody data-hook>
67
+ <tbody id="line-items" data-hook>
68
68
  <% @order.line_items.each do |item| %>
69
69
  <tr data-hook="order_details_line_item_row">
70
70
  <td data-hook="order_item_image">
@@ -76,19 +76,19 @@
76
76
  </td>
77
77
  <td data-hook="order_item_description">
78
78
  <h4><%= item.variant.product.name %></h4>
79
- <%= truncate(raw(item.variant.product.description), :length => 100, :omission => "...") %>
79
+ <%= truncate(item.variant.product.description, :length => 100, :omission => "...") %>
80
80
  <%= "(" + item.variant.options_text + ")" unless item.variant.option_values.empty? %>
81
81
  </td>
82
- <td data-hook="order_item_price" class="price"><span><%= money item.price %></span></td>
82
+ <td data-hook="order_item_price" class="price"><span><%= item.variant.display_amount %></span></td>
83
83
  <td data-hook="order_item_qty"><%= item.quantity %></td>
84
- <td data-hook="order_item_total" class="total"><span><%= money(item.price * item.quantity) %></span></td>
84
+ <td data-hook="order_item_total" class="total"><span><%= item.display_amount %></span></td>
85
85
  </tr>
86
86
  <% end %>
87
87
  </tbody>
88
88
  <tfoot id="order-total" data-hook="order_details_total">
89
89
  <tr class="total">
90
90
  <td colspan="4"><b><%= t(:order_total) %>:</b></td>
91
- <td class="total"><span id="order_total"><%= money @order.total %></span></td>
91
+ <td class="total"><span id="order_total"><%= @order.display_total %></span></td>
92
92
  </tr>
93
93
  </tfoot>
94
94
  <% if order.price_adjustment_totals.present? %>
@@ -96,7 +96,7 @@
96
96
  <% @order.price_adjustment_totals.keys.each do |key| %>
97
97
  <tr class="total">
98
98
  <td colspan="4"><strong><%= key %></strong></td>
99
- <td class="total"><span><%= money @order.price_adjustment_totals[key] %></span></td>
99
+ <td class="total"><span><%= @order.price_adjustment_totals[key].display_amount %></span></td>
100
100
  </tr>
101
101
  <% end %>
102
102
  </tfoot>
@@ -104,7 +104,7 @@
104
104
  <tfoot id="subtotal" data-hook="order_details_subtotal">
105
105
  <tr class="total" id="subtotal-row">
106
106
  <td colspan="4"><b><%= t(:subtotal) %>:</b></td>
107
- <td class="total"><span><%= money @order.item_total %></span></td>
107
+ <td class="total"><span><%= @order.display_item_total %></span></td>
108
108
  </tr>
109
109
  </tfoot>
110
110
  <tfoot id="order-charges" data-hook="order_details_adjustments">
@@ -112,7 +112,7 @@
112
112
  <% next if (adjustment.originator_type == 'Spree::TaxRate') and (adjustment.amount == 0) %>
113
113
  <tr class="total">
114
114
  <td colspan="4"><strong><%= adjustment.label %></strong></td>
115
- <td class="total"><span><%= money adjustment.amount %></span></td>
115
+ <td class="total"><span><%= adjustment.display_amount %></span></td>
116
116
  </tr>
117
117
  <% end %>
118
118
  </tfoot>
data/app/views/spree/shared/_products.html.erb CHANGED
@@ -10,7 +10,6 @@
10
10
 
11
11
  <% if products.any? %>
12
12
  <ul id="products" class="inline product-listing" data-hook>
13
- <% reset_cycle('default') %>
14
13
  <% products.each do |product| %>
15
14
  <% if product.on_display? %>
16
15
  <li id="product_<%= product.id %>" class="columns three <%= cycle("alpha", "secondary", "", "omega secondary", :name => "classes") %>" data-hook="products_list_item" itemscope itemtype="http://schema.org/Product">
@@ -18,7 +17,7 @@
18
17
  <%= link_to small_image(product, :itemprop => "image"), product, :itemprop => 'url' %>
19
18
  </div>
20
19
  <%= link_to truncate(product.name, :length => 50), product, :class => 'info', :itemprop => "name", :title => product.name %>
21
- <span class="price selling" itemprop="price"><%= product.display_price %></span>
20
+ <span class="price selling" itemprop="price"><%= product.price_in(current_currency).display_price %></span>
22
21
  </li>
23
22
  <% end %>
24
23
  <% end %>
data/app/views/spree/taxons/show.html.erb CHANGED
@@ -11,7 +11,7 @@
11
11
  <%= render :partial => 'spree/shared/products', :locals => { :products => @products, :taxon => @taxon } %>
12
12
  </div>
13
13
 
14
- <% unless params[:keywords].present? %>
14
+ <% unless params[:keyword].present? %>
15
15
  <div data-hook="taxon_children">
16
16
  <%= render :partial => 'taxon', :collection => @taxon.children %>
17
17
  </div>
data/config/locales/en.yml CHANGED
@@ -83,11 +83,13 @@ en:
83
83
  name: Name
84
84
  spree/product:
85
85
  available_on: "Available On"
86
+ cost_currency: "Cost Currency"
86
87
  cost_price: "Cost Price"
87
88
  description: Description
88
89
  master_price: "Master Price"
89
90
  name: Name
90
91
  on_hand: "On Hand"
92
+ on_demand: "On Demand"
91
93
  shipping_category: "Shipping Category"
92
94
  tax_category: "Tax Category"
93
95
  spree/property:
@@ -120,6 +122,7 @@ en:
120
122
  password: "Password"
121
123
  password_confirmation: "Password Confirmation"
122
124
  spree/variant:
125
+ cost_currency: "Cost Currency"
123
126
  cost_price: "Cost Price"
124
127
  depth: Depth
125
128
  height: Height
@@ -257,10 +260,9 @@ en:
257
260
  assign_taxon: "Assign Taxon"
258
261
  assign_taxons: "Assign Taxons"
259
262
  attachment_default_style: "Attachments Style"
260
- attachment_default_url: "Attachments Default URL"
263
+ attachment_default_url: "Attachments URL"
261
264
  attachment_path: "Attachments Path"
262
265
  attachment_styles: "Paperclip Styles"
263
- attachment_url: "Attachments URL"
264
266
  authorization_failure: "Authorization Failure"
265
267
  authorized: Authorized
266
268
  availability: "Availability"
@@ -269,7 +271,24 @@ en:
269
271
  awaiting_return: Awaiting Return
270
272
  back: Back
271
273
  back_end: Back End
274
+ back_to_adjustments_list: "Back To Adjustments List"
275
+ back_to_images_list: "Back To Images List"
276
+ back_to_mail_methods_list: "Back To Mail Methods List"
277
+ back_to_option_types_list: "Back To Option Types List"
278
+ back_to_payment_methods_list: "Back To Payment Methods List"
279
+ back_to_payments_list: "Back To Payments List"
280
+ back_to_products_list: "Back To Products List"
281
+ back_to_properties_list: "Back To Products List"
282
+ back_to_prototypes_list: "Back To Prototypes List"
283
+ back_to_reports_list: "Back To Reports List"
284
+ back_to_shipping_categories: "Back To Shipping Categories"
285
+ back_to_shipping_methods_list: "Back To Shipping Methods List"
286
+ back_to_states_list: "Back To States List"
272
287
  back_to_store: "Go Back To Store"
288
+ back_to_tax_categories_list: "Back To Tax Categories List"
289
+ back_to_taxonomies_list: "Back To Taxonomies List"
290
+ back_to_trackers_list: "Back To Trackers List"
291
+ back_to_zones_list: "Back To Zones List"
273
292
  backordered: Backordered
274
293
  backordering_is_allowed: "Backordering %{not} allowed"
275
294
  balance_due: "Balance Due"
@@ -311,6 +330,7 @@ en:
311
330
  configuration: Configuration
312
331
  configuration_options: "Configuration Options"
313
332
  configurations: Configurations
333
+ configure_s3: "Configure S3"
314
334
  configured: Configured
315
335
  confirm: Confirm
316
336
  confirm_delete: "Confirm Deletion"
@@ -318,6 +338,7 @@ en:
318
338
  continue: Continue
319
339
  continue_shopping: "Continue shopping"
320
340
  copy_all_mails_to: Copy All Mails To
341
+ cost_currency: "Cost Currency"
321
342
  cost_price: "Cost Price"
322
343
  count_of_reduced_by: "count of '%{name}' reduced by %{count}"
323
344
  country: Country
@@ -338,10 +359,12 @@ en:
338
359
  current: Current
339
360
  currency: Currency
340
361
  currency_symbol_position: "Put currency symbol before or after dollar amount?"
362
+ currency_settings: "Currency Settings"
341
363
  customer: Customer
342
364
  customer_details: "Customer Details"
343
365
  customer_details_updated: "The customer's details have been updated."
344
366
  customer_search: "Customer Search"
367
+ cut: Cut
345
368
  date_created: Date created
346
369
  date_completed: Date Completed
347
370
  date_range: "Date Range"
@@ -389,6 +412,8 @@ en:
389
412
  email_server_settings_description: "Set email server settings."
390
413
  empty: "Empty"
391
414
  empty_cart: "Empty Cart"
415
+ enable_login_via_login_password: "Use standard email/password"
416
+ enable_login_via_openid: "Use OpenID instead"
392
417
  enable_mail_delivery: Enable Mail Delivery
393
418
  ending_in: "Ending in"
394
419
  enter_exactly_as_shown_on_card: Please enter exactly as shown on the card
@@ -459,6 +484,7 @@ en:
459
484
  has_no_shipped_units: has no shipped units
460
485
  height: Height
461
486
  hello_user: "Hello User"
487
+ hide_cents: "Hide cents"
462
488
  history: History
463
489
  home: "Home"
464
490
  icon: "Icon"
@@ -469,7 +495,7 @@ en:
469
495
  image_settings: "Image Settings"
470
496
  image_settings_description: "Image Settings Description"
471
497
  image_settings_updated: "Image Settings successfully updated."
472
- image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails CLASS=Spree::Image to do this."
498
+ image_settings_warning: "You will need to regenerate thumbnails if you update the paperclip styles. Use rake paperclip:refresh:thumbnails to do this."
473
499
  in_progress: "In Progress"
474
500
  include_in_shipment: Include in Shipment
475
501
  included_in_other_shipment: Included in another Shipment
@@ -507,6 +533,14 @@ en:
507
533
  live: "Live"
508
534
  loading: Loading
509
535
  locale_changed: "Locale Changed"
536
+ logged_in_as: "Logged in as"
537
+ logged_in_succesfully: "Logged in successfully"
538
+ logged_out: "You have been logged out."
539
+ login: Login
540
+ login_as_existing: "Login as Existing Customer"
541
+ login_failed: "Login authentication failed."
542
+ login_name: Login
543
+ logout: Logout
510
544
  look_for_similar_items: Look for similar items
511
545
  maestro_or_solo_cards: Maestro/Solo cards
512
546
  mail_delivery_enabled: "Mail delivery is enabled"
@@ -528,6 +562,7 @@ en:
528
562
  missing_required_information: "Missing Required Information"
529
563
  minimal_amount: "Minimal Amount"
530
564
  month: "Month"
565
+ more: More
531
566
  my_account: "My Account"
532
567
  my_orders: "My Orders"
533
568
  name: Name
@@ -659,6 +694,7 @@ en:
659
694
  password_reset_instructions_are_mailed: "Instructions to reset your password have been emailed to you. Please check your email."
660
695
  password_reset_token_not_found: "We're sorry, but we could not locate your account. If you are having issues try copying and pasting the URL from your email into your browser or restarting the reset password process."
661
696
  password_updated: "Password successfully updated"
697
+ paste: Paste
662
698
  path: Path
663
699
  pay: pay
664
700
  payment: Payment
@@ -843,6 +879,7 @@ en:
843
879
  registration: Registration
844
880
  remember_me: "Remember me"
845
881
  remove: Remove
882
+ rename: Rename
846
883
  reports: Reports
847
884
  required_for_solo_and_maestro: Required for Solo and Maestro cards.
848
885
  resend: Resend
@@ -887,6 +924,7 @@ en:
887
924
  searching: Searching
888
925
  secure_connection_type: Secure Connection Type
889
926
  secure_credit_card: Secure Credit Card
927
+ security_settings: "Security Settings"
890
928
  select: Select
891
929
  select_from_prototype: "Select From Prototype"
892
930
  select_preferred_shipping_option: "Select preferred shipping option"
@@ -1023,6 +1061,7 @@ en:
1023
1061
  test_mode: Test Mode
1024
1062
  thank_you_for_your_order: "Thank you for your business. Please print out a copy of this confirmation page for your records."
1025
1063
  there_were_problems_with_the_following_fields: "There were problems with the following fields"
1064
+ this_file_language: "English (US)"
1026
1065
  thumbnail: "Thumbnail"
1027
1066
  to_add_variants_you_must_first_define: "To add variants, you must first define"
1028
1067
  to_state: "To State"
@@ -1058,12 +1097,12 @@ en:
1058
1097
  users: Users
1059
1098
  validate_on_profile_create: Validate on profile create
1060
1099
  validation:
1100
+ cannot_be_greater_than_available_stock: "cannot be greater than available stock."
1061
1101
  cannot_be_less_than_shipped_units: "cannot be less than the number of shipped units."
1062
1102
  cannot_destory_line_item_as_inventory_units_have_shipped: "Cannot destory line item as some inventory units have shipped."
1063
1103
  is_too_large: "is too large -- stock on hand cannot cover requested quantity!"
1064
1104
  must_be_int: "must be an integer"
1065
1105
  must_be_non_negative: "must be a non-negative value"
1066
- exceeds_available_stock: "exceeds available stock. Please ensure line items have a valid quantity."
1067
1106
  value: Value
1068
1107
  variant: Variant
1069
1108
  variants: Variants