spree_core 1.0.0.rc3 → 1.0.0.rc4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (38) hide show
  1. data/app/assets/images/admin/payment_banner.png +0 -0
  2. data/app/assets/javascripts/admin/admin.js.erb +16 -5
  3. data/app/assets/javascripts/admin/spree_core.js +0 -1
  4. data/app/assets/javascripts/store/spree_core.js +0 -1
  5. data/app/assets/stylesheets/admin/admin.css.erb +57 -3
  6. data/app/assets/stylesheets/store/screen.css.scss +72 -29
  7. data/app/assets/stylesheets/store/spree_core.css +5 -4
  8. data/app/controllers/spree/admin/tax_categories_controller.rb +13 -0
  9. data/app/controllers/spree/admin/users_controller.rb +16 -0
  10. data/app/controllers/spree/products_controller.rb +1 -1
  11. data/app/helpers/spree/admin/navigation_helper.rb +3 -1
  12. data/app/models/spree/payment_method.rb +2 -0
  13. data/app/models/spree/preferences/preferable.rb +32 -1
  14. data/app/models/spree/preferences/preferable_class_methods.rb +21 -4
  15. data/app/models/spree/product.rb +4 -3
  16. data/app/models/spree/tax_category.rb +7 -1
  17. data/app/models/spree/tax_rate.rb +4 -1
  18. data/app/models/spree/user.rb +2 -0
  19. data/app/views/spree/admin/banners/_gateway.html.erb +14 -0
  20. data/app/views/spree/admin/images/index.html.erb +4 -4
  21. data/app/views/spree/admin/option_types/index.html.erb +2 -2
  22. data/app/views/spree/admin/payment_methods/index.html.erb +2 -0
  23. data/app/views/spree/admin/variants/index.html.erb +2 -2
  24. data/app/views/spree/orders/_line_item.html.erb +4 -4
  25. data/app/views/spree/shared/_order_details.html.erb +8 -9
  26. data/config/locales/en.yml +4 -0
  27. data/config/routes.rb +6 -3
  28. data/db/migrate/20120203153759_add_deleted_at_to_tax_category.rb +5 -0
  29. data/lib/spree/core/middleware/seo_assist.rb +1 -1
  30. data/lib/spree/core/user_banners.rb +25 -0
  31. data/lib/spree/core/version.rb +1 -1
  32. data/vendor/assets/images/jquery.formalize/button.png +0 -0
  33. data/vendor/assets/images/jquery.formalize/select_arrow.gif +0 -0
  34. data/vendor/assets/stylesheets/html5reset.css +177 -0
  35. data/vendor/assets/stylesheets/{jquery.formalize.css → jquery.formalize.css.erb} +3 -3
  36. data/{app/assets/stylesheets/store/base.css → vendor/assets/stylesheets/skeleton.css} +14 -159
  37. metadata +37 -31
  38. data/app/assets/javascripts/store/helpers.js.erb +0 -2
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.rc3
4
+ version: 1.0.0.rc4
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-01-31 00:00:00.000000000 Z
12
+ date: 2012-02-06 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: acts_as_list
16
- requirement: &70287232483420 !ruby/object:Gem::Requirement
16
+ requirement: &70315830659780 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - =
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 0.1.4
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70287232483420
24
+ version_requirements: *70315830659780
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: nested_set
27
- requirement: &70287232498240 !ruby/object:Gem::Requirement
27
+ requirement: &70315830658700 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - =
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.6.8
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70287232498240
35
+ version_requirements: *70315830658700
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: jquery-rails
38
- requirement: &70287232494200 !ruby/object:Gem::Requirement
38
+ requirement: &70315830657660 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
46
46
  version: 1.0.19
47
47
  type: :runtime
48
48
  prerelease: false
49
- version_requirements: *70287232494200
49
+ version_requirements: *70315830657660
50
50
  - !ruby/object:Gem::Dependency
51
51
  name: highline
52
- requirement: &70287232491820 !ruby/object:Gem::Requirement
52
+ requirement: &70315830655400 !ruby/object:Gem::Requirement
53
53
  none: false
54
54
  requirements:
55
55
  - - =
@@ -57,10 +57,10 @@ dependencies:
57
57
  version: 1.6.8
58
58
  type: :runtime
59
59
  prerelease: false
60
- version_requirements: *70287232491820
60
+ version_requirements: *70315830655400
61
61
  - !ruby/object:Gem::Dependency
62
62
  name: state_machine
63
- requirement: &70287232517320 !ruby/object:Gem::Requirement
63
+ requirement: &70315830654520 !ruby/object:Gem::Requirement
64
64
  none: false
65
65
  requirements:
66
66
  - - =
@@ -68,10 +68,10 @@ dependencies:
68
68
  version: 1.1.1
69
69
  type: :runtime
70
70
  prerelease: false
71
- version_requirements: *70287232517320
71
+ version_requirements: *70315830654520
72
72
  - !ruby/object:Gem::Dependency
73
73
  name: ffaker
74
- requirement: &70287232512680 !ruby/object:Gem::Requirement
74
+ requirement: &70315830670300 !ruby/object:Gem::Requirement
75
75
  none: false
76
76
  requirements:
77
77
  - - ~>
@@ -79,10 +79,10 @@ dependencies:
79
79
  version: 1.12.0
80
80
  type: :runtime
81
81
  prerelease: false
82
- version_requirements: *70287232512680
82
+ version_requirements: *70315830670300
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: paperclip
85
- requirement: &70287232529780 !ruby/object:Gem::Requirement
85
+ requirement: &70315830669540 !ruby/object:Gem::Requirement
86
86
  none: false
87
87
  requirements:
88
88
  - - =
@@ -90,10 +90,10 @@ dependencies:
90
90
  version: 2.5.0
91
91
  type: :runtime
92
92
  prerelease: false
93
- version_requirements: *70287232529780
93
+ version_requirements: *70315830669540
94
94
  - !ruby/object:Gem::Dependency
95
95
  name: meta_search
96
- requirement: &70287232525620 !ruby/object:Gem::Requirement
96
+ requirement: &70315830668920 !ruby/object:Gem::Requirement
97
97
  none: false
98
98
  requirements:
99
99
  - - =
@@ -101,10 +101,10 @@ dependencies:
101
101
  version: 1.1.1
102
102
  type: :runtime
103
103
  prerelease: false
104
- version_requirements: *70287232525620
104
+ version_requirements: *70315830668920
105
105
  - !ruby/object:Gem::Dependency
106
106
  name: activemerchant
107
- requirement: &70287232544300 !ruby/object:Gem::Requirement
107
+ requirement: &70315830668060 !ruby/object:Gem::Requirement
108
108
  none: false
109
109
  requirements:
110
110
  - - =
@@ -112,10 +112,10 @@ dependencies:
112
112
  version: 1.20.1
113
113
  type: :runtime
114
114
  prerelease: false
115
- version_requirements: *70287232544300
115
+ version_requirements: *70315830668060
116
116
  - !ruby/object:Gem::Dependency
117
117
  name: rails
118
- requirement: &70287232541980 !ruby/object:Gem::Requirement
118
+ requirement: &70315830667420 !ruby/object:Gem::Requirement
119
119
  none: false
120
120
  requirements:
121
121
  - - ! '>='
@@ -126,10 +126,10 @@ dependencies:
126
126
  version: 3.1.3
127
127
  type: :runtime
128
128
  prerelease: false
129
- version_requirements: *70287232541980
129
+ version_requirements: *70315830667420
130
130
  - !ruby/object:Gem::Dependency
131
131
  name: kaminari
132
- requirement: &70287232563100 !ruby/object:Gem::Requirement
132
+ requirement: &70315830666140 !ruby/object:Gem::Requirement
133
133
  none: false
134
134
  requirements:
135
135
  - - ! '>='
@@ -137,10 +137,10 @@ dependencies:
137
137
  version: 0.13.0
138
138
  type: :runtime
139
139
  prerelease: false
140
- version_requirements: *70287232563100
140
+ version_requirements: *70315830666140
141
141
  - !ruby/object:Gem::Dependency
142
142
  name: deface
143
- requirement: &70287232560620 !ruby/object:Gem::Requirement
143
+ requirement: &70315830665460 !ruby/object:Gem::Requirement
144
144
  none: false
145
145
  requirements:
146
146
  - - ! '>='
@@ -148,10 +148,10 @@ dependencies:
148
148
  version: 0.7.2
149
149
  type: :runtime
150
150
  prerelease: false
151
- version_requirements: *70287232560620
151
+ version_requirements: *70315830665460
152
152
  - !ruby/object:Gem::Dependency
153
153
  name: stringex
154
- requirement: &70287232556600 !ruby/object:Gem::Requirement
154
+ requirement: &70315830664880 !ruby/object:Gem::Requirement
155
155
  none: false
156
156
  requirements:
157
157
  - - ~>
@@ -159,7 +159,7 @@ dependencies:
159
159
  version: 1.3.0
160
160
  type: :runtime
161
161
  prerelease: false
162
- version_requirements: *70287232556600
162
+ version_requirements: *70315830664880
163
163
  description: Required dependency for Spree
164
164
  email: sean@spreecommerce.com
165
165
  executables: []
@@ -245,6 +245,7 @@ files:
245
245
  - app/assets/images/admin/icons/tick.png
246
246
  - app/assets/images/admin/icons/up.gif
247
247
  - app/assets/images/admin/icons/xls.png
248
+ - app/assets/images/admin/payment_banner.png
248
249
  - app/assets/images/admin/progress.gif
249
250
  - app/assets/images/creditcards/amex_cid.gif
250
251
  - app/assets/images/creditcards/creditcard.gif
@@ -298,7 +299,6 @@ files:
298
299
  - app/assets/javascripts/admin/zone.js
299
300
  - app/assets/javascripts/store/cart.js
300
301
  - app/assets/javascripts/store/checkout.js
301
- - app/assets/javascripts/store/helpers.js.erb
302
302
  - app/assets/javascripts/store/product.js
303
303
  - app/assets/javascripts/store/spree_core.js
304
304
  - app/assets/stylesheets/admin/admin-form.css.erb
@@ -309,7 +309,6 @@ files:
309
309
  - app/assets/stylesheets/admin/edit_checkouts.css
310
310
  - app/assets/stylesheets/admin/spree_core.css
311
311
  - app/assets/stylesheets/admin/token-input.css
312
- - app/assets/stylesheets/store/base.css
313
312
  - app/assets/stylesheets/store/screen.css.scss
314
313
  - app/assets/stylesheets/store/spree_core.css
315
314
  - app/controllers/spree/admin/adjustments_controller.rb
@@ -451,6 +450,7 @@ files:
451
450
  - app/views/spree/admin/adjustments/edit.html.erb
452
451
  - app/views/spree/admin/adjustments/index.html.erb
453
452
  - app/views/spree/admin/adjustments/new.html.erb
453
+ - app/views/spree/admin/banners/_gateway.html.erb
454
454
  - app/views/spree/admin/configurations/index.html.erb
455
455
  - app/views/spree/admin/general_settings/edit.html.erb
456
456
  - app/views/spree/admin/general_settings/show.html.erb
@@ -760,6 +760,7 @@ files:
760
760
  - lib/spree/core/testing_support/factories.rb
761
761
  - lib/spree/core/theme_support/hook_listener.rb
762
762
  - lib/spree/core/theme_support.rb
763
+ - lib/spree/core/user_banners.rb
763
764
  - lib/spree/core/version.rb
764
765
  - lib/spree/core.rb
765
766
  - lib/spree/product_filters.rb
@@ -869,6 +870,7 @@ files:
869
870
  - db/migrate/20120105193911_associate_shipping_methods_and_shipping_categories.rb
870
871
  - db/migrate/20120105195817_add_match_rules_to_shipping_methods.rb
871
872
  - db/migrate/20120119024710_new_preferences.rb
873
+ - db/migrate/20120203153759_add_deleted_at_to_tax_category.rb
872
874
  - db/sample/users.rb
873
875
  - db/seeds.rb
874
876
  - vendor/assets/images/datepicker/cal.gif
@@ -885,6 +887,8 @@ files:
885
887
  - vendor/assets/images/jquery-ui/ui-icons_666666_256x240.png
886
888
  - vendor/assets/images/jquery-ui/ui-icons_ff0084_256x240.png
887
889
  - vendor/assets/images/jquery-ui/ui-icons_ffffff_256x240.png
890
+ - vendor/assets/images/jquery.formalize/button.png
891
+ - vendor/assets/images/jquery.formalize/select_arrow.gif
888
892
  - vendor/assets/javascripts/jquery.alerts/images/help.gif
889
893
  - vendor/assets/javascripts/jquery.alerts/images/important.gif
890
894
  - vendor/assets/javascripts/jquery.alerts/images/info.gif
@@ -944,8 +948,10 @@ files:
944
948
  - vendor/assets/javascripts/jquery.validate/localization/methods_de.js
945
949
  - vendor/assets/javascripts/jquery.validate/localization/methods_nl.js
946
950
  - vendor/assets/javascripts/jquery.validate/localization/methods_pt.js
951
+ - vendor/assets/stylesheets/html5reset.css
947
952
  - vendor/assets/stylesheets/jquery-ui.datepicker.css.erb
948
- - vendor/assets/stylesheets/jquery.formalize.css
953
+ - vendor/assets/stylesheets/jquery.formalize.css.erb
954
+ - vendor/assets/stylesheets/skeleton.css
949
955
  homepage: http://spreecommerce.com
950
956
  licenses: []
951
957
  post_install_message:
data/app/assets/javascripts/store/helpers.js.erb DELETED
@@ -1,2 +0,0 @@
1
- var Spree = {}
2
- Spree.base_path = <%= Rails.application.routes.named_routes[:spree].path.inspect %>