spree_core 1.3.3 → 1.3.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (80) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/admin/admin.js.erb +9 -5
  3. data/app/assets/javascripts/store/product.js.coffee +6 -1
  4. data/app/assets/stylesheets/store/screen.css.scss +1 -1
  5. data/app/controllers/spree/admin/images_controller.rb +4 -0
  6. data/app/controllers/spree/admin/resource_controller.rb +6 -2
  7. data/app/controllers/spree/orders_controller.rb +1 -1
  8. data/app/helpers/spree/admin/navigation_helper.rb +3 -1
  9. data/app/models/spree/classification.rb +3 -0
  10. data/app/models/spree/credit_card.rb +13 -0
  11. data/app/models/spree/order.rb +20 -11
  12. data/app/models/spree/payment.rb +1 -1
  13. data/app/models/spree/payment/processing.rb +5 -0
  14. data/app/models/spree/product.rb +1 -1
  15. data/app/models/spree/product/scopes.rb +5 -8
  16. data/app/views/spree/admin/adjustments/index.html.erb +2 -2
  17. data/app/views/spree/admin/payments/_form.html.erb +3 -1
  18. data/app/views/spree/checkout/edit.html.erb +4 -0
  19. data/app/views/spree/orders/_line_item.html.erb +5 -3
  20. data/config/initializers/user_class_extensions.rb +1 -1
  21. data/config/locales/en.yml +6 -0
  22. data/config/routes.rb +1 -1
  23. data/db/migrate/20130626232741_add_cvv_result_code_and_cvv_result_message_to_spree_payments.rb +6 -0
  24. data/db/migrate/20130628021056_add_unique_index_to_permalink_on_spree_products.rb +5 -0
  25. data/db/migrate/20130628022817_add_unique_index_to_orders_shipments_and_stock_transfers.rb +6 -0
  26. data/db/migrate/20130813140619_expand_order_number_size.rb +9 -0
  27. data/lib/generators/spree/dummy/templates/rails/database.yml +0 -3
  28. data/lib/spree/core/permalinks.rb +17 -13
  29. data/lib/spree/core/s3_support.rb +1 -1
  30. data/lib/spree/core/testing_support/factories/variant_factory.rb +1 -1
  31. data/lib/spree/core/version.rb +1 -1
  32. data/vendor/assets/javascripts/jquery.validate/additional-methods.min.js +6 -22
  33. data/vendor/assets/javascripts/jquery.validate/jquery.validate.min.js +6 -45
  34. data/vendor/assets/javascripts/jquery.validate/localization/messages_ar.js +23 -22
  35. data/vendor/assets/javascripts/jquery.validate/localization/messages_bg.js +22 -20
  36. data/vendor/assets/javascripts/jquery.validate/localization/messages_ca.js +22 -20
  37. data/vendor/assets/javascripts/jquery.validate/localization/messages_cs.js +22 -20
  38. data/vendor/assets/javascripts/jquery.validate/localization/messages_da.js +19 -17
  39. data/vendor/assets/javascripts/jquery.validate/localization/messages_de.js +19 -18
  40. data/vendor/assets/javascripts/jquery.validate/localization/messages_el.js +22 -21
  41. data/vendor/assets/javascripts/jquery.validate/localization/messages_es.js +22 -20
  42. data/vendor/assets/javascripts/jquery.validate/localization/messages_et.js +23 -0
  43. data/vendor/assets/javascripts/jquery.validate/localization/messages_eu.js +25 -0
  44. data/vendor/assets/javascripts/jquery.validate/localization/messages_fa.js +22 -20
  45. data/vendor/assets/javascripts/jquery.validate/localization/messages_fi.js +20 -18
  46. data/vendor/assets/javascripts/jquery.validate/localization/messages_fr.js +44 -20
  47. data/vendor/assets/javascripts/jquery.validate/localization/messages_he.js +22 -20
  48. data/vendor/assets/javascripts/jquery.validate/localization/messages_hr.js +25 -0
  49. data/vendor/assets/javascripts/jquery.validate/localization/messages_hu.js +21 -18
  50. data/vendor/assets/javascripts/jquery.validate/localization/messages_it.js +22 -20
  51. data/vendor/assets/javascripts/jquery.validate/localization/messages_ja.js +22 -20
  52. data/vendor/assets/javascripts/jquery.validate/localization/messages_ka.js +25 -0
  53. data/vendor/assets/javascripts/jquery.validate/localization/messages_kk.js +22 -20
  54. data/vendor/assets/javascripts/jquery.validate/localization/messages_ko.js +25 -0
  55. data/vendor/assets/javascripts/jquery.validate/localization/messages_lt.js +23 -21
  56. data/vendor/assets/javascripts/jquery.validate/localization/messages_lv.js +22 -20
  57. data/vendor/assets/javascripts/jquery.validate/localization/messages_my.js +25 -0
  58. data/vendor/assets/javascripts/jquery.validate/localization/messages_nl.js +32 -20
  59. data/vendor/assets/javascripts/jquery.validate/localization/messages_no.js +22 -20
  60. data/vendor/assets/javascripts/jquery.validate/localization/messages_pl.js +22 -20
  61. data/vendor/assets/javascripts/jquery.validate/localization/messages_pt_BR.js +26 -0
  62. data/vendor/assets/javascripts/jquery.validate/localization/messages_pt_PT.js +26 -0
  63. data/vendor/assets/javascripts/jquery.validate/localization/messages_ro.js +22 -20
  64. data/vendor/assets/javascripts/jquery.validate/localization/messages_ru.js +22 -20
  65. data/vendor/assets/javascripts/jquery.validate/localization/messages_si.js +21 -19
  66. data/vendor/assets/javascripts/jquery.validate/localization/messages_sk.js +19 -18
  67. data/vendor/assets/javascripts/jquery.validate/localization/messages_sl.js +25 -0
  68. data/vendor/assets/javascripts/jquery.validate/localization/messages_sr.js +23 -21
  69. data/vendor/assets/javascripts/jquery.validate/localization/messages_sv.js +23 -0
  70. data/vendor/assets/javascripts/jquery.validate/localization/messages_th.js +22 -20
  71. data/vendor/assets/javascripts/jquery.validate/localization/messages_tr.js +22 -21
  72. data/vendor/assets/javascripts/jquery.validate/localization/messages_uk.js +25 -0
  73. data/vendor/assets/javascripts/jquery.validate/localization/messages_vi.js +22 -20
  74. data/vendor/assets/javascripts/jquery.validate/localization/messages_zh.js +25 -0
  75. data/vendor/assets/javascripts/jquery.validate/localization/messages_zh_TW.js +26 -0
  76. data/vendor/assets/javascripts/jquery.validate/localization/methods_de.js +6 -6
  77. data/vendor/assets/javascripts/jquery.validate/localization/methods_nl.js +3 -3
  78. data/vendor/assets/javascripts/jquery.validate/localization/methods_pt.js +3 -3
  79. metadata +30 -14
  80. data/app/views/spree/orders/new.html.erb +0 -9
data/app/views/spree/orders/new.html.erb DELETED
@@ -1,9 +0,0 @@
1
- <% @body_id = 'cart' %>
2
-
3
- <h1><%= t(:shopping_cart) %></h1>
4
-
5
- <%= form_for @order, :url =>'#', :method => :put do |order_form| %>
6
- <%= render :partial => 'form', :locals => { :order_form => order_form } %>
7
- <% end %>
8
-
9
- <p><%= link_to t(:continue_shopping), products_path %></p>