spree_core 0.70.7 → 1.0.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
- data/LICENSE +2 -2
- data/app/assets/javascripts/admin/admin.js.erb +41 -22
- data/app/assets/javascripts/admin/checkouts/edit.js +57 -38
- data/app/assets/javascripts/admin/orders/edit.js +6 -1
- data/app/assets/javascripts/admin/products.js +0 -21
- data/app/assets/javascripts/admin/spree_core.js +0 -1
- data/app/assets/javascripts/admin/taxonomy.js +9 -10
- data/app/assets/javascripts/admin/zone.js +1 -16
- data/app/assets/javascripts/store/checkout.js +0 -1
- data/app/assets/stylesheets/admin/admin.css.erb +14 -0
- data/app/assets/stylesheets/admin/spree_core.css +1 -1
- data/app/assets/stylesheets/store/screen.css +5 -0
- data/app/controllers/spree/admin/adjustments_controller.rb +13 -0
- data/app/controllers/spree/admin/base_controller.rb +59 -0
- data/app/controllers/spree/admin/configurations_controller.rb +7 -0
- data/app/controllers/spree/admin/general_settings_controller.rb +34 -0
- data/app/controllers/spree/admin/images_controller.rb +53 -0
- data/app/controllers/spree/admin/inventory_settings_controller.rb +17 -0
- data/app/controllers/spree/admin/inventory_units_controller.rb +6 -0
- data/app/controllers/spree/admin/line_items_controller.rb +64 -0
- data/app/controllers/spree/admin/mail_methods_controller.rb +25 -0
- data/app/controllers/spree/admin/mail_settings_controller.rb +17 -0
- data/app/controllers/spree/admin/option_types_controller.rb +68 -0
- data/app/controllers/spree/admin/orders/customer_details_controller.rb +50 -0
- data/app/controllers/spree/admin/orders_controller.rb +114 -0
- data/app/controllers/spree/admin/overview_controller.rb +17 -0
- data/app/controllers/spree/admin/payment_methods_controller.rb +47 -0
- data/app/controllers/spree/admin/payments_controller.rb +97 -0
- data/app/controllers/spree/admin/product_groups_controller.rb +49 -0
- data/app/controllers/spree/admin/product_properties_controller.rb +14 -0
- data/app/controllers/spree/admin/product_scopes_controller.rb +39 -0
- data/app/controllers/spree/admin/products_controller.rb +110 -0
- data/app/controllers/spree/admin/properties_controller.rb +14 -0
- data/app/controllers/spree/admin/prototypes_controller.rb +31 -0
- data/app/controllers/spree/admin/reports_controller.rb +54 -0
- data/app/controllers/spree/admin/resource_controller.rb +240 -0
- data/app/controllers/spree/admin/return_authorizations_controller.rb +21 -0
- data/app/controllers/spree/admin/shipments_controller.rb +102 -0
- data/app/controllers/spree/admin/shipping_categories_controller.rb +6 -0
- data/app/controllers/spree/admin/shipping_methods_controller.rb +17 -0
- data/app/controllers/spree/admin/states_controller.rb +29 -0
- data/app/controllers/spree/admin/tax_categories_controller.rb +6 -0
- data/app/controllers/spree/admin/tax_rates_controller.rb +26 -0
- data/app/controllers/spree/admin/tax_settings_controller.rb +17 -0
- data/app/controllers/spree/admin/taxonomies_controller.rb +23 -0
- data/app/controllers/spree/admin/taxons_controller.rb +155 -0
- data/app/controllers/spree/admin/trackers_controller.rb +6 -0
- data/app/controllers/spree/admin/users_controller.rb +70 -0
- data/app/controllers/spree/admin/variants_controller.rb +77 -0
- data/app/controllers/spree/admin/zones_controller.rb +27 -0
- data/app/controllers/spree/base_controller.rb +3 -3
- data/app/controllers/spree/checkout_controller.rb +99 -0
- data/app/controllers/spree/content_controller.rb +23 -0
- data/app/controllers/spree/home_controller.rb +12 -0
- data/app/controllers/spree/locale_controller.rb +16 -0
- data/app/controllers/spree/orders_controller.rb +70 -0
- data/app/controllers/spree/products_controller.rb +36 -0
- data/app/controllers/spree/states_controller.rb +16 -0
- data/app/controllers/spree/taxons_controller.rb +23 -0
- data/app/helpers/spree/account_helper.rb +4 -0
- data/app/helpers/spree/admin/base_helper.rb +206 -0
- data/app/helpers/spree/admin/inventory_settings_helper.rb +9 -0
- data/app/helpers/spree/admin/navigation_helper.rb +173 -0
- data/app/helpers/spree/admin/orders_helper.rb +24 -0
- data/app/helpers/spree/admin/overview_helper.rb +16 -0
- data/app/helpers/spree/admin/payments_helper.rb +11 -0
- data/app/helpers/spree/admin/product_groups_helper.rb +14 -0
- data/app/helpers/spree/admin/product_properties_helper.rb +24 -0
- data/app/helpers/spree/admin/products_helper.rb +15 -0
- data/app/helpers/spree/admin/taxons_helper.rb +22 -0
- data/app/helpers/spree/admin/users_helper.rb +10 -0
- data/app/helpers/spree/admin/zones_helper.rb +15 -0
- data/app/helpers/spree/base_helper.rb +127 -140
- data/app/helpers/spree/checkout_helper.rb +35 -0
- data/app/helpers/spree/hook_helper.rb +11 -0
- data/app/helpers/spree/orders_helper.rb +5 -0
- data/app/helpers/spree/products_helper.rb +30 -0
- data/app/helpers/spree/search_helper.rb +12 -0
- data/app/helpers/spree/taxons_helper.rb +18 -0
- data/app/helpers/spree/trackers_helper.rb +4 -0
- data/app/mailers/spree/order_mailer.rb +21 -0
- data/app/mailers/spree/shipment_mailer.rb +13 -0
- data/app/mailers/spree/test_mailer.rb +10 -0
- data/app/models/spree.rb +5 -0
- data/app/models/spree/activator.rb +27 -0
- data/app/models/spree/address.rb +115 -0
- data/app/models/spree/adjustment.rb +77 -0
- data/app/models/spree/alert.rb +11 -10
- data/app/models/spree/app_configuration.rb +77 -0
- data/app/models/spree/asset.rb +6 -0
- data/app/models/spree/billing_integration.rb +24 -0
- data/app/models/spree/calculator.rb +39 -0
- data/app/models/spree/calculator/default_tax.rb +45 -0
- data/app/models/spree/calculator/flat_percent_item_total.rb +16 -0
- data/app/models/spree/calculator/flat_rate.rb +13 -0
- data/app/models/spree/calculator/flexi_rate.rb +31 -0
- data/app/models/spree/calculator/per_item.rb +13 -0
- data/app/models/spree/calculator/price_bucket.rb +26 -0
- data/app/models/spree/configuration.rb +5 -0
- data/app/models/spree/country.rb +18 -0
- data/app/models/spree/creditcard.rb +273 -0
- data/app/models/spree/gateway.rb +50 -0
- data/app/models/spree/gateway/bogus.rb +81 -0
- data/app/models/spree/gateway/bogus_simple.rb +26 -0
- data/app/models/spree/image.rb +38 -0
- data/app/models/spree/inventory_unit.rb +115 -0
- data/app/models/spree/line_item.rb +101 -0
- data/app/models/spree/log_entry.rb +5 -0
- data/app/models/spree/mail_method.rb +25 -0
- data/app/models/spree/option_type.rb +12 -0
- data/app/models/spree/option_value.rb +7 -0
- data/app/models/spree/order.rb +572 -0
- data/app/models/spree/payment.rb +112 -0
- data/app/models/spree/payment_method.rb +51 -0
- data/app/models/spree/payment_method/check.rb +29 -0
- data/app/models/spree/preference.rb +31 -0
- data/app/models/spree/preferences/configuration.rb +71 -0
- data/app/models/spree/preferences/preferable.rb +72 -0
- data/app/models/spree/preferences/preferable_class_methods.rb +81 -0
- data/app/models/spree/preferences/store.rb +70 -0
- data/app/models/spree/product.rb +211 -0
- data/app/models/spree/product/scopes.rb +252 -0
- data/app/models/spree/product_group.rb +206 -0
- data/app/models/spree/product_option_type.rb +7 -0
- data/app/models/spree/product_property.rb +18 -0
- data/app/models/spree/product_scope.rb +79 -0
- data/app/models/spree/product_scope/scopes.rb +47 -0
- data/app/models/spree/property.rb +36 -0
- data/app/models/spree/prototype.rb +7 -0
- data/app/models/spree/return_authorization.rb +80 -0
- data/app/models/spree/role.rb +5 -0
- data/app/models/spree/shipment.rb +153 -0
- data/app/models/spree/shipping_category.rb +5 -0
- data/app/models/spree/shipping_method.rb +26 -0
- data/app/models/spree/state.rb +22 -0
- data/app/models/spree/state_event.rb +18 -0
- data/app/models/spree/tax_category.rb +18 -0
- data/app/models/spree/tax_rate.rb +61 -0
- data/app/models/spree/taxon.rb +53 -0
- data/app/models/spree/taxonomy.rb +24 -0
- data/app/models/spree/tracker.rb +7 -0
- data/app/models/spree/user.rb +23 -0
- data/app/models/spree/variant.rb +107 -0
- data/app/models/spree/variant/scopes.rb +38 -0
- data/app/models/spree/zone.rb +128 -0
- data/app/models/spree/zone_member.rb +11 -0
- data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +24 -0
- data/app/views/{admin → spree/admin}/adjustments/_form.html.erb +0 -0
- data/app/views/spree/admin/adjustments/edit.html.erb +13 -0
- data/app/views/spree/admin/adjustments/index.html.erb +4 -0
- data/app/views/spree/admin/adjustments/new.html.erb +14 -0
- data/app/views/{admin → spree/admin}/configurations/index.html.erb +0 -0
- data/app/views/spree/admin/general_settings/edit.html.erb +18 -0
- data/app/views/spree/admin/general_settings/show.html.erb +34 -0
- data/app/views/spree/admin/images/_form.html.erb +16 -0
- data/app/views/spree/admin/images/edit.html.erb +19 -0
- data/app/views/spree/admin/images/index.html.erb +55 -0
- data/app/views/{admin → spree/admin}/images/new.html.erb +0 -0
- data/app/views/spree/admin/inventory_settings/edit.html.erb +27 -0
- data/app/views/spree/admin/inventory_settings/show.html.erb +9 -0
- data/app/views/spree/admin/inventory_units/adjust.html.erb +33 -0
- data/app/views/spree/admin/line_items/create.js.erb +4 -0
- data/app/views/spree/admin/mail_methods/_form.html.erb +90 -0
- data/app/views/spree/admin/mail_methods/edit.html.erb +9 -0
- data/app/views/spree/admin/mail_methods/index.html.erb +37 -0
- data/app/views/spree/admin/mail_methods/new.html.erb +9 -0
- data/app/views/{admin → spree/admin}/option_types/_available.html.erb +0 -0
- data/app/views/{admin → spree/admin}/option_types/_form.html.erb +0 -0
- data/app/views/{admin → spree/admin}/option_types/_option_value_fields.html.erb +0 -0
- data/app/views/{admin → spree/admin}/option_types/_selected.html.erb +0 -0
- data/app/views/{admin → spree/admin}/option_types/available.js.erb +0 -0
- data/app/views/spree/admin/option_types/edit.html.erb +32 -0
- data/app/views/spree/admin/option_types/index.html.erb +33 -0
- data/app/views/spree/admin/option_types/new.html.erb +11 -0
- data/app/views/spree/admin/option_types/new.js.erb +2 -0
- data/app/views/{admin → spree/admin}/option_types/select.js.erb +0 -0
- data/app/views/spree/admin/option_types/selected.html.erb +6 -0
- data/app/views/spree/admin/orders/_add_product.html.erb +20 -0
- data/app/views/spree/admin/orders/_form.html.erb +56 -0
- data/app/views/spree/admin/orders/_line_item.html.erb +14 -0
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +48 -0
- data/app/views/spree/admin/orders/customer_details/edit.html.erb +19 -0
- data/app/views/spree/admin/orders/edit.html.erb +27 -0
- data/app/views/spree/admin/orders/history.html.erb +29 -0
- data/app/views/spree/admin/orders/index.html.erb +90 -0
- data/app/views/spree/admin/orders/new.html.erb +19 -0
- data/app/views/spree/admin/orders/show.html.erb +26 -0
- data/app/views/spree/admin/payment_methods/_form.html.erb +50 -0
- data/app/views/spree/admin/payment_methods/edit.html.erb +10 -0
- data/app/views/spree/admin/payment_methods/index.html.erb +39 -0
- data/app/views/spree/admin/payment_methods/new.html.erb +11 -0
- data/app/views/spree/admin/payments/_bill_address_form.html.erb +9 -0
- data/app/views/spree/admin/payments/_form.html.erb +15 -0
- data/app/views/{admin → spree/admin}/payments/_list.html.erb +0 -0
- data/app/views/{admin → spree/admin}/payments/_transaction_list.html.erb +0 -0
- data/app/views/spree/admin/payments/credit.html.erb +14 -0
- data/app/views/spree/admin/payments/index.html.erb +22 -0
- data/app/views/spree/admin/payments/new.html.erb +19 -0
- data/app/views/spree/admin/payments/show.html.erb +10 -0
- data/app/views/{admin → spree/admin}/payments/source_forms/_check.html.erb +0 -0
- data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +40 -0
- data/app/views/{admin → spree/admin}/payments/source_views/_check.html.erb +0 -0
- data/app/views/{admin → spree/admin}/payments/source_views/_gateway.html.erb +0 -0
- data/app/views/spree/admin/product_groups/_preview.html.erb +33 -0
- data/app/views/spree/admin/product_groups/_product_scope.html.erb +24 -0
- data/app/views/spree/admin/product_groups/edit.html.erb +53 -0
- data/app/views/spree/admin/product_groups/index.html.erb +37 -0
- data/app/views/spree/admin/product_groups/new.html.erb +12 -0
- data/app/views/spree/admin/product_groups/show.html.erb +32 -0
- data/app/views/spree/admin/product_groups/update.js.erb +12 -0
- data/app/views/{admin → spree/admin}/product_properties/_product_property_fields.html.erb +0 -0
- data/app/views/spree/admin/product_properties/index.html.erb +55 -0
- data/app/views/spree/admin/product_scopes/create.js.erb +3 -0
- data/app/views/spree/admin/product_scopes/destroy.js.erb +3 -0
- data/app/views/{admin → spree/admin}/product_scopes/new.html.erb +0 -0
- data/app/views/spree/admin/products/_form.html.erb +101 -0
- data/app/views/{admin → spree/admin}/products/_option_types.html.erb +0 -0
- data/app/views/{admin → spree/admin}/products/_properties_form.erb +0 -0
- data/app/views/spree/admin/products/edit.html.erb +9 -0
- data/app/views/spree/admin/products/index.html.erb +71 -0
- data/app/views/spree/admin/products/new.html.erb +52 -0
- data/app/views/spree/admin/products/new.js.erb +3 -0
- data/app/views/{admin → spree/admin}/products/show.html.erb +0 -0
- data/app/views/{admin → spree/admin}/properties/_form.html.erb +0 -0
- data/app/views/spree/admin/properties/edit.html.erb +10 -0
- data/app/views/{admin → spree/admin}/properties/filtered.html.erb +0 -0
- data/app/views/spree/admin/properties/index.html.erb +40 -0
- data/app/views/spree/admin/properties/new.html.erb +11 -0
- data/app/views/spree/admin/properties/new.js.erb +2 -0
- data/app/views/spree/admin/prototypes/_form.html.erb +44 -0
- data/app/views/{admin → spree/admin}/prototypes/_prototypes.html.erb +0 -0
- data/app/views/spree/admin/prototypes/available.js.erb +2 -0
- data/app/views/spree/admin/prototypes/edit.html.erb +9 -0
- data/app/views/spree/admin/prototypes/index.html.erb +37 -0
- data/app/views/spree/admin/prototypes/new.html.erb +11 -0
- data/app/views/spree/admin/prototypes/new.js.erb +2 -0
- data/app/views/{admin → spree/admin}/prototypes/select.js.erb +0 -0
- data/app/views/{admin → spree/admin}/reports/index.html.erb +0 -0
- data/app/views/spree/admin/reports/sales_total.html.erb +23 -0
- data/app/views/{admin → spree/admin}/return_authorizations/_form.html.erb +0 -0
- data/app/views/spree/admin/return_authorizations/edit.html.erb +27 -0
- data/app/views/spree/admin/return_authorizations/index.html.erb +45 -0
- data/app/views/spree/admin/return_authorizations/new.html.erb +13 -0
- data/app/views/spree/admin/shared/_additional_field.html.erb +5 -0
- data/app/views/spree/admin/shared/_address.html.erb +6 -0
- data/app/views/spree/admin/shared/_address_form.html.erb +84 -0
- data/app/views/spree/admin/shared/_alert.html.erb +5 -0
- data/app/views/spree/admin/shared/_calculator_fields.html.erb +19 -0
- data/app/views/{admin → spree/admin}/shared/_configuration_menu.html.erb +0 -0
- data/app/views/{admin → spree/admin}/shared/_destroy.js.erb +0 -0
- data/app/views/{admin → spree/admin}/shared/_edit_resource_links.html.erb +0 -0
- data/app/views/{admin → spree/admin}/shared/_group_from_products_form.html.erb +0 -0
- data/app/views/spree/admin/shared/_head.html.erb +26 -0
- data/app/views/{admin → spree/admin}/shared/_new_adjustment_button.html.erb +0 -0
- data/app/views/{admin → spree/admin}/shared/_new_resource_links.html.erb +0 -0
- data/app/views/spree/admin/shared/_order_details.html.erb +2 -0
- data/app/views/{admin → spree/admin}/shared/_order_sub_menu.html.erb +0 -0
- data/app/views/spree/admin/shared/_order_tabs.html.erb +59 -0
- data/app/views/{admin → spree/admin}/shared/_product_sub_menu.html.erb +0 -0
- data/app/views/spree/admin/shared/_product_tabs.html.erb +30 -0
- data/app/views/{admin → spree/admin}/shared/_report_criteria.html.erb +0 -0
- data/app/views/{admin → spree/admin}/shared/_show_resource_links.html.erb +0 -0
- data/app/views/{admin → spree/admin}/shared/_tabs.html.erb +0 -0
- data/app/views/spree/admin/shared/_update_order_state.js +6 -0
- data/app/views/spree/admin/shipments/_form.html.erb +73 -0
- data/app/views/spree/admin/shipments/edit.html.erb +38 -0
- data/app/views/spree/admin/shipments/index.html.erb +38 -0
- data/app/views/spree/admin/shipments/new.html.erb +18 -0
- data/app/views/spree/admin/shipping_categories/_form.html.erb +6 -0
- data/app/views/spree/admin/shipping_categories/edit.html.erb +6 -0
- data/app/views/spree/admin/shipping_categories/index.html.erb +29 -0
- data/app/views/spree/admin/shipping_categories/new.html.erb +8 -0
- data/app/views/spree/admin/shipping_methods/_form.html.erb +23 -0
- data/app/views/spree/admin/shipping_methods/edit.html.erb +16 -0
- data/app/views/spree/admin/shipping_methods/index.html.erb +39 -0
- data/app/views/spree/admin/shipping_methods/new.html.erb +17 -0
- data/app/views/{admin → spree/admin}/states/_form.html.erb +0 -0
- data/app/views/{admin → spree/admin}/states/_state_list.html.erb +0 -0
- data/app/views/spree/admin/states/edit.html.erb +10 -0
- data/app/views/spree/admin/states/index.html.erb +16 -0
- data/app/views/spree/admin/states/new.html.erb +8 -0
- data/app/views/spree/admin/states/new.js.erb +2 -0
- data/app/views/{admin → spree/admin}/tax_categories/_form.html.erb +0 -0
- data/app/views/spree/admin/tax_categories/edit.html.erb +10 -0
- data/app/views/spree/admin/tax_categories/index.html.erb +43 -0
- data/app/views/spree/admin/tax_categories/new.html.erb +10 -0
- data/app/views/spree/admin/tax_categories/show.html.erb +1 -0
- data/app/views/spree/admin/tax_rates/_form.html.erb +20 -0
- data/app/views/spree/admin/tax_rates/edit.html.erb +6 -0
- data/app/views/spree/admin/tax_rates/index.html.erb +36 -0
- data/app/views/spree/admin/tax_rates/new.html.erb +8 -0
- data/app/views/spree/admin/tax_settings/edit.html.erb +16 -0
- data/app/views/spree/admin/tax_settings/show.html.erb +14 -0
- data/app/views/spree/admin/taxonomies/_form.html.erb +7 -0
- data/app/views/{admin → spree/admin}/taxonomies/_js_head.html.erb +0 -0
- data/app/views/{admin → spree/admin}/taxonomies/_list.html.erb +0 -0
- data/app/views/spree/admin/taxonomies/_taxon.html.erb +12 -0
- data/app/views/spree/admin/taxonomies/edit.erb +48 -0
- data/app/views/{admin → spree/admin}/taxonomies/get_children.json.erb +0 -0
- data/app/views/spree/admin/taxonomies/index.html.erb +16 -0
- data/app/views/spree/admin/taxonomies/new.html.erb +12 -0
- data/app/views/spree/admin/taxons/_form.html.erb +23 -0
- data/app/views/spree/admin/taxons/_taxon_table.html.erb +23 -0
- data/app/views/{admin → spree/admin}/taxons/available.js.erb +0 -0
- data/app/views/spree/admin/taxons/edit.html.erb +11 -0
- data/app/views/spree/admin/taxons/remove.html.erb +1 -0
- data/app/views/spree/admin/taxons/select.js.erb +2 -0
- data/app/views/spree/admin/taxons/selected.html.erb +42 -0
- data/app/views/spree/admin/trackers/_form.html.erb +27 -0
- data/app/views/spree/admin/trackers/edit.html.erb +8 -0
- data/app/views/spree/admin/trackers/index.html.erb +36 -0
- data/app/views/spree/admin/trackers/new.html.erb +9 -0
- data/app/views/spree/admin/users/_form.html.erb +34 -0
- data/app/views/spree/admin/users/edit.html.erb +14 -0
- data/app/views/spree/admin/users/index.html.erb +49 -0
- data/app/views/spree/admin/users/new.html.erb +14 -0
- data/app/views/{admin → spree/admin}/users/show.html.erb +0 -0
- data/app/views/spree/admin/variants/_form.html.erb +40 -0
- data/app/views/spree/admin/variants/edit.html.erb +13 -0
- data/app/views/spree/admin/variants/index.html.erb +62 -0
- data/app/views/spree/admin/variants/new.html.erb +8 -0
- data/app/views/spree/admin/variants/new.js.erb +2 -0
- data/app/views/spree/admin/zones/_country_member.html.erb +5 -0
- data/app/views/spree/admin/zones/_form.html.erb +30 -0
- data/app/views/spree/admin/zones/_member_type.html.erb +16 -0
- data/app/views/spree/admin/zones/_state_member.html.erb +5 -0
- data/app/views/spree/admin/zones/edit.html.erb +10 -0
- data/app/views/spree/admin/zones/index.html.erb +42 -0
- data/app/views/spree/admin/zones/new.html.erb +10 -0
- data/app/views/spree/checkout/_address.html.erb +171 -0
- data/app/views/spree/checkout/_confirm.html.erb +11 -0
- data/app/views/spree/checkout/_delivery.html.erb +29 -0
- data/app/views/spree/checkout/_payment.html.erb +31 -0
- data/app/views/spree/checkout/_summary.html.erb +32 -0
- data/app/views/spree/checkout/edit.html.erb +18 -0
- data/app/views/{checkout → spree/checkout}/payment/_check.html.erb +0 -0
- data/app/views/{checkout → spree/checkout}/payment/_gateway.html.erb +0 -0
- data/app/views/spree/checkout/registration.html.erb +20 -0
- data/app/views/{content → spree/content}/cvv.html.erb +0 -0
- data/app/views/spree/home/index.html.erb +10 -0
- data/app/views/spree/layouts/admin.html.erb +68 -0
- data/app/views/spree/layouts/spree_application.html.erb +38 -0
- data/app/views/spree/order_mailer/cancel_email.text.erb +16 -0
- data/app/views/spree/order_mailer/confirm_email.text.erb +19 -0
- data/app/views/spree/orders/_form.html.erb +17 -0
- data/app/views/spree/orders/_line_item.html.erb +31 -0
- data/app/views/spree/orders/edit.html.erb +44 -0
- data/app/views/spree/orders/new.html.erb +9 -0
- data/app/views/spree/orders/show.html.erb +14 -0
- data/app/views/spree/products/_cart_form.html.erb +49 -0
- data/app/views/{products → spree/products}/_image.html.erb +0 -0
- data/app/views/{products → spree/products}/_properties.html.erb +0 -0
- data/app/views/{products → spree/products}/_taxons.html.erb +0 -0
- data/app/views/{products → spree/products}/_thumbnails.html.erb +0 -0
- data/app/views/spree/products/index.html.erb +27 -0
- data/app/views/spree/products/show.html.erb +26 -0
- data/app/views/{shared → spree/shared}/_error_messages.html.erb +0 -0
- data/app/views/spree/shared/_filters.html.erb +26 -0
- data/app/views/spree/shared/_google_analytics.html.erb +37 -0
- data/app/views/spree/shared/_head.html.erb +8 -0
- data/app/views/spree/shared/_nav_bar.html.erb +6 -0
- data/app/views/spree/shared/_order_details.html.erb +50 -0
- data/app/views/spree/shared/_products.html.erb +31 -0
- data/app/views/spree/shared/_search.html.erb +9 -0
- data/app/views/{shared → spree/shared}/_store_menu.html.erb +0 -0
- data/app/views/{shared → spree/shared}/_taxonomies.html.erb +0 -0
- data/app/views/spree/shipment_mailer/shipped_email.text.erb +15 -0
- data/app/views/{states → spree/states}/index.js.erb +0 -0
- data/app/views/spree/taxons/_taxon.html.erb +4 -0
- data/app/views/spree/taxons/show.html.erb +19 -0
- data/app/views/{test_mailer → spree/test_mailer}/test_email.text.erb +0 -0
- data/config/initializers/spree.rb +2 -13
- data/config/locales/en.yml +70 -83
- data/config/routes.rb +18 -29
- data/db/default/{countries.yml → spree/countries.yml} +0 -0
- data/db/default/{roles.yml → spree/roles.yml} +0 -0
- data/db/default/{states.yml → spree/states.yml} +0 -0
- data/db/default/spree/zone_members.yml +169 -0
- data/db/default/{zones.yml → spree/zones.yml} +0 -0
- data/db/migrate/20090823005402_spree_zero_nine_zero.rb +346 -399
- data/db/migrate/20090904192342_create_indexes_for_inventory_units.rb +3 -9
- data/db/migrate/20090923100315_add_count_on_hand_to_variants_and_products.rb +24 -11
- data/db/migrate/20091007134354_change_taxons_to_nested_set.rb +16 -10
- data/db/migrate/20091008091614_move_to_configurable_gateways.rb +33 -34
- data/db/migrate/20091012120519_product_groups_and_scopes.rb +7 -14
- data/db/migrate/20091015110842_add_open_id_authentication_tables.rb +7 -12
- data/db/migrate/20091015153048_add_openid_field_to_users.rb +19 -14
- data/db/migrate/20091016174634_change_preference_value_type.rb +2 -2
- data/db/migrate/20091017175558_create_billing_integrations.rb +4 -8
- data/db/migrate/20091021133257_charge_refactoring.rb +21 -17
- data/db/migrate/20091104151730_add_some_indexes.rb +8 -18
- data/db/migrate/20091126190904_checkout_state_machine.rb +2 -10
- data/db/migrate/20091209153045_state_for_shipments.rb +2 -6
- data/db/migrate/20091209202200_make_state_events_polymorphic.rb +3 -3
- data/db/migrate/20091211203813_ship_address_id_for_checkouts.rb +2 -6
- data/db/migrate/20091212161118_shipping_method_id_for_checkouts.rb +2 -6
- data/db/migrate/20091213222815_creditcard_last_four_digits.rb +5 -10
- data/db/migrate/20091214183826_populate_legacy_shipment_state.rb +7 -11
- data/db/migrate/20100105090147_add_cost_price.rb +1 -5
- data/db/migrate/20100105132138_shipment_id_for_inventory_units.rb +11 -7
- data/db/migrate/20100111205525_cim_fields_for_creditcards.rb +3 -8
- data/db/migrate/20100112151511_create_return_authorizations.rb +3 -7
- data/db/migrate/20100113090919_add_return_authorization_to_inventory_units.rb +1 -5
- data/db/migrate/20100113203104_create_trackers.rb +3 -7
- data/db/migrate/20100121160010_creditcard_id_for_creditcard_txns.rb +2 -6
- data/db/migrate/20100121183934_original_creditcard_txn_id_for_creditcard_txns.rb +2 -6
- data/db/migrate/20100125145351_add_test_mode_to_billing_integration.rb +2 -7
- data/db/migrate/20100126103714_create_products_product_groups.rb +1 -5
- data/db/migrate/20100209025806_create_payment_methods.rb +4 -8
- data/db/migrate/20100209144531_polymorphic_payments.rb +22 -9
- data/db/migrate/20100213103131_change_payments_payment_method_to_belongs_to.rb +6 -6
- data/db/migrate/20100214212536_assign_creditcard_txns_to_payment.rb +15 -8
- data/db/migrate/20100223170312_sti_for_transactions.rb +10 -9
- data/db/migrate/20100223183812_drop_billing_integrations.rb +5 -5
- data/db/migrate/20100224153127_deleted_at_for_payment_methods.rb +4 -3
- data/db/migrate/20100301163454_add_adjustments_index.rb +2 -6
- data/db/migrate/20100306153445_fix_by_popularity.rb +4 -3
- data/db/migrate/20100317120946_add_alt_text_to_images.rb +1 -5
- data/db/migrate/20100419194457_fix_existing_coupon_credits.rb +6 -2
- data/db/migrate/20100427121301_add_display_to_payment_methods.rb +1 -5
- data/db/migrate/20100504142133_add_addresses_checkouts_indexes.rb +1 -9
- data/db/migrate/20100506180619_add_icon_to_taxons.rb +14 -15
- data/db/migrate/20100506185838_add_description_to_taxons.rb +2 -2
- data/db/migrate/20100528155333_index_for_shipments_number.rb +1 -5
- data/db/migrate/20100528185820_add_index_on_users_persistence_token.rb +1 -5
- data/db/migrate/20100605152042_add_default_to_tax_categories.rb +2 -6
- data/db/migrate/20100624110730_add_display_to_shipping_methods.rb +1 -5
- data/db/migrate/20100624123336_rename_payment_method_display.rb +2 -6
- data/db/migrate/20100624175547_rename_preferences_field.rb +2 -5
- data/db/migrate/20100811163637_add_guest_flag.rb +2 -10
- data/db/migrate/20100811205836_drop_order_token.rb +4 -6
- data/db/migrate/20100812162326_payments_state_and_assigned_to_order_only.rb +5 -2
- data/db/migrate/20100813023502_create_address_keys_for_order.rb +4 -13
- data/db/migrate/20100813185745_payment_total_for_orders.rb +1 -5
- data/db/migrate/20100816212146_shipping_method_id_for_orders.rb +1 -5
- data/db/migrate/20100817152723_add_shipment_and_payment_state.rb +4 -13
- data/db/migrate/20100819170125_refactor_adjustments.rb +13 -3
- data/db/migrate/20100820135707_response_code_and_avs_response_for_payments.rb +1 -6
- data/db/migrate/20100901171814_change_guest_flag_to_anonymous.rb +2 -10
- data/db/migrate/20100903203949_email_for_orders.rb +1 -5
- data/db/migrate/20100923162011_create_mail_methods.rb +2 -4
- data/db/migrate/20100929151905_rename_frozen_to_locked.rb +1 -4
- data/db/migrate/20101008190536_move_special_instructions_to_orders.rb +3 -4
- data/db/migrate/20101026184700_create_log_entries.rb +1 -5
- data/db/migrate/20101026184714_migrate_transactions_to_payment_state.rb +31 -27
- data/db/migrate/20101026184746_delete_in_progress_orders.rb +8 -7
- data/db/migrate/20101026184808_migrate_checkout_to_orders.rb +14 -18
- data/db/migrate/20101026184855_remove_shipped_state.rb +7 -9
- data/db/migrate/20101026184916_prevent_nil_payment_total.rb +3 -3
- data/db/migrate/20101026184932_prevent_nil_email.rb +4 -4
- data/db/migrate/20101026184959_generate_anonymous_users.rb +12 -6
- data/db/migrate/20101026185022_update_order_state.rb +8 -4
- data/db/migrate/20101026192225_cleanup_legacy_tables.rb +2 -2
- data/db/migrate/20101028151745_remove_number_and_cvv_from_credicard.rb +4 -2
- data/db/migrate/20101103212716_drop_anonymous_field_for_user.rb +3 -2
- data/db/migrate/20101111133551_renamed_rma_cancelled_state.rb +4 -5
- data/db/migrate/20101117031806_fix_problematic_index_names.rb +4 -4
- data/db/migrate/20101223215658_add_position_to_variants.rb +1 -5
- data/db/migrate/20110110130847_add_next_state_to_state_events.rb +2 -6
- data/db/migrate/20110111122537_add_position_to_option_types.rb +1 -5
- data/db/migrate/20110314192118_remove_trailing_slashes_in_taxon_permalinks.rb +10 -8
- data/db/migrate/20110329141434_create_activators.rb +10 -17
- data/db/migrate/20110418151136_eligible_for_adjustments.rb +1 -5
- data/db/migrate/20111007143030_namespace_top_level_models.rb +52 -0
- data/db/migrate/20111107143030_migrate_namespaced_polymorphic_models.rb +52 -0
- data/db/migrate/20111128153359_new_preferences.rb +56 -0
- data/db/migrate/20111201024007_make_adjustments_polymorphic.rb +9 -0
- data/db/migrate/20111215032408_add_company_to_addresses.rb +5 -0
- data/db/migrate/20111216154844_add_inc_tax_to_tax_rates.rb +5 -0
- data/db/migrate/20111219203242_rename_inc_price_attribute.rb +5 -0
- data/db/migrate/20111219205902_add_default_tax_zone.rb +5 -0
- data/db/sample/users.rb +2 -2
- data/db/seeds.rb +1 -1
- data/lib/generators/spree/dummy/dummy_generator.rb +1 -5
- data/lib/generators/spree/dummy/templates/rails/database.yml +3 -7
- data/lib/generators/spree/dummy/templates/rails/routes.rb +1 -1
- data/lib/generators/spree/extension/extension_generator.rb +25 -0
- data/lib/generators/spree/extension/templates/Gemfile +13 -0
- data/lib/generators/spree/extension/templates/LICENSE +26 -0
- data/lib/generators/spree/extension/templates/README.md +21 -0
- data/lib/generators/spree/extension/templates/Rakefile +29 -0
- data/lib/generators/spree/extension/templates/Versionfile +9 -0
- data/lib/generators/spree/extension/templates/app/assets/javascripts/admin/%file_name%.js +1 -0
- data/lib/generators/spree/extension/templates/app/assets/javascripts/store/%file_name%.js +1 -0
- data/lib/generators/spree/extension/templates/app/assets/stylesheets/admin/%file_name%.css +3 -0
- data/lib/generators/spree/extension/templates/app/assets/stylesheets/store/%file_name%.css +3 -0
- data/lib/generators/spree/extension/templates/config/locales/en.yml +5 -0
- data/lib/generators/spree/extension/templates/config/routes.rb +3 -0
- data/lib/generators/spree/extension/templates/extension.gemspec +26 -0
- data/lib/generators/spree/extension/templates/gitignore +10 -0
- data/lib/generators/spree/extension/templates/lib/%file_name%.rb.tt +2 -0
- data/lib/generators/spree/extension/templates/lib/%file_name%/engine.rb.tt +20 -0
- data/lib/generators/spree/extension/templates/lib/generators/%file_name%/install/install_generator.rb.tt +29 -0
- data/lib/generators/spree/extension/templates/rspec +1 -0
- data/lib/generators/spree/extension/templates/script/rails.tt +5 -0
- data/lib/generators/spree/extension/templates/spec/spec_helper.rb.tt +32 -0
- data/lib/generators/spree/sandbox/sandbox_generator.rb +4 -2
- data/lib/generators/spree/sandbox/templates/rails/routes.rb +7 -0
- data/lib/spree/core.rb +102 -0
- data/lib/{spree_core → spree/core}/action_callbacks.rb +0 -0
- data/lib/{spree_core → spree/core}/authorize_net_cim_hack.rb +0 -0
- data/lib/spree/core/calculated_adjustments.rb +59 -0
- data/lib/spree/core/controller_helpers.rb +131 -0
- data/lib/spree/core/current_order.rb +32 -0
- data/lib/spree/core/custom_fixtures.rb +70 -0
- data/lib/spree/core/delegate_belongs_to.rb +91 -0
- data/lib/spree/core/engine.rb +88 -0
- data/lib/spree/core/environment.rb +14 -0
- data/lib/spree/core/environment/calculators.rb +12 -0
- data/lib/spree/core/environment_extension.rb +28 -0
- data/lib/{spree_core → spree/core}/ext/active_record.rb +0 -0
- data/lib/spree/core/ext/array.rb +14 -0
- data/lib/{spree_core → spree/core}/ext/hash.rb +0 -0
- data/lib/spree/core/ext/string.rb +10 -0
- data/lib/spree/core/file_utilz.rb +74 -0
- data/lib/spree/core/gateway_error.rb +5 -0
- data/lib/spree/core/mail_interceptor.rb +25 -0
- data/lib/spree/core/mail_settings.rb +36 -0
- data/lib/spree/core/middleware/redirect_legacy_product_url.rb +18 -0
- data/lib/spree/core/middleware/seo_assist.rb +50 -0
- data/lib/spree/core/permalinks.rb +64 -0
- data/lib/spree/core/respond_with.rb +63 -0
- data/lib/spree/core/responder.rb +46 -0
- data/lib/spree/core/scopes.rb +65 -0
- data/lib/spree/core/search/base.rb +63 -0
- data/lib/spree/core/ssl_requirement.rb +105 -0
- data/lib/spree/core/store_helpers.rb +14 -0
- data/lib/spree/core/testing_support/common_rake.rb +24 -0
- data/lib/spree/core/testing_support/env.rb +2 -0
- data/lib/spree/core/testing_support/factories.rb +13 -0
- data/lib/spree/core/testing_support/factories/activator_factory.rb +8 -0
- data/lib/spree/core/testing_support/factories/address_factory.rb +22 -0
- data/lib/spree/core/testing_support/factories/adjustment_factory.rb +16 -0
- data/lib/spree/core/testing_support/factories/calculator_factory.rb +9 -0
- data/lib/spree/core/testing_support/factories/configuration_factory.rb +6 -0
- data/lib/spree/core/testing_support/factories/country_factory.rb +9 -0
- data/lib/spree/core/testing_support/factories/creditcard_factory.rb +13 -0
- data/lib/spree/core/testing_support/factories/inventory_unit_factory.rb +9 -0
- data/lib/spree/core/testing_support/factories/line_item_factory.rb +10 -0
- data/lib/spree/core/testing_support/factories/mail_method_factory.rb +6 -0
- data/lib/spree/core/testing_support/factories/options_factory.rb +12 -0
- data/lib/spree/core/testing_support/factories/order_factory.rb +22 -0
- data/lib/spree/core/testing_support/factories/payment_factory.rb +28 -0
- data/lib/spree/core/testing_support/factories/payment_method_factory.rb +21 -0
- data/lib/spree/core/testing_support/factories/product_factory.rb +38 -0
- data/lib/spree/core/testing_support/factories/product_group_factory.rb +5 -0
- data/lib/spree/core/testing_support/factories/product_option_type_factory.rb +6 -0
- data/lib/spree/core/testing_support/factories/product_property_factory.rb +6 -0
- data/lib/spree/core/testing_support/factories/product_scope_factory.rb +7 -0
- data/lib/spree/core/testing_support/factories/property_factory.rb +6 -0
- data/lib/spree/core/testing_support/factories/prototype_factory.rb +6 -0
- data/lib/spree/core/testing_support/factories/return_authorization_factory.rb +10 -0
- data/lib/spree/core/testing_support/factories/role_factory.rb +11 -0
- data/lib/spree/core/testing_support/factories/shipment_factory.rb +11 -0
- data/lib/spree/core/testing_support/factories/shipping_category_factory.rb +7 -0
- data/lib/spree/core/testing_support/factories/shipping_method_factory.rb +13 -0
- data/lib/spree/core/testing_support/factories/state_factory.rb +13 -0
- data/lib/spree/core/testing_support/factories/tax_category_factory.rb +13 -0
- data/lib/spree/core/testing_support/factories/tax_rate_factory.rb +7 -0
- data/lib/spree/core/testing_support/factories/taxon_factory.rb +7 -0
- data/lib/spree/core/testing_support/factories/taxonomy_factory.rb +5 -0
- data/lib/spree/core/testing_support/factories/tracker_factory.rb +7 -0
- data/lib/spree/core/testing_support/factories/user_factory.rb +17 -0
- data/lib/spree/core/testing_support/factories/variant_factory.rb +15 -0
- data/lib/spree/core/testing_support/factories/zone_factory.rb +16 -0
- data/lib/spree/core/theme_support.rb +1 -0
- data/lib/spree/core/theme_support/hook_listener.rb +145 -0
- data/lib/spree/core/version.rb +5 -0
- data/lib/spree/product_filters.rb +186 -0
- data/lib/spree/scopes/dynamic.rb +33 -0
- data/lib/spree_core.rb +1 -97
- data/lib/tasks/assets.rake +1 -1
- data/lib/tasks/core.rake +22 -21
- data/vendor/assets/javascripts/jquery.alerts/jquery.alerts.css.erb +57 -0
- data/vendor/assets/javascripts/jquery.alerts/jquery.alerts.spree.css +16 -17
- metadata +537 -521
- data/app/controllers/admin/adjustments_controller.rb +0 -10
- data/app/controllers/admin/base_controller.rb +0 -64
- data/app/controllers/admin/configurations_controller.rb +0 -2
- data/app/controllers/admin/general_settings_controller.rb +0 -30
- data/app/controllers/admin/images_controller.rb +0 -49
- data/app/controllers/admin/inventory_settings_controller.rb +0 -13
- data/app/controllers/admin/inventory_units_controller.rb +0 -2
- data/app/controllers/admin/line_items_controller.rb +0 -62
- data/app/controllers/admin/mail_methods_controller.rb +0 -21
- data/app/controllers/admin/mail_settings_controller.rb +0 -14
- data/app/controllers/admin/option_types_controller.rb +0 -64
- data/app/controllers/admin/orders_controller.rb +0 -137
- data/app/controllers/admin/overview_controller.rb +0 -14
- data/app/controllers/admin/payment_methods_controller.rb +0 -42
- data/app/controllers/admin/payments_controller.rb +0 -94
- data/app/controllers/admin/product_groups_controller.rb +0 -45
- data/app/controllers/admin/product_properties_controller.rb +0 -10
- data/app/controllers/admin/product_scopes_controller.rb +0 -35
- data/app/controllers/admin/products_controller.rb +0 -111
- data/app/controllers/admin/properties_controller.rb +0 -11
- data/app/controllers/admin/prototypes_controller.rb +0 -27
- data/app/controllers/admin/reports_controller.rb +0 -50
- data/app/controllers/admin/resource_controller.rb +0 -230
- data/app/controllers/admin/return_authorizations_controller.rb +0 -17
- data/app/controllers/admin/shipments_controller.rb +0 -99
- data/app/controllers/admin/shipping_categories_controller.rb +0 -2
- data/app/controllers/admin/shipping_methods_controller.rb +0 -14
- data/app/controllers/admin/states_controller.rb +0 -25
- data/app/controllers/admin/tax_categories_controller.rb +0 -8
- data/app/controllers/admin/tax_rates_controller.rb +0 -22
- data/app/controllers/admin/tax_settings_controller.rb +0 -13
- data/app/controllers/admin/taxonomies_controller.rb +0 -19
- data/app/controllers/admin/taxons_controller.rb +0 -152
- data/app/controllers/admin/trackers_controller.rb +0 -2
- data/app/controllers/admin/users_controller.rb +0 -69
- data/app/controllers/admin/variants_controller.rb +0 -73
- data/app/controllers/admin/zones_controller.rb +0 -23
- data/app/controllers/checkout_controller.rb +0 -103
- data/app/controllers/content_controller.rb +0 -21
- data/app/controllers/home_controller.rb +0 -10
- data/app/controllers/locale_controller.rb +0 -14
- data/app/controllers/orders_controller.rb +0 -68
- data/app/controllers/products_controller.rb +0 -36
- data/app/controllers/states_controller.rb +0 -16
- data/app/controllers/taxons_controller.rb +0 -22
- data/app/helpers/account_helper.rb +0 -2
- data/app/helpers/admin/base_helper.rb +0 -191
- data/app/helpers/admin/inventory_settings_helper.rb +0 -5
- data/app/helpers/admin/navigation_helper.rb +0 -169
- data/app/helpers/admin/orders_helper.rb +0 -22
- data/app/helpers/admin/overview_helper.rb +0 -12
- data/app/helpers/admin/payments_helper.rb +0 -7
- data/app/helpers/admin/product_groups_helper.rb +0 -11
- data/app/helpers/admin/product_properties_helper.rb +0 -21
- data/app/helpers/admin/products_helper.rb +0 -11
- data/app/helpers/admin/taxons_helper.rb +0 -18
- data/app/helpers/admin/users_helper.rb +0 -8
- data/app/helpers/admin/zones_helper.rb +0 -11
- data/app/helpers/checkout_helper.rb +0 -35
- data/app/helpers/hook_helper.rb +0 -10
- data/app/helpers/orders_helper.rb +0 -3
- data/app/helpers/products_helper.rb +0 -34
- data/app/helpers/search_helper.rb +0 -10
- data/app/helpers/taxons_helper.rb +0 -16
- data/app/helpers/trackers_helper.rb +0 -2
- data/app/mailers/order_mailer.rb +0 -19
- data/app/mailers/shipment_mailer.rb +0 -11
- data/app/mailers/test_mailer.rb +0 -10
- data/app/models/activator.rb +0 -27
- data/app/models/address.rb +0 -115
- data/app/models/adjustment.rb +0 -67
- data/app/models/app_configuration.rb +0 -48
- data/app/models/asset.rb +0 -4
- data/app/models/billing_integration.rb +0 -23
- data/app/models/calculator.rb +0 -44
- data/app/models/calculator/flat_percent_item_total.rb +0 -14
- data/app/models/calculator/flat_rate.rb +0 -11
- data/app/models/calculator/flexi_rate.rb +0 -27
- data/app/models/calculator/per_item.rb +0 -11
- data/app/models/calculator/price_sack.rb +0 -24
- data/app/models/calculator/sales_tax.rb +0 -43
- data/app/models/calculator/vat.rb +0 -42
- data/app/models/configuration.rb +0 -3
- data/app/models/country.rb +0 -16
- data/app/models/creditcard.rb +0 -272
- data/app/models/gateway.rb +0 -49
- data/app/models/gateway/authorize_net.rb +0 -19
- data/app/models/gateway/authorize_net_cim.rb +0 -132
- data/app/models/gateway/beanstream.rb +0 -187
- data/app/models/gateway/bogus.rb +0 -80
- data/app/models/gateway/braintree.rb +0 -88
- data/app/models/gateway/eway.rb +0 -11
- data/app/models/gateway/linkpoint.rb +0 -8
- data/app/models/gateway/pay_pal.rb +0 -11
- data/app/models/gateway/sage_pay.rb +0 -9
- data/app/models/image.rb +0 -36
- data/app/models/inventory_unit.rb +0 -115
- data/app/models/line_item.rb +0 -110
- data/app/models/log_entry.rb +0 -3
- data/app/models/mail_method.rb +0 -23
- data/app/models/option_type.rb +0 -9
- data/app/models/option_value.rb +0 -5
- data/app/models/order.rb +0 -497
- data/app/models/payment.rb +0 -119
- data/app/models/payment_method.rb +0 -52
- data/app/models/payment_method/check.rb +0 -31
- data/app/models/preference.rb +0 -51
- data/app/models/product.rb +0 -293
- data/app/models/product_group.rb +0 -216
- data/app/models/product_option_type.rb +0 -5
- data/app/models/product_property.rb +0 -15
- data/app/models/product_scope.rb +0 -78
- data/app/models/property.rb +0 -18
- data/app/models/prototype.rb +0 -5
- data/app/models/return_authorization.rb +0 -79
- data/app/models/role.rb +0 -3
- data/app/models/shipment.rb +0 -152
- data/app/models/shipping_category.rb +0 -3
- data/app/models/shipping_method.rb +0 -25
- data/app/models/state.rb +0 -16
- data/app/models/state_event.rb +0 -16
- data/app/models/tax_category.rb +0 -21
- data/app/models/tax_rate.rb +0 -26
- data/app/models/taxon.rb +0 -52
- data/app/models/taxonomy.rb +0 -20
- data/app/models/tracker.rb +0 -5
- data/app/models/user.rb +0 -21
- data/app/models/variant.rb +0 -104
- data/app/models/zone.rb +0 -84
- data/app/models/zone_member.rb +0 -10
- data/app/views/admin/adjustments/_adjustments_table.html.erb +0 -24
- data/app/views/admin/adjustments/edit.html.erb +0 -13
- data/app/views/admin/adjustments/index.html.erb +0 -4
- data/app/views/admin/adjustments/new.html.erb +0 -14
- data/app/views/admin/general_settings/edit.html.erb +0 -21
- data/app/views/admin/general_settings/show.html.erb +0 -25
- data/app/views/admin/images/_form.html.erb +0 -16
- data/app/views/admin/images/edit.html.erb +0 -19
- data/app/views/admin/images/index.html.erb +0 -55
- data/app/views/admin/inventory_settings/edit.html.erb +0 -27
- data/app/views/admin/inventory_settings/show.html.erb +0 -9
- data/app/views/admin/inventory_units/adjust.html.erb +0 -33
- data/app/views/admin/line_items/create.js.erb +0 -4
- data/app/views/admin/mail_methods/_form.html.erb +0 -90
- data/app/views/admin/mail_methods/edit.html.erb +0 -9
- data/app/views/admin/mail_methods/index.html.erb +0 -37
- data/app/views/admin/mail_methods/new.html.erb +0 -9
- data/app/views/admin/option_types/edit.html.erb +0 -32
- data/app/views/admin/option_types/index.html.erb +0 -33
- data/app/views/admin/option_types/new.html.erb +0 -11
- data/app/views/admin/option_types/new.js.erb +0 -2
- data/app/views/admin/option_types/selected.html.erb +0 -6
- data/app/views/admin/orders/_add_product.html.erb +0 -20
- data/app/views/admin/orders/_form.html.erb +0 -56
- data/app/views/admin/orders/_line_item.html.erb +0 -14
- data/app/views/admin/orders/_user_form.html.erb +0 -47
- data/app/views/admin/orders/edit.html.erb +0 -27
- data/app/views/admin/orders/history.html.erb +0 -29
- data/app/views/admin/orders/index.html.erb +0 -90
- data/app/views/admin/orders/new.html.erb +0 -19
- data/app/views/admin/orders/show.html.erb +0 -26
- data/app/views/admin/orders/user.html.erb +0 -19
- data/app/views/admin/payment_methods/_form.html.erb +0 -50
- data/app/views/admin/payment_methods/edit.html.erb +0 -10
- data/app/views/admin/payment_methods/index.html.erb +0 -39
- data/app/views/admin/payment_methods/new.html.erb +0 -11
- data/app/views/admin/payments/_bill_address_form.html.erb +0 -9
- data/app/views/admin/payments/_form.html.erb +0 -15
- data/app/views/admin/payments/credit.html.erb +0 -14
- data/app/views/admin/payments/index.html.erb +0 -22
- data/app/views/admin/payments/new.html.erb +0 -19
- data/app/views/admin/payments/show.html.erb +0 -10
- data/app/views/admin/payments/source_forms/_gateway.html.erb +0 -43
- data/app/views/admin/product_groups/_preview.html.erb +0 -34
- data/app/views/admin/product_groups/_product_scope.html.erb +0 -24
- data/app/views/admin/product_groups/edit.html.erb +0 -53
- data/app/views/admin/product_groups/index.html.erb +0 -37
- data/app/views/admin/product_groups/new.html.erb +0 -12
- data/app/views/admin/product_groups/show.html.erb +0 -32
- data/app/views/admin/product_groups/update.js.erb +0 -12
- data/app/views/admin/product_properties/index.html.erb +0 -55
- data/app/views/admin/product_scopes/create.js.erb +0 -3
- data/app/views/admin/product_scopes/destroy.js.erb +0 -3
- data/app/views/admin/products/_form.html.erb +0 -109
- data/app/views/admin/products/edit.html.erb +0 -9
- data/app/views/admin/products/index.html.erb +0 -71
- data/app/views/admin/products/new.html.erb +0 -52
- data/app/views/admin/products/new.js.erb +0 -3
- data/app/views/admin/properties/edit.html.erb +0 -10
- data/app/views/admin/properties/index.html.erb +0 -40
- data/app/views/admin/properties/new.html.erb +0 -11
- data/app/views/admin/properties/new.js.erb +0 -2
- data/app/views/admin/prototypes/_form.html.erb +0 -44
- data/app/views/admin/prototypes/available.js.erb +0 -2
- data/app/views/admin/prototypes/edit.html.erb +0 -9
- data/app/views/admin/prototypes/index.html.erb +0 -37
- data/app/views/admin/prototypes/new.html.erb +0 -11
- data/app/views/admin/prototypes/new.js.erb +0 -2
- data/app/views/admin/reports/sales_total.html.erb +0 -23
- data/app/views/admin/return_authorizations/edit.html.erb +0 -27
- data/app/views/admin/return_authorizations/index.html.erb +0 -45
- data/app/views/admin/return_authorizations/new.html.erb +0 -13
- data/app/views/admin/shared/_additional_field.html.erb +0 -5
- data/app/views/admin/shared/_address.html.erb +0 -5
- data/app/views/admin/shared/_address_form.html.erb +0 -78
- data/app/views/admin/shared/_alert.html.erb +0 -6
- data/app/views/admin/shared/_calculator_fields.html.erb +0 -19
- data/app/views/admin/shared/_head.html.erb +0 -26
- data/app/views/admin/shared/_order_details.html.erb +0 -2
- data/app/views/admin/shared/_order_tabs.html.erb +0 -59
- data/app/views/admin/shared/_product_tabs.html.erb +0 -30
- data/app/views/admin/shared/_update_order_state.js +0 -6
- data/app/views/admin/shipments/_form.html.erb +0 -73
- data/app/views/admin/shipments/edit.html.erb +0 -38
- data/app/views/admin/shipments/index.html.erb +0 -38
- data/app/views/admin/shipments/new.html.erb +0 -18
- data/app/views/admin/shipping_categories/_form.html.erb +0 -6
- data/app/views/admin/shipping_categories/edit.html.erb +0 -6
- data/app/views/admin/shipping_categories/index.html.erb +0 -29
- data/app/views/admin/shipping_categories/new.html.erb +0 -8
- data/app/views/admin/shipping_methods/_form.html.erb +0 -25
- data/app/views/admin/shipping_methods/edit.html.erb +0 -16
- data/app/views/admin/shipping_methods/index.html.erb +0 -39
- data/app/views/admin/shipping_methods/new.html.erb +0 -17
- data/app/views/admin/states/edit.html.erb +0 -10
- data/app/views/admin/states/index.html.erb +0 -16
- data/app/views/admin/states/new.html.erb +0 -8
- data/app/views/admin/states/new.js.erb +0 -2
- data/app/views/admin/tax_categories/edit.html.erb +0 -10
- data/app/views/admin/tax_categories/index.html.erb +0 -43
- data/app/views/admin/tax_categories/new.html.erb +0 -10
- data/app/views/admin/tax_categories/show.html.erb +0 -1
- data/app/views/admin/tax_rates/_form.html.erb +0 -16
- data/app/views/admin/tax_rates/edit.html.erb +0 -6
- data/app/views/admin/tax_rates/index.html.erb +0 -34
- data/app/views/admin/tax_rates/new.html.erb +0 -8
- data/app/views/admin/tax_settings/edit.html.erb +0 -23
- data/app/views/admin/tax_settings/show.html.erb +0 -18
- data/app/views/admin/taxonomies/_form.html.erb +0 -7
- data/app/views/admin/taxonomies/_taxon.html.erb +0 -12
- data/app/views/admin/taxonomies/edit.erb +0 -48
- data/app/views/admin/taxonomies/index.html.erb +0 -16
- data/app/views/admin/taxonomies/new.html.erb +0 -12
- data/app/views/admin/taxons/_form.html.erb +0 -23
- data/app/views/admin/taxons/_taxon_table.html.erb +0 -23
- data/app/views/admin/taxons/edit.html.erb +0 -11
- data/app/views/admin/taxons/remove.html.erb +0 -1
- data/app/views/admin/taxons/select.js.erb +0 -2
- data/app/views/admin/taxons/selected.html.erb +0 -43
- data/app/views/admin/trackers/_form.html.erb +0 -27
- data/app/views/admin/trackers/edit.html.erb +0 -8
- data/app/views/admin/trackers/index.html.erb +0 -36
- data/app/views/admin/trackers/new.html.erb +0 -9
- data/app/views/admin/users/_form.html.erb +0 -34
- data/app/views/admin/users/edit.html.erb +0 -14
- data/app/views/admin/users/index.html.erb +0 -49
- data/app/views/admin/users/new.html.erb +0 -14
- data/app/views/admin/variants/_form.html.erb +0 -40
- data/app/views/admin/variants/edit.html.erb +0 -13
- data/app/views/admin/variants/index.html.erb +0 -62
- data/app/views/admin/variants/new.html.erb +0 -8
- data/app/views/admin/variants/new.js.erb +0 -2
- data/app/views/admin/zones/_country_member.html.erb +0 -5
- data/app/views/admin/zones/_form.html.erb +0 -29
- data/app/views/admin/zones/_member_type.html.erb +0 -15
- data/app/views/admin/zones/_state_member.html.erb +0 -5
- data/app/views/admin/zones/_zone_member.html.erb +0 -5
- data/app/views/admin/zones/edit.html.erb +0 -10
- data/app/views/admin/zones/index.html.erb +0 -40
- data/app/views/admin/zones/new.html.erb +0 -10
- data/app/views/checkout/_address.html.erb +0 -154
- data/app/views/checkout/_confirm.html.erb +0 -11
- data/app/views/checkout/_delivery.html.erb +0 -29
- data/app/views/checkout/_payment.html.erb +0 -31
- data/app/views/checkout/_summary.html.erb +0 -22
- data/app/views/checkout/edit.html.erb +0 -18
- data/app/views/checkout/registration.html.erb +0 -20
- data/app/views/home/index.html.erb +0 -10
- data/app/views/layouts/admin.html.erb +0 -68
- data/app/views/layouts/spree_application.html.erb +0 -38
- data/app/views/order_mailer/cancel_email.text.erb +0 -16
- data/app/views/order_mailer/confirm_email.text.erb +0 -19
- data/app/views/orders/_form.html.erb +0 -17
- data/app/views/orders/_line_item.html.erb +0 -31
- data/app/views/orders/edit.html.erb +0 -43
- data/app/views/orders/new.html.erb +0 -9
- data/app/views/orders/show.html.erb +0 -14
- data/app/views/products/_cart_form.html.erb +0 -49
- data/app/views/products/index.html.erb +0 -27
- data/app/views/products/show.html.erb +0 -26
- data/app/views/shared/_filters.html.erb +0 -26
- data/app/views/shared/_google_analytics.html.erb +0 -40
- data/app/views/shared/_head.html.erb +0 -7
- data/app/views/shared/_nav_bar.html.erb +0 -6
- data/app/views/shared/_order_details.html.erb +0 -40
- data/app/views/shared/_products.html.erb +0 -31
- data/app/views/shared/_search.html.erb +0 -9
- data/app/views/shipment_mailer/shipped_email.text.erb +0 -15
- data/app/views/taxons/_taxon.html.erb +0 -4
- data/app/views/taxons/show.html.erb +0 -19
- data/config/cucumber.yml +0 -10
- data/db/default/zone_members.yml +0 -169
- data/lib/custom_fixtures.rb +0 -68
- data/lib/environment_extension.rb +0 -26
- data/lib/generators/spree/dummy/templates/cucumber/cucumber.rb +0 -38
- data/lib/generators/spree/site/site_generator.rb +0 -103
- data/lib/generators/spree/site/templates/app/assets/javascripts/admin/all.js +0 -16
- data/lib/generators/spree/site/templates/app/assets/javascripts/store/all.js +0 -16
- data/lib/generators/spree/site/templates/app/assets/stylesheets/admin/all.css +0 -17
- data/lib/generators/spree/site/templates/app/assets/stylesheets/store/all.css +0 -17
- data/lib/middleware/seo_assist.rb +0 -44
- data/lib/product_filters.rb +0 -197
- data/lib/redirect_legacy_product_url.rb +0 -13
- data/lib/scopes.rb +0 -69
- data/lib/scopes/dynamic.rb +0 -31
- data/lib/scopes/product.rb +0 -262
- data/lib/scopes/variant.rb +0 -18
- data/lib/spree/calculated_adjustments.rb +0 -74
- data/lib/spree/config.rb +0 -33
- data/lib/spree/current_order.rb +0 -30
- data/lib/spree/environment.rb +0 -12
- data/lib/spree/environment/calculators.rb +0 -10
- data/lib/spree/file_utilz.rb +0 -73
- data/lib/spree/gateway_error.rb +0 -3
- data/lib/spree/mail_interceptor.rb +0 -23
- data/lib/spree/mail_settings.rb +0 -33
- data/lib/spree/preference_access.rb +0 -27
- data/lib/spree/search/base.rb +0 -60
- data/lib/spree_base.rb +0 -127
- data/lib/spree_core/delegate_belongs_to.rb +0 -89
- data/lib/spree_core/enumerable_constants.rb +0 -209
- data/lib/spree_core/ext/array.rb +0 -14
- data/lib/spree_core/ext/string.rb +0 -10
- data/lib/spree_core/preferences/model_hooks.rb +0 -297
- data/lib/spree_core/preferences/preference_definition.rb +0 -53
- data/lib/spree_core/railtie.rb +0 -69
- data/lib/spree_core/spree_custom_responder.rb +0 -29
- data/lib/spree_core/spree_respond_with.rb +0 -57
- data/lib/spree_core/ssl_requirement.rb +0 -104
- data/lib/spree_core/testing_support/common_rake.rb +0 -18
- data/lib/spree_core/testing_support/factories.rb +0 -13
- data/lib/spree_core/testing_support/factories/activator_factory.rb +0 -6
- data/lib/spree_core/testing_support/factories/address_factory.rb +0 -20
- data/lib/spree_core/testing_support/factories/adjustment_factory.rb +0 -7
- data/lib/spree_core/testing_support/factories/calculator_factory.rb +0 -11
- data/lib/spree_core/testing_support/factories/configuraion_factory.rb +0 -4
- data/lib/spree_core/testing_support/factories/country_factory.rb +0 -7
- data/lib/spree_core/testing_support/factories/creditcard_factory.rb +0 -11
- data/lib/spree_core/testing_support/factories/inventory_unit_factory.rb +0 -7
- data/lib/spree_core/testing_support/factories/line_item_factory.rb +0 -8
- data/lib/spree_core/testing_support/factories/mail_method_factory.rb +0 -4
- data/lib/spree_core/testing_support/factories/options_factory.rb +0 -10
- data/lib/spree_core/testing_support/factories/order_factory.rb +0 -19
- data/lib/spree_core/testing_support/factories/payment_factory.rb +0 -26
- data/lib/spree_core/testing_support/factories/payment_method_factory.rb +0 -17
- data/lib/spree_core/testing_support/factories/product_factory.rb +0 -22
- data/lib/spree_core/testing_support/factories/product_group_factory.rb +0 -3
- data/lib/spree_core/testing_support/factories/product_option_type_factory.rb +0 -4
- data/lib/spree_core/testing_support/factories/product_property_factory.rb +0 -4
- data/lib/spree_core/testing_support/factories/product_scope_factory.rb +0 -6
- data/lib/spree_core/testing_support/factories/property_factory.rb +0 -4
- data/lib/spree_core/testing_support/factories/prototype_factory.rb +0 -4
- data/lib/spree_core/testing_support/factories/return_authorization_factory.rb +0 -8
- data/lib/spree_core/testing_support/factories/role_factory.rb +0 -9
- data/lib/spree_core/testing_support/factories/shipment_factory.rb +0 -9
- data/lib/spree_core/testing_support/factories/shipping_category_factory.rb +0 -5
- data/lib/spree_core/testing_support/factories/shipping_method_factory.rb +0 -11
- data/lib/spree_core/testing_support/factories/state_factory.rb +0 -11
- data/lib/spree_core/testing_support/factories/tax_category_factory.rb +0 -8
- data/lib/spree_core/testing_support/factories/tax_rate_factory.rb +0 -5
- data/lib/spree_core/testing_support/factories/taxon_factory.rb +0 -5
- data/lib/spree_core/testing_support/factories/taxonomy_factory.rb +0 -3
- data/lib/spree_core/testing_support/factories/tracker_factory.rb +0 -5
- data/lib/spree_core/testing_support/factories/user_factory.rb +0 -19
- data/lib/spree_core/testing_support/factories/variant_factory.rb +0 -14
- data/lib/spree_core/testing_support/factories/zone_factory.rb +0 -18
- data/lib/spree_core/theme_support.rb +0 -1
- data/lib/spree_core/theme_support/hook_listener.rb +0 -145
- data/lib/spree_core/version.rb +0 -5
- data/lib/store_helpers.rb +0 -10
- data/vendor/assets/javascripts/jquery.autocomplete.min.js +0 -13
@@ -0,0 +1,12 @@
|
|
1
|
+
module Spree
|
2
|
+
class OptionType < ActiveRecord::Base
|
3
|
+
has_many :option_values, :order => :position, :dependent => :destroy
|
4
|
+
has_many :product_option_types, :dependent => :destroy
|
5
|
+
has_and_belongs_to_many :prototypes, :join_table => 'spree_option_types_prototypes'
|
6
|
+
|
7
|
+
validates :name, :presentation, :presence => true
|
8
|
+
default_scope :order => "#{self.table_name}.position"
|
9
|
+
|
10
|
+
accepts_nested_attributes_for :option_values, :reject_if => lambda { |ov| ov[:name].blank? || ov[:presentation].blank? }, :allow_destroy => true
|
11
|
+
end
|
12
|
+
end
|
@@ -0,0 +1,572 @@
|
|
1
|
+
module Spree
|
2
|
+
class Order < ActiveRecord::Base
|
3
|
+
attr_accessible :line_items, :bill_address_attributes, :ship_address_attributes, :payments_attributes,
|
4
|
+
:ship_address, :bill_address, :line_items_attributes,
|
5
|
+
:shipping_method_id, :email, :use_billing, :special_instructions
|
6
|
+
|
7
|
+
belongs_to :user
|
8
|
+
belongs_to :bill_address, :foreign_key => 'bill_address_id', :class_name => 'Spree::Address'
|
9
|
+
belongs_to :ship_address, :foreign_key => 'ship_address_id', :class_name => 'Spree::Address'
|
10
|
+
belongs_to :shipping_method
|
11
|
+
|
12
|
+
has_many :state_events, :as => :stateful
|
13
|
+
has_many :line_items, :dependent => :destroy
|
14
|
+
has_many :inventory_units
|
15
|
+
has_many :payments, :dependent => :destroy
|
16
|
+
has_many :shipments, :dependent => :destroy
|
17
|
+
has_many :return_authorizations, :dependent => :destroy
|
18
|
+
has_many :adjustments, :as => :adjustable, :dependent => :destroy
|
19
|
+
|
20
|
+
accepts_nested_attributes_for :line_items
|
21
|
+
accepts_nested_attributes_for :bill_address
|
22
|
+
accepts_nested_attributes_for :ship_address
|
23
|
+
accepts_nested_attributes_for :payments
|
24
|
+
accepts_nested_attributes_for :shipments
|
25
|
+
|
26
|
+
# Needs to happen before save_permalink is called
|
27
|
+
before_validation :generate_order_number, :on => :create
|
28
|
+
|
29
|
+
before_create :create_user
|
30
|
+
after_create :create_tax_charge!
|
31
|
+
|
32
|
+
# TODO: validate the format of the email as well (but we can't rely on authlogic anymore to help with validation)
|
33
|
+
validates :email, :presence => true, :format => /^([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})$/i, :if => :require_email
|
34
|
+
validate :has_available_shipment
|
35
|
+
validate :has_available_payment
|
36
|
+
|
37
|
+
#delegate :ip_address, :to => :checkout
|
38
|
+
def ip_address
|
39
|
+
'192.168.1.100'
|
40
|
+
end
|
41
|
+
|
42
|
+
scope :by_number, lambda { |number| where(:number => number) }
|
43
|
+
scope :between, lambda { |*dates| where('created_at BETWEEN ? AND ?', dates.first.to_date, dates.last.to_date) }
|
44
|
+
scope :by_customer, lambda { |customer| joins(:user).where("#{Spree::User.table_name}.email = ?", customer) }
|
45
|
+
scope :by_state, lambda { |state| where(:state => state) }
|
46
|
+
scope :complete, where('completed_at IS NOT NULL')
|
47
|
+
scope :incomplete, where(:completed_at => nil)
|
48
|
+
|
49
|
+
make_permalink :field => :number
|
50
|
+
|
51
|
+
class_attribute :update_hooks
|
52
|
+
self.update_hooks = Set.new
|
53
|
+
|
54
|
+
# Use this method in other gems that wish to register their own custom logic that should be called after Order#updat
|
55
|
+
def self.register_update_hook(hook)
|
56
|
+
self.update_hooks.add(hook)
|
57
|
+
end
|
58
|
+
|
59
|
+
# For compatiblity with Calculator::PriceBucket
|
60
|
+
def amount
|
61
|
+
line_items.map(&:amount).sum
|
62
|
+
end
|
63
|
+
|
64
|
+
def to_param
|
65
|
+
number.to_s.to_url.upcase
|
66
|
+
end
|
67
|
+
|
68
|
+
def completed?
|
69
|
+
!! completed_at
|
70
|
+
end
|
71
|
+
|
72
|
+
# Indicates whether or not the user is allowed to proceed to checkout. Currently this is implemented as a
|
73
|
+
# check for whether or not there is at least one LineItem in the Order. Feel free to override this logic
|
74
|
+
# in your own application if you require additional steps before allowing a checkout.
|
75
|
+
def checkout_allowed?
|
76
|
+
line_items.count > 0
|
77
|
+
end
|
78
|
+
|
79
|
+
# Is this a free order in which case the payment step should be skipped
|
80
|
+
def payment_required?
|
81
|
+
total.to_f > 0.0
|
82
|
+
end
|
83
|
+
|
84
|
+
# Indicates the number of items in the order
|
85
|
+
def item_count
|
86
|
+
line_items.map(&:quantity).sum
|
87
|
+
end
|
88
|
+
|
89
|
+
# order state machine (see http://github.com/pluginaweek/state_machine/tree/master for details)
|
90
|
+
state_machine :initial => :cart, :use_transactions => false do
|
91
|
+
|
92
|
+
event :next do
|
93
|
+
transition :from => 'cart', :to => 'address'
|
94
|
+
transition :from => 'address', :to => 'delivery'
|
95
|
+
transition :from => 'delivery', :to => 'payment', :if => :payment_required?
|
96
|
+
transition :from => 'delivery', :to => 'complete'
|
97
|
+
transition :from => 'confirm', :to => 'complete'
|
98
|
+
|
99
|
+
# note: some payment methods will not support a confirm step
|
100
|
+
transition :from => 'payment', :to => 'confirm',
|
101
|
+
:if => Proc.new { |order| order.payment_method && order.payment_method.payment_profiles_supported? }
|
102
|
+
|
103
|
+
transition :from => 'payment', :to => 'complete'
|
104
|
+
end
|
105
|
+
|
106
|
+
event :cancel do
|
107
|
+
transition :to => 'canceled', :if => :allow_cancel?
|
108
|
+
end
|
109
|
+
event :return do
|
110
|
+
transition :to => 'returned', :from => 'awaiting_return'
|
111
|
+
end
|
112
|
+
event :resume do
|
113
|
+
transition :to => 'resumed', :from => 'canceled', :if => :allow_resume?
|
114
|
+
end
|
115
|
+
event :authorize_return do
|
116
|
+
transition :to => 'awaiting_return'
|
117
|
+
end
|
118
|
+
|
119
|
+
before_transition :to => 'complete' do |order|
|
120
|
+
begin
|
121
|
+
order.process_payments!
|
122
|
+
rescue Core::GatewayError
|
123
|
+
if Spree::Config[:allow_checkout_on_gateway_error]
|
124
|
+
true
|
125
|
+
else
|
126
|
+
false
|
127
|
+
end
|
128
|
+
end
|
129
|
+
end
|
130
|
+
|
131
|
+
after_transition :to => 'complete', :do => :finalize!
|
132
|
+
after_transition :to => 'delivery', :do => :create_tax_charge!
|
133
|
+
after_transition :to => 'payment', :do => :create_shipment!
|
134
|
+
after_transition :to => 'resumed', :do => :after_resume
|
135
|
+
after_transition :to => 'canceled', :do => :after_cancel
|
136
|
+
|
137
|
+
end
|
138
|
+
|
139
|
+
# Indicates whether there are any backordered InventoryUnits associated with the Order.
|
140
|
+
def backordered?
|
141
|
+
return false unless Spree::Config[:track_inventory_levels]
|
142
|
+
inventory_units.backorder.present?
|
143
|
+
end
|
144
|
+
|
145
|
+
# Returns the relevant zone (if any) to be used for taxation purposes. Uses default tax zone
|
146
|
+
# unless there is a specific match
|
147
|
+
def tax_zone
|
148
|
+
zone_address = Spree::Config[:tax_using_ship_address] ? ship_address : bill_address
|
149
|
+
Zone.match(zone_address) || Zone.default_tax
|
150
|
+
end
|
151
|
+
|
152
|
+
# Indicates whether tax should be backed out of the price calcualtions in cases where prices
|
153
|
+
# include tax but the customer is not required to pay taxes in that case.
|
154
|
+
def exclude_tax?
|
155
|
+
return false unless Spree::Config[:prices_inc_tax]
|
156
|
+
return tax_zone != Zone.default_tax
|
157
|
+
end
|
158
|
+
|
159
|
+
# Array of adjustments that are inclusive in the variant price. Useful for when prices
|
160
|
+
# include tax (ex. VAT) and you need to record the tax amount separately.
|
161
|
+
def price_adjustments
|
162
|
+
adjustments = []
|
163
|
+
|
164
|
+
line_items.each do |line_item|
|
165
|
+
adjustments.concat line_item.adjustments
|
166
|
+
end
|
167
|
+
|
168
|
+
adjustments
|
169
|
+
end
|
170
|
+
|
171
|
+
# Array of totals grouped by Adjustment#label. Useful for displaying price adjustments on an
|
172
|
+
# invoice. For example, you can display tax breakout for cases where tax is included in price.
|
173
|
+
def price_adjustment_totals
|
174
|
+
totals = {}
|
175
|
+
|
176
|
+
price_adjustments.each do |adjustment|
|
177
|
+
label = adjustment.label
|
178
|
+
totals[label] ||= 0
|
179
|
+
totals[label] = totals[label] + adjustment.amount
|
180
|
+
end
|
181
|
+
|
182
|
+
totals
|
183
|
+
end
|
184
|
+
|
185
|
+
# This is a multi-purpose method for processing logic related to changes in the Order. It is meant to be called from
|
186
|
+
# various observers so that the Order is aware of changes that affect totals and other values stored in the Order.
|
187
|
+
# This method should never do anything to the Order that results in a save call on the object (otherwise you will end
|
188
|
+
# up in an infinite recursion as the associations try to save and then in turn try to call +update!+ again.)
|
189
|
+
def update!
|
190
|
+
update_totals
|
191
|
+
update_payment_state
|
192
|
+
|
193
|
+
# give each of the shipments a chance to update themselves
|
194
|
+
shipments.each { |shipment| shipment.update!(self) }#(&:update!)
|
195
|
+
update_shipment_state
|
196
|
+
update_adjustments
|
197
|
+
# update totals a second time in case updated adjustments have an effect on the total
|
198
|
+
update_totals
|
199
|
+
|
200
|
+
update_attributes_without_callbacks({
|
201
|
+
:payment_state => payment_state,
|
202
|
+
:shipment_state => shipment_state,
|
203
|
+
:item_total => item_total,
|
204
|
+
:adjustment_total => adjustment_total,
|
205
|
+
:payment_total => payment_total,
|
206
|
+
:total => total
|
207
|
+
})
|
208
|
+
|
209
|
+
#ensure checkout payment always matches order total
|
210
|
+
if payment and payment.checkout? and payment.amount != total
|
211
|
+
payment.update_attributes_without_callbacks(:amount => total)
|
212
|
+
end
|
213
|
+
|
214
|
+
update_hooks.each { |hook| self.send hook }
|
215
|
+
end
|
216
|
+
|
217
|
+
def restore_state
|
218
|
+
# pop the resume event so we can see what the event before that was
|
219
|
+
state_events.pop if state_events.last.name == 'resume'
|
220
|
+
update_attribute('state', state_events.last.previous_state)
|
221
|
+
|
222
|
+
if paid?
|
223
|
+
raise 'do something with inventory'
|
224
|
+
#Spree::InventoryUnit.assign_opening_inventory(self) if inventory_units.empty?
|
225
|
+
#shipment.inventory_units = inventory_units
|
226
|
+
#shipment.ready!
|
227
|
+
end
|
228
|
+
end
|
229
|
+
|
230
|
+
before_validation :clone_billing_address, :if => :use_billing?
|
231
|
+
attr_accessor :use_billing
|
232
|
+
|
233
|
+
def clone_billing_address
|
234
|
+
if bill_address and self.ship_address.nil?
|
235
|
+
self.ship_address = bill_address.clone
|
236
|
+
else
|
237
|
+
self.ship_address.attributes = bill_address.attributes.except('id', 'updated_at', 'created_at')
|
238
|
+
end
|
239
|
+
true
|
240
|
+
end
|
241
|
+
|
242
|
+
def allow_cancel?
|
243
|
+
return false unless completed? and state != 'canceled'
|
244
|
+
%w{ready backorder pending}.include? shipment_state
|
245
|
+
end
|
246
|
+
|
247
|
+
def allow_resume?
|
248
|
+
# we shouldn't allow resume for legacy orders b/c we lack the information necessary to restore to a previous state
|
249
|
+
return false if state_events.empty? || state_events.last.previous_state.nil?
|
250
|
+
true
|
251
|
+
end
|
252
|
+
|
253
|
+
def add_variant(variant, quantity = 1)
|
254
|
+
current_item = contains?(variant)
|
255
|
+
if current_item
|
256
|
+
current_item.quantity += quantity
|
257
|
+
current_item.save
|
258
|
+
else
|
259
|
+
current_item = LineItem.new(:quantity => quantity)
|
260
|
+
current_item.variant = variant
|
261
|
+
current_item.price = variant.price
|
262
|
+
self.line_items << current_item
|
263
|
+
end
|
264
|
+
|
265
|
+
# populate line_items attributes for additional_fields entries
|
266
|
+
# that have populate => [:line_item]
|
267
|
+
Variant.additional_fields.select { |f| !f[:populate].nil? && f[:populate].include?(:line_item) }.each do |field|
|
268
|
+
value = ''
|
269
|
+
|
270
|
+
if field[:only].nil? || field[:only].include?(:variant)
|
271
|
+
value = variant.send(field[:name].gsub(' ', '_').downcase)
|
272
|
+
elsif field[:only].include?(:product)
|
273
|
+
value = variant.product.send(field[:name].gsub(' ', '_').downcase)
|
274
|
+
end
|
275
|
+
current_item.update_attribute(field[:name].gsub(' ', '_').downcase, value)
|
276
|
+
end
|
277
|
+
|
278
|
+
current_item
|
279
|
+
end
|
280
|
+
|
281
|
+
# FIXME refactor this method and implement validation using validates_* utilities
|
282
|
+
def generate_order_number
|
283
|
+
record = true
|
284
|
+
while record
|
285
|
+
random = "R#{Array.new(9){rand(9)}.join}"
|
286
|
+
record = self.class.where(:number => random).first
|
287
|
+
end
|
288
|
+
self.number = random if self.number.blank?
|
289
|
+
self.number
|
290
|
+
end
|
291
|
+
|
292
|
+
# convenience method since many stores will not allow user to create multiple shipments
|
293
|
+
def shipment
|
294
|
+
@shipment ||= shipments.last
|
295
|
+
end
|
296
|
+
|
297
|
+
def contains?(variant)
|
298
|
+
line_items.detect { |line_item| line_item.variant_id == variant.id }
|
299
|
+
end
|
300
|
+
|
301
|
+
def ship_total
|
302
|
+
adjustments.shipping.map(&:amount).sum
|
303
|
+
end
|
304
|
+
|
305
|
+
def tax_total
|
306
|
+
adjustments.tax.map(&:amount).sum
|
307
|
+
end
|
308
|
+
|
309
|
+
# Creates new tax charges if there are any applicable rates. If prices already
|
310
|
+
# include taxes then price adjustments are created instead.
|
311
|
+
def create_tax_charge!
|
312
|
+
# destroy any previous adjustments (eveything is recalculated from scratch)
|
313
|
+
adjustments.tax.each { |e| e.destroy }
|
314
|
+
price_adjustments.each { |p| p.destroy }
|
315
|
+
|
316
|
+
TaxRate.match(self).each { |rate| rate.adjust(self) }
|
317
|
+
end
|
318
|
+
|
319
|
+
# Creates a new shipment (adjustment is created by shipment model)
|
320
|
+
def create_shipment!
|
321
|
+
shipping_method(true)
|
322
|
+
if shipment.present?
|
323
|
+
shipment.update_attributes!(:shipping_method => shipping_method)
|
324
|
+
else
|
325
|
+
self.shipments << Shipment.create!(:order => self,
|
326
|
+
:shipping_method => shipping_method,
|
327
|
+
:address => self.ship_address,
|
328
|
+
:inventory_units => self.inventory_units)
|
329
|
+
end
|
330
|
+
|
331
|
+
end
|
332
|
+
|
333
|
+
def outstanding_balance
|
334
|
+
total - payment_total
|
335
|
+
end
|
336
|
+
|
337
|
+
def outstanding_balance?
|
338
|
+
self.outstanding_balance != 0
|
339
|
+
end
|
340
|
+
|
341
|
+
def name
|
342
|
+
if (address = bill_address || ship_address)
|
343
|
+
"#{address.firstname} #{address.lastname}"
|
344
|
+
end
|
345
|
+
end
|
346
|
+
|
347
|
+
def creditcards
|
348
|
+
creditcard_ids = payments.from_creditcard.map(&:source_id).uniq
|
349
|
+
Creditcard.scoped(:conditions => { :id => creditcard_ids })
|
350
|
+
end
|
351
|
+
|
352
|
+
def process_payments!
|
353
|
+
ret = payments.each(&:process!)
|
354
|
+
end
|
355
|
+
|
356
|
+
# Finalizes an in progress order after checkout is complete.
|
357
|
+
# Called after transition to complete state when payments will have been processed
|
358
|
+
def finalize!
|
359
|
+
update_attribute(:completed_at, Time.now)
|
360
|
+
InventoryUnit.assign_opening_inventory(self)
|
361
|
+
# lock any optional adjustments (coupon promotions, etc.)
|
362
|
+
adjustments.optional.each { |adjustment| adjustment.update_attribute('locked', true) }
|
363
|
+
OrderMailer.confirm_email(self).deliver
|
364
|
+
|
365
|
+
self.state_events.create({
|
366
|
+
:previous_state => 'cart',
|
367
|
+
:next_state => 'complete',
|
368
|
+
:name => 'order' ,
|
369
|
+
:user_id => (User.respond_to?(:current) && User.current.try(:id)) || self.user_id
|
370
|
+
})
|
371
|
+
end
|
372
|
+
|
373
|
+
# Helper methods for checkout steps
|
374
|
+
|
375
|
+
def available_shipping_methods(display_on = nil)
|
376
|
+
return [] unless ship_address
|
377
|
+
ShippingMethod.all_available(self, display_on)
|
378
|
+
end
|
379
|
+
|
380
|
+
def available_payment_methods(display_on = nil)
|
381
|
+
PaymentMethod.all(display_on)
|
382
|
+
end
|
383
|
+
|
384
|
+
def rate_hash
|
385
|
+
@rate_hash ||= available_shipping_methods(:front_end).collect do |ship_method|
|
386
|
+
next unless cost = ship_method.calculator.compute(self)
|
387
|
+
{ :id => ship_method.id,
|
388
|
+
:shipping_method => ship_method,
|
389
|
+
:name => ship_method.name,
|
390
|
+
:cost => cost
|
391
|
+
}
|
392
|
+
end.compact.sort_by { |r| r[:cost] }
|
393
|
+
end
|
394
|
+
|
395
|
+
def payment
|
396
|
+
payments.first
|
397
|
+
end
|
398
|
+
|
399
|
+
def available_payment_methods
|
400
|
+
@available_payment_methods ||= PaymentMethod.available(:front_end)
|
401
|
+
end
|
402
|
+
|
403
|
+
def payment_method
|
404
|
+
if payment and payment.payment_method
|
405
|
+
payment.payment_method
|
406
|
+
else
|
407
|
+
available_payment_methods.first
|
408
|
+
end
|
409
|
+
end
|
410
|
+
|
411
|
+
def billing_firstname
|
412
|
+
bill_address.try(:firstname)
|
413
|
+
end
|
414
|
+
|
415
|
+
def billing_lastname
|
416
|
+
bill_address.try(:lastname)
|
417
|
+
end
|
418
|
+
|
419
|
+
def products
|
420
|
+
line_items.map { |li| li.variant.product }
|
421
|
+
end
|
422
|
+
|
423
|
+
def insufficient_stock_lines
|
424
|
+
line_items.select &:insufficient_stock?
|
425
|
+
end
|
426
|
+
|
427
|
+
private
|
428
|
+
def create_user
|
429
|
+
self.email = user.email if self.user and not user.anonymous?
|
430
|
+
self.user ||= User.anonymous!
|
431
|
+
end
|
432
|
+
|
433
|
+
# Updates the +shipment_state+ attribute according to the following logic:
|
434
|
+
#
|
435
|
+
# shipped when all Shipments are in the "shipped" state
|
436
|
+
# partial when at least one Shipment has a state of "shipped" and there is another Shipment with a state other than "shipped"
|
437
|
+
# or there are InventoryUnits associated with the order that have a state of "sold" but are not associated with a Shipment.
|
438
|
+
# ready when all Shipments are in the "ready" state
|
439
|
+
# backorder when there is backordered inventory associated with an order
|
440
|
+
# pending when all Shipments are in the "pending" state
|
441
|
+
#
|
442
|
+
# The +shipment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
|
443
|
+
def update_shipment_state
|
444
|
+
self.shipment_state =
|
445
|
+
case shipments.count
|
446
|
+
when 0
|
447
|
+
nil
|
448
|
+
when shipments.shipped.count
|
449
|
+
'shipped'
|
450
|
+
when shipments.ready.count
|
451
|
+
'ready'
|
452
|
+
when shipments.pending.count
|
453
|
+
'pending'
|
454
|
+
else
|
455
|
+
'partial'
|
456
|
+
end
|
457
|
+
self.shipment_state = 'backorder' if backordered?
|
458
|
+
|
459
|
+
if old_shipment_state = self.changed_attributes['shipment_state']
|
460
|
+
self.state_events.create({
|
461
|
+
:previous_state => old_shipment_state,
|
462
|
+
:next_state => self.shipment_state,
|
463
|
+
:name => 'shipment',
|
464
|
+
:user_id => (User.respond_to?(:current) && User.current && User.current.id) || self.user_id
|
465
|
+
})
|
466
|
+
end
|
467
|
+
end
|
468
|
+
|
469
|
+
# Updates the +payment_state+ attribute according to the following logic:
|
470
|
+
#
|
471
|
+
# paid when +payment_total+ is equal to +total+
|
472
|
+
# balance_due when +payment_total+ is less than +total+
|
473
|
+
# credit_owed when +payment_total+ is greater than +total+
|
474
|
+
# failed when most recent payment is in the failed state
|
475
|
+
#
|
476
|
+
# The +payment_state+ value helps with reporting, etc. since it provides a quick and easy way to locate Orders needing attention.
|
477
|
+
def update_payment_state
|
478
|
+
if round_money(payment_total) < round_money(total)
|
479
|
+
self.payment_state = 'balance_due'
|
480
|
+
self.payment_state = 'failed' if payments.present? and payments.last.state == 'failed'
|
481
|
+
elsif round_money(payment_total) > round_money(total)
|
482
|
+
self.payment_state = 'credit_owed'
|
483
|
+
else
|
484
|
+
self.payment_state = 'paid'
|
485
|
+
end
|
486
|
+
|
487
|
+
if old_payment_state = self.changed_attributes['payment_state']
|
488
|
+
self.state_events.create({
|
489
|
+
:previous_state => old_payment_state,
|
490
|
+
:next_state => self.payment_state,
|
491
|
+
:name => 'payment',
|
492
|
+
:user_id => (User.respond_to?(:current) && User.current && User.current.id) || self.user_id
|
493
|
+
})
|
494
|
+
end
|
495
|
+
end
|
496
|
+
|
497
|
+
def round_money(n)
|
498
|
+
(n*100).round / 100.0
|
499
|
+
end
|
500
|
+
|
501
|
+
# Updates the following Order total values:
|
502
|
+
#
|
503
|
+
# +payment_total+ The total value of all finalized Payments (NOTE: non-finalized Payments are excluded)
|
504
|
+
# +item_total+ The total value of all LineItems
|
505
|
+
# +adjustment_total+ The total value of all adjustments (promotions, credits, etc.)
|
506
|
+
# +total+ The so-called "order total." This is equivalent to +item_total+ plus +adjustment_total+.
|
507
|
+
def update_totals
|
508
|
+
# update_adjustments
|
509
|
+
self.payment_total = payments.completed.map(&:amount).sum
|
510
|
+
self.item_total = line_items.map(&:amount).sum
|
511
|
+
self.adjustment_total = adjustments.eligible.map(&:amount).sum
|
512
|
+
self.total = item_total + adjustment_total
|
513
|
+
end
|
514
|
+
|
515
|
+
# Updates each of the Order adjustments. This is intended to be called from an Observer so that the Order can
|
516
|
+
# respond to external changes to LineItem, Shipment, other Adjustments, etc.
|
517
|
+
# Adjustments will check if they are still eligible. Ineligible adjustments are preserved but not counted
|
518
|
+
# towards adjustment_total.
|
519
|
+
def update_adjustments
|
520
|
+
self.adjustments.reload.each(&:update!)
|
521
|
+
end
|
522
|
+
|
523
|
+
# Determine if email is required (we don't want validation errors before we hit the checkout)
|
524
|
+
def require_email
|
525
|
+
return true unless new_record? or state == 'cart'
|
526
|
+
end
|
527
|
+
|
528
|
+
def has_available_shipment
|
529
|
+
return unless :address == state_name.to_sym
|
530
|
+
return unless ship_address && ship_address.valid?
|
531
|
+
errors.add(:base, :no_shipping_methods_available) if available_shipping_methods.empty?
|
532
|
+
end
|
533
|
+
|
534
|
+
def has_available_payment
|
535
|
+
return unless :delivery == state_name.to_sym
|
536
|
+
errors.add(:base, :no_payment_methods_available) if available_payment_methods.empty?
|
537
|
+
end
|
538
|
+
|
539
|
+
def after_cancel
|
540
|
+
restock_items!
|
541
|
+
|
542
|
+
#TODO: make_shipments_pending
|
543
|
+
OrderMailer.cancel_email(self).deliver
|
544
|
+
end
|
545
|
+
|
546
|
+
def restock_items!
|
547
|
+
shipments.each do |shipment|
|
548
|
+
shipment.inventory_units.each do |inventory_unit|
|
549
|
+
line_item = line_items.find_by_variant_id(inventory_unit.variant_id)
|
550
|
+
Spree::InventoryUnit.decrease(self, inventory_unit.variant, line_item.quantity)
|
551
|
+
end
|
552
|
+
end
|
553
|
+
end
|
554
|
+
|
555
|
+
def after_resume
|
556
|
+
unstock_items!
|
557
|
+
end
|
558
|
+
|
559
|
+
def unstock_items!
|
560
|
+
shipments.each do |shipment|
|
561
|
+
shipment.inventory_units.each do |inventory_unit|
|
562
|
+
line_item = line_items.find_by_variant_id(inventory_unit.variant_id)
|
563
|
+
Spree::InventoryUnit.increase(self, inventory_unit.variant, line_item.quantity)
|
564
|
+
end
|
565
|
+
end
|
566
|
+
end
|
567
|
+
|
568
|
+
def use_billing?
|
569
|
+
@use_billing == true || @use_billing == "true" || @use_billing == "1"
|
570
|
+
end
|
571
|
+
end
|
572
|
+
end
|