spree_core 0.60.6 → 0.70.0
Sign up to get free protection for your applications and to get access to all the features.
- data/LICENSE +1 -1
- data/README.md +10 -4
- data/{public → app/assets}/images/admin/bg/active-tab.png +0 -0
- data/{public → app/assets}/images/admin/bg/admin_tab_back.png +0 -0
- data/{public → app/assets}/images/admin/bg/admin_tab_selected_back.png +0 -0
- data/{public → app/assets}/images/admin/bg/content-back-blue.png +0 -0
- data/{public → app/assets}/images/admin/bg/content-back-green.png +0 -0
- data/{public → app/assets}/images/admin/bg/content-back.png +0 -0
- data/{public → app/assets}/images/admin/bg/flash-error.png +0 -0
- data/{public → app/assets}/images/admin/bg/flash-notice.png +0 -0
- data/{public → app/assets}/images/admin/bg/green-stripes.gif +0 -0
- data/{public → app/assets}/images/admin/bg/green-stripes.png +0 -0
- data/{public → app/assets}/images/admin/bg/grid_header_back.png +0 -0
- data/{public → app/assets}/images/admin/bg/grid_header_back_green.png +0 -0
- data/{public → app/assets}/images/admin/bg/header-bg.png +0 -0
- data/{public → app/assets}/images/admin/bg/header.png +0 -0
- data/{public → app/assets}/images/admin/bg/header_bg.jpg +0 -0
- data/{public → app/assets}/images/admin/bg/menu-current.png +0 -0
- data/{public → app/assets}/images/admin/bg/red-stripes.gif +0 -0
- data/{public → app/assets}/images/admin/bg/red-stripes.png +0 -0
- data/{public → app/assets}/images/admin/bg/spree_50.png +0 -0
- data/{public → app/assets}/images/admin/bg/subnav-divider.png +0 -0
- data/{public → app/assets}/images/admin/bg/subnav.png +0 -0
- data/{public → app/assets}/images/admin/bg/tab-back.png +0 -0
- data/{public → app/assets}/images/admin/buttons/blue/left_01.png +0 -0
- data/{public → app/assets}/images/admin/buttons/blue/right_01.png +0 -0
- data/{public → app/assets}/images/admin/buttons/drag-handle-green.png +0 -0
- data/{public → app/assets}/images/admin/buttons/green/left_01.png +0 -0
- data/{public → app/assets}/images/admin/buttons/green/right_01.png +0 -0
- data/{public → app/assets}/images/admin/buttons/left_01.png +0 -0
- data/{public → app/assets}/images/admin/buttons/left_01_small.png +0 -0
- data/{public → app/assets}/images/admin/buttons/orange/left_03.png +0 -0
- data/{public → app/assets}/images/admin/buttons/orange/right_03.png +0 -0
- data/{public → app/assets}/images/admin/buttons/right_01.png +0 -0
- data/{public → app/assets}/images/admin/buttons/right_01_small.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/1.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/10.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/2.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/3.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/4.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/5.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/6.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/7.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/8.png +0 -0
- data/{public → app/assets}/images/admin/icons/16x16/9.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/1.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/10.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/11.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/2.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/3.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/4.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/5.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/6.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/7.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/8.png +0 -0
- data/{public → app/assets}/images/admin/icons/32x32/9.png +0 -0
- data/{public → app/assets}/images/admin/icons/accept.png +0 -0
- data/{public → app/assets}/images/admin/icons/add.gif +0 -0
- data/{public → app/assets}/images/admin/icons/add.png +0 -0
- data/{public → app/assets}/images/admin/icons/arrow-down.gif +0 -0
- data/{public → app/assets}/images/admin/icons/cross.png +0 -0
- data/{public → app/assets}/images/admin/icons/delete.gif +0 -0
- data/{public → app/assets}/images/admin/icons/delete.png +0 -0
- data/{public → app/assets}/images/admin/icons/drag.gif +0 -0
- data/{public → app/assets}/images/admin/icons/edit.gif +0 -0
- data/{public → app/assets}/images/admin/icons/edit.png +0 -0
- data/{public → app/assets}/images/admin/icons/email.png +0 -0
- data/{public → app/assets}/images/admin/icons/error.png +0 -0
- data/{public → app/assets}/images/admin/icons/exclamation.png +0 -0
- data/{public → app/assets}/images/admin/icons/feed.png +0 -0
- data/{public → app/assets}/images/admin/icons/pdf.png +0 -0
- data/{public → app/assets}/images/admin/icons/reorder.gif +0 -0
- data/{public → app/assets}/images/admin/icons/search.gif +0 -0
- data/{public → app/assets}/images/admin/icons/send-email.png +0 -0
- data/{public → app/assets}/images/admin/icons/stop.png +0 -0
- data/app/assets/images/admin/icons/switch.png +0 -0
- data/{public → app/assets}/images/admin/icons/tick.png +0 -0
- data/{public → app/assets}/images/admin/icons/up.gif +0 -0
- data/{public → app/assets}/images/admin/icons/xls.png +0 -0
- data/{public/images → app/assets/images/admin}/progress.gif +0 -0
- data/{public/images → app/assets/images/creditcards}/amex_cid.gif +0 -0
- data/{public/images → app/assets/images/creditcards}/creditcard.gif +0 -0
- data/{public/images → app/assets/images/creditcards}/discover_cid.gif +0 -0
- data/{public/images → app/assets/images/creditcards}/master_cid.jpg +0 -0
- data/{public/images → app/assets/images/creditcards}/visa_cid.gif +0 -0
- data/{public → app/assets}/images/favicon.ico +0 -0
- data/{public/images → app/assets/images/icons}/add-to-cart.png +0 -0
- data/{public/images → app/assets/images/icons}/checkout.png +0 -0
- data/app/assets/images/icons/delete.png +0 -0
- data/{public/images → app/assets/images/icons}/update.png +0 -0
- data/app/assets/images/noimage/mini.png +0 -0
- data/app/assets/images/noimage/product.png +0 -0
- data/app/assets/images/noimage/small.png +0 -0
- data/{public → app/assets}/images/spinner.gif +0 -0
- data/{public → app/assets}/javascripts/admin/address_states.js +4 -4
- data/{public/javascripts/admin.js → app/assets/javascripts/admin/admin.js.erb} +90 -93
- data/app/assets/javascripts/admin/calculator.js +15 -0
- data/{public → app/assets}/javascripts/admin/checkouts/edit.js +13 -13
- data/app/assets/javascripts/admin/gateway.js +13 -0
- data/app/assets/javascripts/admin/images/index.js +10 -0
- data/app/assets/javascripts/admin/images/new.js +5 -0
- data/app/assets/javascripts/admin/nested-attribute.js +23 -0
- data/app/assets/javascripts/admin/orders/edit.js +15 -0
- data/app/assets/javascripts/admin/orders/edit_form.js +18 -0
- data/{public → app/assets}/javascripts/admin/payments/new.js +0 -0
- data/app/assets/javascripts/admin/products.js +23 -0
- data/app/assets/javascripts/admin/spree_core.js +10 -0
- data/app/assets/javascripts/admin/taxonomy.js +206 -0
- data/app/assets/javascripts/admin/underscore-min.js +26 -0
- data/app/assets/javascripts/admin/zone.js +44 -0
- data/app/assets/javascripts/store/cart.js +11 -0
- data/app/assets/javascripts/store/checkout.js +77 -0
- data/app/assets/javascripts/store/product.js +49 -0
- data/app/assets/javascripts/store/spree_core.js +6 -0
- data/{public/stylesheets/admin/admin-forms.css → app/assets/stylesheets/admin/admin-form.css.erb} +28 -19
- data/{public → app/assets}/stylesheets/admin/admin-reset.css +0 -0
- data/{public/stylesheets/admin/admin-tables.css → app/assets/stylesheets/admin/admin-tables.css.erb} +3 -2
- data/{public → app/assets}/stylesheets/admin/admin-typography.css +2 -2
- data/{public/stylesheets/admin/admin.css → app/assets/stylesheets/admin/admin.css.erb} +22 -46
- data/{public/stylesheets/admin/autocomplete.css → app/assets/stylesheets/admin/edit_checkouts.css} +6 -7
- data/app/assets/stylesheets/admin/spree_core.css +15 -0
- data/{public → app/assets}/stylesheets/admin/token-input.css +0 -0
- data/app/assets/stylesheets/store/reset.css +175 -0
- data/app/assets/stylesheets/store/screen.css +122 -0
- data/app/assets/stylesheets/store/spree_core.css +5 -0
- data/app/controllers/admin/base_controller.rb +3 -32
- data/app/controllers/admin/general_settings_controller.rb +14 -15
- data/app/controllers/admin/line_items_controller.rb +4 -2
- data/app/controllers/admin/mail_methods_controller.rb +13 -0
- data/app/controllers/admin/option_types_controller.rb +1 -2
- data/app/controllers/admin/orders_controller.rb +9 -8
- data/app/controllers/admin/product_groups_controller.rb +1 -2
- data/app/controllers/admin/products_controller.rb +4 -6
- data/app/controllers/admin/prototypes_controller.rb +1 -0
- data/app/controllers/admin/resource_controller.rb +7 -1
- data/app/controllers/admin/shipments_controller.rb +1 -1
- data/app/controllers/admin/states_controller.rb +1 -1
- data/app/controllers/admin/tax_categories_controller.rb +6 -0
- data/app/controllers/admin/tax_rates_controller.rb +2 -2
- data/app/controllers/admin/taxons_controller.rb +0 -9
- data/app/controllers/admin/users_controller.rb +9 -5
- data/app/controllers/admin/variants_controller.rb +22 -0
- data/app/controllers/admin/zones_controller.rb +1 -1
- data/app/controllers/checkout_controller.rb +12 -0
- data/app/controllers/content_controller.rb +1 -1
- data/app/controllers/home_controller.rb +10 -0
- data/app/controllers/orders_controller.rb +11 -7
- data/app/controllers/products_controller.rb +0 -1
- data/app/helpers/admin/base_helper.rb +5 -9
- data/app/helpers/admin/navigation_helper.rb +9 -2
- data/app/helpers/checkout_helper.rb +7 -3
- data/app/helpers/hook_helper.rb +5 -15
- data/app/helpers/products_helper.rb +4 -0
- data/app/helpers/spree/base_helper.rb +70 -16
- data/app/helpers/taxons_helper.rb +0 -16
- data/app/mailers/order_mailer.rb +5 -5
- data/app/mailers/shipment_mailer.rb +3 -3
- data/app/mailers/test_mailer.rb +10 -0
- data/app/models/activator.rb +27 -0
- data/app/models/adjustment.rb +32 -12
- data/app/models/app_configuration.rb +7 -6
- data/app/models/calculator/flat_percent_item_total.rb +0 -5
- data/app/models/calculator/flat_rate.rb +0 -5
- data/app/models/calculator/flexi_rate.rb +0 -5
- data/app/models/calculator/per_item.rb +0 -5
- data/app/models/calculator/price_bucket.rb +0 -6
- data/app/models/calculator/sales_tax.rb +1 -6
- data/app/models/calculator/vat.rb +26 -47
- data/app/models/calculator.rb +7 -9
- data/app/models/creditcard.rb +36 -31
- data/app/models/gateway.rb +1 -0
- data/app/models/image.rb +7 -2
- data/app/models/inventory_unit.rb +6 -10
- data/app/models/line_item.rb +17 -2
- data/app/models/order.rb +35 -20
- data/app/models/payment.rb +6 -12
- data/app/models/payment_method/check.rb +0 -4
- data/app/models/payment_method.rb +1 -11
- data/app/models/product.rb +54 -29
- data/app/models/product_group.rb +4 -8
- data/app/models/product_scope.rb +1 -1
- data/app/models/shipment.rb +1 -6
- data/app/models/tax_category.rb +6 -0
- data/app/models/tax_rate.rb +10 -0
- data/app/models/taxon.rb +3 -3
- data/app/models/taxonomy.rb +1 -1
- data/app/models/zone.rb +4 -4
- data/app/views/admin/adjustments/_adjustments_table.html.erb +6 -6
- data/app/views/admin/adjustments/_form.html.erb +4 -4
- data/app/views/admin/adjustments/edit.html.erb +8 -8
- data/app/views/admin/adjustments/index.html.erb +2 -2
- data/app/views/admin/adjustments/new.html.erb +7 -7
- data/app/views/admin/configurations/index.html.erb +57 -59
- data/app/views/admin/general_settings/edit.html.erb +16 -41
- data/app/views/admin/general_settings/show.html.erb +15 -26
- data/app/views/admin/images/_form.html.erb +6 -6
- data/app/views/admin/images/edit.html.erb +11 -11
- data/app/views/admin/images/index.html.erb +18 -32
- data/app/views/admin/images/new.html.erb +8 -18
- data/app/views/admin/inventory_settings/edit.html.erb +10 -10
- data/app/views/admin/inventory_settings/show.html.erb +4 -4
- data/app/views/admin/inventory_units/adjust.html.erb +13 -13
- data/app/views/admin/line_items/create.js.erb +4 -0
- data/app/views/admin/mail_methods/_form.html.erb +27 -33
- data/app/views/admin/mail_methods/edit.html.erb +5 -5
- data/app/views/admin/mail_methods/index.html.erb +19 -23
- data/app/views/admin/mail_methods/new.html.erb +5 -5
- data/app/views/admin/option_types/_available.html.erb +14 -13
- data/app/views/admin/option_types/_form.html.erb +2 -2
- data/app/views/admin/option_types/_option_value_fields.html.erb +4 -4
- data/app/views/admin/option_types/_selected.html.erb +10 -10
- data/app/views/admin/option_types/available.js.erb +1 -1
- data/app/views/admin/option_types/edit.html.erb +13 -13
- data/app/views/admin/option_types/index.html.erb +11 -11
- data/app/views/admin/option_types/new.html.erb +11 -0
- data/app/views/admin/option_types/new.js.erb +2 -0
- data/app/views/admin/option_types/selected.html.erb +2 -2
- data/app/views/admin/orders/_add_product.html.erb +8 -8
- data/app/views/admin/orders/_form.html.erb +36 -47
- data/app/views/admin/orders/_line_item.html.erb +12 -15
- data/app/views/admin/orders/_user_form.html.erb +22 -17
- data/app/views/admin/orders/edit.html.erb +16 -20
- data/app/views/admin/orders/history.html.erb +11 -11
- data/app/views/admin/orders/index.html.erb +54 -67
- data/app/views/admin/orders/new.html.erb +10 -11
- data/app/views/admin/orders/show.html.erb +11 -13
- data/app/views/admin/orders/user.html.erb +8 -13
- data/app/views/admin/payment_methods/_form.html.erb +23 -23
- data/app/views/admin/payment_methods/edit.html.erb +6 -6
- data/app/views/admin/payment_methods/index.html.erb +22 -32
- data/app/views/admin/payment_methods/new.html.erb +5 -5
- data/app/views/admin/payments/_bill_address_form.html.erb +1 -1
- data/app/views/admin/payments/_form.html.erb +6 -6
- data/app/views/admin/payments/_list.html.erb +7 -7
- data/app/views/admin/payments/_transaction_list.html.erb +9 -9
- data/app/views/admin/payments/credit.html.erb +6 -6
- data/app/views/admin/payments/index.html.erb +9 -9
- data/app/views/admin/payments/new.html.erb +7 -7
- data/app/views/admin/payments/show.html.erb +3 -3
- data/app/views/admin/payments/source_forms/_gateway.html.erb +13 -13
- data/app/views/admin/payments/source_views/_gateway.html.erb +9 -9
- data/app/views/admin/product_groups/_preview.html.erb +8 -8
- data/app/views/admin/product_groups/_product_scope.html.erb +8 -8
- data/app/views/admin/product_groups/edit.html.erb +12 -15
- data/app/views/admin/product_groups/index.html.erb +14 -14
- data/app/views/admin/product_groups/new.html.erb +4 -4
- data/app/views/admin/product_groups/show.html.erb +5 -5
- data/app/views/admin/product_groups/update.js.erb +7 -3
- data/app/views/admin/product_properties/_product_property_fields.html.erb +4 -4
- data/app/views/admin/product_properties/index.html.erb +22 -22
- data/app/views/admin/product_scopes/create.js.erb +3 -3
- data/app/views/admin/product_scopes/destroy.js.erb +3 -3
- data/app/views/admin/products/_form.html.erb +81 -78
- data/app/views/admin/products/_option_types.html.erb +36 -36
- data/app/views/admin/products/_properties_form.erb +3 -3
- data/app/views/admin/products/edit.html.erb +3 -4
- data/app/views/admin/products/index.html.erb +34 -43
- data/app/views/admin/products/new.html.erb +52 -0
- data/app/views/admin/products/new.js.erb +3 -0
- data/app/views/admin/products/show.html.erb +1 -1
- data/app/views/admin/properties/_form.html.erb +13 -10
- data/app/views/admin/properties/edit.html.erb +3 -3
- data/app/views/admin/properties/index.html.erb +11 -11
- data/app/views/admin/properties/{new.erb → new.html.erb} +4 -4
- data/app/views/admin/properties/new.js.erb +2 -0
- data/app/views/admin/prototypes/_form.html.erb +21 -21
- data/app/views/admin/prototypes/_prototypes.html.erb +21 -0
- data/app/views/admin/prototypes/available.js.erb +2 -0
- data/app/views/admin/prototypes/edit.html.erb +4 -4
- data/app/views/admin/prototypes/index.html.erb +11 -11
- data/app/views/admin/prototypes/{new.erb → new.html.erb} +4 -4
- data/app/views/admin/prototypes/new.js.erb +2 -0
- data/app/views/admin/reports/index.html.erb +5 -5
- data/app/views/admin/reports/sales_total.html.erb +8 -8
- data/app/views/admin/return_authorizations/_form.html.erb +15 -16
- data/app/views/admin/return_authorizations/edit.html.erb +13 -13
- data/app/views/admin/return_authorizations/index.html.erb +14 -14
- data/app/views/admin/return_authorizations/new.html.erb +8 -8
- data/app/views/admin/shared/_additional_field.html.erb +1 -1
- data/app/views/admin/shared/_address.html.erb +1 -1
- data/app/views/admin/shared/_address_form.html.erb +26 -27
- data/app/views/admin/shared/_calculator_fields.html.erb +6 -6
- data/app/views/admin/shared/_configuration_menu.html.erb +14 -15
- data/app/views/admin/shared/_destroy.js.erb +2 -2
- data/app/views/admin/shared/_edit_resource_links.html.erb +3 -3
- data/app/views/admin/shared/_group_from_products_form.html.erb +7 -7
- data/app/views/admin/shared/_head.html.erb +26 -0
- data/app/views/admin/shared/_new_adjustment_button.html.erb +5 -5
- data/app/views/admin/shared/_new_resource_links.html.erb +3 -3
- data/app/views/admin/shared/_order_details.html.erb +0 -1
- data/app/views/admin/shared/_order_tabs.html.erb +43 -48
- data/app/views/admin/shared/_product_sub_menu.html.erb +6 -8
- data/app/views/admin/shared/_product_tabs.html.erb +21 -25
- data/app/views/admin/shared/_report_criteria.html.erb +9 -9
- data/app/views/admin/shared/_show_resource_links.html.erb +5 -5
- data/app/views/admin/shared/_tabs.html.erb +1 -1
- data/app/views/admin/shared/_update_order_state.js +4 -4
- data/app/views/admin/shipments/_form.html.erb +42 -46
- data/app/views/admin/shipments/edit.html.erb +23 -25
- data/app/views/admin/shipments/index.html.erb +25 -34
- data/app/views/admin/shipments/new.html.erb +12 -12
- data/app/views/admin/shipping_categories/_form.html.erb +4 -4
- data/app/views/admin/shipping_categories/edit.html.erb +4 -4
- data/app/views/admin/shipping_categories/index.html.erb +12 -12
- data/app/views/admin/shipping_categories/new.html.erb +4 -4
- data/app/views/admin/shipping_methods/_form.html.erb +9 -10
- data/app/views/admin/shipping_methods/edit.html.erb +11 -11
- data/app/views/admin/shipping_methods/index.html.erb +19 -29
- data/app/views/admin/shipping_methods/new.html.erb +10 -10
- data/app/views/admin/states/_form.html.erb +3 -3
- data/app/views/admin/states/_state_list.html.erb +11 -13
- data/app/views/admin/states/edit.html.erb +4 -4
- data/app/views/admin/states/index.html.erb +6 -6
- data/app/views/admin/states/new.html.erb +8 -0
- data/app/views/admin/states/new.js.erb +2 -0
- data/app/views/admin/tax_categories/_form.html.erb +6 -6
- data/app/views/admin/tax_categories/edit.html.erb +4 -4
- data/app/views/admin/tax_categories/index.html.erb +14 -15
- data/app/views/admin/tax_categories/new.html.erb +4 -4
- data/app/views/admin/tax_rates/_form.html.erb +9 -9
- data/app/views/admin/tax_rates/edit.html.erb +5 -5
- data/app/views/admin/tax_rates/index.html.erb +14 -14
- data/app/views/admin/tax_rates/new.html.erb +4 -4
- data/app/views/admin/tax_settings/edit.html.erb +15 -9
- data/app/views/admin/tax_settings/show.html.erb +11 -7
- data/app/views/admin/taxonomies/_form.html.erb +3 -3
- data/app/views/admin/taxonomies/_js_head.html.erb +4 -5
- data/app/views/admin/taxonomies/_list.html.erb +7 -7
- data/app/views/admin/taxonomies/_taxon.html.erb +2 -2
- data/app/views/admin/taxonomies/edit.erb +31 -32
- data/app/views/admin/taxonomies/get_children.json.erb +7 -7
- data/app/views/admin/taxonomies/index.html.erb +7 -7
- data/app/views/admin/taxonomies/new.html.erb +5 -5
- data/app/views/admin/taxons/_form.html.erb +5 -5
- data/app/views/admin/taxons/_taxon_table.html.erb +10 -10
- data/app/views/admin/taxons/available.js.erb +7 -14
- data/app/views/admin/taxons/edit.html.erb +4 -4
- data/app/views/admin/taxons/remove.html.erb +1 -1
- data/app/views/admin/taxons/select.js.erb +1 -1
- data/app/views/admin/taxons/selected.html.erb +14 -14
- data/app/views/admin/trackers/_form.html.erb +16 -15
- data/app/views/admin/trackers/edit.html.erb +5 -5
- data/app/views/admin/trackers/index.html.erb +15 -20
- data/app/views/admin/trackers/new.html.erb +4 -4
- data/app/views/admin/users/_form.html.erb +17 -18
- data/app/views/admin/users/edit.html.erb +10 -10
- data/app/views/admin/users/index.html.erb +24 -38
- data/app/views/admin/users/new.html.erb +10 -10
- data/app/views/admin/users/show.html.erb +7 -7
- data/app/views/admin/variants/_form.html.erb +9 -9
- data/app/views/admin/variants/edit.html.erb +5 -5
- data/app/views/admin/variants/index.html.erb +20 -24
- data/app/views/admin/variants/new.html.erb +8 -0
- data/app/views/admin/variants/new.js.erb +2 -0
- data/app/views/admin/zones/_country_member.html.erb +2 -2
- data/app/views/admin/zones/_form.html.erb +15 -15
- data/app/views/admin/zones/_member_type.html.erb +2 -2
- data/app/views/admin/zones/_state_member.html.erb +3 -3
- data/app/views/admin/zones/_zone_member.html.erb +2 -2
- data/app/views/admin/zones/edit.html.erb +5 -5
- data/app/views/admin/zones/index.html.erb +12 -13
- data/app/views/admin/zones/new.html.erb +5 -5
- data/app/views/checkout/_address.html.erb +125 -134
- data/app/views/checkout/_confirm.html.erb +3 -3
- data/app/views/checkout/_delivery.html.erb +11 -7
- data/app/views/checkout/_payment.html.erb +10 -10
- data/app/views/checkout/_summary.html.erb +8 -7
- data/app/views/checkout/edit.html.erb +9 -11
- data/app/views/checkout/payment/_gateway.html.erb +13 -13
- data/app/views/checkout/registration.html.erb +9 -9
- data/app/views/content/cvv.html.erb +7 -7
- data/app/views/home/index.html.erb +10 -0
- data/app/views/layouts/admin.html.erb +23 -32
- data/app/views/layouts/spree_application.html.erb +29 -43
- data/app/views/order_mailer/cancel_email.text.erb +2 -2
- data/app/views/order_mailer/confirm_email.text.erb +1 -1
- data/app/views/orders/_form.html.erb +9 -11
- data/app/views/orders/_line_item.html.erb +21 -31
- data/app/views/orders/edit.html.erb +25 -23
- data/app/views/orders/new.html.erb +3 -3
- data/app/views/orders/show.html.erb +5 -5
- data/app/views/products/_cart_form.html.erb +42 -47
- data/app/views/products/_properties.html.erb +5 -4
- data/app/views/products/_taxons.html.erb +10 -12
- data/app/views/products/_thumbnails.html.erb +14 -35
- data/app/views/products/index.html.erb +10 -13
- data/app/views/products/show.html.erb +19 -24
- data/app/views/shared/_error_messages.html.erb +1 -1
- data/app/views/shared/_filters.html.erb +3 -4
- data/app/views/shared/_google_analytics.html.erb +6 -6
- data/app/views/shared/_head.html.erb +4 -7
- data/app/views/shared/_nav_bar.html.erb +3 -2
- data/app/views/shared/_order_details.html.erb +31 -41
- data/app/views/shared/_products.html.erb +10 -16
- data/app/views/shared/_store_menu.html.erb +2 -2
- data/app/views/shared/_taxonomies.html.erb +3 -14
- data/app/views/shipment_mailer/shipped_email.text.erb +2 -2
- data/app/views/taxons/_taxon.html.erb +2 -2
- data/app/views/taxons/show.html.erb +10 -10
- data/app/views/test_mailer/test_email.text.erb +4 -0
- data/config/initializers/deprecation_checker.rb +7 -0
- data/config/initializers/form_builder.rb +0 -4
- data/config/initializers/rails_3_1.rb +12 -0
- data/config/initializers/workarounds_for_ruby19.rb +1 -1
- data/config/locales/en.yml +59 -24
- data/config/routes.rb +9 -8
- data/db/default/roles.yml +1 -3
- data/db/migrate/20100419194457_fix_existing_coupon_credits.rb +9 -0
- data/db/migrate/20110329141434_create_activators.rb +21 -0
- data/db/migrate/20110418151136_eligible_for_adjustments.rb +9 -0
- data/db/seeds.rb +4 -2
- data/lib/custom_fixtures.rb +64 -3
- data/lib/environment_extension.rb +26 -0
- data/lib/generators/spree/dummy/dummy_generator.rb +106 -0
- data/lib/generators/spree/dummy/templates/cucumber/cucumber.rb +38 -0
- data/lib/generators/spree/dummy/templates/rails/application.rb +10 -0
- data/lib/generators/spree/dummy/templates/rails/boot.rb +6 -0
- data/lib/generators/spree/dummy/templates/rails/database.yml +30 -0
- data/lib/generators/spree/dummy/templates/rails/routes.rb +3 -0
- data/lib/generators/spree/sandbox/sandbox_generator.rb +27 -0
- data/lib/generators/spree/site/site_generator.rb +87 -0
- data/lib/generators/spree/site/templates/app/assets/javascripts/admin/all.js +16 -0
- data/lib/generators/spree/site/templates/app/assets/javascripts/store/all.js +16 -0
- data/lib/generators/spree/site/templates/app/assets/stylesheets/admin/all.css +17 -0
- data/lib/generators/spree/site/templates/app/assets/stylesheets/store/all.css +17 -0
- data/lib/product_filters.rb +8 -0
- data/lib/scopes/product.rb +6 -6
- data/lib/scopes.rb +1 -1
- data/lib/spree/calculated_adjustments.rb +16 -11
- data/lib/spree/environment/calculators.rb +10 -0
- data/lib/spree/environment.rb +12 -0
- data/lib/spree/search/base.rb +1 -5
- data/lib/spree_base.rb +17 -6
- data/lib/spree_core/ext/active_record.rb +1 -1
- data/lib/spree_core/preferences/model_hooks.rb +7 -3
- data/lib/spree_core/railtie.rb +42 -36
- data/lib/spree_core/ssl_requirement.rb +1 -1
- data/lib/spree_core/testing_support/common_rake.rb +12 -0
- data/lib/spree_core/testing_support/factories/activator_factory.rb +6 -0
- data/lib/spree_core/testing_support/factories/adjustment_factory.rb +1 -0
- data/lib/spree_core/testing_support/factories/calculator_factory.rb +6 -0
- data/lib/spree_core/testing_support/factories/order_factory.rb +7 -6
- data/lib/spree_core/testing_support/factories/product_factory.rb +6 -0
- data/lib/spree_core/testing_support/factories/user_factory.rb +14 -10
- data/lib/spree_core/testing_support/factories/zone_factory.rb +1 -1
- data/lib/spree_core/theme_support/hook_listener.rb +112 -35
- data/lib/spree_core/theme_support.rb +0 -3
- data/lib/spree_core/version.rb +1 -1
- data/lib/spree_core.rb +10 -7
- data/lib/tasks/assets.rake +58 -0
- data/lib/tasks/core.rake +18 -11
- data/lib/tasks/install.rake +4 -12
- data/{public → vendor/assets}/images/datepicker/cal.gif +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_55_ffffff_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_flat_75_ffffff_40x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_100_f6f6f6_1x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_25_0073ea_1x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_50_dddddd_1x100.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_0073ea_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_454545_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_666666_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_ff0084_256x240.png +0 -0
- data/vendor/assets/images/jquery-ui/ui-icons_ffffff_256x240.png +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/images/help.gif +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/images/important.gif +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/images/info.gif +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/images/title.gif +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/jquery.alerts.css +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/jquery.alerts.js +0 -0
- data/{public → vendor/assets}/javascripts/jquery.alerts/jquery.alerts.spree.css +0 -0
- data/{public → vendor/assets}/javascripts/jquery.autocomplete.min.js +0 -0
- data/vendor/assets/javascripts/jquery.cookie.js +41 -0
- data/{public → vendor/assets}/javascripts/jquery.delayedobserver.js +0 -0
- data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/jquery.jstree.js +4544 -3510
- data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/bg.jpg +0 -0
- data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/d.png +0 -0
- data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/dot_for_ie.gif +0 -0
- data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/style.css +2 -1
- data/{public/javascripts/jsTree → vendor/assets/javascripts/jquery.jstree}/themes/apple/throbber.gif +0 -0
- data/vendor/assets/javascripts/jquery.tokeninput.js +860 -0
- data/vendor/assets/javascripts/jquery.validate/additional-methods.min.js +28 -0
- data/vendor/assets/javascripts/jquery.validate/jquery.validate.min.js +51 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ar.js +24 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_bg.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ca.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_cn.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_cs.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_da.js +20 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_de.js +21 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_el.js +24 -0
- data/{public/javascripts → vendor/assets/javascripts/jquery.validate}/localization/messages_es.js +22 -23
- data/vendor/assets/javascripts/jquery.validate/localization/messages_fa.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_fi.js +21 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_fr.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ge.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_he.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_hu.js +21 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_it.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ja.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_kk.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_lt.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_lv.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_nl.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_no.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_pl.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ptbr.js +30 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ptpt.js +23 -0
- data/{public/javascripts → vendor/assets/javascripts/jquery.validate}/localization/messages_ro.js +22 -23
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ru.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_se.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_si.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_sk.js +21 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_sr.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_th.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_tr.js +24 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_tw.js +24 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_ua.js +24 -0
- data/vendor/assets/javascripts/jquery.validate/localization/messages_vi.js +23 -0
- data/vendor/assets/javascripts/jquery.validate/localization/methods_de.js +12 -0
- data/vendor/assets/javascripts/jquery.validate/localization/methods_nl.js +9 -0
- data/vendor/assets/javascripts/jquery.validate/localization/methods_pt.js +9 -0
- data/vendor/assets/stylesheets/jquery-ui.datepicker.css.erb +357 -0
- metadata +310 -417
- data/app/models/spree/alert.rb +0 -13
- data/app/stylesheets/_buttons.less +0 -80
- data/app/stylesheets/_cart.less +0 -24
- data/app/stylesheets/_checkout.less +0 -76
- data/app/stylesheets/_checkout_progress.less +0 -62
- data/app/stylesheets/_colors.less +0 -16
- data/app/stylesheets/_forms.less +0 -50
- data/app/stylesheets/_layout.less +0 -77
- data/app/stylesheets/_messages.less +0 -32
- data/app/stylesheets/_mixins.less +0 -71
- data/app/stylesheets/_navigation.less +0 -130
- data/app/stylesheets/_prices.less +0 -18
- data/app/stylesheets/_product_details.less +0 -56
- data/app/stylesheets/_product_lists.less +0 -66
- data/app/stylesheets/_registration.less +0 -24
- data/app/stylesheets/_reset.less +0 -69
- data/app/stylesheets/_typography.less +0 -158
- data/app/stylesheets/screen.less +0 -13
- data/app/views/admin/extensions/index.html.erb +0 -23
- data/app/views/admin/option_types/new.erb +0 -11
- data/app/views/admin/product_scopes/_form.html.erb +0 -106
- data/app/views/admin/products/new.erb +0 -53
- data/app/views/admin/prototypes/available.html.erb +0 -22
- data/app/views/admin/shared/_alert.html.erb +0 -6
- data/app/views/admin/states/new.erb +0 -8
- data/app/views/admin/variants/new.erb +0 -11
- data/app/views/shared/_additional_field.html.erb +0 -7
- data/app/views/shared/_admin_head.html.erb +0 -34
- data/app/views/shared/_basic_layout.html.erb +0 -44
- data/app/views/shared/_edit_resource_links.html.erb +0 -1
- data/app/views/shared/_footer.html.erb +0 -13
- data/app/views/shared/_method_error_message.html.erb +0 -4
- data/app/views/shared/_new_resource_links.html.erb +0 -1
- data/app/views/shared/_show_resource_links.html.erb +0 -3
- data/app/views/shared/_test_hook.html.erb +0 -1
- data/config/initializers/load_unobtrusive_date_picker.rb +0 -8
- data/db/migrate/20101026184833_migrate_adjustments.rb +0 -9
- data/lib/generators/spree_core/upgrade_generator.rb +0 -23
- data/lib/generators/templates/config/initializers/%file_name%.rb.tt +0 -1
- data/lib/generators/templates/config/locales/%current_locale%.yml.tt +0 -2
- data/lib/generators/templates/config/routes.rb +0 -3
- data/lib/spree_core/theme_support/hook.rb +0 -51
- data/lib/spree_core/theme_support/hook_modifier.rb +0 -35
- data/lib/spree_core/theme_support/more_patches.rb +0 -118
- data/lib/tasks/common.rb +0 -30
- data/lib/tasks/themes.rake +0 -34
- data/public/images/admin/tabs/off-left.png +0 -0
- data/public/images/admin/tabs/off-right.png +0 -0
- data/public/images/admin/tabs/on-left.png +0 -0
- data/public/images/admin/tabs/on-right.png +0 -0
- data/public/images/ajax_loader.gif +0 -0
- data/public/images/bg-button-hover.png +0 -0
- data/public/images/bg-button-pressed.png +0 -0
- data/public/images/bg-button.gif +0 -0
- data/public/images/bg-button.png +0 -0
- data/public/images/blue/left_01.png +0 -0
- data/public/images/blue/right_01.png +0 -0
- data/public/images/body-back.png +0 -0
- data/public/images/bottom_shine.png +0 -0
- data/public/images/breadcrumb.gif +0 -0
- data/public/images/button-dark-hover.png +0 -0
- data/public/images/button-dark.png +0 -0
- data/public/images/buttons/bg-button-hover.png +0 -0
- data/public/images/buttons/bg-button-pressed.png +0 -0
- data/public/images/buttons/bg-button.gif +0 -0
- data/public/images/buttons/bg-button.png +0 -0
- data/public/images/buttons/blue/left_01.png +0 -0
- data/public/images/buttons/blue/right_01.png +0 -0
- data/public/images/buttons/button-dark-hover.png +0 -0
- data/public/images/buttons/button-dark.png +0 -0
- data/public/images/buttons/drag-handle-green.png +0 -0
- data/public/images/buttons/green/left_01.png +0 -0
- data/public/images/buttons/green/right_01.png +0 -0
- data/public/images/buttons/left_01.png +0 -0
- data/public/images/buttons/left_01_small.png +0 -0
- data/public/images/buttons/orange/left_03.png +0 -0
- data/public/images/buttons/orange/right_03.png +0 -0
- data/public/images/buttons/right_01.png +0 -0
- data/public/images/buttons/right_01_small.png +0 -0
- data/public/images/buttons/sxsw-ribbon-v1.png +0 -0
- data/public/images/buttons/top-shine.png +0 -0
- data/public/images/calendar_date_select/calendar.gif +0 -0
- data/public/images/cart-empty.png +0 -0
- data/public/images/cart-empty_x32.png +0 -0
- data/public/images/cart-full.png +0 -0
- data/public/images/cart-full_x32.png +0 -0
- data/public/images/datepicker/backstripes.gif +0 -0
- data/public/images/datepicker/bg_header.jpg +0 -0
- data/public/images/datepicker/bullet1.gif +0 -0
- data/public/images/datepicker/bullet2.gif +0 -0
- data/public/images/datepicker/gradient-e5e5e5-ffffff.gif +0 -0
- data/public/images/drag-handle-green.png +0 -0
- data/public/images/green/left_01.png +0 -0
- data/public/images/green/right_01.png +0 -0
- data/public/images/grid.png +0 -0
- data/public/images/left_01.png +0 -0
- data/public/images/left_01_small.png +0 -0
- data/public/images/menu-current.png +0 -0
- data/public/images/menu-hover.png +0 -0
- data/public/images/noimage/mini.jpg +0 -0
- data/public/images/noimage/product.jpg +0 -0
- data/public/images/noimage/small.jpg +0 -0
- data/public/images/openid-inputicon.gif +0 -0
- data/public/images/orange/left_03.png +0 -0
- data/public/images/orange/right_03.png +0 -0
- data/public/images/reorder.jpg +0 -0
- data/public/images/right_01.png +0 -0
- data/public/images/right_01_small.png +0 -0
- data/public/images/separator.png +0 -0
- data/public/images/shadow-top.png +0 -0
- data/public/images/shadow_top.png +0 -0
- data/public/images/spree/progress.gif +0 -0
- data/public/images/spree/spinner.gif +0 -0
- data/public/images/spree/spree.jpg +0 -0
- data/public/images/spree.jpg +0 -0
- data/public/images/step-progress/completed-completed.gif +0 -0
- data/public/images/step-progress/completed-current.gif +0 -0
- data/public/images/step-progress/completed-first.gif +0 -0
- data/public/images/step-progress/current-first.gif +0 -0
- data/public/images/step-progress/current-incomplete.gif +0 -0
- data/public/images/step-progress/current-right.gif +0 -0
- data/public/images/step-progress/incomplete-incomplete.gif +0 -0
- data/public/images/step-progress/incomplete-right.gif +0 -0
- data/public/images/steps/1.png +0 -0
- data/public/images/steps/1_small.png +0 -0
- data/public/images/steps/2.png +0 -0
- data/public/images/steps/2_small.png +0 -0
- data/public/images/steps/3.png +0 -0
- data/public/images/steps/3_small.png +0 -0
- data/public/images/steps/4.png +0 -0
- data/public/images/steps/4_small.png +0 -0
- data/public/images/steps/5.png +0 -0
- data/public/images/steps/5_small.png +0 -0
- data/public/images/steps/6.png +0 -0
- data/public/images/steps/6_small.png +0 -0
- data/public/images/sxsw-ribbon-v1.png +0 -0
- data/public/images/tab_bottom.gif +0 -0
- data/public/images/tile-header.png +0 -0
- data/public/images/tile-slider.png +0 -0
- data/public/images/top-shine.png +0 -0
- data/public/images/tree-nav-icons/bullet.gif +0 -0
- data/public/images/tree-nav-icons/minus.gif +0 -0
- data/public/images/tree-nav-icons/plus.gif +0 -0
- data/public/images/tree-nav-icons/treeview-loading.gif +0 -0
- data/public/images/tree-nav-icons/treeview-sprite.gif +0 -0
- data/public/images/wrapper-back-2.png +0 -0
- data/public/images/wrapper-back.png +0 -0
- data/public/images/yui-menubaritem_submenuindicator.png +0 -0
- data/public/images/yui-menubaritem_submenuindicator_disabled.png +0 -0
- data/public/images/yui-menuitem_checkbox.png +0 -0
- data/public/images/yui-menuitem_checkbox_disabled.png +0 -0
- data/public/images/yui-menuitem_submenuindicator.png +0 -0
- data/public/images/yui-menuitem_submenuindicator_disabled.png +0 -0
- data/public/images/yui-sprite.png +0 -0
- data/public/javascripts/additional-methods.js +0 -236
- data/public/javascripts/admin/orders/edit.js +0 -23
- data/public/javascripts/admin/orders/edit_form.js +0 -16
- data/public/javascripts/admin/unobtrusive_handlers.js +0 -43
- data/public/javascripts/application.js +0 -12
- data/public/javascripts/calculator.js +0 -15
- data/public/javascripts/checkout.js +0 -75
- data/public/javascripts/datepicker.js +0 -1445
- data/public/javascripts/gateway.js +0 -13
- data/public/javascripts/jquery-1.4.2.min.js +0 -154
- data/public/javascripts/jquery-ui.js +0 -188
- data/public/javascripts/jquery.cookie.js +0 -96
- data/public/javascripts/jquery.suggest.js +0 -276
- data/public/javascripts/jquery.template.js +0 -255
- data/public/javascripts/jquery.tokeninput.js +0 -618
- data/public/javascripts/jquery.validate.min.js +0 -16
- data/public/javascripts/lang/af.js +0 -40
- data/public/javascripts/lang/ar.js +0 -50
- data/public/javascripts/lang/de.js +0 -40
- data/public/javascripts/lang/du.js +0 -40
- data/public/javascripts/lang/en.js +0 -42
- data/public/javascripts/lang/es.js +0 -41
- data/public/javascripts/lang/fi.js +0 -40
- data/public/javascripts/lang/fr.js +0 -44
- data/public/javascripts/lang/gr.js +0 -40
- data/public/javascripts/lang/he.js +0 -49
- data/public/javascripts/lang/it.js +0 -13
- data/public/javascripts/lang/nl.js +0 -40
- data/public/javascripts/lang/no.js +0 -40
- data/public/javascripts/lang/pt.js +0 -50
- data/public/javascripts/lang/ro.js +0 -40
- data/public/javascripts/lang/ru.js +0 -40
- data/public/javascripts/lang/sp.js +0 -40
- data/public/javascripts/lang/sv.js +0 -41
- data/public/javascripts/lang/ua.js +0 -40
- data/public/javascripts/localization/messages_cn.js +0 -24
- data/public/javascripts/localization/messages_cs.js +0 -23
- data/public/javascripts/localization/messages_da.js +0 -21
- data/public/javascripts/localization/messages_de.js +0 -21
- data/public/javascripts/localization/messages_fr.js +0 -23
- data/public/javascripts/localization/messages_hu.js +0 -21
- data/public/javascripts/localization/messages_it.js +0 -26
- data/public/javascripts/localization/messages_kk.js +0 -23
- data/public/javascripts/localization/messages_nl.js +0 -23
- data/public/javascripts/localization/messages_no.js +0 -23
- data/public/javascripts/localization/messages_pl.js +0 -23
- data/public/javascripts/localization/messages_ptbr.js +0 -30
- data/public/javascripts/localization/messages_ru.js +0 -23
- data/public/javascripts/localization/messages_se.js +0 -23
- data/public/javascripts/localization/messages_sk.js +0 -21
- data/public/javascripts/localization/messages_tr.js +0 -24
- data/public/javascripts/localization/messages_tw.js +0 -24
- data/public/javascripts/localization/messages_ua.js +0 -24
- data/public/javascripts/nested-attribute.js +0 -26
- data/public/javascripts/open_id.js +0 -15
- data/public/javascripts/product.js +0 -49
- data/public/javascripts/rails.js +0 -127
- data/public/javascripts/taxonomy.js +0 -201
- data/public/javascripts/zone.js +0 -39
- data/public/stylesheets/admin/dashboard.css +0 -143
- data/public/stylesheets/admin/edit_checkouts.css +0 -57
- data/public/stylesheets/admin/grids.css +0 -314
- data/public/stylesheets/admin/reset-fonts-grids-2-6-0.css +0 -7
- data/public/stylesheets/admin/yui-includes.css +0 -14
- data/public/stylesheets/datepicker.css +0 -263
- data/public/stylesheets/jquery.autocomplete.css +0 -48
- data/public/stylesheets/screen.css +0 -916
@@ -1,50 +1,50 @@
|
|
1
|
-
<table>
|
2
|
-
<tr>
|
3
|
-
<td
|
4
|
-
<td><%= text_field :payment_method, :name, {
|
1
|
+
<table data-hook="payment_method">
|
2
|
+
<tr data-hook="name">
|
3
|
+
<td><%= label_tag nil, t(:name) %></td>
|
4
|
+
<td><%= text_field :payment_method, :name, {'style' => 'width:200px;'} %></td>
|
5
5
|
</tr>
|
6
|
-
<tr>
|
7
|
-
<td
|
6
|
+
<tr data-hook="description">
|
7
|
+
<td><%= label_tag nil, t(:description) %></td>
|
8
8
|
<td><%= text_area :payment_method, :description, {:cols => 60, :rows => 4} %></td>
|
9
9
|
</tr>
|
10
|
-
<tr>
|
11
|
-
<td
|
10
|
+
<tr data-hook="environment">
|
11
|
+
<td><%= label_tag nil, t(:environment) %></td>
|
12
12
|
<td>
|
13
|
-
<%= collection_select(:payment_method, :environment, Configuration.configurations.keys, :to_s, :titleize, {}, {:id =>
|
13
|
+
<%= collection_select(:payment_method, :environment, Configuration.configurations.keys, :to_s, :titleize, {}, {:id => 'gtwy-env'}) %>
|
14
14
|
</td>
|
15
15
|
</tr>
|
16
|
-
<tr>
|
17
|
-
<td
|
16
|
+
<tr data-hook="display">
|
17
|
+
<td><%= label_tag nil, t(:display) %></td>
|
18
18
|
<td>
|
19
19
|
<%= select(:payment_method, :display_on, PaymentMethod::DISPLAY.collect {|display| [t(display), display == :both ? nil : display.to_s]}) %>
|
20
20
|
</td>
|
21
21
|
</tr>
|
22
|
-
<tr>
|
23
|
-
<td
|
22
|
+
<tr data-hook="active">
|
23
|
+
<td><%= label_tag nil, t(:active) %></td>
|
24
24
|
<td>
|
25
25
|
<label class="sub">
|
26
|
-
<%= radio_button
|
27
|
-
<%= t(
|
26
|
+
<%= radio_button :payment_method, :active, true %>
|
27
|
+
<%= t(:yes) %>
|
28
28
|
</label>
|
29
29
|
<label class="sub">
|
30
|
-
<%= radio_button
|
31
|
-
<%= t(
|
30
|
+
<%= radio_button :payment_method, :active, false %>
|
31
|
+
<%= t(:no) %>
|
32
32
|
</label>
|
33
33
|
</td>
|
34
34
|
</tr>
|
35
35
|
</table>
|
36
36
|
|
37
|
-
<h2><%= t(
|
37
|
+
<h2><%= t(:settings) %></h2>
|
38
38
|
|
39
|
-
<div id="preference-settings">
|
40
|
-
<%= f.label
|
41
|
-
<%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id =>
|
39
|
+
<div id="preference-settings" data-hook>
|
40
|
+
<%= f.label :type, t(:provider) %>
|
41
|
+
<%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {:id => 'gtwy-type'}) %>
|
42
42
|
|
43
43
|
<% unless @object.new_record? %>
|
44
44
|
<%= preference_fields(@object, f) %>
|
45
45
|
|
46
46
|
<% if @object.respond_to?(:preferences) %>
|
47
|
-
<div id="gateway-settings-warning" style="color:#FF0000"><%= t(
|
47
|
+
<div id="gateway-settings-warning" style="color:#FF0000;"><%= t(:provider_settings_warning) %></div>
|
48
48
|
<% end %>
|
49
49
|
<% end %>
|
50
|
-
</div>
|
50
|
+
</div>
|
@@ -1,10 +1,10 @@
|
|
1
1
|
<%= render :partial => 'admin/shared/configuration_menu' %>
|
2
2
|
|
3
|
-
<h1><%= t(
|
4
|
-
<%= render
|
5
|
-
<%= form_for
|
6
|
-
<%= render :partial =>
|
7
|
-
<p>
|
8
|
-
<%=submit_tag t(
|
3
|
+
<h1><%= t(:editing_payment_method) %></h1>
|
4
|
+
<%= render 'shared/error_messages', :target => @payment_method %>
|
5
|
+
<%= form_for @payment_method, :url => admin_payment_method_path(@payment_method), :html => { :method => :put } do |f| %>
|
6
|
+
<%= render :partial => 'form', :locals => { :f => f } %>
|
7
|
+
<p data-hook="buttons">
|
8
|
+
<%= submit_tag t(:update) %>
|
9
9
|
</p>
|
10
10
|
<% end %>
|
@@ -1,47 +1,37 @@
|
|
1
1
|
<%= render :partial => 'admin/shared/configuration_menu' %>
|
2
2
|
|
3
|
-
<div class=
|
4
|
-
<ul class=
|
3
|
+
<div class="toolbar" data-hook="toolbar">
|
4
|
+
<ul class="actions">
|
5
5
|
<li>
|
6
|
-
<%= button_link_to t(
|
7
|
-
:id => 'admin_new_payment_methods_link' %>
|
6
|
+
<%= button_link_to t(:new_payment_method), new_object_url, :icon => 'add', :id => 'admin_new_payment_methods_link' %>
|
8
7
|
</li>
|
9
8
|
</ul>
|
10
|
-
<br class=
|
9
|
+
<br class="clear" />
|
11
10
|
</div>
|
12
11
|
|
13
|
-
<h1><%= t(
|
12
|
+
<h1><%= t(:payment_methods) %></h1>
|
14
13
|
|
15
14
|
<table class="index" id='listing_payment_methods'>
|
16
|
-
<tr>
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
<% end %>
|
24
|
-
<th>
|
25
|
-
<%= hook :admin_payment_methods_index_header_actions %>
|
26
|
-
</th>
|
15
|
+
<tr data-hook="admin_payment_methods_index_headers">
|
16
|
+
<th><%= t(:name) %></th>
|
17
|
+
<th><%= t(:provider) %></th>
|
18
|
+
<th><%= t(:environment) %></th>
|
19
|
+
<th><%= t(:display) %></th>
|
20
|
+
<th><%= t(:active) %></th>
|
21
|
+
<th data-hook="admin_payment_methods_index_header_actions"></th>
|
27
22
|
</tr>
|
28
23
|
<tbody>
|
29
24
|
<% @payment_methods.each do |method|%>
|
30
|
-
<tr id="<%= dom_id method %>">
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
<%= hook :admin_payment_methods_index_row_actions, locals do %>
|
41
|
-
<%= link_to_edit method, :class => 'edit' %>
|
42
|
-
|
43
|
-
<%= link_to_delete method %>
|
44
|
-
<% end %>
|
25
|
+
<tr id="<%= dom_id method %>" data-hook="admin_payment_methods_index_rows">
|
26
|
+
<td width="120px"><%= method.name %></td>
|
27
|
+
<td width="140px"><%= method.type %></td>
|
28
|
+
<td width="100px"><%= method.environment.to_s.titleize %></td>
|
29
|
+
<td width="60px"><%= method.display_on.blank? ? t(:both) : t(method.display_on) %></td>
|
30
|
+
<td width="60px"><%= method.active ? t(:yes) : t(:no) %></td>
|
31
|
+
<td width="140px" data-hook="admin_payment_methods_index_row_actions">
|
32
|
+
<%= link_to_edit method, :class => 'edit' %>
|
33
|
+
|
34
|
+
<%= link_to_delete method %>
|
45
35
|
</td>
|
46
36
|
</tr>
|
47
37
|
<% end %>
|
@@ -1,11 +1,11 @@
|
|
1
1
|
<%= render :partial => 'admin/shared/configuration_menu' %>
|
2
2
|
|
3
|
-
<h1><%= t(
|
3
|
+
<h1><%= t(:new_payment_method) %></h1>
|
4
4
|
<%= render 'shared/error_messages', :target => @payment_method %>
|
5
5
|
|
6
|
-
<%= form_for
|
7
|
-
<%= render :partial =>
|
8
|
-
<p>
|
9
|
-
<%= submit_tag t(
|
6
|
+
<%= form_for @payment_method, :url => collection_url do |f| %>
|
7
|
+
<%= render :partial => 'form', :locals => { :f => f } %>
|
8
|
+
<p data-hook="buttons">
|
9
|
+
<%= submit_tag t(:create) %>
|
10
10
|
</p>
|
11
11
|
<% end %>
|
@@ -2,7 +2,7 @@
|
|
2
2
|
<% order_form.fields_for :checkout do |checkout_form| %>
|
3
3
|
|
4
4
|
<% checkout_form.fields_for :bill_address do |ba_form| %>
|
5
|
-
<%= render :partial =>
|
5
|
+
<%= render :partial => 'admin/shared/address_form', :locals => {:f => ba_form, :name => t(:billing_address)} %>
|
6
6
|
<% end %>
|
7
7
|
|
8
8
|
<% end %>
|
@@ -1,15 +1,15 @@
|
|
1
1
|
<p>
|
2
|
-
<%= f.label :amount, t(:amount) %>
|
3
|
-
<%= f.text_field :amount, :size=> 8, :value => @order.outstanding_balance %>
|
4
|
-
</p>
|
2
|
+
<%= f.label :amount, t(:amount) %>
|
3
|
+
<%= f.text_field :amount, :size => 8, :value => @order.outstanding_balance %>
|
4
|
+
</p>
|
5
5
|
|
6
6
|
<% @payment_methods.each do |method| %>
|
7
7
|
|
8
|
-
<label>
|
9
|
-
<%= radio_button_tag
|
8
|
+
<label data-hook="payment_method">
|
9
|
+
<%= radio_button_tag 'payment[payment_method_id]', method.id, method == @payment_method %>
|
10
10
|
<%= t(method.name, :scope => :payment_methods, :default => method.name) %>
|
11
11
|
</label>
|
12
12
|
|
13
13
|
<%= render "admin/payments/source_forms/#{method.method_type}", :payment_method => method %>
|
14
14
|
|
15
|
-
<% end %>
|
15
|
+
<% end %>
|
@@ -1,15 +1,15 @@
|
|
1
1
|
<table class="index">
|
2
|
-
<tr>
|
2
|
+
<tr data-hook="payments_header">
|
3
3
|
<th><%= "#{t('spree.date')}/#{t('spree.time')}" %></th>
|
4
|
-
<th><%= t(
|
5
|
-
<th><%= t(
|
6
|
-
<th><%= t(
|
7
|
-
<th><%= t(
|
4
|
+
<th><%= t(:amount) %></th>
|
5
|
+
<th><%= t(:payment_method) %></th>
|
6
|
+
<th><%= t(:payment_state) %></th>
|
7
|
+
<th><%= t(:payment_actions) %></th>
|
8
8
|
</tr>
|
9
9
|
<% payments.each do |payment| %>
|
10
|
-
<tr>
|
10
|
+
<tr data-hook="payments_row">
|
11
11
|
<td><%= payment.created_at.to_s(:date_time24) %></td>
|
12
|
-
<td><%= number_to_currency
|
12
|
+
<td><%= number_to_currency payment.amount %></td>
|
13
13
|
<td><%= link_to payment_method_name(payment), admin_order_payment_path(@order, payment) %></td>
|
14
14
|
<td><%= t(payment.state, :scope => :payment_states, :default => payment.state.capitalize) %></td>
|
15
15
|
<td>
|
@@ -1,16 +1,16 @@
|
|
1
1
|
<fieldset>
|
2
2
|
|
3
|
-
<legend><%= t(
|
3
|
+
<legend><%= t(:transactions) %></legend>
|
4
4
|
|
5
5
|
<table class="index">
|
6
|
-
<tr>
|
7
|
-
<th><%= t(
|
8
|
-
<th><%= 'date' %></th>
|
9
|
-
<th><%= t(
|
10
|
-
<th><%= t(
|
6
|
+
<tr data-hook="transactions_header">
|
7
|
+
<th><%= t(:type) %></th>
|
8
|
+
<th><%= t('spree.date') %></th>
|
9
|
+
<th><%= t(:amount) %></th>
|
10
|
+
<th><%= t(:response_code) %></th>
|
11
11
|
</tr>
|
12
|
-
<%
|
13
|
-
<tr>
|
12
|
+
<% txns.each do |txn| %>
|
13
|
+
<tr data-hook="transaction_row">
|
14
14
|
<td>
|
15
15
|
<%= txn.txn_type_name %>
|
16
16
|
</td>
|
@@ -21,4 +21,4 @@
|
|
21
21
|
<% end %>
|
22
22
|
</table>
|
23
23
|
|
24
|
-
</fieldset>
|
24
|
+
</fieldset>
|
@@ -1,14 +1,14 @@
|
|
1
|
-
<%= render :partial => 'admin/shared/order_tabs', :locals => {:current =>
|
1
|
+
<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Creditcards'} %>
|
2
2
|
|
3
3
|
<%= form_tag do %>
|
4
|
-
<h3><%= t(
|
5
|
-
<fieldset>
|
4
|
+
<h3><%= t(:refund) %></h3>
|
5
|
+
<fieldset data-hook="credit">
|
6
6
|
<p>
|
7
|
-
|
7
|
+
<%= label_tag :amount, t(:amount) %>
|
8
8
|
<%= text_field_tag :amount, @payment.amount %>
|
9
9
|
</p>
|
10
10
|
<p class="form-buttons">
|
11
|
-
<%= button t(
|
12
|
-
</p>
|
11
|
+
<%= button t(:make_refund) %>
|
12
|
+
</p>
|
13
13
|
</fieldset>
|
14
14
|
<% end %>
|
@@ -1,22 +1,22 @@
|
|
1
|
-
<div class=
|
2
|
-
<ul class=
|
1
|
+
<div class="toolbar" data-hook="toolbar">
|
2
|
+
<ul class="actions">
|
3
3
|
<% if @order.outstanding_balance? %>
|
4
|
-
<li id=
|
5
|
-
<%= button_link_to t(
|
4
|
+
<li id="new_payment_section">
|
5
|
+
<%= button_link_to t(:new_payment), new_admin_order_payment_url(@order), :icon => 'add' %>
|
6
6
|
</li>
|
7
7
|
<% end %>
|
8
8
|
</ul>
|
9
|
-
<br class=
|
9
|
+
<br class="clear" />
|
10
10
|
</div>
|
11
11
|
|
12
|
-
<%= render 'admin/shared/order_tabs', :current =>
|
12
|
+
<%= render 'admin/shared/order_tabs', :current => 'Payments' %>
|
13
13
|
|
14
14
|
<% if @order.outstanding_balance? %>
|
15
|
-
<p><%= @order.outstanding_balance < 0 ? t(
|
15
|
+
<p><%= @order.outstanding_balance < 0 ? t(:credit_owed) : t(:balance_due) %> <strong><%= number_to_currency @order.outstanding_balance %></strong></p>
|
16
16
|
<% end %>
|
17
17
|
|
18
|
-
<h2><%= t(
|
18
|
+
<h2><%= t(:payments) %></h2>
|
19
19
|
<%= render 'list', :payments => @payments %>
|
20
20
|
|
21
21
|
|
22
|
-
<%= button_link_to t(
|
22
|
+
<%= button_link_to t(:continue), admin_orders_url %>
|
@@ -1,19 +1,19 @@
|
|
1
|
-
<%= render :partial => 'admin/shared/order_tabs', :locals => {:current =>
|
1
|
+
<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Payments'} %>
|
2
2
|
|
3
|
-
<h2><%= t(
|
3
|
+
<h2><%= t(:new) %> <%= t("activerecord.models.#{@payment.class.to_s.underscore}.one") %></h2>
|
4
4
|
|
5
|
-
<%= render
|
5
|
+
<%= render 'shared/error_messages', :target => @payment %>
|
6
6
|
|
7
7
|
<%= form_for @payment, :url => admin_order_payments_path(@order) do |f| %>
|
8
8
|
|
9
|
-
<%= render
|
9
|
+
<%= render 'form', :f => f %>
|
10
10
|
|
11
|
-
<p class="form-buttons">
|
12
|
-
<%= button @order.cart? ? t(
|
11
|
+
<p class="form-buttons" data-hook="buttons">
|
12
|
+
<%= button @order.cart? ? t(:continue) : t(:update) %>
|
13
13
|
</p>
|
14
14
|
|
15
15
|
<% end %>
|
16
16
|
|
17
17
|
<% content_for :head do %>
|
18
|
-
<%= javascript_include_tag 'admin/payments/new' %>
|
18
|
+
<%= javascript_include_tag '/admin/javascripts/payments/new.js' %>
|
19
19
|
<% end %>
|
@@ -1,9 +1,9 @@
|
|
1
|
-
<%= render :partial => 'admin/shared/order_tabs', :locals => {:current =>
|
1
|
+
<%= render :partial => 'admin/shared/order_tabs', :locals => {:current => 'Payments'} %>
|
2
2
|
|
3
3
|
<h2><%= t("activerecord.models.#{@payment.class.to_s.underscore}.one") %></h2>
|
4
4
|
|
5
|
-
<p>
|
6
|
-
|
5
|
+
<p data-hook="amount">
|
6
|
+
<%= label_tag nil, t(:amount) %>
|
7
7
|
<%= @payment.amount %>
|
8
8
|
</p>
|
9
9
|
|
@@ -1,40 +1,40 @@
|
|
1
1
|
<fieldset>
|
2
2
|
|
3
|
-
<p class="field">
|
4
|
-
<%
|
3
|
+
<p class="field" data-hook="previous_cards">
|
4
|
+
<% @previous_cards.each do |card| %>
|
5
5
|
<label><%= radio_button_tag :card, card.id, card == @previous_cards.first %> <%= card.display_number %><br /></label>
|
6
6
|
<% end %>
|
7
7
|
<label><%= radio_button_tag :card, 'new', @previous_cards.none? %> <%= t(:use_new_cc) %></label>
|
8
8
|
</p>
|
9
9
|
|
10
|
-
<div id="card_form">
|
10
|
+
<div id="card_form" data-hook>
|
11
11
|
|
12
|
-
<%= image_tag
|
12
|
+
<%= image_tag 'creditcards/creditcard.gif', :id => 'creditcard-image' %>
|
13
13
|
<% param_prefix = "payment_source[#{payment_method.id}]" %>
|
14
14
|
|
15
|
-
<div>
|
16
|
-
|
15
|
+
<div data-hook="card_number">
|
16
|
+
<%= label_tag nil, t(:card_number) %><br />
|
17
17
|
<%= text_field_tag "#{param_prefix}[number]", '', :class => 'required', :size => 19, :maxlength => 19 %>
|
18
18
|
<span class="req">*</span>
|
19
19
|
|
20
20
|
<span id="card_type" style="display:none;">
|
21
|
-
( <span id="looks_like" ><%= t(
|
22
|
-
<span id="unrecognized"><%= t(
|
21
|
+
( <span id="looks_like" ><%= t(:card_type_is) %> <span id="type"></span></span>
|
22
|
+
<span id="unrecognized"><%= t(:unrecognized_card_type) %></span>
|
23
23
|
)
|
24
24
|
</span>
|
25
25
|
</div>
|
26
|
-
<div>
|
27
|
-
|
26
|
+
<div data-hook="card_expiration">
|
27
|
+
<%= label_tag nil, t(:expiration) %><br />
|
28
28
|
<%= select_month(Date.today, :prefix => param_prefix, :field_name => 'month', :use_month_numbers => true, :class => 'required') %>
|
29
29
|
<%= select_year(Date.today, :prefix => param_prefix, :field_name => 'year', :start_year => Date.today.year, :end_year => Date.today.year + 15, :class => 'required') %>
|
30
30
|
<span class="req">*</span>
|
31
31
|
</div>
|
32
|
-
<div>
|
33
|
-
|
32
|
+
<div data-hook="card_code">
|
33
|
+
<%= label_tag nil, t(:card_code) %><br />
|
34
34
|
<%= text_field_tag "#{param_prefix}[verification_value]", '', :class => 'required', :size => 5 %>
|
35
35
|
<span class="req">*</span>
|
36
36
|
<a href="/content/cvv" target="_blank" onclick="window.open(this.href,'cvv_info','left=20,top=20,width=500,height=500,toolbar=0,resizable=0,scrollbars=1');return false">
|
37
|
-
(<%= t(
|
37
|
+
(<%= t(:whats_this) %>)
|
38
38
|
</a>
|
39
39
|
</div>
|
40
40
|
|
@@ -1,30 +1,30 @@
|
|
1
|
-
<fieldset>
|
2
|
-
<legend><%= t(
|
1
|
+
<fieldset data-hook="creditcard">
|
2
|
+
<legend><%= t(:creditcard) %></legend>
|
3
3
|
|
4
4
|
<table class="index">
|
5
5
|
<tr>
|
6
|
-
<th colspan="6"><%= t(
|
6
|
+
<th colspan="6"><%= t(:card_details) %></th>
|
7
7
|
</tr>
|
8
8
|
<tr>
|
9
|
-
<td
|
9
|
+
<td><%= label_tag nil, t(:card_number) %>:</td>
|
10
10
|
<td>
|
11
|
-
|
11
|
+
<%= payment.source.display_number %>
|
12
12
|
</td>
|
13
|
-
<td
|
13
|
+
<td><%= label_tag nil, t(:expiration) %>:</td>
|
14
14
|
<td>
|
15
15
|
<%= payment.source.month %>/<%= payment.source.year %>
|
16
16
|
</td>
|
17
|
-
<td
|
17
|
+
<td><%= label_tag nil, t(:card_code) %>:</td>
|
18
18
|
<td>
|
19
19
|
<%= payment.source.verification_value %>
|
20
20
|
</td>
|
21
21
|
</tr>
|
22
22
|
<tr>
|
23
|
-
<td
|
23
|
+
<td><%= label_tag nil, t(:maestro_or_solo_cards) %>:</td>
|
24
24
|
<td>
|
25
25
|
<%= payment.source.issue_number %>
|
26
26
|
</td>
|
27
|
-
<td
|
27
|
+
<td><%= label_tag nil, t(:start_date) %>:</td>
|
28
28
|
<td colspan="3">
|
29
29
|
<%= payment.source.start_month %>/<%= payment.source.start_year %>
|
30
30
|
</td>
|
@@ -3,23 +3,23 @@
|
|
3
3
|
<h2><%= ProductGroup.human_attribute_name(:products) %> (<%= count %>)</h2>
|
4
4
|
|
5
5
|
<% if count == 0 %>
|
6
|
-
<p><%= t(
|
6
|
+
<p data-hook="preview_empty"><%= t(:no_match_found) %></p>
|
7
7
|
<% else %>
|
8
8
|
|
9
9
|
<% if count > Spree::Config[:admin_pgroup_preview_size] %>
|
10
|
-
<p><%= t(
|
10
|
+
<p data-hook="preview_showing"><%= t(:showing_first_n, :n => Spree::Config[:admin_pgroup_preview_size]) %></p>
|
11
11
|
<% end %>
|
12
12
|
|
13
|
-
<table class="index">
|
13
|
+
<table class="index" data-hook="preview">
|
14
14
|
<thead>
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
15
|
+
<tr data-hook="preview_header">
|
16
|
+
<th><%= Product.human_attribute_name(:name) %></th>
|
17
|
+
<th><%= t(:action) %></th>
|
18
|
+
</tr>
|
19
19
|
</thead>
|
20
20
|
<tbody>
|
21
21
|
<% preview.each do |product| %>
|
22
|
-
<tr>
|
22
|
+
<tr data-hook="preview_row">
|
23
23
|
<td>
|
24
24
|
<%= link_to product.name, product_url(product) %>
|
25
25
|
</td>
|
@@ -1,24 +1,24 @@
|
|
1
|
-
<tr id="<%= dom_id product_scope %>">
|
2
|
-
<td>
|
3
|
-
|
1
|
+
<tr id="<%= dom_id product_scope %>" data-hook="product_scope">
|
2
|
+
<td data-hook="description">
|
3
|
+
<%= label_tag nil, t(:name, :scope => [:product_scopes, :scopes, product_scope.name]) %>
|
4
4
|
<% if description = t(:description, :scope => [:product_scopes, :scopes, product_scope.name], :default => "") and description.present? %>
|
5
5
|
<br /><%= description %>
|
6
6
|
<% end %>
|
7
7
|
</td>
|
8
|
-
<td>
|
8
|
+
<td data-hook="arguments">
|
9
9
|
<% if arguments = Scopes::Product.arguments_for_scope_name(product_scope.name.strip) %>
|
10
10
|
<table><tr>
|
11
11
|
<% arguments.each_with_index do |argument, i| %>
|
12
12
|
<td>
|
13
|
-
|
14
|
-
<%= hidden_field_tag
|
13
|
+
<%= label_tag nil, t(argument, :scope => [:product_scopes, :scopes, product_scope.name, :args]) %><br />
|
14
|
+
<%= hidden_field_tag 'product_group[product_scopes_attributes][][id]', product_scope.id %>
|
15
15
|
<%= product_scope_field product_scope, i %>
|
16
16
|
</td>
|
17
17
|
<% end %>
|
18
18
|
</tr></table>
|
19
19
|
<% end %>
|
20
20
|
</td>
|
21
|
-
<td class="actions">
|
22
|
-
<%= link_to_with_icon 'cross', '', admin_product_group_product_scope_path(@product_group, product_scope),
|
21
|
+
<td class="actions" data-hook="actions">
|
22
|
+
<%= link_to_with_icon 'cross', '', admin_product_group_product_scope_path(@product_group, product_scope), :remote => true, :method => 'delete' %>
|
23
23
|
</td>
|
24
24
|
</tr>
|
@@ -1,32 +1,31 @@
|
|
1
1
|
<%= render 'admin/shared/product_sub_menu' %>
|
2
2
|
|
3
|
-
<h1><%= t(
|
3
|
+
<h1><%= t(:editing_product_group) %></h1>
|
4
4
|
|
5
|
-
<fieldset id="product_group_forms_container">
|
5
|
+
<fieldset id="product_group_forms_container" data-hook>
|
6
6
|
|
7
|
-
<%= form_for
|
7
|
+
<%= form_for [:admin, @product_group], :html => { :id => 'product-group-form', :method => :put, :remote => true } do |f| %>
|
8
8
|
|
9
9
|
<%= f.field_container :name do %>
|
10
|
-
<%= f.label :name, t(
|
10
|
+
<%= f.label :name, t(:name) %><br />
|
11
11
|
<%= f.text_field :name %>
|
12
12
|
<%= f.error_message_on :name %>
|
13
13
|
<% end %>
|
14
14
|
|
15
15
|
<%= f.field_container :order_scope do %>
|
16
|
-
<%= f.label :order_scope, t(
|
16
|
+
<%= f.label :order_scope, t(:sort_ordering) %><br />
|
17
17
|
<%= f.select(:order_scope, Scopes::Product::ORDERING.collect{|p| [ t(:name, :scope =>[:product_scopes, :scopes, p]), p.to_s ] }) %>
|
18
18
|
<% end %>
|
19
19
|
|
20
|
-
<table id="product_scopes">
|
20
|
+
<table id="product_scopes" data-hook>
|
21
21
|
<%= render :partial => 'product_scope', :collection => @product_group.product_scopes.reject {|s| s.is_ordering? } %>
|
22
22
|
</table>
|
23
23
|
|
24
|
-
<%=
|
24
|
+
<%= button t(:update) %>
|
25
25
|
|
26
26
|
<% end %>
|
27
27
|
|
28
|
-
|
29
|
-
<%= form_tag(admin_product_group_product_scopes_path(@product_group), 'data-remote' => true, :id => 'new_product_group_form') do %>
|
28
|
+
<%= form_tag admin_product_group_product_scopes_path(@product_group), :remote => true, :id => 'new_product_group_form' do %>
|
30
29
|
<%
|
31
30
|
options =
|
32
31
|
grouped_options_for_select(
|
@@ -41,16 +40,14 @@
|
|
41
40
|
)
|
42
41
|
%>
|
43
42
|
<p>
|
44
|
-
|
45
|
-
<%= select_tag
|
46
|
-
|
43
|
+
<%= label_tag :product_scope_name, t(:add_scope) %>
|
44
|
+
<%= select_tag 'product_scope[name]', options %>
|
45
|
+
<%= submit_tag t(:add) %>
|
47
46
|
</p>
|
48
47
|
<% end %>
|
49
48
|
|
50
|
-
|
51
49
|
</fieldset>
|
52
50
|
|
53
|
-
|
54
|
-
<fieldset id="preview_container">
|
51
|
+
<fieldset id="preview_container" data-hook>
|
55
52
|
<%= render 'preview' %>
|
56
53
|
</fieldset>
|