spree_core 0.40.4 → 0.50.0
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +6 -1
- data/app/controllers/admin/base_controller.rb +0 -57
- data/app/controllers/admin/configurations_controller.rb +1 -1
- data/app/controllers/admin/general_settings_controller.rb +1 -1
- data/app/controllers/admin/images_controller.rb +18 -8
- data/app/controllers/admin/inventory_settings_controller.rb +1 -1
- data/app/controllers/admin/mail_settings_controller.rb +1 -1
- data/app/controllers/admin/option_types_controller.rb +11 -0
- data/app/controllers/admin/orders_controller.rb +16 -20
- data/app/controllers/admin/overview_controller.rb +1 -1
- data/app/controllers/admin/payment_methods_controller.rb +6 -6
- data/app/controllers/admin/product_groups_controller.rb +10 -11
- data/app/controllers/admin/product_properties_controller.rb +5 -5
- data/app/controllers/admin/product_scopes_controller.rb +12 -4
- data/app/controllers/admin/products_controller.rb +17 -12
- data/app/controllers/admin/properties_controller.rb +7 -7
- data/app/controllers/admin/prototypes_controller.rb +15 -15
- data/app/controllers/admin/reports_controller.rb +12 -11
- data/app/controllers/admin/shipments_controller.rb +0 -5
- data/app/controllers/admin/shipping_categories_controller.rb +6 -6
- data/app/controllers/admin/shipping_methods_controller.rb +1 -2
- data/app/controllers/admin/states_controller.rb +12 -12
- data/app/controllers/admin/tax_categories_controller.rb +2 -2
- data/app/controllers/admin/tax_rates_controller.rb +8 -8
- data/app/controllers/admin/tax_settings_controller.rb +1 -1
- data/app/controllers/admin/taxonomies_controller.rb +3 -3
- data/app/controllers/admin/taxons_controller.rb +1 -8
- data/app/controllers/admin/trackers_controller.rb +1 -1
- data/app/controllers/admin/users_controller.rb +6 -9
- data/app/controllers/admin/variants_controller.rb +13 -2
- data/app/controllers/admin/zones_controller.rb +9 -9
- data/app/controllers/checkout_controller.rb +5 -5
- data/app/controllers/products_controller.rb +1 -1
- data/app/controllers/taxons_controller.rb +3 -1
- data/app/helpers/admin/navigation_helper.rb +36 -19
- data/app/helpers/admin/payments_helper.rb +1 -1
- data/app/helpers/admin/product_groups_helper.rb +1 -1
- data/app/helpers/admin/product_properties_helper.rb +5 -5
- data/app/helpers/admin/products_helper.rb +2 -2
- data/app/helpers/admin/users_helper.rb +5 -2
- data/app/helpers/hook_helper.rb +3 -3
- data/app/helpers/products_helper.rb +0 -19
- data/app/helpers/spree/base_helper.rb +33 -2
- data/app/helpers/taxons_helper.rb +3 -3
- data/app/mailers/order_mailer.rb +2 -2
- data/app/mailers/shipment_mailer.rb +2 -2
- data/app/models/address.rb +42 -9
- data/app/models/adjustment.rb +8 -8
- data/app/models/app_configuration.rb +0 -6
- data/app/models/billing_integration.rb +1 -1
- data/app/models/calculator/sales_tax.rb +3 -3
- data/app/models/configuration.rb +1 -1
- data/app/models/country.rb +4 -5
- data/app/models/creditcard.rb +38 -31
- data/app/models/gateway.rb +14 -14
- data/app/models/gateway/beanstream.rb +4 -4
- data/app/models/gateway/bogus.rb +6 -6
- data/app/models/gateway/braintree.rb +88 -0
- data/app/models/gateway/eway.rb +3 -3
- data/app/models/image.rb +5 -4
- data/app/models/option_type.rb +1 -0
- data/app/models/order.rb +60 -21
- data/app/models/payment.rb +5 -32
- data/app/models/preference.rb +7 -7
- data/app/models/product.rb +22 -7
- data/app/models/product_group.rb +22 -26
- data/app/models/product_property.rb +5 -5
- data/app/models/product_scope.rb +26 -6
- data/app/models/property.rb +1 -1
- data/app/models/state.rb +2 -3
- data/app/models/tax_category.rb +1 -0
- data/app/models/tax_rate.rb +1 -2
- data/app/models/taxon.rb +12 -10
- data/app/models/taxonomy.rb +7 -4
- data/app/models/tracker.rb +1 -1
- data/app/models/user.rb +4 -0
- data/app/models/variant.rb +1 -1
- data/app/models/zone.rb +1 -1
- data/app/models/zone_member.rb +3 -3
- data/app/views/admin/{shared → adjustments}/_adjustments_table.html.erb +7 -4
- data/app/views/admin/adjustments/edit.html.erb +1 -1
- data/app/views/admin/adjustments/index.html.erb +2 -2
- data/app/views/admin/adjustments/new.html.erb +2 -1
- data/app/views/admin/general_settings/edit.html.erb +4 -12
- data/app/views/admin/general_settings/show.html.erb +0 -5
- data/app/views/admin/images/index.html.erb +8 -5
- data/app/views/admin/inventory_settings/show.html.erb +1 -1
- data/app/views/admin/mail_methods/index.html.erb +4 -4
- data/app/views/admin/option_types/_form.html.erb +4 -4
- data/app/views/admin/option_types/_option_value_fields.html.erb +2 -2
- data/app/views/admin/option_types/edit.html.erb +4 -2
- data/app/views/admin/option_types/index.html.erb +5 -5
- data/app/views/admin/orders/_line_item.html.erb +2 -1
- data/app/views/admin/orders/history.html.erb +6 -2
- data/app/views/admin/orders/index.html.erb +22 -19
- data/app/views/admin/orders/show.html.erb +1 -1
- data/app/views/admin/orders/user.html.erb +1 -1
- data/app/views/admin/payment_methods/index.html.erb +7 -5
- data/app/views/admin/payments/_list.html.erb +3 -3
- data/app/views/admin/payments/index.html.erb +1 -1
- data/app/views/admin/payments/show.html.erb +2 -2
- data/app/views/admin/product_groups/edit.html.erb +7 -7
- data/app/views/admin/product_groups/index.html.erb +5 -3
- data/app/views/admin/product_groups/update.js.erb +4 -3
- data/app/views/admin/product_properties/_product_property_fields.html.erb +3 -3
- data/app/views/admin/product_properties/index.html.erb +10 -5
- data/app/views/admin/product_scopes/destroy.js.erb +1 -0
- data/app/views/admin/products/index.html.erb +32 -33
- data/app/views/admin/properties/_form.html.erb +2 -2
- data/app/views/admin/properties/index.html.erb +4 -4
- data/app/views/admin/prototypes/index.html.erb +4 -4
- data/app/views/admin/shared/_address_form.html.erb +1 -1
- data/app/views/admin/shared/_calculator_fields.html.erb +1 -1
- data/app/views/admin/shared/_destroy.js.erb +15 -2
- data/app/views/admin/shared/_order_tabs.html.erb +1 -1
- data/app/views/admin/shared/_report_criteria.html.erb +1 -1
- data/app/views/admin/shipments/_form.html.erb +6 -2
- data/app/views/admin/shipments/edit.html.erb +1 -1
- data/app/views/admin/shipments/index.html.erb +4 -2
- data/app/views/admin/shipping_methods/_form.html.erb +2 -0
- data/app/views/admin/shipping_methods/index.html.erb +3 -2
- data/app/views/admin/states/_state_list.html.erb +11 -5
- data/app/views/admin/tax_categories/index.html.erb +9 -4
- data/app/views/admin/tax_settings/show.html.erb +2 -2
- data/app/views/admin/taxonomies/_list.html.erb +4 -2
- data/app/views/admin/taxonomies/index.html.erb +2 -2
- data/app/views/admin/taxons/_form.html.erb +1 -1
- data/app/views/admin/trackers/index.html.erb +5 -5
- data/app/views/admin/users/_form.html.erb +3 -4
- data/app/views/admin/users/index.html.erb +7 -6
- data/app/views/admin/users/show.html.erb +3 -3
- data/app/views/admin/variants/index.html.erb +21 -6
- data/app/views/admin/zones/_form.html.erb +9 -9
- data/app/views/admin/zones/_member_type.html.erb +5 -5
- data/app/views/admin/zones/index.html.erb +7 -5
- data/app/views/checkout/_address.html.erb +2 -2
- data/app/views/checkout/_payment.html.erb +3 -6
- data/app/views/layouts/admin.html.erb +3 -9
- data/app/views/layouts/spree_application.html.erb +2 -1
- data/app/views/orders/_line_item.html.erb +1 -1
- data/app/views/orders/edit.html.erb +17 -16
- data/app/views/orders/show.html.erb +1 -1
- data/app/views/shared/_admin_head.html.erb +1 -1
- data/app/views/shared/_error_messages.html.erb +2 -2
- data/app/views/shared/_filters.html.erb +4 -4
- data/app/views/shared/_head.html.erb +2 -2
- data/app/views/shared/_nav_bar.html.erb +2 -2
- data/app/views/shared/_products.html.erb +4 -2
- data/app/views/shared/_taxonomies.html.erb +15 -8
- data/app/views/shipment_mailer/shipped_email.text.erb +2 -2
- data/config/cucumber.yml +10 -0
- data/config/initializers/form_builder.rb +1 -5
- data/config/initializers/workarounds_for_ruby19.rb +5 -5
- data/config/locales/en.yml +33 -6
- data/config/routes.rb +18 -13
- data/db/migrate/20090923100315_add_count_on_hand_to_variants_and_products.rb +5 -5
- data/db/migrate/20091213222815_creditcard_last_four_digits.rb +5 -5
- data/db/migrate/20100105132138_shipment_id_for_inventory_units.rb +2 -2
- data/db/migrate/20100209025806_create_payment_methods.rb +3 -3
- data/db/migrate/20100209144531_polymorphic_payments.rb +1 -1
- data/db/migrate/20100214212536_assign_creditcard_txns_to_payment.rb +2 -2
- data/db/migrate/20100224153127_deleted_at_for_payment_methods.rb +1 -1
- data/db/migrate/20100506185838_add_description_to_taxons.rb +1 -1
- data/db/migrate/20100816212146_shipping_method_id_for_orders.rb +1 -1
- data/db/migrate/20101026184808_migrate_checkout_to_orders.rb +2 -2
- data/db/migrate/20101223215658_add_position_to_variants.rb +9 -0
- data/db/migrate/20110110130847_add_next_state_to_state_events.rb +9 -0
- data/db/migrate/20110111122537_add_position_to_option_types.rb +9 -0
- data/db/migrate/20110314192118_remove_trailing_slashes_in_taxon_permalinks.rb +17 -0
- data/lib/custom_fixtures.rb +1 -1
- data/lib/{seo_assist.rb → middleware/seo_assist.rb} +14 -8
- data/lib/product_filters.rb +49 -43
- data/lib/redirect_legacy_product_url.rb +5 -5
- data/lib/scopes.rb +2 -2
- data/lib/scopes/dynamic.rb +9 -16
- data/lib/scopes/product.rb +33 -16
- data/lib/scopes/variant.rb +4 -3
- data/lib/spree/calculated_adjustments.rb +5 -2
- data/lib/spree/config.rb +2 -0
- data/lib/spree/current_order.rb +4 -4
- data/lib/spree/mail_settings.rb +3 -2
- data/lib/spree/search/base.rb +9 -10
- data/lib/spree_base.rb +22 -23
- data/lib/spree_core.rb +10 -69
- data/lib/spree_core/authorize_net_cim_hack.rb +1 -1
- data/lib/spree_core/delegate_belongs_to.rb +18 -24
- data/lib/spree_core/enumerable_constants.rb +38 -38
- data/lib/spree_core/find_by_param.rb +8 -6
- data/lib/spree_core/preferences/preference_definition.rb +7 -7
- data/lib/spree_core/railtie.rb +58 -0
- data/lib/spree_core/ssl_requirement.rb +4 -3
- data/lib/spree_core/testing_support/factories.rb +13 -0
- data/lib/spree_core/testing_support/factories/address_factory.rb +20 -0
- data/lib/spree_core/testing_support/factories/adjustment_factory.rb +6 -0
- data/lib/spree_core/testing_support/factories/calculator_factory.rb +5 -0
- data/lib/spree_core/testing_support/factories/configuraion_factory.rb +4 -0
- data/lib/spree_core/testing_support/factories/country_factory.rb +7 -0
- data/lib/spree_core/testing_support/factories/creditcard_factory.rb +11 -0
- data/lib/spree_core/testing_support/factories/inventory_unit_factory.rb +7 -0
- data/lib/spree_core/testing_support/factories/line_item_factory.rb +8 -0
- data/lib/spree_core/testing_support/factories/mail_method_factory.rb +4 -0
- data/lib/spree_core/testing_support/factories/options_factory.rb +10 -0
- data/lib/spree_core/testing_support/factories/order_factory.rb +18 -0
- data/lib/spree_core/testing_support/factories/payment_factory.rb +26 -0
- data/lib/spree_core/testing_support/factories/payment_method_factory.rb +17 -0
- data/lib/spree_core/testing_support/factories/product_factory.rb +16 -0
- data/lib/spree_core/testing_support/factories/product_group_factory.rb +3 -0
- data/lib/spree_core/testing_support/factories/product_option_type_factory.rb +4 -0
- data/lib/spree_core/testing_support/factories/product_property_factory.rb +4 -0
- data/lib/spree_core/testing_support/factories/product_scope_factory.rb +6 -0
- data/lib/spree_core/testing_support/factories/property_factory.rb +4 -0
- data/lib/spree_core/testing_support/factories/prototype_factory.rb +4 -0
- data/lib/spree_core/testing_support/factories/return_authorization_factory.rb +8 -0
- data/lib/spree_core/testing_support/factories/role_factory.rb +9 -0
- data/lib/spree_core/testing_support/factories/shipment_factory.rb +9 -0
- data/lib/spree_core/testing_support/factories/shipping_category_factory.rb +5 -0
- data/lib/spree_core/testing_support/factories/shipping_method_factory.rb +7 -0
- data/lib/spree_core/testing_support/factories/state_factory.rb +11 -0
- data/lib/spree_core/testing_support/factories/tax_category_factory.rb +8 -0
- data/lib/spree_core/testing_support/factories/tax_rate_factory.rb +5 -0
- data/lib/spree_core/testing_support/factories/taxon_factory.rb +5 -0
- data/lib/spree_core/testing_support/factories/taxonomy_factory.rb +3 -0
- data/lib/spree_core/testing_support/factories/tracker_factory.rb +5 -0
- data/lib/spree_core/testing_support/factories/user_factory.rb +15 -0
- data/lib/spree_core/testing_support/factories/variant_factory.rb +14 -0
- data/lib/spree_core/testing_support/factories/zone_factory.rb +18 -0
- data/lib/spree_core/theme_support/hook.rb +1 -1
- data/lib/spree_core/theme_support/more_patches.rb +20 -20
- data/lib/spree_core/version.rb +5 -0
- data/lib/tasks/common.rb +30 -0
- data/lib/tasks/install.rake +1 -1
- data/lib/tasks/rake_util.rb +19 -0
- data/lib/tasks/taxon.rake +14 -0
- data/public/images/reorder.jpg +0 -0
- data/public/javascripts/admin.js +0 -6
- data/public/javascripts/admin/unobtrusive_handlers.js +28 -0
- data/public/javascripts/checkout.js +3 -3
- data/public/stylesheets/admin/admin-forms.css +1 -6
- data/public/stylesheets/admin/admin.css +0 -28
- data/public/stylesheets/screen.css +0 -280
- metadata +81 -43
- data/app/controllers/countries_controller.rb +0 -11
- data/app/models/spree/alert.rb +0 -13
- data/app/models/state_monitor.rb +0 -25
- data/app/views/admin/shared/_alert.html.erb +0 -6
- data/app/views/countries/index.js.erb +0 -1
- data/app/views/shared/_doc_and_xmlns.html.erb +0 -2
- data/app/views/users/edit.html.erb +0 -9
- data/app/views/users/show.html.erb +0 -46
- data/lib/spree_core/validation_group.rb +0 -143
- data/public/stylesheets/scaffold.css +0 -54
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
5
|
-
prerelease:
|
4
|
+
hash: 215
|
5
|
+
prerelease: false
|
6
6
|
segments:
|
7
7
|
- 0
|
8
|
-
-
|
9
|
-
-
|
10
|
-
version: 0.
|
8
|
+
- 50
|
9
|
+
- 0
|
10
|
+
version: 0.50.0
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Sean Schofield
|
@@ -15,7 +15,8 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2011-
|
18
|
+
date: 2011-03-23 00:00:00 -04:00
|
19
|
+
default_executable:
|
19
20
|
dependencies:
|
20
21
|
- !ruby/object:Gem::Dependency
|
21
22
|
name: acts_as_list
|
@@ -34,19 +35,19 @@ dependencies:
|
|
34
35
|
type: :runtime
|
35
36
|
version_requirements: *id001
|
36
37
|
- !ruby/object:Gem::Dependency
|
37
|
-
name:
|
38
|
+
name: nested_set
|
38
39
|
prerelease: false
|
39
40
|
requirement: &id002 !ruby/object:Gem::Requirement
|
40
41
|
none: false
|
41
42
|
requirements:
|
42
43
|
- - "="
|
43
44
|
- !ruby/object:Gem::Version
|
44
|
-
hash:
|
45
|
+
hash: 7
|
45
46
|
segments:
|
46
47
|
- 1
|
48
|
+
- 6
|
47
49
|
- 4
|
48
|
-
|
49
|
-
version: 1.4.4
|
50
|
+
version: 1.6.4
|
50
51
|
type: :runtime
|
51
52
|
version_requirements: *id002
|
52
53
|
- !ruby/object:Gem::Dependency
|
@@ -121,12 +122,12 @@ dependencies:
|
|
121
122
|
requirements:
|
122
123
|
- - "="
|
123
124
|
- !ruby/object:Gem::Version
|
124
|
-
hash:
|
125
|
+
hash: 49
|
125
126
|
segments:
|
126
127
|
- 0
|
127
128
|
- 9
|
128
|
-
-
|
129
|
-
version: 0.9.
|
129
|
+
- 5
|
130
|
+
version: 0.9.5
|
130
131
|
type: :runtime
|
131
132
|
version_requirements: *id007
|
132
133
|
- !ruby/object:Gem::Dependency
|
@@ -160,19 +161,19 @@ dependencies:
|
|
160
161
|
type: :runtime
|
161
162
|
version_requirements: *id009
|
162
163
|
- !ruby/object:Gem::Dependency
|
163
|
-
name:
|
164
|
+
name: meta_search
|
164
165
|
prerelease: false
|
165
166
|
requirement: &id010 !ruby/object:Gem::Requirement
|
166
167
|
none: false
|
167
168
|
requirements:
|
168
169
|
- - "="
|
169
170
|
- !ruby/object:Gem::Version
|
170
|
-
hash:
|
171
|
+
hash: 21
|
171
172
|
segments:
|
172
|
-
-
|
173
|
-
- 0
|
173
|
+
- 1
|
174
174
|
- 0
|
175
|
-
|
175
|
+
- 1
|
176
|
+
version: 1.0.1
|
176
177
|
type: :runtime
|
177
178
|
version_requirements: *id010
|
178
179
|
- !ruby/object:Gem::Dependency
|
@@ -183,12 +184,12 @@ dependencies:
|
|
183
184
|
requirements:
|
184
185
|
- - "="
|
185
186
|
- !ruby/object:Gem::Version
|
186
|
-
hash:
|
187
|
+
hash: 39
|
187
188
|
segments:
|
188
189
|
- 1
|
189
|
-
-
|
190
|
+
- 12
|
190
191
|
- 0
|
191
|
-
version: 1.
|
192
|
+
version: 1.12.0
|
192
193
|
type: :runtime
|
193
194
|
version_requirements: *id011
|
194
195
|
- !ruby/object:Gem::Dependency
|
@@ -199,12 +200,11 @@ dependencies:
|
|
199
200
|
requirements:
|
200
201
|
- - "="
|
201
202
|
- !ruby/object:Gem::Version
|
202
|
-
hash:
|
203
|
+
hash: -1876988247
|
203
204
|
segments:
|
204
205
|
- 3
|
205
206
|
- 0
|
206
|
-
-
|
207
|
-
- 2
|
207
|
+
- pre2
|
208
208
|
version: 3.0.pre2
|
209
209
|
type: :runtime
|
210
210
|
version_requirements: *id012
|
@@ -216,12 +216,12 @@ dependencies:
|
|
216
216
|
requirements:
|
217
217
|
- - "="
|
218
218
|
- !ruby/object:Gem::Version
|
219
|
-
hash:
|
219
|
+
hash: 13
|
220
220
|
segments:
|
221
221
|
- 3
|
222
222
|
- 0
|
223
|
-
-
|
224
|
-
version: 3.0.
|
223
|
+
- 5
|
224
|
+
version: 3.0.5
|
225
225
|
type: :runtime
|
226
226
|
version_requirements: *id013
|
227
227
|
- !ruby/object:Gem::Dependency
|
@@ -232,12 +232,12 @@ dependencies:
|
|
232
232
|
requirements:
|
233
233
|
- - "="
|
234
234
|
- !ruby/object:Gem::Version
|
235
|
-
hash:
|
235
|
+
hash: 27
|
236
236
|
segments:
|
237
237
|
- 0
|
238
238
|
- 2
|
239
|
-
-
|
240
|
-
version: 0.2.
|
239
|
+
- 6
|
240
|
+
version: 0.2.6
|
241
241
|
type: :runtime
|
242
242
|
version_requirements: *id014
|
243
243
|
description: Required dependancy for Spree
|
@@ -289,7 +289,6 @@ files:
|
|
289
289
|
- app/controllers/admin/zones_controller.rb
|
290
290
|
- app/controllers/checkout_controller.rb
|
291
291
|
- app/controllers/content_controller.rb
|
292
|
-
- app/controllers/countries_controller.rb
|
293
292
|
- app/controllers/locale_controller.rb
|
294
293
|
- app/controllers/orders_controller.rb
|
295
294
|
- app/controllers/products_controller.rb
|
@@ -339,6 +338,7 @@ files:
|
|
339
338
|
- app/models/gateway/authorize_net_cim.rb
|
340
339
|
- app/models/gateway/beanstream.rb
|
341
340
|
- app/models/gateway/bogus.rb
|
341
|
+
- app/models/gateway/braintree.rb
|
342
342
|
- app/models/gateway/eway.rb
|
343
343
|
- app/models/gateway/linkpoint.rb
|
344
344
|
- app/models/gateway/pay_pal.rb
|
@@ -368,10 +368,8 @@ files:
|
|
368
368
|
- app/models/shipment.rb
|
369
369
|
- app/models/shipping_category.rb
|
370
370
|
- app/models/shipping_method.rb
|
371
|
-
- app/models/spree/alert.rb
|
372
371
|
- app/models/state.rb
|
373
372
|
- app/models/state_event.rb
|
374
|
-
- app/models/state_monitor.rb
|
375
373
|
- app/models/tax_category.rb
|
376
374
|
- app/models/tax_rate.rb
|
377
375
|
- app/models/taxon.rb
|
@@ -399,6 +397,7 @@ files:
|
|
399
397
|
- app/stylesheets/_typography.less
|
400
398
|
- app/stylesheets/screen.less
|
401
399
|
- app/views/account/login.html.erb
|
400
|
+
- app/views/admin/adjustments/_adjustments_table.html.erb
|
402
401
|
- app/views/admin/adjustments/_form.html.erb
|
403
402
|
- app/views/admin/adjustments/edit.html.erb
|
404
403
|
- app/views/admin/adjustments/index.html.erb
|
@@ -496,8 +495,6 @@ files:
|
|
496
495
|
- app/views/admin/shared/_additional_field.html.erb
|
497
496
|
- app/views/admin/shared/_address.html.erb
|
498
497
|
- app/views/admin/shared/_address_form.html.erb
|
499
|
-
- app/views/admin/shared/_adjustments_table.html.erb
|
500
|
-
- app/views/admin/shared/_alert.html.erb
|
501
498
|
- app/views/admin/shared/_calculator_fields.html.erb
|
502
499
|
- app/views/admin/shared/_configuration_menu.html.erb
|
503
500
|
- app/views/admin/shared/_destroy.js.erb
|
@@ -588,7 +585,6 @@ files:
|
|
588
585
|
- app/views/checkout/payment/_gateway.html.erb
|
589
586
|
- app/views/checkout/registration.html.erb
|
590
587
|
- app/views/content/cvv.html.erb
|
591
|
-
- app/views/countries/index.js.erb
|
592
588
|
- app/views/layouts/admin.html.erb
|
593
589
|
- app/views/layouts/spree_application.html.erb
|
594
590
|
- app/views/order_mailer/cancel_email.text.erb
|
@@ -608,7 +604,6 @@ files:
|
|
608
604
|
- app/views/shared/_additional_field.html.erb
|
609
605
|
- app/views/shared/_admin_head.html.erb
|
610
606
|
- app/views/shared/_basic_layout.html.erb
|
611
|
-
- app/views/shared/_doc_and_xmlns.html.erb
|
612
607
|
- app/views/shared/_edit_resource_links.html.erb
|
613
608
|
- app/views/shared/_error_messages.html.erb
|
614
609
|
- app/views/shared/_filters.html.erb
|
@@ -629,8 +624,7 @@ files:
|
|
629
624
|
- app/views/states/index.js.erb
|
630
625
|
- app/views/taxons/_taxon.html.erb
|
631
626
|
- app/views/taxons/show.html.erb
|
632
|
-
-
|
633
|
-
- app/views/users/show.html.erb
|
627
|
+
- config/cucumber.yml
|
634
628
|
- config/initializers/form_builder.rb
|
635
629
|
- config/initializers/load_unobtrusive_date_picker.rb
|
636
630
|
- config/initializers/spree.rb
|
@@ -642,13 +636,13 @@ files:
|
|
642
636
|
- lib/generators/templates/config/initializers/%file_name%.rb.tt
|
643
637
|
- lib/generators/templates/config/locales/%current_locale%.yml.tt
|
644
638
|
- lib/generators/templates/config/routes.rb
|
639
|
+
- lib/middleware/seo_assist.rb
|
645
640
|
- lib/product_filters.rb
|
646
641
|
- lib/redirect_legacy_product_url.rb
|
647
642
|
- lib/scopes/dynamic.rb
|
648
643
|
- lib/scopes/product.rb
|
649
644
|
- lib/scopes/variant.rb
|
650
645
|
- lib/scopes.rb
|
651
|
-
- lib/seo_assist.rb
|
652
646
|
- lib/spree/calculated_adjustments.rb
|
653
647
|
- lib/spree/config.rb
|
654
648
|
- lib/spree/current_order.rb
|
@@ -668,17 +662,56 @@ files:
|
|
668
662
|
- lib/spree_core/find_by_param.rb
|
669
663
|
- lib/spree_core/preferences/model_hooks.rb
|
670
664
|
- lib/spree_core/preferences/preference_definition.rb
|
665
|
+
- lib/spree_core/railtie.rb
|
671
666
|
- lib/spree_core/ssl_requirement.rb
|
667
|
+
- lib/spree_core/testing_support/factories/address_factory.rb
|
668
|
+
- lib/spree_core/testing_support/factories/adjustment_factory.rb
|
669
|
+
- lib/spree_core/testing_support/factories/calculator_factory.rb
|
670
|
+
- lib/spree_core/testing_support/factories/configuraion_factory.rb
|
671
|
+
- lib/spree_core/testing_support/factories/country_factory.rb
|
672
|
+
- lib/spree_core/testing_support/factories/creditcard_factory.rb
|
673
|
+
- lib/spree_core/testing_support/factories/inventory_unit_factory.rb
|
674
|
+
- lib/spree_core/testing_support/factories/line_item_factory.rb
|
675
|
+
- lib/spree_core/testing_support/factories/mail_method_factory.rb
|
676
|
+
- lib/spree_core/testing_support/factories/options_factory.rb
|
677
|
+
- lib/spree_core/testing_support/factories/order_factory.rb
|
678
|
+
- lib/spree_core/testing_support/factories/payment_factory.rb
|
679
|
+
- lib/spree_core/testing_support/factories/payment_method_factory.rb
|
680
|
+
- lib/spree_core/testing_support/factories/product_factory.rb
|
681
|
+
- lib/spree_core/testing_support/factories/product_group_factory.rb
|
682
|
+
- lib/spree_core/testing_support/factories/product_option_type_factory.rb
|
683
|
+
- lib/spree_core/testing_support/factories/product_property_factory.rb
|
684
|
+
- lib/spree_core/testing_support/factories/product_scope_factory.rb
|
685
|
+
- lib/spree_core/testing_support/factories/property_factory.rb
|
686
|
+
- lib/spree_core/testing_support/factories/prototype_factory.rb
|
687
|
+
- lib/spree_core/testing_support/factories/return_authorization_factory.rb
|
688
|
+
- lib/spree_core/testing_support/factories/role_factory.rb
|
689
|
+
- lib/spree_core/testing_support/factories/shipment_factory.rb
|
690
|
+
- lib/spree_core/testing_support/factories/shipping_category_factory.rb
|
691
|
+
- lib/spree_core/testing_support/factories/shipping_method_factory.rb
|
692
|
+
- lib/spree_core/testing_support/factories/state_factory.rb
|
693
|
+
- lib/spree_core/testing_support/factories/tax_category_factory.rb
|
694
|
+
- lib/spree_core/testing_support/factories/tax_rate_factory.rb
|
695
|
+
- lib/spree_core/testing_support/factories/taxon_factory.rb
|
696
|
+
- lib/spree_core/testing_support/factories/taxonomy_factory.rb
|
697
|
+
- lib/spree_core/testing_support/factories/tracker_factory.rb
|
698
|
+
- lib/spree_core/testing_support/factories/user_factory.rb
|
699
|
+
- lib/spree_core/testing_support/factories/variant_factory.rb
|
700
|
+
- lib/spree_core/testing_support/factories/zone_factory.rb
|
701
|
+
- lib/spree_core/testing_support/factories.rb
|
672
702
|
- lib/spree_core/theme_support/hook.rb
|
673
703
|
- lib/spree_core/theme_support/hook_listener.rb
|
674
704
|
- lib/spree_core/theme_support/hook_modifier.rb
|
675
705
|
- lib/spree_core/theme_support/more_patches.rb
|
676
706
|
- lib/spree_core/theme_support.rb
|
677
|
-
- lib/spree_core/
|
707
|
+
- lib/spree_core/version.rb
|
678
708
|
- lib/spree_core.rb
|
679
709
|
- lib/store_helpers.rb
|
710
|
+
- lib/tasks/common.rb
|
680
711
|
- lib/tasks/core.rake
|
681
712
|
- lib/tasks/install.rake
|
713
|
+
- lib/tasks/rake_util.rb
|
714
|
+
- lib/tasks/taxon.rake
|
682
715
|
- lib/tasks/themes.rake
|
683
716
|
- db/default/countries.yml
|
684
717
|
- db/default/roles.yml
|
@@ -763,6 +796,10 @@ files:
|
|
763
796
|
- db/migrate/20101103212716_drop_anonymous_field_for_user.rb
|
764
797
|
- db/migrate/20101111133551_renamed_rma_cancelled_state.rb
|
765
798
|
- db/migrate/20101117031806_fix_problematic_index_names.rb
|
799
|
+
- db/migrate/20101223215658_add_position_to_variants.rb
|
800
|
+
- db/migrate/20110110130847_add_next_state_to_state_events.rb
|
801
|
+
- db/migrate/20110111122537_add_position_to_option_types.rb
|
802
|
+
- db/migrate/20110314192118_remove_trailing_slashes_in_taxon_permalinks.rb
|
766
803
|
- db/sample/users.rb
|
767
804
|
- db/seeds.rb
|
768
805
|
- public/images/add-to-cart.png
|
@@ -909,6 +946,7 @@ files:
|
|
909
946
|
- public/images/orange/left_03.png
|
910
947
|
- public/images/orange/right_03.png
|
911
948
|
- public/images/progress.gif
|
949
|
+
- public/images/reorder.jpg
|
912
950
|
- public/images/right_01.png
|
913
951
|
- public/images/right_01_small.png
|
914
952
|
- public/images/separator.png
|
@@ -1054,8 +1092,8 @@ files:
|
|
1054
1092
|
- public/stylesheets/admin/yui-includes.css
|
1055
1093
|
- public/stylesheets/datepicker.css
|
1056
1094
|
- public/stylesheets/jquery.autocomplete.css
|
1057
|
-
- public/stylesheets/scaffold.css
|
1058
1095
|
- public/stylesheets/screen.css
|
1096
|
+
has_rdoc: true
|
1059
1097
|
homepage: http://spreecommerce.com
|
1060
1098
|
licenses: []
|
1061
1099
|
|
@@ -1087,7 +1125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
1087
1125
|
requirements:
|
1088
1126
|
- none
|
1089
1127
|
rubyforge_project: spree_core
|
1090
|
-
rubygems_version: 1.
|
1128
|
+
rubygems_version: 1.3.7
|
1091
1129
|
signing_key:
|
1092
1130
|
specification_version: 3
|
1093
1131
|
summary: Core e-commerce functionality for the Spree project.
|
data/app/models/spree/alert.rb
DELETED
@@ -1,13 +0,0 @@
|
|
1
|
-
class Spree::Alert < ActiveResource::Base
|
2
|
-
self.site = "http://alerts.spreecommerce.com/"
|
3
|
-
self.format = :json
|
4
|
-
|
5
|
-
def self.current(host)
|
6
|
-
find(:all, :params => { :version => Spree.version,
|
7
|
-
:name => Spree::Config[:site_name],
|
8
|
-
:host => host,
|
9
|
-
:rails_env => Rails.env,
|
10
|
-
:rails_version => Rails.version })
|
11
|
-
end
|
12
|
-
end
|
13
|
-
|
data/app/models/state_monitor.rb
DELETED
@@ -1,25 +0,0 @@
|
|
1
|
-
class StateMonitor < ActiveRecord::Observer
|
2
|
-
observe :order, :shipment
|
3
|
-
|
4
|
-
# Generic transition callback *after* the transition is performed
|
5
|
-
def after_transition(object, transition)
|
6
|
-
|
7
|
-
# current_user_session = Session.activated? ? Session.find : nil
|
8
|
-
#
|
9
|
-
# if current_user_session
|
10
|
-
# author = current_user_session.user
|
11
|
-
# elsif object.respond_to?(:user)
|
12
|
-
# author = object.user
|
13
|
-
# end
|
14
|
-
#
|
15
|
-
# to_state = transition.attributes[:to_name]
|
16
|
-
# object.state_events.create({
|
17
|
-
# :previous_state => transition.attributes[:from],
|
18
|
-
# :name => transition.attributes[:event].to_s,
|
19
|
-
# :user_id => author && author.id
|
20
|
-
# })
|
21
|
-
#
|
22
|
-
# ActiveRecord::Base.logger.info("#{object.class}##{object.id}: #{transition.attributes[:from]} => #{transition.attributes[:to]}")
|
23
|
-
end
|
24
|
-
|
25
|
-
end
|
@@ -1,6 +0,0 @@
|
|
1
|
-
<div class="alert <%= alert.severity.downcase %>">
|
2
|
-
<%= alert.message %> <%= link_to alert.url_name, alert.url if alert.url %>
|
3
|
-
<%= link_to 'X', dismiss_alert_admin_general_settings_path(:alert_id => alert.id),
|
4
|
-
:remote => true, :method => :post, :class => 'dismiss' %>
|
5
|
-
</div>
|
6
|
-
|
@@ -1 +0,0 @@
|
|
1
|
-
<%= auto_complete_result @countries, :name %>
|
@@ -1,9 +0,0 @@
|
|
1
|
-
<%= render "shared/error_messages", :target => @user %>
|
2
|
-
<h1><%= t("editing_user") %></h1>
|
3
|
-
<br/>
|
4
|
-
<%= form_for(:user, :url => object_url, :html => { :method => :put }) do |f| %>
|
5
|
-
<%= render 'shared/user_form', :f => f %>
|
6
|
-
<p>
|
7
|
-
<%=submit_tag t("update") %>
|
8
|
-
</p>
|
9
|
-
<% end %>
|
@@ -1,46 +0,0 @@
|
|
1
|
-
<h1><%= t("my_account") %></h1>
|
2
|
-
|
3
|
-
<%= hook :account_summary do %>
|
4
|
-
|
5
|
-
<table>
|
6
|
-
<tr>
|
7
|
-
<td><%= t("email") %>:</td>
|
8
|
-
<td>
|
9
|
-
<%= @user.email %>
|
10
|
-
</td>
|
11
|
-
</tr>
|
12
|
-
</table>
|
13
|
-
<p><%= link_to t('edit'), edit_object_url %></p>
|
14
|
-
|
15
|
-
<% end %>
|
16
|
-
|
17
|
-
<%= hook :account_my_orders do %>
|
18
|
-
|
19
|
-
<h2><%= t("my_orders") %></h2>
|
20
|
-
|
21
|
-
<table class="order-summary" width="545">
|
22
|
-
<thead>
|
23
|
-
<tr>
|
24
|
-
<th><%= t("order_number") %></th>
|
25
|
-
<th><%= t("order_date") %></th>
|
26
|
-
<th><%= t("status") %></th>
|
27
|
-
<th><%= t("customer") %></th>
|
28
|
-
<th><%= t("total") %></th>
|
29
|
-
</tr>
|
30
|
-
</thead>
|
31
|
-
<tbody>
|
32
|
-
<% @orders.each do |order| %>
|
33
|
-
<tr class="<%= cycle('even', 'odd') %>">
|
34
|
-
<td><%= link_to order.number, order_url(order) %></td>
|
35
|
-
<td><%=order.created_at.to_date%></td>
|
36
|
-
<td><%= t(order.state).titleize %></td>
|
37
|
-
<td><%= order.user.email if order.user %></td>
|
38
|
-
<td><%= number_to_currency order.total %></td>
|
39
|
-
</tr>
|
40
|
-
<% end %>
|
41
|
-
</tbody>
|
42
|
-
</table>
|
43
|
-
|
44
|
-
<br />
|
45
|
-
|
46
|
-
<% end %>
|