spree 0.8.5 → 0.9.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of spree might be problematic. Click here for more details.
- data/CHANGELOG +97 -4
- data/CONTRIBUTORS +62 -29
- data/LICENSE +1 -1
- data/README.markdown +1 -1
- data/app/controllers/admin/base_controller.rb +10 -1
- data/app/controllers/admin/configurations_controller.rb +19 -8
- data/app/controllers/admin/coupons_controller.rb +17 -0
- data/app/controllers/admin/creditcard_payments_controller.rb +4 -8
- data/app/controllers/admin/images_controller.rb +42 -3
- data/app/controllers/admin/orders_controller.rb +12 -12
- data/app/controllers/admin/products_controller.rb +12 -32
- data/app/controllers/admin/prototypes_controller.rb +3 -1
- data/app/controllers/admin/reports_controller.rb +6 -6
- data/app/controllers/admin/shipments_controller.rb +12 -1
- data/app/controllers/admin/shipping_methods_controller.rb +17 -17
- data/app/controllers/admin/shipping_rates_controller.rb +20 -0
- data/app/controllers/admin/tax_rates_controller.rb +28 -0
- data/{vendor/extensions/tax_calculator/app → app}/controllers/admin/tax_settings_controller.rb +1 -1
- data/app/controllers/admin/taxons_controller.rb +18 -72
- data/app/controllers/admin/users_controller.rb +6 -6
- data/app/controllers/admin/zones_controller.rb +4 -4
- data/app/controllers/application.rb +3 -3
- data/app/controllers/checkouts_controller.rb +158 -0
- data/app/controllers/content_controller.rb +1 -8
- data/app/controllers/orders_controller.rb +11 -23
- data/app/controllers/products_controller.rb +24 -23
- data/app/controllers/spree/base_controller.rb +47 -3
- data/app/controllers/states_controller.rb +4 -5
- data/app/controllers/taxons_controller.rb +13 -9
- data/app/controllers/user_sessions_controller.rb +3 -1
- data/app/controllers/users_controller.rb +3 -7
- data/app/helpers/admin/base_helper.rb +74 -6
- data/app/helpers/admin/calculators_helper.rb +2 -0
- data/app/helpers/admin/orders_helper.rb +1 -1
- data/{vendor/extensions/tax_calculator/app → app}/helpers/admin/tax_rates_helper.rb +0 -0
- data/app/helpers/admin/taxonomies_helper.rb +0 -59
- data/app/helpers/application_helper.rb +1 -2
- data/app/helpers/checkouts_helper.rb +7 -0
- data/app/helpers/products_helper.rb +15 -15
- data/app/helpers/spree/base_helper.rb +27 -5
- data/app/helpers/taxons_helper.rb +9 -9
- data/app/metal/create_admin_user.rb +21 -0
- data/app/models/address.rb +42 -2
- data/app/models/adjustment.rb +37 -0
- data/app/models/app_configuration.rb +10 -1
- data/app/models/calculator.rb +41 -0
- data/app/models/calculator/flat_percent_item_total.rb +19 -0
- data/app/models/calculator/flat_rate.rb +18 -0
- data/app/models/calculator/flexi_rate.rb +33 -0
- data/app/models/calculator/per_item.rb +18 -0
- data/app/models/calculator/price_bucket.rb +31 -0
- data/app/models/calculator/sales_tax.rb +48 -0
- data/app/models/calculator/vat.rb +63 -0
- data/app/models/charge.rb +37 -0
- data/app/models/checkout.rb +48 -0
- data/app/models/country.rb +11 -1
- data/app/models/coupon.rb +27 -0
- data/app/models/credit.rb +27 -0
- data/app/models/creditcard.rb +5 -5
- data/app/models/creditcard_payment.rb +13 -5
- data/app/models/image.rb +23 -1
- data/app/models/inventory_unit.rb +4 -3
- data/app/models/line_item.rb +10 -4
- data/app/models/order.rb +125 -65
- data/app/models/order_mailer.rb +1 -1
- data/app/models/order_observer.rb +15 -0
- data/app/models/product.rb +101 -87
- data/app/models/shipment.rb +20 -14
- data/app/models/shipping_category.rb +2 -0
- data/app/models/shipping_method.rb +19 -6
- data/app/models/shipping_rate.rb +6 -0
- data/app/models/state.rb +8 -2
- data/app/models/state_event.rb +7 -0
- data/app/models/tax_category.rb +2 -0
- data/{vendor/extensions/tax_calculator/app → app}/models/tax_rate.rb +9 -3
- data/app/models/taxon.rb +21 -15
- data/app/models/user.rb +17 -18
- data/app/models/user_mailer.rb +1 -1
- data/app/models/variant.rb +51 -60
- data/app/models/zone.rb +38 -23
- data/app/views/admin/configurations/index.html.erb +12 -0
- data/app/views/admin/coupons/_form.html.erb +24 -0
- data/app/views/admin/coupons/edit.html.erb +8 -0
- data/app/views/admin/coupons/index.html.erb +38 -0
- data/app/views/admin/coupons/new.html.erb +9 -0
- data/app/views/admin/creditcard_payments/new.html.erb +1 -1
- data/app/views/admin/general_settings/edit.html.erb +1 -1
- data/app/views/admin/general_settings/show.html.erb +2 -4
- data/app/views/admin/images/_form.html.erb +12 -0
- data/app/views/admin/images/edit.html.erb +19 -0
- data/app/views/admin/images/index.html.erb +63 -0
- data/app/views/admin/images/new.html.erb +20 -8
- data/app/views/admin/inventory_settings/show.html.erb +2 -2
- data/app/views/admin/mail_settings/edit.html.erb +13 -4
- data/app/views/admin/mail_settings/show.html.erb +7 -0
- data/app/views/admin/option_types/index.html.erb +1 -1
- data/app/views/admin/orders/index.html.erb +41 -54
- data/app/views/admin/orders/show.html.erb +19 -2
- data/app/views/admin/products/_form.html.erb +29 -16
- data/app/views/admin/products/index.html.erb +12 -17
- data/app/views/admin/products/new.html.erb +5 -5
- data/app/views/admin/properties/index.html.erb +1 -1
- data/app/views/admin/prototypes/index.html.erb +1 -1
- data/app/views/admin/reports/sales_total.html.erb +4 -4
- data/app/views/admin/shared/_address.html.erb +3 -1
- data/app/views/admin/shared/_calculator_fields.html.erb +15 -0
- data/app/views/admin/shared/_edit_resource_links.html.erb +1 -1
- data/app/views/admin/shared/_form_address.html.erb +8 -2
- data/app/views/admin/shared/_new_resource_links.html.erb +1 -1
- data/app/views/admin/shared/_order_details.html.erb +3 -36
- data/app/views/admin/shared/_order_tabs.html.erb +2 -2
- data/app/views/admin/shared/_product_tabs.html.erb +25 -12
- data/app/views/admin/shared/_report_criteria.html.erb +3 -7
- data/app/views/admin/shipments/_form.html.erb +11 -1
- data/app/views/admin/shipping_categories/index.html.erb +1 -1
- data/app/views/admin/shipping_methods/_form.html.erb +3 -5
- data/app/views/admin/shipping_methods/edit.html.erb +2 -2
- data/app/views/admin/shipping_methods/index.html.erb +3 -3
- data/app/views/admin/shipping_rates/_form.html.erb +12 -0
- data/app/views/admin/shipping_rates/edit.html.erb +8 -0
- data/app/views/admin/shipping_rates/index.html.erb +30 -0
- data/app/views/admin/shipping_rates/new.html.erb +10 -0
- data/app/views/admin/tax_categories/index.html.erb +1 -1
- data/app/views/admin/tax_rates/_form.html.erb +16 -0
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_rates/edit.html.erb +2 -2
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_rates/index.html.erb +4 -4
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_rates/new.html.erb +0 -0
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_settings/edit.html.erb +3 -3
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_settings/show.html.erb +1 -1
- data/app/views/admin/taxonomies/_js_head.html.erb +13 -0
- data/app/views/admin/taxonomies/_list.html.erb +3 -3
- data/app/views/admin/taxonomies/_taxon.html.erb +12 -0
- data/app/views/admin/taxonomies/edit.html.erb +17 -7
- data/app/views/admin/users/index.html.erb +7 -9
- data/app/views/admin/variants/_form.html.erb +1 -1
- data/app/views/admin/variants/index.html.erb +2 -2
- data/app/views/admin/zones/index.html.erb +4 -4
- data/app/views/checkouts/_billing.html.erb +66 -0
- data/app/views/checkouts/_confirmation.html.erb +11 -0
- data/app/views/checkouts/_form.html.erb +20 -0
- data/app/views/checkouts/_payment.html.erb +45 -0
- data/app/views/{orders → checkouts}/_registration.html.erb +4 -4
- data/app/views/checkouts/_shipping.html.erb +68 -0
- data/app/views/checkouts/_shipping_method.html.erb +19 -0
- data/app/views/checkouts/_summary.html.erb +36 -0
- data/app/views/checkouts/edit.html.erb +13 -0
- data/app/views/checkouts/new.html.erb +13 -0
- data/app/views/layouts/admin.html.erb +15 -5
- data/app/views/layouts/application.html.erb +3 -11
- data/{vendor/plugins/resource_controller/test/app/views/layouts/application.rhtml → app/views/layouts/checkouts.html.erb} +2 -2
- data/app/views/order_mailer/cancel.html.erb +4 -3
- data/app/views/order_mailer/confirm.html.erb +5 -4
- data/app/views/orders/_form.html.erb +4 -1
- data/app/views/orders/_google_order.html.erb +2 -2
- data/app/views/orders/_line_item.html.erb +6 -3
- data/app/views/orders/edit.html.erb +3 -3
- data/app/views/orders/new.html.erb +2 -2
- data/app/views/products/_cart_form.html.erb +45 -14
- data/app/views/products/_thumbnails.html.erb +34 -6
- data/app/views/products/index.html.erb +6 -2
- data/app/views/products/show.html.erb +1 -1
- data/app/views/shared/_edit_resource_links.html.erb +1 -1
- data/app/views/shared/_filters.html.erb +52 -0
- data/app/views/shared/_footer.html.erb +1 -1
- data/app/views/shared/_head.html.erb +6 -0
- data/app/views/shared/_login.html.erb +2 -2
- data/app/views/shared/_new_resource_links.html.erb +1 -1
- data/app/views/shared/_order_details.html.erb +46 -36
- data/app/views/shared/_taxonomies.html.erb +5 -6
- data/app/views/states/index.js.erb +1 -1
- data/app/views/taxons/show.html.erb +1 -1
- data/bin/spree +43 -2
- data/config/boot.rb +2 -2
- data/config/environment.rb +13 -5
- data/config/environments/test.rb +6 -2
- data/config/initializers/locales.rb +20 -8
- data/config/initializers/paperclip.rb +20 -0
- data/config/initializers/spree.rb +12 -2
- data/config/locales/da.yml +614 -0
- data/config/locales/da_rails.yml +197 -0
- data/config/locales/de-CH.yml +614 -0
- data/config/locales/de-CH_rails.yml +142 -0
- data/config/locales/de.yml +95 -4
- data/config/locales/en-GB.yml +112 -21
- data/config/locales/en-GB_rails.yml +84 -42
- data/config/locales/en-US.yml +103 -12
- data/config/locales/es.yml +95 -4
- data/config/locales/fi.yml +614 -0
- data/config/locales/fi_rails.yml +143 -0
- data/config/locales/fr-FR.yml +95 -4
- data/config/locales/fr-FR_rails.yml +1 -1
- data/config/locales/il.yml +614 -0
- data/config/locales/il_rails.yml +103 -0
- data/config/locales/it.yml +102 -11
- data/config/locales/jp.yml +614 -0
- data/config/locales/jp_rails.yml +135 -0
- data/config/locales/mx.yml +614 -0
- data/config/locales/mx_rails.yml +181 -0
- data/config/locales/nb-NO.yml +95 -4
- data/config/locales/nl-BE.yml +95 -4
- data/config/locales/nl-NL.yml +614 -0
- data/config/locales/nl-NL_rails.yml +172 -0
- data/config/locales/pl.yml +102 -11
- data/config/locales/pt-BR.yml +101 -10
- data/config/locales/pt-PT.yml +95 -4
- data/config/locales/ru-RU.yml +414 -323
- data/config/locales/ru-RU_rails.yml +1 -1
- data/config/locales/th.yml +614 -0
- data/config/locales/th_rails.yml +195 -0
- data/config/routes.rb +10 -6
- data/config/schedule.rb +27 -0
- data/config/spree_permissions.yml +8 -7
- data/db/default/zone_members.yml +2 -14
- data/{vendor/extensions/tax_calculator/db → db}/migrate/20080620100001_create_tax_rates.rb +0 -0
- data/{vendor/extensions/tax_calculator/db → db}/migrate/20080704192456_update_tax_rates_add_zones_etc.rb +0 -0
- data/db/migrate/20090401223217_create_eu_vat_zone_again.rb +1 -1
- data/db/migrate/20090404192723_add_maestro_fields.rb +12 -0
- data/db/migrate/20090406091357_add_alternative_phone.rb +9 -0
- data/db/migrate/20090525000325_remove_address_orphans.rb +15 -0
- data/db/migrate/20090603153927_create_checkouts.rb +71 -0
- data/db/migrate/20090617181106_change_txn_type_to_int.rb +18 -0
- data/db/migrate/20090618203233_create_charges.rb +61 -0
- data/db/migrate/20090626235303_create_credits.rb +22 -0
- data/db/migrate/20090705101511_add_image_dimensions.rb +12 -0
- data/db/migrate/20090708175306_create_coupons.rb +16 -0
- data/db/migrate/20090708175317_create_discounts.rb +14 -0
- data/db/migrate/20090714094201_add_default_addresses_to_user.rb +11 -0
- data/db/migrate/20090715172345_create_calculators.rb +22 -0
- data/db/migrate/20090731085008_add_charge_source_to_charge.rb +11 -0
- data/db/migrate/20090803072025_create_shipping_rates.rb +12 -0
- data/db/migrate/20090804090559_create_calculators_for_tax_rates.rb +16 -0
- data/db/migrate/20090805131937_drop_credits_and_discounts.rb +9 -0
- data/db/migrate/20090805185015_remove_tax_type.rb +13 -0
- data/db/migrate/20090806063212_rename_charges_to_adjustments.rb +24 -0
- data/db/migrate/20090806160214_rename_base_to_source.rb +11 -0
- data/db/migrate/20090809170304_remove_checkout_shipping_address_and_method.rb +15 -0
- data/db/migrate/20090809193131_add_is_master_to_variants.rb +43 -0
- data/db/migrate/20090809201209_drop_master_price_from_products.rb +13 -0
- data/db/migrate/20090809231957_update_legacy_calculators.rb +9 -0
- data/db/migrate/20090823005402_coupon_starts_at.rb +13 -0
- data/db/migrate/20090828114732_add_queued_mail.rb +12 -0
- data/db/migrate/20090908141056_adjust_percent_calc_settings.rb +9 -0
- data/db/migrate/migrate/20080620100001_create_tax_rates.rb +13 -0
- data/db/migrate/migrate/20080704192456_update_tax_rates_add_zones_etc.rb +17 -0
- data/db/sample/adjustments.yml +20 -0
- data/db/sample/assets.yml +219 -11
- data/db/sample/calculators.yml +16 -0
- data/db/sample/checkouts.yml +8 -0
- data/db/sample/coupons.yml +4 -0
- data/db/sample/creditcards.yml +0 -1
- data/db/sample/orders.yml +0 -7
- data/db/sample/preferences.yml +20 -0
- data/db/sample/products.yml +0 -9
- data/db/sample/shipping_methods.yml +3 -10
- data/db/sample/variants.yml +13 -0
- data/db/schema.rb +73 -23
- data/db/seeds.rb +8 -3
- data/generate +4 -0
- data/lib/generators/extension/extension_generator.rb +1 -1
- data/lib/generators/extension/templates/Rakefile +1 -1
- data/lib/generators/extension/templates/extension.rb +22 -2
- data/lib/generators/extension_migration/extension_migration_generator.rb +3 -3
- data/lib/generators/instance/instance_generator.rb +4 -2
- data/lib/plugins/extension_patches/lib/asset_copy.rb +1 -50
- data/lib/plugins/monkey_patches/lib/monkey_patches.rb +2 -2
- data/lib/product_filters.rb +174 -0
- data/lib/product_scopes.rb +76 -0
- data/lib/spree.rb +2 -2
- data/lib/spree/config.rb +1 -1
- data/lib/spree/extension_loader.rb +10 -1
- data/lib/spree/file_utilz.rb +71 -0
- data/lib/spree/initializer.rb +13 -1
- data/lib/spree/setup.rb +7 -1
- data/lib/tasks/consistency.rake +30 -0
- data/lib/tasks/database.rake +1 -7
- data/lib/tasks/extensions.rake +24 -8
- data/lib/tasks/framework.rake +0 -1
- data/lib/tasks/release.rake +22 -11
- data/lib/tasks/sample/products/1009/large/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1009/mini/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1009/original/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1009/product/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1009/small/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1010/large/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1010/mini/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1010/original/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1010/product/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1010/small/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1011/large/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1011/mini/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1011/original/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1011/product/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1011/small/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1012/large/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1012/mini/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1012/original/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1012/product/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1012/small/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1013/large/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1013/mini/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1013/original/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1013/product/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1013/small/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1014/large/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1014/mini/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1014/original/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1014/product/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1014/small/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1015/large/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1015/mini/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1015/original/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1015/product/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1015/small/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1016/large/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1016/mini/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1016/original/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1016/product/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1016/small/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1017/large/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1017/mini/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1017/original/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1017/product/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1017/small/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1018/large/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1018/mini/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1018/original/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1018/product/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1018/small/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1019/large/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1019/mini/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1019/original/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1019/product/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1019/small/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1020/large/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1020/mini/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1020/original/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1020/product/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1020/small/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1021/large/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1021/mini/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1021/original/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1021/product/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1021/small/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1022/large/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1022/mini/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1022/original/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1022/product/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1022/small/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1023/large/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1023/mini/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1023/original/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1023/product/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1023/small/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1024/large/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1024/mini/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1024/original/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1024/product/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1024/small/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1025/large/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1025/mini/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1025/original/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1025/product/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1025/small/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1026/large/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1026/mini/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1026/original/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1026/product/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1026/small/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/translation.rake +1 -1
- data/lib/tasks/upgrade.rake +2 -9
- data/public/images/menu-current.png +0 -0
- data/public/images/progress.gif +0 -0
- data/public/javascripts/calculator.js +13 -0
- data/public/javascripts/checkout.js +163 -34
- data/public/javascripts/jquery.alerts/images/help.gif +0 -0
- data/public/javascripts/jquery.alerts/images/important.gif +0 -0
- data/public/javascripts/jquery.alerts/images/info.gif +0 -0
- data/public/javascripts/jquery.alerts/images/title.gif +0 -0
- data/public/javascripts/jquery.alerts/jquery.alerts.css +57 -0
- data/public/javascripts/jquery.alerts/jquery.alerts.js +235 -0
- data/public/javascripts/jquery.alerts/jquery.alerts.spree.css +30 -0
- data/public/javascripts/jquery.validate.min.js +16 -0
- data/public/javascripts/jsTree/source/_lib.js +126 -0
- data/public/javascripts/jsTree/source/themes/default/context.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/create.png +0 -0
- data/public/javascripts/jsTree/source/themes/default/dot.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/f.png +0 -0
- data/public/javascripts/jsTree/source/themes/default/fminus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/fminus_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/fplus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/fplus_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/lastli.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/lastli_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/li.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/remove.png +0 -0
- data/public/javascripts/jsTree/source/themes/default/rename.png +0 -0
- data/public/javascripts/jsTree/source/themes/default/style.css +44 -0
- data/public/javascripts/jsTree/source/themes/default/throbber.gif +0 -0
- data/public/javascripts/jsTree/source/themes/marker.gif +0 -0
- data/public/javascripts/jsTree/source/themes/marker_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/plus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/remove.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/context.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/create.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/dot.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/f.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/fminus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/fminus_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/fplus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/fplus_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/lastli.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/li.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/remove.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/rename.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/style.css +39 -0
- data/public/javascripts/jsTree/source/themes/spree/throbber.gif +0 -0
- data/public/javascripts/jsTree/source/tree_component.css +62 -0
- data/public/javascripts/jsTree/source/tree_component.js +2315 -0
- data/public/javascripts/jsTree/source/tree_component.min.js +14 -0
- data/public/javascripts/spree.js +9 -0
- data/public/javascripts/taxonomy.js +202 -0
- data/public/stylesheets/admin/admin.css +36 -3
- data/public/stylesheets/compiled/screen.css +393 -306
- data/public/stylesheets/sass/_buttons.sass +59 -0
- data/public/stylesheets/sass/_cart.sass +21 -0
- data/public/stylesheets/sass/_checkout.sass +173 -0
- data/public/stylesheets/sass/_colors.sass +11 -0
- data/public/stylesheets/sass/_layout.sass +63 -0
- data/public/stylesheets/sass/_messages.sass +28 -0
- data/public/stylesheets/sass/_mixins.sass +17 -0
- data/public/stylesheets/sass/_navigation.sass +97 -0
- data/public/stylesheets/sass/_prices.sass +13 -0
- data/public/stylesheets/sass/_product_detail.sass +27 -0
- data/public/stylesheets/sass/_product_thumbnail.sass +58 -0
- data/public/stylesheets/sass/_registration.sass +9 -0
- data/public/stylesheets/sass/screen.sass +12 -555
- data/public/stylesheets/scaffold.css +54 -0
- data/spec/controllers/orders_controller_spec.rb +3 -2
- data/spec/models/address_spec.rb +2 -1
- data/spec/models/shipping_order_spec.rb +8 -6
- data/spec/models/zone_spec.rb +1 -1
- data/spec/preference_factory.rb +1 -1
- data/test/factories/address_factory.rb +20 -0
- data/test/factories/adjustments_factory.rb +53 -0
- data/test/factories/checkout_factory.rb +15 -0
- data/test/factories/country_factory.rb +5 -0
- data/test/factories/coupon_factory.rb +5 -0
- data/test/factories/creditcard_factory.rb +12 -0
- data/test/factories/creditcard_payment_factory.rb +11 -0
- data/test/factories/inventory_unit_factory.rb +2 -0
- data/test/factories/line_item_factory.rb +8 -0
- data/test/factories/options_factory.rb +10 -0
- data/test/factories/order_factory.rb +6 -0
- data/test/factories/preference_factory.rb +5 -0
- data/test/factories/product_factory.rb +13 -0
- data/test/factories/role_factory.rb +5 -0
- data/test/factories/shipment_factory.rb +6 -0
- data/test/factories/shipping_category_factory.rb +5 -0
- data/test/factories/shipping_method_factory.rb +13 -0
- data/test/factories/tax_category_factory.rb +8 -0
- data/test/factories/tax_rate_factory.rb +4 -0
- data/test/factories/taxon_factory.rb +16 -0
- data/test/factories/taxonomy_factory.rb +5 -0
- data/test/factories/user_factory.rb +11 -0
- data/test/factories/variant_factory.rb +13 -0
- data/test/factories/zone_factory.rb +10 -0
- data/test/fixtures/countries.yml +4 -0
- data/test/fixtures/gateway_configurations.yml +2 -0
- data/test/fixtures/gateways.yml +4 -0
- data/test/fixtures/states.yml +204 -0
- data/test/functional/calculators_controller_test.rb +8 -0
- data/test/functional/checkouts_controller_test.rb +77 -0
- data/test/functional/products_controller_test.rb +12 -0
- data/test/functional/users_controller_test.rb +25 -0
- data/test/test_helper.rb +66 -0
- data/test/unit/address_test.rb +39 -0
- data/test/unit/charge_test.rb +90 -0
- data/test/unit/checkout_test.rb +10 -0
- data/test/unit/country_test.rb +6 -0
- data/test/unit/coupon_test.rb +56 -0
- data/test/unit/credit_test.rb +61 -0
- data/test/unit/creditcard_payment_test.rb +28 -0
- data/test/unit/creditcard_test.rb +44 -0
- data/test/unit/factories_test.rb +29 -0
- data/test/unit/flat_percent_item_total_test.rb +28 -0
- data/test/unit/flat_rate_calculators_test.rb +13 -0
- data/test/unit/has_calculator_test.rb +22 -0
- data/test/unit/helpers/calculators_helper_test.rb +4 -0
- data/test/unit/helpers/checkouts_helper_test.rb +26 -0
- data/test/unit/helpers/products_helper_test.rb +32 -0
- data/test/unit/helpers/spree/base_helper_test.rb +43 -0
- data/test/unit/incomplete_checkout_test.rb +68 -0
- data/test/unit/inventory_unit_test.rb +20 -0
- data/test/unit/line_item_test.rb +73 -0
- data/test/unit/order_test.rb +80 -0
- data/test/unit/per_item_calculator_test.rb +14 -0
- data/test/unit/preference_test.rb +148 -0
- data/test/unit/product_test.rb +279 -0
- data/test/unit/sales_tax_calculator_test.rb +46 -0
- data/test/unit/shipping_method_test.rb +21 -0
- data/test/unit/state_event_test.rb +40 -0
- data/test/unit/state_test.rb +7 -0
- data/test/unit/tax_rate_test.rb +9 -0
- data/test/unit/variant_test.rb +128 -0
- data/test/unit/vat_calculator_test.rb +60 -0
- data/vendor/extensions/calculators/README.markdown +4 -0
- data/vendor/extensions/calculators/calculators_extension.rb +31 -0
- data/vendor/extensions/localization/public/images/flags/{dk.png → da.png} +0 -0
- data/vendor/extensions/localization/public/images/flags/de_CH.png +0 -0
- data/vendor/extensions/payment_gateway/README_PAYPAL.markdown +1 -1
- data/vendor/extensions/payment_gateway/db/migrate/20090517173727_add_currency_code_option_to_paypal_gateway.rb +13 -0
- data/vendor/extensions/payment_gateway/lib/spree/payment_gateway.rb +22 -12
- data/vendor/plugins/acts_as_adjacency_list/lib/active_record/acts/adjacency_list.rb +13 -20
- data/vendor/plugins/delegate_belongs_to/README +1 -0
- data/vendor/plugins/delegate_belongs_to/Rakefile +21 -0
- data/vendor/plugins/delegate_belongs_to/init.rb +2 -0
- data/vendor/plugins/delegate_belongs_to/lib/delegate_belongs_to.rb +95 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/controllers/application.rb +2 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/models/contact.rb +5 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/models/user_default.rb +2 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/models/user_mixed.rb +2 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/models/user_no_default.rb +2 -0
- data/vendor/plugins/{resource_controller/test → delegate_belongs_to/spec/app_root}/config/boot.rb +14 -9
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/database.yml +21 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/environment.rb +13 -0
- data/{public/favicon.ico → vendor/plugins/delegate_belongs_to/spec/app_root/config/environments/in_memory.rb} +0 -0
- data/vendor/plugins/{resource_controller/test/app/views/tags/index.rjs → delegate_belongs_to/spec/app_root/config/environments/mysql.rb} +0 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/environments/postgresql.rb +0 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/environments/sqlite.rb +0 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/environments/sqlite3.rb +0 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/routes.rb +4 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/db/migrate/01_create_users.rb +22 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/db/migrate/02_create_contacts.rb +12 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/lib/console_with_fixtures.rb +4 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/script/console +7 -0
- data/vendor/plugins/delegate_belongs_to/spec/model/with_defaults_spec.rb +30 -0
- data/vendor/plugins/delegate_belongs_to/spec/model/with_mixed_spec.rb +29 -0
- data/vendor/plugins/delegate_belongs_to/spec/model/with_no_defaults_spec.rb +30 -0
- data/vendor/plugins/delegate_belongs_to/spec/spec_helper.rb +68 -0
- data/vendor/plugins/has_calculator/README +7 -0
- data/vendor/plugins/has_calculator/init.rb +2 -0
- data/vendor/plugins/has_calculator/lib/has_calculator.rb +52 -0
- data/vendor/plugins/mail_queue/README +40 -0
- data/vendor/plugins/mail_queue/Rakefile +22 -0
- data/vendor/plugins/mail_queue/init.rb +1 -0
- data/vendor/plugins/mail_queue/install.rb +1 -0
- data/vendor/plugins/mail_queue/lib/mail_queue.rb +48 -0
- data/vendor/plugins/mail_queue/lib/queued_mail.rb +5 -0
- data/vendor/plugins/mail_queue/lib/test_mail_queue_mailer.rb +19 -0
- data/vendor/plugins/mail_queue/lib/test_mail_queue_mailer/notify.rhtml +1 -0
- data/vendor/plugins/mail_queue/tasks/mailer_queue_tasks.rake +4 -0
- data/vendor/plugins/mail_queue/test/mailer_queue_test.rb +29 -0
- data/vendor/plugins/paperclip/README.rdoc +126 -11
- data/vendor/plugins/paperclip/Rakefile +35 -24
- data/vendor/plugins/paperclip/lib/paperclip.rb +141 -67
- data/vendor/plugins/paperclip/lib/paperclip/attachment.rb +233 -117
- data/vendor/plugins/paperclip/lib/paperclip/callback_compatability.rb +33 -0
- data/vendor/plugins/paperclip/lib/paperclip/geometry.rb +4 -3
- data/vendor/plugins/paperclip/lib/paperclip/interpolations.rb +105 -0
- data/vendor/plugins/paperclip/lib/paperclip/iostream.rb +16 -1
- data/vendor/plugins/paperclip/lib/paperclip/matchers.rb +4 -0
- data/vendor/plugins/paperclip/lib/paperclip/matchers/have_attached_file_matcher.rb +49 -0
- data/vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb +66 -0
- data/vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_presence_matcher.rb +48 -0
- data/vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_size_matcher.rb +83 -0
- data/vendor/plugins/paperclip/lib/paperclip/processor.rb +49 -0
- data/vendor/plugins/paperclip/lib/paperclip/storage.rb +54 -25
- data/vendor/plugins/paperclip/lib/paperclip/thumbnail.rb +13 -31
- data/vendor/plugins/paperclip/lib/paperclip/upfile.rb +11 -0
- data/vendor/plugins/paperclip/paperclip.gemspec +37 -0
- data/vendor/plugins/paperclip/shoulda_macros/paperclip.rb +58 -22
- data/vendor/plugins/paperclip/tasks/paperclip_tasks.rake +1 -1
- data/vendor/plugins/paperclip/test/attachment_test.rb +460 -54
- data/vendor/plugins/paperclip/test/database.yml +0 -1
- data/vendor/plugins/paperclip/test/fixtures/s3.yml +4 -0
- data/vendor/plugins/paperclip/test/fixtures/twopage.pdf +0 -0
- data/vendor/plugins/paperclip/test/geometry_test.rb +22 -13
- data/vendor/plugins/paperclip/test/helper.rb +46 -3
- data/vendor/plugins/paperclip/test/integration_test.rb +140 -52
- data/vendor/plugins/paperclip/test/interpolations_test.rb +120 -0
- data/vendor/plugins/paperclip/test/iostream_test.rb +32 -21
- data/vendor/plugins/paperclip/test/matchers/have_attached_file_matcher_test.rb +21 -0
- data/vendor/plugins/paperclip/test/matchers/validate_attachment_content_type_matcher_test.rb +30 -0
- data/vendor/plugins/paperclip/test/matchers/validate_attachment_presence_matcher_test.rb +21 -0
- data/vendor/plugins/paperclip/test/matchers/validate_attachment_size_matcher_test.rb +50 -0
- data/vendor/plugins/paperclip/test/paperclip_test.rb +148 -36
- data/vendor/plugins/paperclip/test/processor_test.rb +10 -0
- data/vendor/plugins/paperclip/test/storage_test.rb +126 -16
- data/vendor/plugins/paperclip/test/thumbnail_test.rb +51 -19
- metadata +586 -622
- data/app/views/admin/products/_images.html.erb +0 -42
- data/app/views/admin/taxonomies/_yui_head.html.erb +0 -17
- data/app/views/orders/_billing.html.erb +0 -53
- data/app/views/orders/_checkout_form.html.erb +0 -14
- data/app/views/orders/_confirmation.html.erb +0 -11
- data/app/views/orders/_payment.html.erb +0 -30
- data/app/views/orders/_shipping.html.erb +0 -54
- data/app/views/orders/_shipping_method.html.erb +0 -10
- data/app/views/orders/checkout.html.erb +0 -15
- data/config/initializers/searchlogic.rb +0 -6
- data/db/sample/images/ror_bag.jpg +0 -0
- data/db/sample/images/ror_baseball_jersey.jpg +0 -0
- data/db/sample/images/ror_jr_spaghetti.jpg +0 -0
- data/db/sample/images/ror_mug.jpg +0 -0
- data/db/sample/images/ror_ringer_tshirt.jpg +0 -0
- data/db/sample/images/ror_stein.jpg +0 -0
- data/db/sample/images/ror_tote.jpg +0 -0
- data/db/sample/zone_members.yml +0 -16
- data/db/sample/zones.yml +0 -6
- data/lib/flat_rate.rb +0 -10
- data/lib/spree/checkout.rb +0 -74
- data/public/assets/products/1/mini/ror_tote.jpeg +0 -0
- data/public/assets/products/1/original/ror_tote.jpeg +0 -0
- data/public/assets/products/1/product/ror_tote.jpeg +0 -0
- data/public/assets/products/1/small/ror_tote.jpeg +0 -0
- data/public/assets/products/10/mini/ror_ringer_back.jpeg +0 -0
- data/public/assets/products/10/original/ror_ringer_back.jpeg +0 -0
- data/public/assets/products/10/product/ror_ringer_back.jpeg +0 -0
- data/public/assets/products/10/small/ror_ringer_back.jpeg +0 -0
- data/public/assets/products/1004/mini/apache_baseball.png +0 -0
- data/public/assets/products/1004/original/apache_baseball.png +0 -0
- data/public/assets/products/1004/product/apache_baseball.png +0 -0
- data/public/assets/products/1004/small/apache_baseball.png +0 -0
- data/public/assets/products/1008/mini/ruby_baseball.png +0 -0
- data/public/assets/products/1008/original/ruby_baseball.png +0 -0
- data/public/assets/products/1008/product/ruby_baseball.png +0 -0
- data/public/assets/products/1008/small/ruby_baseball.png +0 -0
- data/public/assets/products/11/mini/ror_stein.jpeg +0 -0
- data/public/assets/products/11/original/ror_stein.jpeg +0 -0
- data/public/assets/products/11/product/ror_stein.jpeg +0 -0
- data/public/assets/products/11/small/ror_stein.jpeg +0 -0
- data/public/assets/products/12/mini/ror_stein_back.jpeg +0 -0
- data/public/assets/products/12/original/ror_stein_back.jpeg +0 -0
- data/public/assets/products/12/product/ror_stein_back.jpeg +0 -0
- data/public/assets/products/12/small/ror_stein_back.jpeg +0 -0
- data/public/assets/products/2/mini/ror_tote_back.jpeg +0 -0
- data/public/assets/products/2/original/ror_tote_back.jpeg +0 -0
- data/public/assets/products/2/product/ror_tote_back.jpeg +0 -0
- data/public/assets/products/2/small/ror_tote_back.jpeg +0 -0
- data/public/assets/products/3/mini/ror_bag.jpeg +0 -0
- data/public/assets/products/3/original/ror_bag.jpeg +0 -0
- data/public/assets/products/3/product/ror_bag.jpeg +0 -0
- data/public/assets/products/3/small/ror_bag.jpeg +0 -0
- data/public/assets/products/4/mini/ror_baseball.jpeg +0 -0
- data/public/assets/products/4/original/ror_baseball.jpeg +0 -0
- data/public/assets/products/4/product/ror_baseball.jpeg +0 -0
- data/public/assets/products/4/small/ror_baseball.jpeg +0 -0
- data/public/assets/products/5/mini/ror_baseball_back.jpeg +0 -0
- data/public/assets/products/5/original/ror_baseball_back.jpeg +0 -0
- data/public/assets/products/5/product/ror_baseball_back.jpeg +0 -0
- data/public/assets/products/5/small/ror_baseball_back.jpeg +0 -0
- data/public/assets/products/6/mini/ror_jr_spaghetti.jpeg +0 -0
- data/public/assets/products/6/original/ror_jr_spaghetti.jpeg +0 -0
- data/public/assets/products/6/product/ror_jr_spaghetti.jpeg +0 -0
- data/public/assets/products/6/small/ror_jr_spaghetti.jpeg +0 -0
- data/public/assets/products/7/mini/ror_mug.jpeg +0 -0
- data/public/assets/products/7/original/ror_mug.jpeg +0 -0
- data/public/assets/products/7/product/ror_mug.jpeg +0 -0
- data/public/assets/products/7/small/ror_mug.jpeg +0 -0
- data/public/assets/products/8/mini/ror_mug_back.jpeg +0 -0
- data/public/assets/products/8/original/ror_mug_back.jpeg +0 -0
- data/public/assets/products/8/product/ror_mug_back.jpeg +0 -0
- data/public/assets/products/8/small/ror_mug_back.jpeg +0 -0
- data/public/assets/products/9/mini/ror_ringer.jpeg +0 -0
- data/public/assets/products/9/original/ror_ringer.jpeg +0 -0
- data/public/assets/products/9/product/ror_ringer.jpeg +0 -0
- data/public/assets/products/9/small/ror_ringer.jpeg +0 -0
- data/public/javascripts/jquery.validate.pack.js +0 -15
- data/public/javascripts/spree-yui.js +0 -693
- data/public/javascripts/yui-includes.js +0 -57
- data/public/stylesheets/admin/david-admin.css +0 -210
- data/spec/controllers/admin/shipments_controller_spec.rb +0 -30
- data/spec/helpers/admin/configurations_helper_spec.rb +0 -11
- data/spec/helpers/admin/mail_settings_helper_spec.rb +0 -11
- data/spec/helpers/products_helper_spec.rb +0 -12
- data/spec/helpers/spree/base_helper_spec.rb +0 -30
- data/spec/models/country_spec.rb +0 -29
- data/spec/models/line_item_spec.rb +0 -78
- data/spec/models/preference_spec.rb +0 -185
- data/spec/models/product_spec.rb +0 -207
- data/spec/models/shipping_method_spec.rb +0 -59
- data/spec/models/state_event_spec.rb +0 -12
- data/spec/models/state_spec.rb +0 -28
- data/spec/models/variant_spec.rb +0 -98
- data/vendor/extensions/flat_rate_shipping/README.markdown +0 -3
- data/vendor/extensions/flat_rate_shipping/Rakefile +0 -120
- data/vendor/extensions/flat_rate_shipping/flat_rate_shipping_extension.rb +0 -11
- data/vendor/extensions/flat_rate_shipping/lib/flat_rate_shipping_configuration.rb +0 -7
- data/vendor/extensions/flat_rate_shipping/lib/spree/flat_rate_shipping/calculator.rb +0 -9
- data/vendor/extensions/flat_rate_shipping/lib/spree/flat_rate_shipping/config.rb +0 -22
- data/vendor/extensions/flat_rate_shipping/lib/tasks/flat_rate_shipping_extension_tasks.rake +0 -29
- data/vendor/extensions/flat_rate_shipping/spec/spec.opts +0 -6
- data/vendor/extensions/flat_rate_shipping/spec/spec_helper.rb +0 -37
- data/vendor/extensions/tax_calculator/README.markdown +0 -8
- data/vendor/extensions/tax_calculator/Rakefile +0 -120
- data/vendor/extensions/tax_calculator/app/controllers/admin/tax_rates_controller.rb +0 -27
- data/vendor/extensions/tax_calculator/app/views/admin/tax_rates/_form.html.erb +0 -20
- data/vendor/extensions/tax_calculator/config/locales/de.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/en-GB.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/en-US.yml +0 -32
- data/vendor/extensions/tax_calculator/config/locales/es.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/it.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/nb-NO.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/pl.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/pt-BR.yml +0 -30
- data/vendor/extensions/tax_calculator/config/routes.rb +0 -4
- data/vendor/extensions/tax_calculator/lib/spree/sales_tax_calculator.rb +0 -31
- data/vendor/extensions/tax_calculator/lib/spree/tax/config.rb +0 -22
- data/vendor/extensions/tax_calculator/lib/spree/tax_calculator.rb +0 -18
- data/vendor/extensions/tax_calculator/lib/spree/vat_calculator.rb +0 -42
- data/vendor/extensions/tax_calculator/lib/tasks/tax_calculator_extension_tasks.rake +0 -18
- data/vendor/extensions/tax_calculator/lib/tax_configuration.rb +0 -7
- data/vendor/extensions/tax_calculator/spec/controllers/tax_calculator_spec.rb +0 -12
- data/vendor/extensions/tax_calculator/spec/helpers/admin/tax_rates_helper_spec.rb +0 -6
- data/vendor/extensions/tax_calculator/spec/helpers/products_helper_spec.rb +0 -88
- data/vendor/extensions/tax_calculator/spec/models/sales_tax_calculator_spec.rb +0 -53
- data/vendor/extensions/tax_calculator/spec/models/tax_calculator_spec.rb +0 -58
- data/vendor/extensions/tax_calculator/spec/models/tax_rate_spec.rb +0 -17
- data/vendor/extensions/tax_calculator/spec/models/vat_calculator_spec.rb +0 -56
- data/vendor/extensions/tax_calculator/spec/spec.opts +0 -6
- data/vendor/extensions/tax_calculator/spec/spec_helper.rb +0 -42
- data/vendor/extensions/tax_calculator/tax_calculator_extension.rb +0 -41
- data/vendor/plugins/resource_controller/test/Rakefile +0 -10
- data/vendor/plugins/resource_controller/test/app/controllers/accounts_controller.rb +0 -6
- data/vendor/plugins/resource_controller/test/app/controllers/application.rb +0 -7
- data/vendor/plugins/resource_controller/test/app/controllers/cms/options_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/cms/personnel_controller.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/controllers/cms/photos_controller.rb +0 -6
- data/vendor/plugins/resource_controller/test/app/controllers/cms/products_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/comments_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/images_controller.rb +0 -4
- data/vendor/plugins/resource_controller/test/app/controllers/options_controller.rb +0 -8
- data/vendor/plugins/resource_controller/test/app/controllers/people_controller.rb +0 -9
- data/vendor/plugins/resource_controller/test/app/controllers/photos_controller.rb +0 -11
- data/vendor/plugins/resource_controller/test/app/controllers/posts_controller.rb +0 -10
- data/vendor/plugins/resource_controller/test/app/controllers/projects_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/somethings_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/tags_controller.rb +0 -13
- data/vendor/plugins/resource_controller/test/app/controllers/users_controller.rb +0 -12
- data/vendor/plugins/resource_controller/test/app/helpers/accounts_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/application_helper.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/helpers/cms/products_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/comments_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/images_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/options_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/people_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/photos_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/posts_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/projects_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/somethings_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/tags_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/users_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/models/account.rb +0 -4
- data/vendor/plugins/resource_controller/test/app/models/comment.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/image.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/option.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/personnel.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/photo.rb +0 -5
- data/vendor/plugins/resource_controller/test/app/models/post.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/product.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/project.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/models/something.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/models/tag.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/user.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/views/accounts/_form.html.erb +0 -4
- data/vendor/plugins/resource_controller/test/app/views/accounts/edit.html.erb +0 -14
- data/vendor/plugins/resource_controller/test/app/views/accounts/new.html.erb +0 -12
- data/vendor/plugins/resource_controller/test/app/views/accounts/show.html.erb +0 -5
- data/vendor/plugins/resource_controller/test/app/views/cms/options/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/cms/options/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/cms/options/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/cms/options/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/cms/photos/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/cms/photos/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/cms/photos/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/cms/photos/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/cms/products/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/cms/products/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/cms/products/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/cms/products/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/comments/edit.rhtml +0 -27
- data/vendor/plugins/resource_controller/test/app/views/comments/index.rhtml +0 -24
- data/vendor/plugins/resource_controller/test/app/views/comments/new.rhtml +0 -26
- data/vendor/plugins/resource_controller/test/app/views/comments/show.rhtml +0 -18
- data/vendor/plugins/resource_controller/test/app/views/images/_form.html.erb +0 -4
- data/vendor/plugins/resource_controller/test/app/views/images/edit.html.erb +0 -14
- data/vendor/plugins/resource_controller/test/app/views/images/new.html.erb +0 -12
- data/vendor/plugins/resource_controller/test/app/views/layouts/comments.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/options.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/people.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/photos.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/projects.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/somethings.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/tags.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/options/_form.html.erb +0 -8
- data/vendor/plugins/resource_controller/test/app/views/options/edit.html.erb +0 -16
- data/vendor/plugins/resource_controller/test/app/views/options/index.html.erb +0 -21
- data/vendor/plugins/resource_controller/test/app/views/options/new.html.erb +0 -12
- data/vendor/plugins/resource_controller/test/app/views/options/show.html.erb +0 -10
- data/vendor/plugins/resource_controller/test/app/views/people/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/people/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/people/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/people/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/photos/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/photos/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/photos/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/photos/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/posts/edit.rhtml +0 -22
- data/vendor/plugins/resource_controller/test/app/views/posts/index.rhtml +0 -22
- data/vendor/plugins/resource_controller/test/app/views/posts/new.rhtml +0 -21
- data/vendor/plugins/resource_controller/test/app/views/posts/show.rhtml +0 -13
- data/vendor/plugins/resource_controller/test/app/views/projects/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/projects/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/projects/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/projects/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/somethings/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/somethings/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/somethings/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/somethings/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/tags/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/tags/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/tags/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/tags/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/users/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/users/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/users/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/users/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/config/database.yml +0 -9
- data/vendor/plugins/resource_controller/test/config/environment.rb +0 -47
- data/vendor/plugins/resource_controller/test/config/environments/development.rb +0 -21
- data/vendor/plugins/resource_controller/test/config/environments/test.rb +0 -19
- data/vendor/plugins/resource_controller/test/config/initializers/inflections.rb +0 -14
- data/vendor/plugins/resource_controller/test/config/routes.rb +0 -61
- data/vendor/plugins/resource_controller/test/db/migrate/001_create_posts.rb +0 -12
- data/vendor/plugins/resource_controller/test/db/migrate/002_create_products.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/003_create_comments.rb +0 -13
- data/vendor/plugins/resource_controller/test/db/migrate/004_create_options.rb +0 -13
- data/vendor/plugins/resource_controller/test/db/migrate/005_create_photos.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/006_create_tags.rb +0 -17
- data/vendor/plugins/resource_controller/test/db/migrate/007_create_somethings.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/008_create_accounts.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/009_add_account_id_to_photos.rb +0 -9
- data/vendor/plugins/resource_controller/test/db/migrate/010_create_projects.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/011_create_images.rb +0 -12
- data/vendor/plugins/resource_controller/test/db/migrate/012_create_users.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/013_create_personnel.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/014_add_personnel_id_to_photos.rb +0 -9
- data/vendor/plugins/resource_controller/test/db/schema.rb +0 -78
- data/vendor/plugins/resource_controller/test/script/console +0 -3
- data/vendor/plugins/resource_controller/test/script/destroy +0 -3
- data/vendor/plugins/resource_controller/test/script/generate +0 -3
- data/vendor/plugins/resource_controller/test/script/server +0 -3
- data/vendor/plugins/resource_controller/test/test/fixtures/accounts.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/comments.yml +0 -11
- data/vendor/plugins/resource_controller/test/test/fixtures/images.yml +0 -6
- data/vendor/plugins/resource_controller/test/test/fixtures/options.yml +0 -9
- data/vendor/plugins/resource_controller/test/test/fixtures/personnel.yml +0 -5
- data/vendor/plugins/resource_controller/test/test/fixtures/photos.yml +0 -9
- data/vendor/plugins/resource_controller/test/test/fixtures/photos_tags.yml +0 -3
- data/vendor/plugins/resource_controller/test/test/fixtures/posts.yml +0 -9
- data/vendor/plugins/resource_controller/test/test/fixtures/products.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/projects.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/somethings.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/tags.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/users.yml +0 -5
- data/vendor/plugins/resource_controller/test/test/functional/cms/options_controller_test.rb +0 -23
- data/vendor/plugins/resource_controller/test/test/functional/cms/photos_controller_test.rb +0 -43
- data/vendor/plugins/resource_controller/test/test/functional/cms/products_controller_test.rb +0 -23
- data/vendor/plugins/resource_controller/test/test/functional/comments_controller_test.rb +0 -26
- data/vendor/plugins/resource_controller/test/test/functional/images_controller_test.rb +0 -37
- data/vendor/plugins/resource_controller/test/test/functional/people_controller_test.rb +0 -34
- data/vendor/plugins/resource_controller/test/test/functional/photos_controller_test.rb +0 -130
- data/vendor/plugins/resource_controller/test/test/functional/posts_controller_test.rb +0 -34
- data/vendor/plugins/resource_controller/test/test/functional/projects_controller_test.rb +0 -18
- data/vendor/plugins/resource_controller/test/test/functional/somethings_controller_test.rb +0 -28
- data/vendor/plugins/resource_controller/test/test/functional/tags_controller_test.rb +0 -64
- data/vendor/plugins/resource_controller/test/test/functional/users_controller_test.rb +0 -24
- data/vendor/plugins/resource_controller/test/test/test_helper.rb +0 -12
- data/vendor/plugins/resource_controller/test/test/unit/accessors_test.rb +0 -110
- data/vendor/plugins/resource_controller/test/test/unit/account_test.rb +0 -7
- data/vendor/plugins/resource_controller/test/test/unit/action_options_test.rb +0 -109
- data/vendor/plugins/resource_controller/test/test/unit/base_test.rb +0 -11
- data/vendor/plugins/resource_controller/test/test/unit/comment_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/failable_action_options_test.rb +0 -77
- data/vendor/plugins/resource_controller/test/test/unit/helpers/current_objects_test.rb +0 -133
- data/vendor/plugins/resource_controller/test/test/unit/helpers/internal_test.rb +0 -106
- data/vendor/plugins/resource_controller/test/test/unit/helpers/nested_test.rb +0 -86
- data/vendor/plugins/resource_controller/test/test/unit/helpers/singleton_current_objects_test.rb +0 -68
- data/vendor/plugins/resource_controller/test/test/unit/helpers/singleton_nested_test.rb +0 -77
- data/vendor/plugins/resource_controller/test/test/unit/helpers/singleton_urls_test.rb +0 -67
- data/vendor/plugins/resource_controller/test/test/unit/helpers/urls_test.rb +0 -75
- data/vendor/plugins/resource_controller/test/test/unit/helpers_test.rb +0 -25
- data/vendor/plugins/resource_controller/test/test/unit/image_test.rb +0 -7
- data/vendor/plugins/resource_controller/test/test/unit/option_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/photo_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/post_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/project_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/response_collector_test.rb +0 -49
- data/vendor/plugins/resource_controller/test/test/unit/something_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/tag_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/urligence_test.rb +0 -203
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/Rakefile +0 -32
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/bin/convert_to_should_syntax +0 -40
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/init.rb +0 -3
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda.rb +0 -43
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/active_record_helpers.rb +0 -580
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/color.rb +0 -77
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/controller_tests/controller_tests.rb +0 -467
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/controller_tests/formats/html.rb +0 -201
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/controller_tests/formats/xml.rb +0 -170
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/gem/proc_extensions.rb +0 -14
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/gem/shoulda.rb +0 -239
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/general.rb +0 -118
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/private_helpers.rb +0 -22
@@ -1,5 +1,6 @@
|
|
1
1
|
class ContentController < Spree::BaseController
|
2
2
|
rescue_from ActionView::MissingTemplate, :with => :render_404
|
3
|
+
caches_page :show, :index
|
3
4
|
|
4
5
|
def show
|
5
6
|
render :action => params[:path].join('/')
|
@@ -8,12 +9,4 @@ class ContentController < Spree::BaseController
|
|
8
9
|
def cvv
|
9
10
|
render "cvv", :layout => false
|
10
11
|
end
|
11
|
-
|
12
|
-
protected
|
13
|
-
def render_404(exception)
|
14
|
-
respond_to do |type|
|
15
|
-
type.html { render :file => "#{RAILS_ROOT}/public/404.html", :status => "404 Not Found" }
|
16
|
-
type.all { render :nothing => true, :status => "404 Not Found" }
|
17
|
-
end
|
18
|
-
end
|
19
12
|
end
|
@@ -1,9 +1,8 @@
|
|
1
1
|
class OrdersController < Spree::BaseController
|
2
|
-
|
3
|
-
|
2
|
+
prepend_before_filter :reject_unknown_object, :only => [:show, :edit, :update, :checkout]
|
4
3
|
before_filter :prevent_editing_complete_order, :only => [:edit, :update, :checkout]
|
5
4
|
|
6
|
-
ssl_required :show
|
5
|
+
ssl_required :show
|
7
6
|
|
8
7
|
resource_controller
|
9
8
|
actions :all, :except => :index
|
@@ -44,14 +43,17 @@ class OrdersController < Spree::BaseController
|
|
44
43
|
|
45
44
|
#override r_c default b/c we don't want to actually destroy, we just want to clear line items
|
46
45
|
def destroy
|
46
|
+
flash[:notice] = I18n.t(:basket_successfully_cleared)
|
47
47
|
@order.line_items.clear
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
48
|
+
@order.update_totals!
|
49
|
+
after :destroy
|
50
|
+
set_flash :destroy
|
51
|
+
response_for :destroy
|
52
|
+
end
|
52
53
|
|
53
|
-
|
54
|
-
|
54
|
+
destroy.response do |wants|
|
55
|
+
wants.html { redirect_to(edit_object_url) }
|
56
|
+
end
|
55
57
|
|
56
58
|
def can_access?
|
57
59
|
return true unless order = load_object
|
@@ -73,18 +75,4 @@ class OrdersController < Spree::BaseController
|
|
73
75
|
load_object
|
74
76
|
redirect_to object_url if @order.checkout_complete
|
75
77
|
end
|
76
|
-
|
77
|
-
def load_data
|
78
|
-
@default_country = Country.find Spree::Config[:default_country_id]
|
79
|
-
@countries = Country.find(:all).sort
|
80
|
-
@shipping_countries = @order.shipping_countries.sort
|
81
|
-
@states = @default_country.states.sort
|
82
|
-
end
|
83
|
-
|
84
|
-
def rate_hash
|
85
|
-
shipment = @order.shipments.last
|
86
|
-
@order.shipping_methods.collect { |ship_method| {:id => ship_method.id,
|
87
|
-
:name => ship_method.name,
|
88
|
-
:rate => number_to_currency(ship_method.calculate_shipping(shipment)) } }
|
89
|
-
end
|
90
78
|
end
|
@@ -1,9 +1,9 @@
|
|
1
1
|
class ProductsController < Spree::BaseController
|
2
|
-
|
2
|
+
prepend_before_filter :reject_unknown_object, :only => [:show]
|
3
|
+
before_filter :load_data, :only => :show
|
3
4
|
|
4
5
|
resource_controller
|
5
6
|
helper :taxons
|
6
|
-
before_filter :load_data, :only => :show
|
7
7
|
actions :show, :index
|
8
8
|
|
9
9
|
index do
|
@@ -19,33 +19,34 @@ class ProductsController < Spree::BaseController
|
|
19
19
|
end
|
20
20
|
|
21
21
|
private
|
22
|
-
def
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
end
|
27
|
-
|
28
|
-
def load_data
|
22
|
+
def load_data
|
23
|
+
load_object
|
24
|
+
@selected_variant = @product.variants.detect { |v| v.available? }
|
25
|
+
|
29
26
|
return unless permalink = params[:taxon_path]
|
30
|
-
@taxon = Taxon.find_by_permalink(params[:taxon_path].join("/") + "/")
|
27
|
+
@taxon = Taxon.find_by_permalink(params[:taxon_path].join("/") + "/")
|
31
28
|
end
|
32
29
|
|
33
30
|
def collection
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
["products.id in (select product_id from products_taxons where taxon_id in (" +
|
39
|
-
@taxon.descendents.inject( @taxon.id.to_s) { |clause, t| clause += ', ' + t.id.to_s} + "))"
|
40
|
-
]).new_search(params[:search])
|
41
|
-
else
|
42
|
-
@search = Product.active.new_search(params[:search])
|
31
|
+
base_scope = Product.active
|
32
|
+
|
33
|
+
if !params[:taxon].blank? && (@taxon = Taxon.find_by_id(params[:taxon]))
|
34
|
+
base_scope = base_scope.taxons_id_in_tree(@taxon)
|
43
35
|
end
|
36
|
+
|
37
|
+
@search = base_scope.search(params[:search])
|
38
|
+
# might want to add .scoped(:select => "distinct on (products.id) products.*") here
|
39
|
+
# in case some filter goes astray with its joins
|
40
|
+
|
41
|
+
# this can now be set on a model basis
|
42
|
+
# Product.per_page ||= Spree::Config[:products_per_page]
|
43
|
+
per_page = params[:per_page].present? ? params[:per_page] : Spree::Config[:products_per_page]
|
44
44
|
|
45
|
-
|
46
|
-
@
|
45
|
+
## defunct?
|
46
|
+
@product_cols = 3
|
47
47
|
|
48
|
-
@
|
49
|
-
|
48
|
+
@products ||= @search.paginate(:include => [:images, {:variants => :images}],
|
49
|
+
:per_page => per_page,
|
50
|
+
:page => params[:page])
|
50
51
|
end
|
51
52
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
class Spree::BaseController < ApplicationController
|
2
|
-
|
3
2
|
filter_parameter_logging :password, :number, :verification_value
|
3
|
+
helper_method :title, :set_title
|
4
4
|
|
5
5
|
# retrieve the order_id from the session and then load from the database (or return a new order if no
|
6
6
|
# such id exists in the session)
|
@@ -10,7 +10,8 @@ class Spree::BaseController < ApplicationController
|
|
10
10
|
else
|
11
11
|
@order = Order.create
|
12
12
|
end
|
13
|
-
session[:order_id]
|
13
|
+
session[:order_id] = @order.id
|
14
|
+
session[:order_token] = @order.token
|
14
15
|
@order
|
15
16
|
end
|
16
17
|
|
@@ -23,5 +24,48 @@ class Spree::BaseController < ApplicationController
|
|
23
24
|
def initialize_extension_partials
|
24
25
|
@extension_partials = []
|
25
26
|
end
|
27
|
+
|
28
|
+
# set_title can be used in views as well as controllers.
|
29
|
+
# e.g. <% set_title 'This is a custom title for this view' %>
|
30
|
+
def set_title(title)
|
31
|
+
@title = title
|
32
|
+
end
|
33
|
+
|
34
|
+
def title
|
35
|
+
if @title.blank?
|
36
|
+
default_title
|
37
|
+
else
|
38
|
+
@title
|
39
|
+
end
|
40
|
+
end
|
26
41
|
|
27
|
-
|
42
|
+
def default_title
|
43
|
+
Spree::Config[:site_name]
|
44
|
+
end
|
45
|
+
|
46
|
+
protected
|
47
|
+
def reject_unknown_object
|
48
|
+
# workaround to catch problems with loading errors for permalink ids (reconsider RC permalink hack elsewhere?)
|
49
|
+
begin
|
50
|
+
load_object
|
51
|
+
rescue Exception => e
|
52
|
+
@object = nil
|
53
|
+
end
|
54
|
+
the_object = instance_variable_get "@#{object_name}"
|
55
|
+
unless params[:id].blank? || the_object
|
56
|
+
if self.respond_to? :object_missing
|
57
|
+
self.object_missing(params[:id])
|
58
|
+
else
|
59
|
+
render_404 Exception.new("missing object in #{self.class.to_s}")
|
60
|
+
end
|
61
|
+
end
|
62
|
+
return true
|
63
|
+
end
|
64
|
+
|
65
|
+
def render_404(exception)
|
66
|
+
respond_to do |type|
|
67
|
+
type.html { render :file => "#{RAILS_ROOT}/public/404.html", :status => "404 Not Found" }
|
68
|
+
type.all { render :nothing => true, :status => "404 Not Found" }
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
@@ -10,11 +10,10 @@ class StatesController < Spree::BaseController
|
|
10
10
|
# blank is added elsewhere, if needed
|
11
11
|
# we return ALL known information, since billing country isn't restricted
|
12
12
|
# by shipping country
|
13
|
-
@state_info = {}
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
end
|
13
|
+
@state_info = Hash.new {|h, k| h[k] = []}
|
14
|
+
State.find(:all, :order => "name ASC").each{|state|
|
15
|
+
@state_info[state.country_id.to_s].push [state.id, state.name]
|
16
|
+
}
|
18
17
|
end
|
19
18
|
end
|
20
19
|
end
|
@@ -1,21 +1,25 @@
|
|
1
1
|
class TaxonsController < Spree::BaseController
|
2
|
-
|
2
|
+
prepend_before_filter :reject_unknown_object, :only => [:show]
|
3
3
|
before_filter :load_data, :only => :show
|
4
|
+
resource_controller
|
4
5
|
actions :show
|
5
6
|
helper :products
|
6
|
-
|
7
|
+
|
7
8
|
private
|
8
9
|
def load_data
|
9
|
-
@search = object.products.active.
|
10
|
-
@search.per_page = Spree::Config[:products_per_page]
|
11
|
-
@search.include = :images
|
10
|
+
@search = object.products.active.search(params[:search])
|
12
11
|
|
12
|
+
## push into model?
|
13
|
+
## @search.per_page ||= Spree::Config[:products_per_page]
|
14
|
+
|
15
|
+
@products ||= @search.paginate(:include => [:images, {:variants => :images}],
|
16
|
+
:per_page => Spree::Config[:products_per_page],
|
17
|
+
:page => params[:page])
|
18
|
+
## defunct?
|
13
19
|
@product_cols = 3
|
14
|
-
@products ||= @search.all
|
15
20
|
end
|
16
|
-
|
21
|
+
|
17
22
|
def object
|
18
23
|
@object ||= end_of_association_chain.find_by_permalink(params[:id].join("/") + "/")
|
19
24
|
end
|
20
|
-
|
21
|
-
end
|
25
|
+
end
|
@@ -2,6 +2,7 @@ class UserSessionsController < Spree::BaseController
|
|
2
2
|
before_filter :require_no_user, :only => [:new, :create]
|
3
3
|
before_filter :require_user, :only => :destroy
|
4
4
|
ssl_required :new, :create, :destroy, :update
|
5
|
+
ssl_allowed :login_bar
|
5
6
|
|
6
7
|
def new
|
7
8
|
@user_session = UserSession.new
|
@@ -21,7 +22,8 @@ class UserSessionsController < Spree::BaseController
|
|
21
22
|
end
|
22
23
|
}
|
23
24
|
format.js {
|
24
|
-
|
25
|
+
user = success ? @user_session.record : nil
|
26
|
+
render :json => user ? {:ship_address => user.ship_address, :bill_address => user.bill_address}.to_json : success.to_json
|
25
27
|
}
|
26
28
|
end
|
27
29
|
end
|
@@ -22,8 +22,10 @@ class UsersController < Spree::BaseController
|
|
22
22
|
end
|
23
23
|
|
24
24
|
show.before do
|
25
|
-
@orders =
|
25
|
+
@orders = @user.orders.checkout_complete
|
26
26
|
end
|
27
|
+
|
28
|
+
new_action.before { flash.now[:notice] = I18n.t(:please_create_user) unless admin_created? }
|
27
29
|
|
28
30
|
def update
|
29
31
|
@user = @current_user
|
@@ -35,10 +37,4 @@ class UsersController < Spree::BaseController
|
|
35
37
|
end
|
36
38
|
end
|
37
39
|
|
38
|
-
|
39
|
-
private
|
40
|
-
def object
|
41
|
-
@object ||= current_user
|
42
|
-
end
|
43
|
-
|
44
40
|
end
|
@@ -1,5 +1,4 @@
|
|
1
1
|
module Admin::BaseHelper
|
2
|
-
|
3
2
|
def link_to_new(resource)
|
4
3
|
link_to_with_icon('add', t("new"), edit_object_url(resource))
|
5
4
|
end
|
@@ -8,8 +7,24 @@ module Admin::BaseHelper
|
|
8
7
|
link_to_with_icon('edit', t("edit"), edit_object_url(resource))
|
9
8
|
end
|
10
9
|
|
11
|
-
def link_to_delete(resource)
|
12
|
-
|
10
|
+
def link_to_delete(resource, options = {})
|
11
|
+
options.assert_valid_keys(:url, :caption, :title)
|
12
|
+
|
13
|
+
options.reverse_merge! :url => object_url(resource) unless options.key? :url
|
14
|
+
options.reverse_merge! :caption => t('are_you_sure')
|
15
|
+
options.reverse_merge! :title => t('confirm_delete')
|
16
|
+
|
17
|
+
#link_to_with_icon('delete', t("delete"), object_url(resource), :confirm => t('are_you_sure'), :method => :delete )
|
18
|
+
link_to_function icon("delete") + ' ' + t("delete"), "jConfirm('#{options[:caption]}', '#{options[:title]}', function(r) {
|
19
|
+
if(r){
|
20
|
+
jQuery.ajax({
|
21
|
+
type: 'POST',
|
22
|
+
url: '#{options[:url]}',
|
23
|
+
data: ({_method: 'delete', authenticity_token: AUTH_TOKEN}),
|
24
|
+
success: function(r){ jQuery('##{dom_id resource}').fadeOut('hide'); }
|
25
|
+
});
|
26
|
+
}
|
27
|
+
});"
|
13
28
|
end
|
14
29
|
|
15
30
|
def link_to_with_icon(icon_name, text, url, options = {})
|
@@ -62,10 +77,14 @@ module Admin::BaseHelper
|
|
62
77
|
options = options.merge(args.pop)
|
63
78
|
end
|
64
79
|
options[:route] ||= "admin_#{args.first}"
|
65
|
-
|
80
|
+
|
81
|
+
destination_url = send("#{options[:route]}_path")
|
82
|
+
|
83
|
+
return("") unless url_options_authenticate?(ActionController::Routing::Routes.recognize_path(destination_url))
|
84
|
+
|
66
85
|
## if more than one form, it'll capitalize all words
|
67
86
|
label_with_first_letters_capitalized = t(options[:label]).gsub(/\b\w/){$&.upcase}
|
68
|
-
link = link_to(label_with_first_letters_capitalized,
|
87
|
+
link = link_to(label_with_first_letters_capitalized, destination_url)
|
69
88
|
|
70
89
|
css_classes = []
|
71
90
|
|
@@ -146,5 +165,54 @@ module Admin::BaseHelper
|
|
146
165
|
out << fields.hidden_field(:_delete) unless fields.object.new_record?
|
147
166
|
out << (link_to icon("delete"), "#", :class => "remove")
|
148
167
|
out
|
149
|
-
end
|
168
|
+
end
|
169
|
+
|
170
|
+
def preference_field(form, field, options)
|
171
|
+
case options[:type]
|
172
|
+
when :integer
|
173
|
+
form.text_field(field, {
|
174
|
+
:size => 10,
|
175
|
+
:class => 'input_integer',
|
176
|
+
:readonly => options[:readonly],
|
177
|
+
:disabled => options[:disabled]
|
178
|
+
}
|
179
|
+
)
|
180
|
+
when :boolean
|
181
|
+
form.check_box(field, {:readonly => options[:readonly],
|
182
|
+
:disabled => options[:disabled]})
|
183
|
+
when :string
|
184
|
+
form.text_field(field, {
|
185
|
+
:size => 10,
|
186
|
+
:class => 'input_string',
|
187
|
+
:readonly => options[:readonly],
|
188
|
+
:disabled => options[:disabled]
|
189
|
+
}
|
190
|
+
)
|
191
|
+
when :text
|
192
|
+
form.text_area(field,
|
193
|
+
{:rows => 15, :cols => 85, :readonly => options[:readonly],
|
194
|
+
:disabled => options[:disabled]}
|
195
|
+
)
|
196
|
+
else
|
197
|
+
form.text_field(field, {
|
198
|
+
:size => 10,
|
199
|
+
:class => 'input_string',
|
200
|
+
:readonly => options[:readonly],
|
201
|
+
:disabled => options[:disabled]
|
202
|
+
}
|
203
|
+
)
|
204
|
+
end
|
205
|
+
end
|
206
|
+
|
207
|
+
def preference_fields(object, form)
|
208
|
+
return unless object.respond_to?(:preferences)
|
209
|
+
object.preferences.keys.map{ |key|
|
210
|
+
definition = object.class.preference_definitions[key]
|
211
|
+
type = definition.instance_eval{@type}.to_sym
|
212
|
+
|
213
|
+
form.label("preferred_#{key}", t(key)+": ") +
|
214
|
+
preference_field(form, "preferred_#{key}", :type => type)
|
215
|
+
}.join("<br />")
|
216
|
+
end
|
217
|
+
|
150
218
|
end
|
@@ -11,7 +11,7 @@ module Admin::OrdersHelper
|
|
11
11
|
def event_links
|
12
12
|
links = []
|
13
13
|
@order_events.sort.each do |event|
|
14
|
-
links << (button_link_to event, fire_admin_order_url(@order, :e => event), {:method => :put, :confirm => "Are you sure you want to #{event}?"}) if @order.send("can_#{event}?")
|
14
|
+
links << (button_link_to t(event), fire_admin_order_url(@order, :e => event), {:method => :put, :confirm => "Are you sure you want to #{event}?"}) if @order.send("can_#{event}?")
|
15
15
|
end
|
16
16
|
return "" if links.empty?
|
17
17
|
links.join(' ')
|
File without changes
|
@@ -1,62 +1,3 @@
|
|
1
1
|
module Admin::TaxonomiesHelper
|
2
2
|
|
3
|
-
|
4
|
-
## YUI stuff
|
5
|
-
def yui_tree_helper(taxonomy)
|
6
|
-
tree_elem_id = taxonomy.id
|
7
|
-
cm_elem_id = "cm_#{taxonomy.id}"
|
8
|
-
tree_data_name = "tree_data_#{taxonomy.id}"
|
9
|
-
tree_data = build_tree_data(taxonomy)
|
10
|
-
out = <<EOT
|
11
|
-
<div id="#{tree_elem_id}" class="taxonomy_tree"></div>
|
12
|
-
<script type="text/javascript">
|
13
|
-
|
14
|
-
|
15
|
-
function setup_tree(){
|
16
|
-
//<![CDATA[
|
17
|
-
var #{tree_data_name} = #{tree_data};
|
18
|
-
//]]>
|
19
|
-
var tree = spree.YUI.build_tree("#{tree_elem_id}", #{tree_data_name});
|
20
|
-
tree.tree_view.draw();
|
21
|
-
spree.YUI.add_inplace_controls(#{tree_data_name});
|
22
|
-
};
|
23
|
-
|
24
|
-
|
25
|
-
YAHOO.util.Event.onDOMReady(setup_tree, spree.YUI.DDList, true);
|
26
|
-
</script>
|
27
|
-
EOT
|
28
|
-
out
|
29
|
-
end
|
30
|
-
|
31
|
-
def build_tree_data(taxonomy)
|
32
|
-
html = %Q{<span id=\\"node_#{taxonomy.root.id}\\" class=\\"spree-YUI-tree-node\\">}
|
33
|
-
html << taxonomy.root.name
|
34
|
-
html << %Q{</span> <img src='/images/spinner.gif' style='display:none;vertical-align:middle;' id='#{dom_id(taxonomy.root)}'>}
|
35
|
-
|
36
|
-
out = [%Q{{"id":#{taxonomy.root.id}, "parent_id":null, "object_url":"#{admin_taxonomy_taxon_path(taxonomy, taxonomy.root)}", "html":"#{html}"}}]
|
37
|
-
taxonomy.root.descendents.each do |node|
|
38
|
-
html = %Q{<span id=\\"node_#{node.id}\\" class=\\"spree-YUI-tree-node\\">}
|
39
|
-
html << node.name
|
40
|
-
html << %Q{</span> <img src='/images/spinner.gif' style='display:none;vertical-align:middle;' id='#{dom_id(node)}'>}
|
41
|
-
out << [%Q{{"id":#{node.id}, "parent_id":#{node.parent.id}, "object_url":"#{admin_taxonomy_taxon_path(node.taxonomy, node)}","position": #{node.position}, "html":"#{html}"}}]
|
42
|
-
end
|
43
|
-
return %Q{[#{out.join(",\n")}]}
|
44
|
-
end
|
45
|
-
|
46
|
-
def yui_build_tree(node)
|
47
|
-
out = yui_build_node(node)
|
48
|
-
node.children.each do |child|
|
49
|
-
out += yui_build_tree(child)
|
50
|
-
end
|
51
|
-
out
|
52
|
-
end
|
53
|
-
|
54
|
-
def yui_build_node(node)
|
55
|
-
parent_node_name = node.root? ? 'tree.getRoot()' : "node_#{node.parent.id}"
|
56
|
-
node_name = "node_#{node.id}"
|
57
|
-
html = "#{node.presentation}"
|
58
|
-
out = %Q{var #{node_name} = new YAHOO.widget.HTMLNode("#{html}", #{parent_node_name}, false, true);\n}
|
59
|
-
out += %Q{nodeMap[#{node_name}.labelElId] = #{node_name};\n}
|
60
|
-
out
|
61
|
-
end
|
62
3
|
end
|