spree_core 1.2.0.rc2 → 1.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (80) hide show
  1. data/app/assets/images/noimage/large.png +0 -0
  2. data/app/assets/javascripts/admin/admin.js.erb +1 -0
  3. data/app/assets/javascripts/admin/product_autocomplete.js.erb +1 -0
  4. data/app/assets/javascripts/admin/shipping_methods.js.coffee +10 -0
  5. data/app/assets/javascripts/admin/zone.js.coffee +39 -0
  6. data/app/assets/javascripts/store/cart.js.coffee +4 -5
  7. data/app/assets/javascripts/store/product.js.coffee +1 -2
  8. data/app/controllers/spree/admin/general_settings_controller.rb +1 -1
  9. data/app/controllers/spree/admin/images_controller.rb +5 -13
  10. data/app/controllers/spree/admin/orders_controller.rb +3 -1
  11. data/app/controllers/spree/admin/products_controller.rb +2 -6
  12. data/app/controllers/spree/admin/prototypes_controller.rb +2 -2
  13. data/app/controllers/spree/checkout_controller.rb +12 -23
  14. data/app/controllers/spree/orders_controller.rb +1 -0
  15. data/app/helpers/spree/admin/general_settings_helper.rb +13 -0
  16. data/app/helpers/spree/admin/users_helper.rb +1 -1
  17. data/app/helpers/spree/base_helper.rb +9 -24
  18. data/app/helpers/spree/products_helper.rb +2 -6
  19. data/app/models/spree/ability.rb +3 -3
  20. data/app/models/spree/address.rb +1 -1
  21. data/app/models/spree/adjustment.rb +4 -0
  22. data/app/models/spree/app_configuration.rb +3 -1
  23. data/app/models/spree/credit_card.rb +1 -1
  24. data/app/models/spree/inventory_unit.rb +1 -1
  25. data/app/models/spree/line_item.rb +1 -1
  26. data/app/models/spree/order.rb +14 -1
  27. data/app/models/spree/order/checkout.rb +19 -5
  28. data/app/models/spree/product.rb +37 -29
  29. data/app/models/spree/product/scopes.rb +2 -2
  30. data/app/models/spree/shipping_rate.rb +10 -0
  31. data/app/models/spree/variant.rb +14 -8
  32. data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +1 -1
  33. data/app/views/spree/admin/general_settings/edit.html.erb +15 -6
  34. data/app/views/spree/admin/general_settings/show.html.erb +6 -0
  35. data/app/views/spree/admin/images/_form.html.erb +4 -8
  36. data/app/views/spree/admin/orders/_form.html.erb +3 -3
  37. data/app/views/spree/admin/orders/_line_item.html.erb +2 -2
  38. data/app/views/spree/admin/orders/index.html.erb +5 -1
  39. data/app/views/spree/admin/payments/_list.html.erb +1 -1
  40. data/app/views/spree/admin/payments/index.html.erb +1 -1
  41. data/app/views/spree/admin/products/index.html.erb +1 -1
  42. data/app/views/spree/admin/reports/sales_total.html.erb +3 -3
  43. data/app/views/spree/admin/return_authorizations/_form.html.erb +1 -1
  44. data/app/views/spree/admin/return_authorizations/index.html.erb +1 -1
  45. data/app/views/spree/admin/shared/_order_details.html.erb +6 -6
  46. data/app/views/spree/admin/shared/_order_tabs.html.erb +2 -1
  47. data/app/views/spree/admin/shared/_update_order_state.js +1 -1
  48. data/app/views/spree/admin/shipments/edit.html.erb +1 -1
  49. data/app/views/spree/admin/shipments/index.html.erb +1 -1
  50. data/app/views/spree/admin/variants/_form.html.erb +2 -2
  51. data/app/views/spree/admin/variants/index.html.erb +1 -1
  52. data/app/views/spree/checkout/_address.html.erb +0 -6
  53. data/app/views/spree/checkout/_delivery.html.erb +1 -5
  54. data/app/views/spree/checkout/_summary.html.erb +4 -4
  55. data/app/views/spree/checkout/edit.html.erb +6 -0
  56. data/app/views/spree/order_mailer/cancel_email.text.erb +7 -7
  57. data/app/views/spree/order_mailer/confirm_email.text.erb +9 -8
  58. data/app/views/spree/orders/_adjustments.html.erb +1 -1
  59. data/app/views/spree/orders/_line_item.html.erb +2 -2
  60. data/app/views/spree/orders/edit.html.erb +2 -2
  61. data/app/views/spree/products/_cart_form.html.erb +1 -1
  62. data/app/views/spree/shared/_google_analytics.html.erb +16 -15
  63. data/app/views/spree/shared/_order_details.html.erb +24 -22
  64. data/app/views/spree/shared/_products.html.erb +1 -1
  65. data/app/views/spree/shipment_mailer/shipped_email.text.erb +6 -6
  66. data/config/locales/en.yml +21 -0
  67. data/config/routes.rb +1 -1
  68. data/lib/generators/spree/install/templates/config/initializers/spree.rb +1 -1
  69. data/lib/spree/core.rb +1 -0
  70. data/lib/spree/core/controller_helpers.rb +19 -1
  71. data/lib/spree/core/engine.rb +0 -1
  72. data/lib/spree/core/search/base.rb +5 -2
  73. data/lib/spree/core/version.rb +1 -1
  74. data/lib/spree/money.rb +16 -0
  75. data/lib/spree/product_filters.rb +4 -3
  76. metadata +64 -129
  77. data/app/assets/javascripts/admin/shipping_methods.js +0 -15
  78. data/app/assets/javascripts/admin/zone.js +0 -29
  79. data/app/views/spree/admin/payments/_transaction_list.html.erb +0 -24
  80. data/lib/spree/core/relation_serialization.rb +0 -9
data/app/assets/javascripts/admin/shipping_methods.js DELETED
@@ -1,15 +0,0 @@
1
- $(document).ready(function() {
2
- if ($(".categories input:checked").length > 0) {
3
- $('input[type=checkbox]:not(:checked)').attr('disabled', true);
4
- }
5
-
6
- categoryCheckboxes = '.categories input[type=checkbox]';
7
- $(categoryCheckboxes).change(function(){
8
- if($(this).is(':checked')) {
9
- $(categoryCheckboxes + ':not(:checked)').attr('disabled', true);
10
- $(this).removeAttr('disabled');
11
- } else {
12
- $('input[type=checkbox]').removeAttr('disabled');
13
- }
14
- });
15
- });
data/app/assets/javascripts/admin/zone.js DELETED
@@ -1,29 +0,0 @@
1
- $(function() {
2
- if ($('#country_based').is(':checked')) {
3
- show_country();
4
- } else {
5
- show_state();
6
- }
7
- $('#country_based').click(function() { show_country();} );
8
- $('#state_based').click(function() { show_state();} );
9
- })
10
-
11
- var show_country = function() {
12
- $('#state_members :input').each(function() { $(this).prop("disabled", true); })
13
- $('#state_members').hide();
14
- $('#zone_members :input').each(function() { $(this).prop("disabled", true); })
15
- $('#zone_members').hide();
16
- $('#country_members :input').each(function() { $(this).prop("disabled", false); })
17
- $('#country_members').show();
18
- };
19
-
20
- var show_state = function() {
21
- $('#country_members :input').each(function() { $(this).prop("disabled", true);
22
- })
23
- $('#country_members').hide();
24
- $('#zone_members :input').each(function() { $(this).prop("disabled", true);
25
- })
26
- $('#zone_members').hide();
27
- $('#state_members :input').each(function() { $(this).prop("disabled", false); })
28
- $('#state_members').show();
29
- };
data/app/views/spree/admin/payments/_transaction_list.html.erb DELETED
@@ -1,24 +0,0 @@
1
- <fieldset>
2
-
3
- <legend><%= t(:transactions) %></legend>
4
-
5
- <table class="index">
6
- <tr data-hook="transactions_header">
7
- <th><%= t(:type) %></th>
8
- <th><%= t('spree.date') %></th>
9
- <th><%= t(:amount) %></th>
10
- <th><%= t(:response_code) %></th>
11
- </tr>
12
- <% txns.each do |txn| %>
13
- <tr data-hook="transaction_row">
14
- <td>
15
- <%= txn.txn_type_name %>
16
- </td>
17
- <td><%= txn.created_at.to_date %></td>
18
- <td><%= number_to_currency txn.amount %></td>
19
- <td><%= txn.response_code %></td>
20
- </tr>
21
- <% end %>
22
- </table>
23
-
24
- </fieldset>
data/lib/spree/core/relation_serialization.rb DELETED
@@ -1,9 +0,0 @@
1
- module Spree
2
- module Core
3
- module RelationSerialization
4
- def serializable_hash(options = nil)
5
- self.map { |a| a.serializable_hash(options) }
6
- end
7
- end
8
- end
9
- end