spree_core 2.0.4 → 2.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (51) hide show
  1. checksums.yaml +4 -4
  2. data/app/mailers/spree/test_mailer.rb +2 -1
  3. data/app/models/spree/adjustment.rb +18 -7
  4. data/app/models/spree/alert.rb +1 -1
  5. data/app/models/spree/credit_card.rb +2 -2
  6. data/app/models/spree/inventory_unit.rb +5 -0
  7. data/app/models/spree/line_item.rb +18 -4
  8. data/app/models/spree/order/checkout.rb +10 -14
  9. data/app/models/spree/order.rb +39 -27
  10. data/app/models/spree/order_contents.rb +2 -2
  11. data/app/models/spree/order_inventory.rb +2 -9
  12. data/app/models/spree/order_updater.rb +18 -7
  13. data/app/models/spree/payment/processing.rb +102 -102
  14. data/app/models/spree/payment.rb +10 -9
  15. data/app/models/spree/preferences/store.rb +1 -1
  16. data/app/models/spree/product.rb +11 -2
  17. data/app/models/spree/promotion/rules/user.rb +7 -2
  18. data/app/models/spree/property.rb +1 -1
  19. data/app/models/spree/shipment.rb +12 -7
  20. data/app/models/spree/shipping_method.rb +1 -1
  21. data/app/models/spree/stock/availability_validator.rb +9 -1
  22. data/app/models/spree/stock/coordinator.rb +1 -3
  23. data/app/models/spree/stock/estimator.rb +1 -1
  24. data/app/models/spree/stock/packer.rb +13 -5
  25. data/app/models/spree/stock_item.rb +10 -1
  26. data/app/models/spree/stock_location.rb +1 -1
  27. data/app/models/spree/tax_rate.rb +3 -1
  28. data/app/models/spree/zone.rb +37 -1
  29. data/app/views/spree/test_mailer/test_email.text.erb +4 -0
  30. data/config/locales/en.yml +24 -1
  31. data/db/default/spree/roles.rb +2 -2
  32. data/db/migrate/20130213191427_create_default_stock.rb +2 -1
  33. data/db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb +1 -1
  34. data/db/migrate/20130806022521_drop_spree_mail_methods.rb +12 -0
  35. data/db/migrate/20130806145853_set_default_stock_location_on_shipments.rb +8 -0
  36. data/db/migrate/20130809164245_add_admin_name_column_to_spree_shipping_methods.rb +5 -0
  37. data/db/migrate/20130809164330_add_admin_name_column_to_spree_stock_locations.rb +5 -0
  38. data/db/migrate/20130813140619_expand_order_number_size.rb +9 -0
  39. data/db/migrate/20130826062534_add_depth_to_spree_taxons.rb +16 -0
  40. data/db/migrate/20130915032339_add_deleted_at_to_spree_stock_items.rb +5 -0
  41. data/lib/generators/spree/dummy/templates/rails/database.yml +0 -3
  42. data/lib/spree/core/engine.rb +1 -5
  43. data/lib/spree/core/permalinks.rb +4 -2
  44. data/lib/spree/core/version.rb +1 -1
  45. data/lib/spree/promo/coupon_applicator.rb +2 -2
  46. data/lib/spree/testing_support/capybara_ext.rb +2 -2
  47. data/lib/spree/testing_support/factories/order_factory.rb +8 -4
  48. metadata +17 -12
  49. data/app/models/spree/new_adjustment.rb +0 -4
  50. data/app/models/spree/shipping_adjustment.rb +0 -4
  51. data/db/migrate/20130805043440_create_spree_new_adjustments.rb +0 -8
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.4
4
+ version: 2.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Schofield
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-08-05 00:00:00.000000000 Z
11
+ date: 2013-09-16 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activemerchant
@@ -58,14 +58,14 @@ dependencies:
58
58
  requirements:
59
59
  - - ~>
60
60
  - !ruby/object:Gem::Version
61
- version: 1.3.4
61
+ version: 1.14.1
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
66
  - - ~>
67
67
  - !ruby/object:Gem::Version
68
- version: 1.3.4
68
+ version: 1.14.1
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: cancan
71
71
  requirement: !ruby/object:Gem::Requirement
@@ -224,16 +224,16 @@ dependencies:
224
224
  name: ransack
225
225
  requirement: !ruby/object:Gem::Requirement
226
226
  requirements:
227
- - - '='
227
+ - - ~>
228
228
  - !ruby/object:Gem::Version
229
- version: 0.7.2
229
+ version: 1.0.0
230
230
  type: :runtime
231
231
  prerelease: false
232
232
  version_requirements: !ruby/object:Gem::Requirement
233
233
  requirements:
234
- - - '='
234
+ - - ~>
235
235
  - !ruby/object:Gem::Version
236
- version: 0.7.2
236
+ version: 1.0.0
237
237
  - !ruby/object:Gem::Dependency
238
238
  name: state_machine
239
239
  requirement: !ruby/object:Gem::Requirement
@@ -337,7 +337,6 @@ files:
337
337
  - app/models/spree/legacy_user.rb
338
338
  - app/models/spree/line_item.rb
339
339
  - app/models/spree/log_entry.rb
340
- - app/models/spree/new_adjustment.rb
341
340
  - app/models/spree/option_type.rb
342
341
  - app/models/spree/option_value.rb
343
342
  - app/models/spree/order/checkout.rb
@@ -377,7 +376,6 @@ files:
377
376
  - app/models/spree/return_authorization.rb
378
377
  - app/models/spree/role.rb
379
378
  - app/models/spree/shipment.rb
380
- - app/models/spree/shipping_adjustment.rb
381
379
  - app/models/spree/shipping_calculator.rb
382
380
  - app/models/spree/shipping_category.rb
383
381
  - app/models/spree/shipping_method.rb
@@ -422,6 +420,7 @@ files:
422
420
  - app/views/spree/shared/_error_messages.html.erb
423
421
  - app/views/spree/shared/_routes.html.erb
424
422
  - app/views/spree/shipment_mailer/shipped_email.text.erb
423
+ - app/views/spree/test_mailer/test_email.text.erb
425
424
  - config/initializers/user_class_extensions.rb
426
425
  - config/locales/en.yml
427
426
  - lib/generators/spree/custom_user/custom_user_generator.rb
@@ -608,7 +607,13 @@ files:
608
607
  - db/migrate/20130729214043_index_completed_at_on_spree_orders.rb
609
608
  - db/migrate/20130802014537_add_tax_category_id_to_spree_line_items.rb
610
609
  - db/migrate/20130802022321_migrate_tax_categories_to_line_items.rb
611
- - db/migrate/20130805043440_create_spree_new_adjustments.rb
610
+ - db/migrate/20130806022521_drop_spree_mail_methods.rb
611
+ - db/migrate/20130806145853_set_default_stock_location_on_shipments.rb
612
+ - db/migrate/20130809164245_add_admin_name_column_to_spree_shipping_methods.rb
613
+ - db/migrate/20130809164330_add_admin_name_column_to_spree_stock_locations.rb
614
+ - db/migrate/20130813140619_expand_order_number_size.rb
615
+ - db/migrate/20130826062534_add_depth_to_spree_taxons.rb
616
+ - db/migrate/20130915032339_add_deleted_at_to_spree_stock_items.rb
612
617
  - db/seeds.rb
613
618
  - vendor/assets/javascripts/jquery-migrate-1.0.0.js
614
619
  - vendor/assets/javascripts/jquery.validate/localization/messages_et.js
@@ -647,7 +652,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
647
652
  version: '0'
648
653
  requirements: []
649
654
  rubyforge_project:
650
- rubygems_version: 2.0.0
655
+ rubygems_version: 2.1.0
651
656
  signing_key:
652
657
  specification_version: 4
653
658
  summary: The bare bones necessary for Spree.
@@ -1,4 +0,0 @@
1
- module Spree
2
- class NewAdjustment < ActiveRecord::Base
3
- end
4
- end
@@ -1,4 +0,0 @@
1
- module Spree
2
- class ShippingAdjustment < Spree::Adjustment
3
- end
4
- end
@@ -1,8 +0,0 @@
1
- class CreateSpreeNewAdjustments < ActiveRecord::Migration
2
- def change
3
- create_table :spree_new_adjustments do |t|
4
-
5
- t.timestamps
6
- end
7
- end
8
- end