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
File without changes
|
File without changes
|
@@ -0,0 +1,10 @@
|
|
1
|
+
<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
|
2
|
+
|
3
|
+
<h1><%= t(:editing_property) %></h1>
|
4
|
+
|
5
|
+
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @property } %>
|
6
|
+
|
7
|
+
<%= form_for [:admin, @property] do |f| %>
|
8
|
+
<%= render :partial => 'form', :locals => { :f => f } %>
|
9
|
+
<%= render :partial => 'spree/admin/shared/edit_resource_links' %>
|
10
|
+
<% end %>
|
File without changes
|
@@ -0,0 +1,40 @@
|
|
1
|
+
<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
|
2
|
+
|
3
|
+
<div class="toolbar" data-hook="toolbar">
|
4
|
+
<ul class="actions">
|
5
|
+
<li id="new_property_link">
|
6
|
+
<%= button_link_to t(:new_property), new_admin_property_url, {:remote => true, :icon => 'add', 'data-update' => 'new_property', :id => 'new_property_link'} %>
|
7
|
+
</li>
|
8
|
+
</ul>
|
9
|
+
<br class="clear" />
|
10
|
+
</div>
|
11
|
+
|
12
|
+
<h1><%= t(:properties) %></h1>
|
13
|
+
|
14
|
+
<div id="new_property"></div>
|
15
|
+
|
16
|
+
<%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display:none;', :id => 'busy_indicator' %>
|
17
|
+
|
18
|
+
<table class="index" id='listing_properties' data-hook>
|
19
|
+
<thead>
|
20
|
+
<tr data-hook="listing_properties_header">
|
21
|
+
<th><%= t(:name) %></th>
|
22
|
+
<th><%= t(:presentation) %></th>
|
23
|
+
<th></th>
|
24
|
+
</tr>
|
25
|
+
</thead>
|
26
|
+
<tbody>
|
27
|
+
<% @properties.each do |property| %>
|
28
|
+
<tr id="<%= dom_id property %>" data-hook="listing_properties_row">
|
29
|
+
<td><%= property.name %></td>
|
30
|
+
<td><%= property.presentation %></td>
|
31
|
+
<td class="actions">
|
32
|
+
<%= link_to_edit(property, :class => 'edit') %>
|
33
|
+
|
34
|
+
<%= link_to_delete(property) %>
|
35
|
+
</td>
|
36
|
+
</tr>
|
37
|
+
<% end %>
|
38
|
+
</tbody>
|
39
|
+
</table>
|
40
|
+
|
@@ -0,0 +1,11 @@
|
|
1
|
+
<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
|
2
|
+
|
3
|
+
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @property } %>
|
4
|
+
|
5
|
+
<%= form_for [:admin, @property] do |f| %>
|
6
|
+
<fieldset data-hook="new_property">
|
7
|
+
<legend><%= t(:new_property) %></legend>
|
8
|
+
<%= render :partial => 'form', :locals => { :f => f } %>
|
9
|
+
<%= render :partial => 'spree/admin/shared/new_resource_links' %>
|
10
|
+
</fieldset>
|
11
|
+
<% end %>
|
@@ -0,0 +1,44 @@
|
|
1
|
+
<%= f.field_container :name do %>
|
2
|
+
<%= f.label :name, t(:name) %><br />
|
3
|
+
<%= f.text_field :name %>
|
4
|
+
<%= f.error_message_on :name %>
|
5
|
+
<% end %>
|
6
|
+
|
7
|
+
<h3><%= t(:properties) %></h3>
|
8
|
+
|
9
|
+
<ul class='checkbox-list' id='properties' data-hook>
|
10
|
+
<% Spree::Property.sorted.each do |property| %>
|
11
|
+
<% selected = if @prototype.new_record?
|
12
|
+
(params[:property] and params[:property][:id] and params[:property][:id].include?(property.id.to_s))
|
13
|
+
else
|
14
|
+
@prototype.properties.include?(property)
|
15
|
+
end %>
|
16
|
+
<li>
|
17
|
+
<label>
|
18
|
+
<%= check_box_tag 'property[id][]', "#{property.id}", selected %>
|
19
|
+
<%= property.name %>
|
20
|
+
</label>
|
21
|
+
</li>
|
22
|
+
<% end %>
|
23
|
+
</ul>
|
24
|
+
|
25
|
+
<hr />
|
26
|
+
|
27
|
+
<h3><%= t(:option_types) %></h3>
|
28
|
+
|
29
|
+
<ul class="checkbox-list" id="option_types" data-hook>
|
30
|
+
<% Spree::OptionType.all.each do |option_type| %>
|
31
|
+
<% selected = if @prototype.new_record?
|
32
|
+
(params[:option_type] and params[:option_type][:id] and params[:option_type][:id].include?(option_type.id.to_s))
|
33
|
+
else
|
34
|
+
@prototype.option_types.include?(option_type)
|
35
|
+
end %>
|
36
|
+
<li>
|
37
|
+
<label>
|
38
|
+
<%= check_box_tag 'option_type[id][]', "#{option_type.id}", selected %>
|
39
|
+
<%= option_type.name %>
|
40
|
+
</label>
|
41
|
+
</li>
|
42
|
+
<% end %>
|
43
|
+
</ul>
|
44
|
+
<hr />
|
File without changes
|
@@ -0,0 +1,9 @@
|
|
1
|
+
<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
|
2
|
+
<h1><%= t(:editing_prototype) %></h1>
|
3
|
+
|
4
|
+
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @prototype } %>
|
5
|
+
|
6
|
+
<%= form_for [:admin, @prototype] do |f| %>
|
7
|
+
<%= render :partial => 'form', :locals => { :f => f } %>
|
8
|
+
<%= render :partial => 'spree/admin/shared/edit_resource_links' %>
|
9
|
+
<% end %>
|
@@ -0,0 +1,37 @@
|
|
1
|
+
<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
|
2
|
+
|
3
|
+
<div class="toolbar" data-hook="toolbar">
|
4
|
+
<ul class="actions">
|
5
|
+
<li id="new_prototype_link">
|
6
|
+
<%= button_link_to t(:new_prototype), new_admin_prototype_url, {:remote => true, :icon => 'add', 'data-update' => 'new_prototype', :id => 'new_prototype_link'} %>
|
7
|
+
</li>
|
8
|
+
</ul>
|
9
|
+
<br class="clear" />
|
10
|
+
</div>
|
11
|
+
|
12
|
+
|
13
|
+
<h1><%= t(:prototypes) %></h1>
|
14
|
+
|
15
|
+
<%= image_tag 'spinner.gif', :plugin => 'spree', :style => 'display: none', :id => 'busy_indicator' %>
|
16
|
+
<div id="new_prototype"></div>
|
17
|
+
|
18
|
+
<table class="index" id='listing_prototypes' data-hook>
|
19
|
+
<thead>
|
20
|
+
<tr data-hook="prototypes_header">
|
21
|
+
<th><%= t(:name) %></th>
|
22
|
+
<th><%= t(:action) %></th>
|
23
|
+
</tr>
|
24
|
+
</thead>
|
25
|
+
<tbody>
|
26
|
+
<% @prototypes.each do |prototype| %>
|
27
|
+
<tr id="<%= dom_id prototype %>" data-hook="prototypes_row">
|
28
|
+
<td><%= prototype.name %></td>
|
29
|
+
<td class="actions">
|
30
|
+
<%= link_to_edit(prototype, :class => 'admin_edit_prototype') %>
|
31
|
+
|
32
|
+
<%= link_to_delete(prototype) %>
|
33
|
+
</td>
|
34
|
+
</tr>
|
35
|
+
<% end %>
|
36
|
+
</tbody>
|
37
|
+
</table>
|
@@ -0,0 +1,11 @@
|
|
1
|
+
<%= render :partial => 'spree/admin/shared/product_sub_menu' %>
|
2
|
+
|
3
|
+
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @prototype } %>
|
4
|
+
|
5
|
+
<%= form_for [:admin, @prototype] do |f| %>
|
6
|
+
<fieldset data-hook="new_prototype">
|
7
|
+
<legend><%= t(:new_prototype) %></legend>
|
8
|
+
<%= render :partial => 'form', :locals => { :f => f } %>
|
9
|
+
<%= render :partial => 'spree/admin/shared/new_resource_links' %>
|
10
|
+
</fieldset>
|
11
|
+
<% end %>
|
File without changes
|
File without changes
|
@@ -0,0 +1,23 @@
|
|
1
|
+
<h1><%= t(:sales_totals) %> </h1>
|
2
|
+
|
3
|
+
<table class="admin-report" data-hook="sales_total">
|
4
|
+
<tbody>
|
5
|
+
<tr>
|
6
|
+
<th scope="row"><%= t(:item_total) %>:</th>
|
7
|
+
<td align="right"><%= number_to_currency @item_total %></td>
|
8
|
+
</tr>
|
9
|
+
<tr>
|
10
|
+
<th scope="row"><%= t(:adjustment_total) %>:</th>
|
11
|
+
<td align="right"><%= number_to_currency @adjustment_total %></td>
|
12
|
+
</tr>
|
13
|
+
<tr>
|
14
|
+
<th scope="row"><%= t(:sales_total) %>:</th>
|
15
|
+
<td align="right"><%= number_to_currency @sales_total %></td>
|
16
|
+
</tr>
|
17
|
+
</tbody>
|
18
|
+
</table>
|
19
|
+
|
20
|
+
<% content_for :sidebar do %>
|
21
|
+
<%= render :partial => 'spree/admin/shared/report_criteria', :locals => {} %>
|
22
|
+
<% end %>
|
23
|
+
|
File without changes
|
@@ -0,0 +1,27 @@
|
|
1
|
+
<div class="toolbar" data-hook="toolbar">
|
2
|
+
<ul class="actions">
|
3
|
+
<li>
|
4
|
+
<% if @return_authorization.can_receive? %>
|
5
|
+
<%= button_link_to t(:receive), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'receive'), :method => :put, :confirm => t(:are_you_sure) %>
|
6
|
+
<% end %>
|
7
|
+
<% if @return_authorization.can_cancel? %>
|
8
|
+
<%= button_link_to t(:cancel), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'cancel'), :method => :put, :confirm => t(:are_you_sure) %>
|
9
|
+
<% end %>
|
10
|
+
</li>
|
11
|
+
</ul>
|
12
|
+
<br class="clear" />
|
13
|
+
</div>
|
14
|
+
|
15
|
+
<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
|
16
|
+
|
17
|
+
<h2><%= t(:return_authorization) %> <%= @return_authorization.number %> (<%= t(@return_authorization.state.downcase) %>)</h2>
|
18
|
+
|
19
|
+
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
|
20
|
+
<%= form_for [:admin, @order, @return_authorization] do |f| %>
|
21
|
+
<%= render :partial => 'form', :locals => { :f => f } %>
|
22
|
+
|
23
|
+
<p class="form-buttons" data-hook="buttons">
|
24
|
+
<%= button t(:update) %>
|
25
|
+
<%= t(:or) %> <%= link_to t('actions.cancel'), admin_order_return_authorizations_url(@order) %>
|
26
|
+
</p>
|
27
|
+
<% end %>
|
@@ -0,0 +1,45 @@
|
|
1
|
+
<% if @order.inventory_units.any? &:shipped? %>
|
2
|
+
<div class="toolbar" data-hook="toolbar">
|
3
|
+
<ul class="actions">
|
4
|
+
<li>
|
5
|
+
<%= button_link_to t(:new_return_authorization), new_admin_order_return_authorization_url(@order), :icon => 'add' %>
|
6
|
+
</li>
|
7
|
+
</ul>
|
8
|
+
<br class="clear" />
|
9
|
+
</div>
|
10
|
+
<% end %>
|
11
|
+
|
12
|
+
<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
|
13
|
+
|
14
|
+
<table class="index">
|
15
|
+
<tr data-hook="rma_header">
|
16
|
+
<th><%= t(:rma_number) %></th>
|
17
|
+
<th><%= t(:status) %></th>
|
18
|
+
<th><%= t(:amount) %></th>
|
19
|
+
<th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
|
20
|
+
<th></th>
|
21
|
+
</tr>
|
22
|
+
<% @return_authorizations.each do |return_authorization| %>
|
23
|
+
<tr id="<%= dom_id(return_authorization) %>" data-hook="rma_row">
|
24
|
+
<td><%= return_authorization.number %></td>
|
25
|
+
<td><%= t(return_authorization.state.downcase) %></td>
|
26
|
+
<td><%= number_to_currency return_authorization.amount %></td>
|
27
|
+
<td><%= return_authorization.created_at.to_s(:date_time24) %></td>
|
28
|
+
<td>
|
29
|
+
<%= link_to_edit return_authorization %>
|
30
|
+
<% unless return_authorization.received? %>
|
31
|
+
|
32
|
+
<%= link_to_delete return_authorization %>
|
33
|
+
<% end %>
|
34
|
+
</td>
|
35
|
+
|
36
|
+
</tr>
|
37
|
+
<% end %>
|
38
|
+
<% unless @order.inventory_units.any? &:shipped? %>
|
39
|
+
<tr data-hook="rma_cannont_create">
|
40
|
+
<td colspan="5"><%= t(:cannot_create_returns) %></td>
|
41
|
+
</tr>
|
42
|
+
<% end %>
|
43
|
+
</table>
|
44
|
+
|
45
|
+
<%= button_link_to t(:continue), admin_orders_url %>
|
@@ -0,0 +1,13 @@
|
|
1
|
+
<%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
|
2
|
+
|
3
|
+
<h2><%= t(:new_return_authorization) %></h2>
|
4
|
+
|
5
|
+
<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
|
6
|
+
<%= form_for [:admin, @order, @return_authorization] do |f| %>
|
7
|
+
<%= render :partial => 'form', :locals => { :f => f } %>
|
8
|
+
|
9
|
+
<p class="form-buttons" data-hook="buttons">
|
10
|
+
<%= button t(:continue) %>
|
11
|
+
<%= t(:or) %> <%= link_to t('actions.cancel'), admin_order_return_authorizations_url(@order) %>
|
12
|
+
</p>
|
13
|
+
<% end %>
|
@@ -0,0 +1,5 @@
|
|
1
|
+
<p>
|
2
|
+
<%= label controller.controller_name.singularize, field[:name], t('activerecord.attributes.variant.' + field[:name].downcase, :default => field[:name].titleize) %><br />
|
3
|
+
<%= additional_field_for(controller, field) %>
|
4
|
+
<%= error_message_on controller.controller_name.singularize, attribute_name_for(field[:name]) %>
|
5
|
+
</p>
|
@@ -0,0 +1,6 @@
|
|
1
|
+
<p data-hook="address">
|
2
|
+
<%="#{address.firstname} #{address.lastname} "%><%= address.company unless address.company.blank? %>
|
3
|
+
<%="(#{address.phone}" %><%= address.alternative_phone unless address.alternative_phone.blank? %>)<br />
|
4
|
+
<%= address.address1 %> <%= ", #{address.address2}" unless address.address2.blank? %>
|
5
|
+
<%= ", #{address.city}, #{address.state_text}, #{address.zipcode}, #{address.country.name}" %>
|
6
|
+
</p>
|
@@ -0,0 +1,84 @@
|
|
1
|
+
<table class="index">
|
2
|
+
<thead>
|
3
|
+
<tr data-hook="use_billing">
|
4
|
+
<th colspan="8">
|
5
|
+
<%= name %>
|
6
|
+
<span class="right">
|
7
|
+
<% if use_billing %>
|
8
|
+
<%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address)) %> <%= t(:use_billing_address) %>
|
9
|
+
<% end %>
|
10
|
+
</span>
|
11
|
+
</th>
|
12
|
+
</tr>
|
13
|
+
</thead>
|
14
|
+
<tbody id="<%= name == t(:shipping_address) ? 'shipping' : 'billing' %>" style="display: <%= (use_billing && (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address))) ? 'none' : '' %>" data-hook="address_fields">
|
15
|
+
<tr class="<%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">
|
16
|
+
<td class="lbl-col">
|
17
|
+
<%= f.label :firstname, t(:first_name) + ':' %>
|
18
|
+
</td>
|
19
|
+
<td class="val-col" colspan="3"><%= f.text_field :firstname %></td>
|
20
|
+
<td class="lbl-col">
|
21
|
+
<%= f.label :lastname, t(:last_name) + ':' %>
|
22
|
+
</td>
|
23
|
+
<td class="val-col" colspan="3"><%= f.text_field :lastname %></td>
|
24
|
+
</tr>
|
25
|
+
<% if Spree::Config[:company] %>
|
26
|
+
<tr class="<%= name == t(:company) ? 'shipping-row' : 'billing-row' %>">
|
27
|
+
<td class="lbl-col"> <%= f.label :company, t(:company) + ':' %> </td>
|
28
|
+
<td class=colspan="7"> <%= f.text_field :company %> </td>
|
29
|
+
</tr>
|
30
|
+
<% end %>
|
31
|
+
<tr class="<%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">
|
32
|
+
<td class="lbl-col">
|
33
|
+
<%= f.label :address1, t(:street_address) + ':' %>
|
34
|
+
</td>
|
35
|
+
<td colspan="3"><%= f.text_field :address1, :class => "fullwidth" %></td>
|
36
|
+
<td class="lbl-col">
|
37
|
+
<%= f.label :address2, t(:street_address_2) + ':' %>
|
38
|
+
</td>
|
39
|
+
<td colspan="3"><%= f.text_field :address2, :class => "fullwidth" %></td>
|
40
|
+
</tr>
|
41
|
+
<tr class="<%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">
|
42
|
+
<td class="lbl-col">
|
43
|
+
<%= f.label :city, t(:city) + ':' %>
|
44
|
+
</td>
|
45
|
+
<td colspan="3"><%= f.text_field :city %></td>
|
46
|
+
<td class="lbl-col">
|
47
|
+
<%= f.label :zipcode, t(:zip) + ':' %>
|
48
|
+
</td>
|
49
|
+
<td colspan="3"><%= f.text_field :zipcode, :style => 'width: 100px;' %></td>
|
50
|
+
</tr>
|
51
|
+
<tr class="<%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">
|
52
|
+
<td class="lbl-col">
|
53
|
+
<%= f.label :state_id, t(:state) + ':' %>
|
54
|
+
</td>
|
55
|
+
<td colspan="3">
|
56
|
+
<span id="<%= name == t(:shipping_address) ? 's' : 'b' %>state">
|
57
|
+
|
58
|
+
<%= f.text_field :state_name, :style => "width:150px; display: #{f.object.country.states.empty? ? 'block' : 'none' };", :disabled => !f.object.country.states.empty? %>
|
59
|
+
<%= f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:style => "width:150px; display: #{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?} %>
|
60
|
+
</span>
|
61
|
+
</td>
|
62
|
+
<td class="lbl-col">
|
63
|
+
<%= f.label :country_id, t(:country) + ':' %>
|
64
|
+
</td>
|
65
|
+
<td colspan="3">
|
66
|
+
<span id="<%= name == t(:shipping_address) ? 's' : 'b' %>country"><%= f.collection_select :country_id, available_countries, :id, :name, {}, {:style => 'width: 150px;'} %></span>
|
67
|
+
</td>
|
68
|
+
</tr>
|
69
|
+
<tr class="<%= name == t(:shipping_address) ? 'shipping-row' : 'billing-row' %>">
|
70
|
+
<td class="lbl-col">
|
71
|
+
<%= f.label :phone, t(:phone) + ':' %>
|
72
|
+
</td>
|
73
|
+
<td colspan="7"><%= f.text_field :phone %></td>
|
74
|
+
</tr>
|
75
|
+
</tbody>
|
76
|
+
</table>
|
77
|
+
|
78
|
+
<% content_for :head do %>
|
79
|
+
<%= javascript_tag do -%>
|
80
|
+
$(document).ready(function(){
|
81
|
+
$('span#<%= name == t(:shipping_address) ? 's' : 'b' %>country select').change(function() { update_state('<%= name == t(:shipping_address) ? 's' : 'b' %>'); });
|
82
|
+
});
|
83
|
+
<% end -%>
|
84
|
+
<% end %>
|
@@ -0,0 +1,5 @@
|
|
1
|
+
<div class="alert <%= alert.severity.downcase %>">
|
2
|
+
<%= alert.message %> <%= link_to alert.url_name, alert.url if alert.url %>
|
3
|
+
<%= link_to 'X', dismiss_alert_admin_general_settings_path(:alert_id => alert.id),
|
4
|
+
:remote => true, :method => :post, :class => 'dismiss' %>
|
5
|
+
</div>
|
@@ -0,0 +1,19 @@
|
|
1
|
+
<fieldset id="calculator_fields" data-hook>
|
2
|
+
<legend><%= t(:calculator) %></legend>
|
3
|
+
<div id="preference-settings" data-hook>
|
4
|
+
<p>
|
5
|
+
<%= f.label(:calc_type, t(:calculator), :for => 'calc-type') %>
|
6
|
+
<%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {:id => 'calc-type'}) %>
|
7
|
+
</p>
|
8
|
+
<% if !@object.new_record? %>
|
9
|
+
<div class="calculator-settings">
|
10
|
+
<%= f.fields_for :calculator do |calculator_form| %>
|
11
|
+
<%= preference_fields(@object.calculator, calculator_form) %>
|
12
|
+
<% end %>
|
13
|
+
</div>
|
14
|
+
<% if @object.calculator.respond_to?(:preferences) %>
|
15
|
+
<div class="calculator-settings-warning"><%= t(:calculator_settings_warning) %></div>
|
16
|
+
<% end %>
|
17
|
+
<% end %>
|
18
|
+
</div>
|
19
|
+
</fieldset>
|