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
data/app/models/user.rb
CHANGED
@@ -1,25 +1,28 @@
|
|
1
1
|
class User < ActiveRecord::Base
|
2
2
|
before_validation :set_login
|
3
3
|
before_save :add_user_role
|
4
|
-
|
4
|
+
|
5
|
+
has_many :orders
|
6
|
+
has_and_belongs_to_many :roles
|
7
|
+
|
8
|
+
belongs_to :ship_address, :foreign_key => "ship_address_id", :class_name => "Address"
|
9
|
+
belongs_to :bill_address, :foreign_key => "bill_address_id", :class_name => "Address"
|
10
|
+
|
5
11
|
acts_as_authentic do |c|
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
end
|
12
|
+
c.transition_from_restful_authentication = true
|
13
|
+
#AuthLogic defaults
|
14
|
+
#c.validate_email_field = true
|
15
|
+
#c.validates_length_of_email_field_options = {:within => 6..100}
|
16
|
+
#c.validates_format_of_email_field_options = {:with => email_regex, :message => I18n.t(‘error_messages.email_invalid’, :default => “should look like an email address.”)}
|
17
|
+
#c.validate_password_field = true
|
18
|
+
#c.validates_length_of_password_field_options = {:minimum => 4, :if => :require_password?}
|
19
|
+
#for more defaults check the AuthLogic documentation
|
20
|
+
end
|
15
21
|
|
16
22
|
# prevents a user from submitting a crafted form that bypasses activation
|
17
23
|
# anything else you want your user to change should be added here.
|
18
24
|
attr_accessible :email, :password, :password_confirmation
|
19
|
-
|
20
|
-
has_many :orders
|
21
|
-
has_and_belongs_to_many :roles
|
22
|
-
|
25
|
+
|
23
26
|
def deliver_password_reset_instructions!
|
24
27
|
reset_perishable_token!
|
25
28
|
UserMailer.deliver_password_reset_instructions(self)
|
@@ -31,10 +34,6 @@ class User < ActiveRecord::Base
|
|
31
34
|
(@_list.include?(role_in_question.to_s) )
|
32
35
|
end
|
33
36
|
|
34
|
-
def last_address
|
35
|
-
addresses.last
|
36
|
-
end
|
37
|
-
|
38
37
|
private
|
39
38
|
def set_login
|
40
39
|
# for now force login to be same as email, eventually we will make this configurable, etc.
|
data/app/models/user_mailer.rb
CHANGED
@@ -3,7 +3,7 @@ class UserMailer < ActionMailer::Base
|
|
3
3
|
|
4
4
|
def password_reset_instructions(user)
|
5
5
|
subject Spree::Config[:site_name] + ' ' + I18n.t("password_reset_instructions")
|
6
|
-
from Spree::Config[:
|
6
|
+
from Spree::Config[:mails_from]
|
7
7
|
recipients user.email
|
8
8
|
sent_on Time.now
|
9
9
|
body :edit_password_reset_url => edit_password_reset_url(user.perishable_token)
|
data/app/models/variant.rb
CHANGED
@@ -1,39 +1,63 @@
|
|
1
1
|
class Variant < ActiveRecord::Base
|
2
|
-
after_update :adjust_inventory
|
3
|
-
|
4
2
|
belongs_to :product
|
3
|
+
delegate_belongs_to :product, :name, :description, :permalink, :available_on, :tax_category_id, :shipping_category_id, :meta_description, :meta_keywords
|
4
|
+
|
5
5
|
has_many :inventory_units
|
6
6
|
has_and_belongs_to_many :option_values
|
7
|
-
|
8
|
-
|
7
|
+
has_many :images, :as => :viewable, :order => :position, :dependent => :destroy
|
8
|
+
|
9
9
|
validate :check_price
|
10
|
-
|
10
|
+
validates_presence_of :price
|
11
11
|
|
12
12
|
# default variant scope only lists non-deleted variants
|
13
|
-
named_scope :active, :conditions => "deleted_at is null"
|
14
|
-
named_scope :deleted, :conditions => "not deleted_at is null"
|
13
|
+
named_scope :active, :conditions => "variants.deleted_at is null"
|
14
|
+
named_scope :deleted, :conditions => "not variants.deleted_at is null"
|
15
15
|
|
16
16
|
# default extra fields for shipping purposes
|
17
17
|
@fields = [ {:name => 'Weight', :only => [:variant], :format => "%.2f"},
|
18
18
|
{:name => 'Height', :only => [:variant], :format => "%.2f"},
|
19
19
|
{:name => 'Width', :only => [:variant], :format => "%.2f"},
|
20
20
|
{:name => 'Depth', :only => [:variant], :format => "%.2f"} ]
|
21
|
-
|
21
|
+
|
22
|
+
# Returns number of inventory units for this variant (new records haven't been saved to database, yet)
|
22
23
|
def on_hand
|
23
|
-
inventory_units.with_state("on_hand").size
|
24
|
+
new_record? ? inventory_units.size : inventory_units.with_state("on_hand").size
|
24
25
|
end
|
25
26
|
|
27
|
+
# Adjusts the inventory units to match the given new level.
|
26
28
|
def on_hand=(new_level)
|
27
|
-
|
29
|
+
delta_units = new_level.to_i - on_hand
|
30
|
+
|
31
|
+
# decrease inventory
|
32
|
+
if delta_units < 0
|
33
|
+
inventory_units.with_state("on_hand").slice(0, delta_units.abs).each{|iu| iu.destroy}
|
34
|
+
|
35
|
+
# otherwise, increase Inventory when positive delta
|
36
|
+
elsif delta_units > 0
|
37
|
+
|
38
|
+
# fill backordered orders before creating new units
|
39
|
+
inventory_units.with_state("backordered").slice(0, delta_units).each do |iu|
|
40
|
+
iu.fill_backorder
|
41
|
+
delta_units -= 1
|
42
|
+
end
|
43
|
+
|
44
|
+
# create new units
|
45
|
+
(delta_units).times do
|
46
|
+
new_record? ? inventory_units.build(:state => 'on_hand') : inventory_units.create(:state => 'on_hand')
|
47
|
+
end
|
48
|
+
end
|
28
49
|
end
|
29
|
-
|
50
|
+
|
51
|
+
# returns number of units currently on backorder for this variant.
|
30
52
|
def on_backorder
|
31
53
|
inventory_units.with_state("backordered").size
|
32
54
|
end
|
33
|
-
|
34
|
-
|
55
|
+
|
56
|
+
# returns true if at least one inventory unit of this variant is "on_hand"
|
57
|
+
def in_stock?
|
35
58
|
on_hand > 0
|
36
59
|
end
|
60
|
+
alias in_stock in_stock?
|
37
61
|
|
38
62
|
def self.additional_fields
|
39
63
|
@fields
|
@@ -42,56 +66,23 @@ class Variant < ActiveRecord::Base
|
|
42
66
|
def self.additional_fields=(new_fields)
|
43
67
|
@fields = new_fields
|
44
68
|
end
|
45
|
-
|
46
|
-
#
|
47
|
-
def
|
48
|
-
|
49
|
-
product.has_attribute?(method) ? product[method] : super
|
50
|
-
else
|
51
|
-
super
|
52
|
-
end
|
53
|
-
end
|
54
|
-
|
55
|
-
def orderable?
|
56
|
-
self.in_stock || ( !self.in_stock && self.allow_backordering) || Spree::Config[:allow_backorders]
|
69
|
+
|
70
|
+
# returns true if this variant is allowed to be placed on a new order
|
71
|
+
def available?
|
72
|
+
self.in_stock? || Spree::Config[:allow_backorders]
|
57
73
|
end
|
74
|
+
|
75
|
+
def options_text
|
76
|
+
self.option_values.map { |ov| "#{ov.option_type.presentation}: #{ov.presentation}" }.to_sentence({:words_connector => ", ", :two_words_connector => ", "})
|
77
|
+
end
|
58
78
|
|
59
79
|
private
|
60
80
|
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
# fill backordered orders first
|
68
|
-
inventory_units.with_state("backordered").each{|iu|
|
69
|
-
if @new_level > 0
|
70
|
-
iu.fill_backorder
|
71
|
-
@new_level = @new_level - 1
|
72
|
-
end
|
73
|
-
break if @new_level < 1
|
74
|
-
}
|
75
|
-
|
76
|
-
adjustment = @new_level - on_hand
|
77
|
-
if adjustment > 0
|
78
|
-
InventoryUnit.create_on_hand(self, adjustment)
|
79
|
-
reload
|
80
|
-
elsif adjustment < 0
|
81
|
-
InventoryUnit.destroy_on_hand(self, adjustment.abs)
|
82
|
-
reload
|
83
|
-
end
|
84
|
-
end
|
85
|
-
|
86
|
-
# if no variant price has been set, set it to be equivalent to the master_price
|
87
|
-
def check_price
|
88
|
-
return unless self.price.nil?
|
89
|
-
if product && product.master_price
|
90
|
-
self.price = product.master_price
|
91
|
-
else
|
92
|
-
errors.add_to_base("Must supply price for variant or master_price for product.")
|
93
|
-
return false
|
94
|
-
end
|
81
|
+
# Ensures a new variant takes the product master price when price is not supplied
|
82
|
+
def check_price
|
83
|
+
if self.price.nil?
|
84
|
+
raise "Must supply price for variant or master.price for product." if self == product.master
|
85
|
+
self.price = product.master.price
|
95
86
|
end
|
96
|
-
|
87
|
+
end
|
97
88
|
end
|
data/app/models/zone.rb
CHANGED
@@ -1,18 +1,25 @@
|
|
1
1
|
class Zone < ActiveRecord::Base
|
2
2
|
has_many :zone_members
|
3
|
+
has_many :tax_rates
|
4
|
+
|
3
5
|
validates_presence_of :name
|
4
6
|
validates_uniqueness_of :name
|
5
7
|
after_save :remove_defunct_members
|
6
8
|
|
7
9
|
alias :members :zone_members
|
8
10
|
accepts_nested_attributes_for :zone_members, :allow_destroy => true, :reject_if => proc { |a| a['zoneable_id'].blank? }
|
11
|
+
|
12
|
+
# WARNING during tets class method .global is declared to indicate global Zone to use with tests
|
9
13
|
|
10
14
|
#attr_accessor :type
|
11
15
|
def kind
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
"
|
16
|
+
member = self.members.last
|
17
|
+
case member && member.zoneable_type
|
18
|
+
when "State" then "state"
|
19
|
+
when "Zone" then "zone"
|
20
|
+
else
|
21
|
+
"country"
|
22
|
+
end
|
16
23
|
end
|
17
24
|
|
18
25
|
def kind=(value)
|
@@ -25,38 +32,46 @@ class Zone < ActiveRecord::Base
|
|
25
32
|
include?(address)
|
26
33
|
end
|
27
34
|
|
28
|
-
def include?(address)
|
35
|
+
def include?(address)
|
36
|
+
return unless address
|
37
|
+
|
29
38
|
# NOTE: This is complicated by the fact that include? for HMP is broken in Rails 2.1 (so we use awkward index method)
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
39
|
+
members.any? do |zone_member|
|
40
|
+
case zone_member.zoneable_type
|
41
|
+
when "Zone"
|
42
|
+
zone_member.zoneable.include?(address)
|
43
|
+
when "Country"
|
44
|
+
zone_member.zoneable == address.country
|
45
|
+
when "State"
|
46
|
+
zone_member.zoneable == address.state
|
47
|
+
else
|
48
|
+
false
|
49
|
+
end
|
36
50
|
end
|
37
|
-
members.each do |zone_member|
|
38
|
-
return true if zone_member.zoneable.include?(address)
|
39
|
-
end
|
40
|
-
false
|
41
51
|
end
|
42
52
|
|
43
53
|
def self.match(address)
|
44
|
-
|
45
|
-
Zone.all.each {|zone| zones << zone if zone.include?(address)}
|
46
|
-
zones
|
54
|
+
Zone.all.select {|zone| zone.include?(address)}
|
47
55
|
end
|
48
56
|
|
49
|
-
# convenience method for returning the countries contained within a zone (different then the countries method which only
|
57
|
+
# convenience method for returning the countries contained within a zone (different then the countries method which only
|
50
58
|
# returns the zones children and does not consider the grand children if the children themselves are zones)
|
51
59
|
def country_list
|
52
|
-
|
53
|
-
|
54
|
-
|
60
|
+
members.map {|zone_member|
|
61
|
+
case zone_member.zoneable_type
|
62
|
+
when "Zone"
|
63
|
+
zone_member.zoneable.country_list
|
64
|
+
when "Country"
|
65
|
+
zone_member.zoneable
|
66
|
+
else
|
67
|
+
nil
|
68
|
+
end
|
69
|
+
}.flatten.compact
|
55
70
|
end
|
56
71
|
|
57
72
|
def <=>(other)
|
58
73
|
name <=> other.name
|
59
|
-
end
|
74
|
+
end
|
60
75
|
|
61
76
|
private
|
62
77
|
def remove_defunct_members
|
@@ -40,6 +40,18 @@
|
|
40
40
|
<td><%= link_to t("inventory_settings"), admin_inventory_settings_path %></td>
|
41
41
|
<td><%= t("inventory_setting_description") %></td>
|
42
42
|
</tr>
|
43
|
+
<tr>
|
44
|
+
<td><%= link_to t("tax_rates"), admin_tax_rates_path %></td>
|
45
|
+
<td><%= t("tax_rates_description") %></td>
|
46
|
+
</tr>
|
47
|
+
<tr>
|
48
|
+
<td><%= link_to t("tax_settings"), admin_tax_settings_path %></td>
|
49
|
+
<td><%= t("tax_settings_description") %></td>
|
50
|
+
</tr>
|
51
|
+
<tr>
|
52
|
+
<td><%= link_to t("coupons"), admin_coupons_path %></td>
|
53
|
+
<td><%= t("coupons_description") %></td>
|
54
|
+
</tr>
|
43
55
|
<% @extension_links.each do |link_map| %>
|
44
56
|
<tr>
|
45
57
|
<td><%= link_to(link_map[:link_text], link_map[:link]) %></td>
|
@@ -0,0 +1,24 @@
|
|
1
|
+
<table>
|
2
|
+
<tr>
|
3
|
+
<td><%=t("code")%>:</td>
|
4
|
+
<td><%= f.text_field :code, {"style" => "width:200px"} %></td>
|
5
|
+
</tr>
|
6
|
+
<tr>
|
7
|
+
<td><%=t("description")%>:</td>
|
8
|
+
<td><%= f.text_field :description, {"style" => "width:200px"} %></td>
|
9
|
+
</tr>
|
10
|
+
<tr>
|
11
|
+
<td><%=t("usage_limit")%>:</td>
|
12
|
+
<td><%= f.text_field :usage_limit, {"style" => "width:200px"} %></td>
|
13
|
+
</tr>
|
14
|
+
<tr>
|
15
|
+
<td><%=t("combine")%>:</td>
|
16
|
+
<td><%= f.check_box :combine %></td>
|
17
|
+
</tr>
|
18
|
+
<tr>
|
19
|
+
<td><%=t("expiration")%>:</td>
|
20
|
+
<td><%= date_select :coupon, :expires_at, :prompt => true, :use_month_numbers => true %></td>
|
21
|
+
</tr>
|
22
|
+
</table>
|
23
|
+
|
24
|
+
<%= render "admin/shared/calculator_fields", :f => f %>
|
@@ -0,0 +1,8 @@
|
|
1
|
+
<h1><%= t("editing_coupon") %></h1>
|
2
|
+
<%= error_messages_for :coupon %>
|
3
|
+
<% form_for(@coupon, :url => object_url, :html => { :method => :put }) do |f| %>
|
4
|
+
<%= render :partial => "form", :locals => { :f => f } %>
|
5
|
+
<p>
|
6
|
+
<%=submit_tag t("update")%>
|
7
|
+
</p>
|
8
|
+
<% end %>
|
@@ -0,0 +1,38 @@
|
|
1
|
+
<div class='toolbar'>
|
2
|
+
<ul class='actions'>
|
3
|
+
<li>
|
4
|
+
<%= button_link_to t("new_coupon"), new_object_url, :icon => 'add' %>
|
5
|
+
</li>
|
6
|
+
</ul>
|
7
|
+
<br class='clear' />
|
8
|
+
</div>
|
9
|
+
|
10
|
+
<h1><%= t("coupons") %></h1>
|
11
|
+
|
12
|
+
<table class="index">
|
13
|
+
<thead>
|
14
|
+
<th><%= t("code") %></th>
|
15
|
+
<th><%= t("description") %></th>
|
16
|
+
<th><%= t("combine") %></th>
|
17
|
+
<th><%= t("usage_limit") %></th>
|
18
|
+
<th><%= t("expiration") %></th>
|
19
|
+
<th><%= t("calculator") %></th>
|
20
|
+
<th><%= t("action") %></th>
|
21
|
+
</thead>
|
22
|
+
<tbody>
|
23
|
+
<% @coupons.each do |coupon|%>
|
24
|
+
<tr id="<%= dom_id coupon %>">
|
25
|
+
<td width="80px"><%= coupon.code %></td>
|
26
|
+
<td width="200px"><%= coupon.description %></td>
|
27
|
+
<td width="40px"><%= coupon.combine %></td>
|
28
|
+
<td width="40px"><%= coupon.usage_limit %></td>
|
29
|
+
<td width="70px"><%= coupon.expires_at.to_s(:short_date) if coupon.expires_at %></td>
|
30
|
+
<td width="120px"><%= coupon.calculator.to_s %></td>
|
31
|
+
<td>
|
32
|
+
<%= link_to_edit coupon %>
|
33
|
+
<%= link_to_delete coupon %>
|
34
|
+
</td>
|
35
|
+
</tr>
|
36
|
+
<% end %>
|
37
|
+
</tbody>
|
38
|
+
</table>
|
@@ -13,14 +13,12 @@
|
|
13
13
|
</tr>
|
14
14
|
<tr>
|
15
15
|
<td colspan="2">
|
16
|
-
|
17
|
-
mode if necessary.
|
16
|
+
<%= (Spree::Config[:allow_ssl_in_production] ? t("ssl_will_be_used_in_production_mode") : t("ssl_will_not_be_used_in_production_mode")) %>
|
18
17
|
</td>
|
19
18
|
</tr>
|
20
19
|
<tr>
|
21
20
|
<td colspan="2">
|
22
|
-
|
23
|
-
and test mode if necessary.
|
21
|
+
<%= (Spree::Config[:allow_ssl_in_development_and_test] ? t("ssl_will_be_used_in_development_and_test_modes") : t("ssl_will_not_be_used_in_development_and_test_modes")) %>
|
24
22
|
</td>
|
25
23
|
</tr>
|
26
24
|
</table>
|