spree 0.8.5 → 0.9.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of spree might be problematic. Click here for more details.
- data/CHANGELOG +97 -4
- data/CONTRIBUTORS +62 -29
- data/LICENSE +1 -1
- data/README.markdown +1 -1
- data/app/controllers/admin/base_controller.rb +10 -1
- data/app/controllers/admin/configurations_controller.rb +19 -8
- data/app/controllers/admin/coupons_controller.rb +17 -0
- data/app/controllers/admin/creditcard_payments_controller.rb +4 -8
- data/app/controllers/admin/images_controller.rb +42 -3
- data/app/controllers/admin/orders_controller.rb +12 -12
- data/app/controllers/admin/products_controller.rb +12 -32
- data/app/controllers/admin/prototypes_controller.rb +3 -1
- data/app/controllers/admin/reports_controller.rb +6 -6
- data/app/controllers/admin/shipments_controller.rb +12 -1
- data/app/controllers/admin/shipping_methods_controller.rb +17 -17
- data/app/controllers/admin/shipping_rates_controller.rb +20 -0
- data/app/controllers/admin/tax_rates_controller.rb +28 -0
- data/{vendor/extensions/tax_calculator/app → app}/controllers/admin/tax_settings_controller.rb +1 -1
- data/app/controllers/admin/taxons_controller.rb +18 -72
- data/app/controllers/admin/users_controller.rb +6 -6
- data/app/controllers/admin/zones_controller.rb +4 -4
- data/app/controllers/application.rb +3 -3
- data/app/controllers/checkouts_controller.rb +158 -0
- data/app/controllers/content_controller.rb +1 -8
- data/app/controllers/orders_controller.rb +11 -23
- data/app/controllers/products_controller.rb +24 -23
- data/app/controllers/spree/base_controller.rb +47 -3
- data/app/controllers/states_controller.rb +4 -5
- data/app/controllers/taxons_controller.rb +13 -9
- data/app/controllers/user_sessions_controller.rb +3 -1
- data/app/controllers/users_controller.rb +3 -7
- data/app/helpers/admin/base_helper.rb +74 -6
- data/app/helpers/admin/calculators_helper.rb +2 -0
- data/app/helpers/admin/orders_helper.rb +1 -1
- data/{vendor/extensions/tax_calculator/app → app}/helpers/admin/tax_rates_helper.rb +0 -0
- data/app/helpers/admin/taxonomies_helper.rb +0 -59
- data/app/helpers/application_helper.rb +1 -2
- data/app/helpers/checkouts_helper.rb +7 -0
- data/app/helpers/products_helper.rb +15 -15
- data/app/helpers/spree/base_helper.rb +27 -5
- data/app/helpers/taxons_helper.rb +9 -9
- data/app/metal/create_admin_user.rb +21 -0
- data/app/models/address.rb +42 -2
- data/app/models/adjustment.rb +37 -0
- data/app/models/app_configuration.rb +10 -1
- data/app/models/calculator.rb +41 -0
- data/app/models/calculator/flat_percent_item_total.rb +19 -0
- data/app/models/calculator/flat_rate.rb +18 -0
- data/app/models/calculator/flexi_rate.rb +33 -0
- data/app/models/calculator/per_item.rb +18 -0
- data/app/models/calculator/price_bucket.rb +31 -0
- data/app/models/calculator/sales_tax.rb +48 -0
- data/app/models/calculator/vat.rb +63 -0
- data/app/models/charge.rb +37 -0
- data/app/models/checkout.rb +48 -0
- data/app/models/country.rb +11 -1
- data/app/models/coupon.rb +27 -0
- data/app/models/credit.rb +27 -0
- data/app/models/creditcard.rb +5 -5
- data/app/models/creditcard_payment.rb +13 -5
- data/app/models/image.rb +23 -1
- data/app/models/inventory_unit.rb +4 -3
- data/app/models/line_item.rb +10 -4
- data/app/models/order.rb +125 -65
- data/app/models/order_mailer.rb +1 -1
- data/app/models/order_observer.rb +15 -0
- data/app/models/product.rb +101 -87
- data/app/models/shipment.rb +20 -14
- data/app/models/shipping_category.rb +2 -0
- data/app/models/shipping_method.rb +19 -6
- data/app/models/shipping_rate.rb +6 -0
- data/app/models/state.rb +8 -2
- data/app/models/state_event.rb +7 -0
- data/app/models/tax_category.rb +2 -0
- data/{vendor/extensions/tax_calculator/app → app}/models/tax_rate.rb +9 -3
- data/app/models/taxon.rb +21 -15
- data/app/models/user.rb +17 -18
- data/app/models/user_mailer.rb +1 -1
- data/app/models/variant.rb +51 -60
- data/app/models/zone.rb +38 -23
- data/app/views/admin/configurations/index.html.erb +12 -0
- data/app/views/admin/coupons/_form.html.erb +24 -0
- data/app/views/admin/coupons/edit.html.erb +8 -0
- data/app/views/admin/coupons/index.html.erb +38 -0
- data/app/views/admin/coupons/new.html.erb +9 -0
- data/app/views/admin/creditcard_payments/new.html.erb +1 -1
- data/app/views/admin/general_settings/edit.html.erb +1 -1
- data/app/views/admin/general_settings/show.html.erb +2 -4
- data/app/views/admin/images/_form.html.erb +12 -0
- data/app/views/admin/images/edit.html.erb +19 -0
- data/app/views/admin/images/index.html.erb +63 -0
- data/app/views/admin/images/new.html.erb +20 -8
- data/app/views/admin/inventory_settings/show.html.erb +2 -2
- data/app/views/admin/mail_settings/edit.html.erb +13 -4
- data/app/views/admin/mail_settings/show.html.erb +7 -0
- data/app/views/admin/option_types/index.html.erb +1 -1
- data/app/views/admin/orders/index.html.erb +41 -54
- data/app/views/admin/orders/show.html.erb +19 -2
- data/app/views/admin/products/_form.html.erb +29 -16
- data/app/views/admin/products/index.html.erb +12 -17
- data/app/views/admin/products/new.html.erb +5 -5
- data/app/views/admin/properties/index.html.erb +1 -1
- data/app/views/admin/prototypes/index.html.erb +1 -1
- data/app/views/admin/reports/sales_total.html.erb +4 -4
- data/app/views/admin/shared/_address.html.erb +3 -1
- data/app/views/admin/shared/_calculator_fields.html.erb +15 -0
- data/app/views/admin/shared/_edit_resource_links.html.erb +1 -1
- data/app/views/admin/shared/_form_address.html.erb +8 -2
- data/app/views/admin/shared/_new_resource_links.html.erb +1 -1
- data/app/views/admin/shared/_order_details.html.erb +3 -36
- data/app/views/admin/shared/_order_tabs.html.erb +2 -2
- data/app/views/admin/shared/_product_tabs.html.erb +25 -12
- data/app/views/admin/shared/_report_criteria.html.erb +3 -7
- data/app/views/admin/shipments/_form.html.erb +11 -1
- data/app/views/admin/shipping_categories/index.html.erb +1 -1
- data/app/views/admin/shipping_methods/_form.html.erb +3 -5
- data/app/views/admin/shipping_methods/edit.html.erb +2 -2
- data/app/views/admin/shipping_methods/index.html.erb +3 -3
- data/app/views/admin/shipping_rates/_form.html.erb +12 -0
- data/app/views/admin/shipping_rates/edit.html.erb +8 -0
- data/app/views/admin/shipping_rates/index.html.erb +30 -0
- data/app/views/admin/shipping_rates/new.html.erb +10 -0
- data/app/views/admin/tax_categories/index.html.erb +1 -1
- data/app/views/admin/tax_rates/_form.html.erb +16 -0
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_rates/edit.html.erb +2 -2
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_rates/index.html.erb +4 -4
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_rates/new.html.erb +0 -0
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_settings/edit.html.erb +3 -3
- data/{vendor/extensions/tax_calculator/app → app}/views/admin/tax_settings/show.html.erb +1 -1
- data/app/views/admin/taxonomies/_js_head.html.erb +13 -0
- data/app/views/admin/taxonomies/_list.html.erb +3 -3
- data/app/views/admin/taxonomies/_taxon.html.erb +12 -0
- data/app/views/admin/taxonomies/edit.html.erb +17 -7
- data/app/views/admin/users/index.html.erb +7 -9
- data/app/views/admin/variants/_form.html.erb +1 -1
- data/app/views/admin/variants/index.html.erb +2 -2
- data/app/views/admin/zones/index.html.erb +4 -4
- data/app/views/checkouts/_billing.html.erb +66 -0
- data/app/views/checkouts/_confirmation.html.erb +11 -0
- data/app/views/checkouts/_form.html.erb +20 -0
- data/app/views/checkouts/_payment.html.erb +45 -0
- data/app/views/{orders → checkouts}/_registration.html.erb +4 -4
- data/app/views/checkouts/_shipping.html.erb +68 -0
- data/app/views/checkouts/_shipping_method.html.erb +19 -0
- data/app/views/checkouts/_summary.html.erb +36 -0
- data/app/views/checkouts/edit.html.erb +13 -0
- data/app/views/checkouts/new.html.erb +13 -0
- data/app/views/layouts/admin.html.erb +15 -5
- data/app/views/layouts/application.html.erb +3 -11
- data/{vendor/plugins/resource_controller/test/app/views/layouts/application.rhtml → app/views/layouts/checkouts.html.erb} +2 -2
- data/app/views/order_mailer/cancel.html.erb +4 -3
- data/app/views/order_mailer/confirm.html.erb +5 -4
- data/app/views/orders/_form.html.erb +4 -1
- data/app/views/orders/_google_order.html.erb +2 -2
- data/app/views/orders/_line_item.html.erb +6 -3
- data/app/views/orders/edit.html.erb +3 -3
- data/app/views/orders/new.html.erb +2 -2
- data/app/views/products/_cart_form.html.erb +45 -14
- data/app/views/products/_thumbnails.html.erb +34 -6
- data/app/views/products/index.html.erb +6 -2
- data/app/views/products/show.html.erb +1 -1
- data/app/views/shared/_edit_resource_links.html.erb +1 -1
- data/app/views/shared/_filters.html.erb +52 -0
- data/app/views/shared/_footer.html.erb +1 -1
- data/app/views/shared/_head.html.erb +6 -0
- data/app/views/shared/_login.html.erb +2 -2
- data/app/views/shared/_new_resource_links.html.erb +1 -1
- data/app/views/shared/_order_details.html.erb +46 -36
- data/app/views/shared/_taxonomies.html.erb +5 -6
- data/app/views/states/index.js.erb +1 -1
- data/app/views/taxons/show.html.erb +1 -1
- data/bin/spree +43 -2
- data/config/boot.rb +2 -2
- data/config/environment.rb +13 -5
- data/config/environments/test.rb +6 -2
- data/config/initializers/locales.rb +20 -8
- data/config/initializers/paperclip.rb +20 -0
- data/config/initializers/spree.rb +12 -2
- data/config/locales/da.yml +614 -0
- data/config/locales/da_rails.yml +197 -0
- data/config/locales/de-CH.yml +614 -0
- data/config/locales/de-CH_rails.yml +142 -0
- data/config/locales/de.yml +95 -4
- data/config/locales/en-GB.yml +112 -21
- data/config/locales/en-GB_rails.yml +84 -42
- data/config/locales/en-US.yml +103 -12
- data/config/locales/es.yml +95 -4
- data/config/locales/fi.yml +614 -0
- data/config/locales/fi_rails.yml +143 -0
- data/config/locales/fr-FR.yml +95 -4
- data/config/locales/fr-FR_rails.yml +1 -1
- data/config/locales/il.yml +614 -0
- data/config/locales/il_rails.yml +103 -0
- data/config/locales/it.yml +102 -11
- data/config/locales/jp.yml +614 -0
- data/config/locales/jp_rails.yml +135 -0
- data/config/locales/mx.yml +614 -0
- data/config/locales/mx_rails.yml +181 -0
- data/config/locales/nb-NO.yml +95 -4
- data/config/locales/nl-BE.yml +95 -4
- data/config/locales/nl-NL.yml +614 -0
- data/config/locales/nl-NL_rails.yml +172 -0
- data/config/locales/pl.yml +102 -11
- data/config/locales/pt-BR.yml +101 -10
- data/config/locales/pt-PT.yml +95 -4
- data/config/locales/ru-RU.yml +414 -323
- data/config/locales/ru-RU_rails.yml +1 -1
- data/config/locales/th.yml +614 -0
- data/config/locales/th_rails.yml +195 -0
- data/config/routes.rb +10 -6
- data/config/schedule.rb +27 -0
- data/config/spree_permissions.yml +8 -7
- data/db/default/zone_members.yml +2 -14
- data/{vendor/extensions/tax_calculator/db → db}/migrate/20080620100001_create_tax_rates.rb +0 -0
- data/{vendor/extensions/tax_calculator/db → db}/migrate/20080704192456_update_tax_rates_add_zones_etc.rb +0 -0
- data/db/migrate/20090401223217_create_eu_vat_zone_again.rb +1 -1
- data/db/migrate/20090404192723_add_maestro_fields.rb +12 -0
- data/db/migrate/20090406091357_add_alternative_phone.rb +9 -0
- data/db/migrate/20090525000325_remove_address_orphans.rb +15 -0
- data/db/migrate/20090603153927_create_checkouts.rb +71 -0
- data/db/migrate/20090617181106_change_txn_type_to_int.rb +18 -0
- data/db/migrate/20090618203233_create_charges.rb +61 -0
- data/db/migrate/20090626235303_create_credits.rb +22 -0
- data/db/migrate/20090705101511_add_image_dimensions.rb +12 -0
- data/db/migrate/20090708175306_create_coupons.rb +16 -0
- data/db/migrate/20090708175317_create_discounts.rb +14 -0
- data/db/migrate/20090714094201_add_default_addresses_to_user.rb +11 -0
- data/db/migrate/20090715172345_create_calculators.rb +22 -0
- data/db/migrate/20090731085008_add_charge_source_to_charge.rb +11 -0
- data/db/migrate/20090803072025_create_shipping_rates.rb +12 -0
- data/db/migrate/20090804090559_create_calculators_for_tax_rates.rb +16 -0
- data/db/migrate/20090805131937_drop_credits_and_discounts.rb +9 -0
- data/db/migrate/20090805185015_remove_tax_type.rb +13 -0
- data/db/migrate/20090806063212_rename_charges_to_adjustments.rb +24 -0
- data/db/migrate/20090806160214_rename_base_to_source.rb +11 -0
- data/db/migrate/20090809170304_remove_checkout_shipping_address_and_method.rb +15 -0
- data/db/migrate/20090809193131_add_is_master_to_variants.rb +43 -0
- data/db/migrate/20090809201209_drop_master_price_from_products.rb +13 -0
- data/db/migrate/20090809231957_update_legacy_calculators.rb +9 -0
- data/db/migrate/20090823005402_coupon_starts_at.rb +13 -0
- data/db/migrate/20090828114732_add_queued_mail.rb +12 -0
- data/db/migrate/20090908141056_adjust_percent_calc_settings.rb +9 -0
- data/db/migrate/migrate/20080620100001_create_tax_rates.rb +13 -0
- data/db/migrate/migrate/20080704192456_update_tax_rates_add_zones_etc.rb +17 -0
- data/db/sample/adjustments.yml +20 -0
- data/db/sample/assets.yml +219 -11
- data/db/sample/calculators.yml +16 -0
- data/db/sample/checkouts.yml +8 -0
- data/db/sample/coupons.yml +4 -0
- data/db/sample/creditcards.yml +0 -1
- data/db/sample/orders.yml +0 -7
- data/db/sample/preferences.yml +20 -0
- data/db/sample/products.yml +0 -9
- data/db/sample/shipping_methods.yml +3 -10
- data/db/sample/variants.yml +13 -0
- data/db/schema.rb +73 -23
- data/db/seeds.rb +8 -3
- data/generate +4 -0
- data/lib/generators/extension/extension_generator.rb +1 -1
- data/lib/generators/extension/templates/Rakefile +1 -1
- data/lib/generators/extension/templates/extension.rb +22 -2
- data/lib/generators/extension_migration/extension_migration_generator.rb +3 -3
- data/lib/generators/instance/instance_generator.rb +4 -2
- data/lib/plugins/extension_patches/lib/asset_copy.rb +1 -50
- data/lib/plugins/monkey_patches/lib/monkey_patches.rb +2 -2
- data/lib/product_filters.rb +174 -0
- data/lib/product_scopes.rb +76 -0
- data/lib/spree.rb +2 -2
- data/lib/spree/config.rb +1 -1
- data/lib/spree/extension_loader.rb +10 -1
- data/lib/spree/file_utilz.rb +71 -0
- data/lib/spree/initializer.rb +13 -1
- data/lib/spree/setup.rb +7 -1
- data/lib/tasks/consistency.rake +30 -0
- data/lib/tasks/database.rake +1 -7
- data/lib/tasks/extensions.rake +24 -8
- data/lib/tasks/framework.rake +0 -1
- data/lib/tasks/release.rake +22 -11
- data/lib/tasks/sample/products/1009/large/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1009/mini/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1009/original/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1009/product/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1009/small/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1010/large/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1010/mini/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1010/original/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1010/product/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1010/small/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1011/large/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1011/mini/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1011/original/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1011/product/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1011/small/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1012/large/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1012/mini/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1012/original/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1012/product/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1012/small/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1013/large/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1013/mini/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1013/original/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1013/product/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1013/small/ror_baseball_jersey_green.png +0 -0
- data/lib/tasks/sample/products/1014/large/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1014/mini/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1014/original/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1014/product/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1014/small/ror_baseball_jersey_back_green.png +0 -0
- data/lib/tasks/sample/products/1015/large/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1015/mini/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1015/original/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1015/product/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1015/small/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1016/large/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1016/mini/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1016/original/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1016/product/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1016/small/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1017/large/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1017/mini/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1017/original/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1017/product/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1017/small/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1018/large/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1018/mini/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1018/original/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1018/product/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1018/small/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1019/large/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1019/mini/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1019/original/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1019/product/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1019/small/ror_baseball_jersey_blue.png +0 -0
- data/lib/tasks/sample/products/1020/large/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1020/mini/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1020/original/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1020/product/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1020/small/ror_baseball_jersey_back_blue.png +0 -0
- data/lib/tasks/sample/products/1021/large/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1021/mini/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1021/original/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1021/product/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1021/small/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1022/large/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1022/mini/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1022/original/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1022/product/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1022/small/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1023/large/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1023/mini/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1023/original/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1023/product/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1023/small/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1024/large/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1024/mini/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1024/original/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1024/product/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1024/small/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1025/large/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1025/mini/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1025/original/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1025/product/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1025/small/ror_baseball_jersey_red.png +0 -0
- data/lib/tasks/sample/products/1026/large/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1026/mini/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1026/original/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1026/product/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/sample/products/1026/small/ror_baseball_jersey_back_red.png +0 -0
- data/lib/tasks/translation.rake +1 -1
- data/lib/tasks/upgrade.rake +2 -9
- data/public/images/menu-current.png +0 -0
- data/public/images/progress.gif +0 -0
- data/public/javascripts/calculator.js +13 -0
- data/public/javascripts/checkout.js +163 -34
- data/public/javascripts/jquery.alerts/images/help.gif +0 -0
- data/public/javascripts/jquery.alerts/images/important.gif +0 -0
- data/public/javascripts/jquery.alerts/images/info.gif +0 -0
- data/public/javascripts/jquery.alerts/images/title.gif +0 -0
- data/public/javascripts/jquery.alerts/jquery.alerts.css +57 -0
- data/public/javascripts/jquery.alerts/jquery.alerts.js +235 -0
- data/public/javascripts/jquery.alerts/jquery.alerts.spree.css +30 -0
- data/public/javascripts/jquery.validate.min.js +16 -0
- data/public/javascripts/jsTree/source/_lib.js +126 -0
- data/public/javascripts/jsTree/source/themes/default/context.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/create.png +0 -0
- data/public/javascripts/jsTree/source/themes/default/dot.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/f.png +0 -0
- data/public/javascripts/jsTree/source/themes/default/fminus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/fminus_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/fplus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/fplus_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/lastli.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/lastli_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/li.gif +0 -0
- data/public/javascripts/jsTree/source/themes/default/remove.png +0 -0
- data/public/javascripts/jsTree/source/themes/default/rename.png +0 -0
- data/public/javascripts/jsTree/source/themes/default/style.css +44 -0
- data/public/javascripts/jsTree/source/themes/default/throbber.gif +0 -0
- data/public/javascripts/jsTree/source/themes/marker.gif +0 -0
- data/public/javascripts/jsTree/source/themes/marker_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/plus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/remove.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/context.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/create.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/dot.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/f.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/fminus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/fminus_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/fplus.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/fplus_rtl.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/lastli.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/li.gif +0 -0
- data/public/javascripts/jsTree/source/themes/spree/remove.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/rename.png +0 -0
- data/public/javascripts/jsTree/source/themes/spree/style.css +39 -0
- data/public/javascripts/jsTree/source/themes/spree/throbber.gif +0 -0
- data/public/javascripts/jsTree/source/tree_component.css +62 -0
- data/public/javascripts/jsTree/source/tree_component.js +2315 -0
- data/public/javascripts/jsTree/source/tree_component.min.js +14 -0
- data/public/javascripts/spree.js +9 -0
- data/public/javascripts/taxonomy.js +202 -0
- data/public/stylesheets/admin/admin.css +36 -3
- data/public/stylesheets/compiled/screen.css +393 -306
- data/public/stylesheets/sass/_buttons.sass +59 -0
- data/public/stylesheets/sass/_cart.sass +21 -0
- data/public/stylesheets/sass/_checkout.sass +173 -0
- data/public/stylesheets/sass/_colors.sass +11 -0
- data/public/stylesheets/sass/_layout.sass +63 -0
- data/public/stylesheets/sass/_messages.sass +28 -0
- data/public/stylesheets/sass/_mixins.sass +17 -0
- data/public/stylesheets/sass/_navigation.sass +97 -0
- data/public/stylesheets/sass/_prices.sass +13 -0
- data/public/stylesheets/sass/_product_detail.sass +27 -0
- data/public/stylesheets/sass/_product_thumbnail.sass +58 -0
- data/public/stylesheets/sass/_registration.sass +9 -0
- data/public/stylesheets/sass/screen.sass +12 -555
- data/public/stylesheets/scaffold.css +54 -0
- data/spec/controllers/orders_controller_spec.rb +3 -2
- data/spec/models/address_spec.rb +2 -1
- data/spec/models/shipping_order_spec.rb +8 -6
- data/spec/models/zone_spec.rb +1 -1
- data/spec/preference_factory.rb +1 -1
- data/test/factories/address_factory.rb +20 -0
- data/test/factories/adjustments_factory.rb +53 -0
- data/test/factories/checkout_factory.rb +15 -0
- data/test/factories/country_factory.rb +5 -0
- data/test/factories/coupon_factory.rb +5 -0
- data/test/factories/creditcard_factory.rb +12 -0
- data/test/factories/creditcard_payment_factory.rb +11 -0
- data/test/factories/inventory_unit_factory.rb +2 -0
- data/test/factories/line_item_factory.rb +8 -0
- data/test/factories/options_factory.rb +10 -0
- data/test/factories/order_factory.rb +6 -0
- data/test/factories/preference_factory.rb +5 -0
- data/test/factories/product_factory.rb +13 -0
- data/test/factories/role_factory.rb +5 -0
- data/test/factories/shipment_factory.rb +6 -0
- data/test/factories/shipping_category_factory.rb +5 -0
- data/test/factories/shipping_method_factory.rb +13 -0
- data/test/factories/tax_category_factory.rb +8 -0
- data/test/factories/tax_rate_factory.rb +4 -0
- data/test/factories/taxon_factory.rb +16 -0
- data/test/factories/taxonomy_factory.rb +5 -0
- data/test/factories/user_factory.rb +11 -0
- data/test/factories/variant_factory.rb +13 -0
- data/test/factories/zone_factory.rb +10 -0
- data/test/fixtures/countries.yml +4 -0
- data/test/fixtures/gateway_configurations.yml +2 -0
- data/test/fixtures/gateways.yml +4 -0
- data/test/fixtures/states.yml +204 -0
- data/test/functional/calculators_controller_test.rb +8 -0
- data/test/functional/checkouts_controller_test.rb +77 -0
- data/test/functional/products_controller_test.rb +12 -0
- data/test/functional/users_controller_test.rb +25 -0
- data/test/test_helper.rb +66 -0
- data/test/unit/address_test.rb +39 -0
- data/test/unit/charge_test.rb +90 -0
- data/test/unit/checkout_test.rb +10 -0
- data/test/unit/country_test.rb +6 -0
- data/test/unit/coupon_test.rb +56 -0
- data/test/unit/credit_test.rb +61 -0
- data/test/unit/creditcard_payment_test.rb +28 -0
- data/test/unit/creditcard_test.rb +44 -0
- data/test/unit/factories_test.rb +29 -0
- data/test/unit/flat_percent_item_total_test.rb +28 -0
- data/test/unit/flat_rate_calculators_test.rb +13 -0
- data/test/unit/has_calculator_test.rb +22 -0
- data/test/unit/helpers/calculators_helper_test.rb +4 -0
- data/test/unit/helpers/checkouts_helper_test.rb +26 -0
- data/test/unit/helpers/products_helper_test.rb +32 -0
- data/test/unit/helpers/spree/base_helper_test.rb +43 -0
- data/test/unit/incomplete_checkout_test.rb +68 -0
- data/test/unit/inventory_unit_test.rb +20 -0
- data/test/unit/line_item_test.rb +73 -0
- data/test/unit/order_test.rb +80 -0
- data/test/unit/per_item_calculator_test.rb +14 -0
- data/test/unit/preference_test.rb +148 -0
- data/test/unit/product_test.rb +279 -0
- data/test/unit/sales_tax_calculator_test.rb +46 -0
- data/test/unit/shipping_method_test.rb +21 -0
- data/test/unit/state_event_test.rb +40 -0
- data/test/unit/state_test.rb +7 -0
- data/test/unit/tax_rate_test.rb +9 -0
- data/test/unit/variant_test.rb +128 -0
- data/test/unit/vat_calculator_test.rb +60 -0
- data/vendor/extensions/calculators/README.markdown +4 -0
- data/vendor/extensions/calculators/calculators_extension.rb +31 -0
- data/vendor/extensions/localization/public/images/flags/{dk.png → da.png} +0 -0
- data/vendor/extensions/localization/public/images/flags/de_CH.png +0 -0
- data/vendor/extensions/payment_gateway/README_PAYPAL.markdown +1 -1
- data/vendor/extensions/payment_gateway/db/migrate/20090517173727_add_currency_code_option_to_paypal_gateway.rb +13 -0
- data/vendor/extensions/payment_gateway/lib/spree/payment_gateway.rb +22 -12
- data/vendor/plugins/acts_as_adjacency_list/lib/active_record/acts/adjacency_list.rb +13 -20
- data/vendor/plugins/delegate_belongs_to/README +1 -0
- data/vendor/plugins/delegate_belongs_to/Rakefile +21 -0
- data/vendor/plugins/delegate_belongs_to/init.rb +2 -0
- data/vendor/plugins/delegate_belongs_to/lib/delegate_belongs_to.rb +95 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/controllers/application.rb +2 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/models/contact.rb +5 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/models/user_default.rb +2 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/models/user_mixed.rb +2 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/app/models/user_no_default.rb +2 -0
- data/vendor/plugins/{resource_controller/test → delegate_belongs_to/spec/app_root}/config/boot.rb +14 -9
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/database.yml +21 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/environment.rb +13 -0
- data/{public/favicon.ico → vendor/plugins/delegate_belongs_to/spec/app_root/config/environments/in_memory.rb} +0 -0
- data/vendor/plugins/{resource_controller/test/app/views/tags/index.rjs → delegate_belongs_to/spec/app_root/config/environments/mysql.rb} +0 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/environments/postgresql.rb +0 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/environments/sqlite.rb +0 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/environments/sqlite3.rb +0 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/config/routes.rb +4 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/db/migrate/01_create_users.rb +22 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/db/migrate/02_create_contacts.rb +12 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/lib/console_with_fixtures.rb +4 -0
- data/vendor/plugins/delegate_belongs_to/spec/app_root/script/console +7 -0
- data/vendor/plugins/delegate_belongs_to/spec/model/with_defaults_spec.rb +30 -0
- data/vendor/plugins/delegate_belongs_to/spec/model/with_mixed_spec.rb +29 -0
- data/vendor/plugins/delegate_belongs_to/spec/model/with_no_defaults_spec.rb +30 -0
- data/vendor/plugins/delegate_belongs_to/spec/spec_helper.rb +68 -0
- data/vendor/plugins/has_calculator/README +7 -0
- data/vendor/plugins/has_calculator/init.rb +2 -0
- data/vendor/plugins/has_calculator/lib/has_calculator.rb +52 -0
- data/vendor/plugins/mail_queue/README +40 -0
- data/vendor/plugins/mail_queue/Rakefile +22 -0
- data/vendor/plugins/mail_queue/init.rb +1 -0
- data/vendor/plugins/mail_queue/install.rb +1 -0
- data/vendor/plugins/mail_queue/lib/mail_queue.rb +48 -0
- data/vendor/plugins/mail_queue/lib/queued_mail.rb +5 -0
- data/vendor/plugins/mail_queue/lib/test_mail_queue_mailer.rb +19 -0
- data/vendor/plugins/mail_queue/lib/test_mail_queue_mailer/notify.rhtml +1 -0
- data/vendor/plugins/mail_queue/tasks/mailer_queue_tasks.rake +4 -0
- data/vendor/plugins/mail_queue/test/mailer_queue_test.rb +29 -0
- data/vendor/plugins/paperclip/README.rdoc +126 -11
- data/vendor/plugins/paperclip/Rakefile +35 -24
- data/vendor/plugins/paperclip/lib/paperclip.rb +141 -67
- data/vendor/plugins/paperclip/lib/paperclip/attachment.rb +233 -117
- data/vendor/plugins/paperclip/lib/paperclip/callback_compatability.rb +33 -0
- data/vendor/plugins/paperclip/lib/paperclip/geometry.rb +4 -3
- data/vendor/plugins/paperclip/lib/paperclip/interpolations.rb +105 -0
- data/vendor/plugins/paperclip/lib/paperclip/iostream.rb +16 -1
- data/vendor/plugins/paperclip/lib/paperclip/matchers.rb +4 -0
- data/vendor/plugins/paperclip/lib/paperclip/matchers/have_attached_file_matcher.rb +49 -0
- data/vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_content_type_matcher.rb +66 -0
- data/vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_presence_matcher.rb +48 -0
- data/vendor/plugins/paperclip/lib/paperclip/matchers/validate_attachment_size_matcher.rb +83 -0
- data/vendor/plugins/paperclip/lib/paperclip/processor.rb +49 -0
- data/vendor/plugins/paperclip/lib/paperclip/storage.rb +54 -25
- data/vendor/plugins/paperclip/lib/paperclip/thumbnail.rb +13 -31
- data/vendor/plugins/paperclip/lib/paperclip/upfile.rb +11 -0
- data/vendor/plugins/paperclip/paperclip.gemspec +37 -0
- data/vendor/plugins/paperclip/shoulda_macros/paperclip.rb +58 -22
- data/vendor/plugins/paperclip/tasks/paperclip_tasks.rake +1 -1
- data/vendor/plugins/paperclip/test/attachment_test.rb +460 -54
- data/vendor/plugins/paperclip/test/database.yml +0 -1
- data/vendor/plugins/paperclip/test/fixtures/s3.yml +4 -0
- data/vendor/plugins/paperclip/test/fixtures/twopage.pdf +0 -0
- data/vendor/plugins/paperclip/test/geometry_test.rb +22 -13
- data/vendor/plugins/paperclip/test/helper.rb +46 -3
- data/vendor/plugins/paperclip/test/integration_test.rb +140 -52
- data/vendor/plugins/paperclip/test/interpolations_test.rb +120 -0
- data/vendor/plugins/paperclip/test/iostream_test.rb +32 -21
- data/vendor/plugins/paperclip/test/matchers/have_attached_file_matcher_test.rb +21 -0
- data/vendor/plugins/paperclip/test/matchers/validate_attachment_content_type_matcher_test.rb +30 -0
- data/vendor/plugins/paperclip/test/matchers/validate_attachment_presence_matcher_test.rb +21 -0
- data/vendor/plugins/paperclip/test/matchers/validate_attachment_size_matcher_test.rb +50 -0
- data/vendor/plugins/paperclip/test/paperclip_test.rb +148 -36
- data/vendor/plugins/paperclip/test/processor_test.rb +10 -0
- data/vendor/plugins/paperclip/test/storage_test.rb +126 -16
- data/vendor/plugins/paperclip/test/thumbnail_test.rb +51 -19
- metadata +586 -622
- data/app/views/admin/products/_images.html.erb +0 -42
- data/app/views/admin/taxonomies/_yui_head.html.erb +0 -17
- data/app/views/orders/_billing.html.erb +0 -53
- data/app/views/orders/_checkout_form.html.erb +0 -14
- data/app/views/orders/_confirmation.html.erb +0 -11
- data/app/views/orders/_payment.html.erb +0 -30
- data/app/views/orders/_shipping.html.erb +0 -54
- data/app/views/orders/_shipping_method.html.erb +0 -10
- data/app/views/orders/checkout.html.erb +0 -15
- data/config/initializers/searchlogic.rb +0 -6
- data/db/sample/images/ror_bag.jpg +0 -0
- data/db/sample/images/ror_baseball_jersey.jpg +0 -0
- data/db/sample/images/ror_jr_spaghetti.jpg +0 -0
- data/db/sample/images/ror_mug.jpg +0 -0
- data/db/sample/images/ror_ringer_tshirt.jpg +0 -0
- data/db/sample/images/ror_stein.jpg +0 -0
- data/db/sample/images/ror_tote.jpg +0 -0
- data/db/sample/zone_members.yml +0 -16
- data/db/sample/zones.yml +0 -6
- data/lib/flat_rate.rb +0 -10
- data/lib/spree/checkout.rb +0 -74
- data/public/assets/products/1/mini/ror_tote.jpeg +0 -0
- data/public/assets/products/1/original/ror_tote.jpeg +0 -0
- data/public/assets/products/1/product/ror_tote.jpeg +0 -0
- data/public/assets/products/1/small/ror_tote.jpeg +0 -0
- data/public/assets/products/10/mini/ror_ringer_back.jpeg +0 -0
- data/public/assets/products/10/original/ror_ringer_back.jpeg +0 -0
- data/public/assets/products/10/product/ror_ringer_back.jpeg +0 -0
- data/public/assets/products/10/small/ror_ringer_back.jpeg +0 -0
- data/public/assets/products/1004/mini/apache_baseball.png +0 -0
- data/public/assets/products/1004/original/apache_baseball.png +0 -0
- data/public/assets/products/1004/product/apache_baseball.png +0 -0
- data/public/assets/products/1004/small/apache_baseball.png +0 -0
- data/public/assets/products/1008/mini/ruby_baseball.png +0 -0
- data/public/assets/products/1008/original/ruby_baseball.png +0 -0
- data/public/assets/products/1008/product/ruby_baseball.png +0 -0
- data/public/assets/products/1008/small/ruby_baseball.png +0 -0
- data/public/assets/products/11/mini/ror_stein.jpeg +0 -0
- data/public/assets/products/11/original/ror_stein.jpeg +0 -0
- data/public/assets/products/11/product/ror_stein.jpeg +0 -0
- data/public/assets/products/11/small/ror_stein.jpeg +0 -0
- data/public/assets/products/12/mini/ror_stein_back.jpeg +0 -0
- data/public/assets/products/12/original/ror_stein_back.jpeg +0 -0
- data/public/assets/products/12/product/ror_stein_back.jpeg +0 -0
- data/public/assets/products/12/small/ror_stein_back.jpeg +0 -0
- data/public/assets/products/2/mini/ror_tote_back.jpeg +0 -0
- data/public/assets/products/2/original/ror_tote_back.jpeg +0 -0
- data/public/assets/products/2/product/ror_tote_back.jpeg +0 -0
- data/public/assets/products/2/small/ror_tote_back.jpeg +0 -0
- data/public/assets/products/3/mini/ror_bag.jpeg +0 -0
- data/public/assets/products/3/original/ror_bag.jpeg +0 -0
- data/public/assets/products/3/product/ror_bag.jpeg +0 -0
- data/public/assets/products/3/small/ror_bag.jpeg +0 -0
- data/public/assets/products/4/mini/ror_baseball.jpeg +0 -0
- data/public/assets/products/4/original/ror_baseball.jpeg +0 -0
- data/public/assets/products/4/product/ror_baseball.jpeg +0 -0
- data/public/assets/products/4/small/ror_baseball.jpeg +0 -0
- data/public/assets/products/5/mini/ror_baseball_back.jpeg +0 -0
- data/public/assets/products/5/original/ror_baseball_back.jpeg +0 -0
- data/public/assets/products/5/product/ror_baseball_back.jpeg +0 -0
- data/public/assets/products/5/small/ror_baseball_back.jpeg +0 -0
- data/public/assets/products/6/mini/ror_jr_spaghetti.jpeg +0 -0
- data/public/assets/products/6/original/ror_jr_spaghetti.jpeg +0 -0
- data/public/assets/products/6/product/ror_jr_spaghetti.jpeg +0 -0
- data/public/assets/products/6/small/ror_jr_spaghetti.jpeg +0 -0
- data/public/assets/products/7/mini/ror_mug.jpeg +0 -0
- data/public/assets/products/7/original/ror_mug.jpeg +0 -0
- data/public/assets/products/7/product/ror_mug.jpeg +0 -0
- data/public/assets/products/7/small/ror_mug.jpeg +0 -0
- data/public/assets/products/8/mini/ror_mug_back.jpeg +0 -0
- data/public/assets/products/8/original/ror_mug_back.jpeg +0 -0
- data/public/assets/products/8/product/ror_mug_back.jpeg +0 -0
- data/public/assets/products/8/small/ror_mug_back.jpeg +0 -0
- data/public/assets/products/9/mini/ror_ringer.jpeg +0 -0
- data/public/assets/products/9/original/ror_ringer.jpeg +0 -0
- data/public/assets/products/9/product/ror_ringer.jpeg +0 -0
- data/public/assets/products/9/small/ror_ringer.jpeg +0 -0
- data/public/javascripts/jquery.validate.pack.js +0 -15
- data/public/javascripts/spree-yui.js +0 -693
- data/public/javascripts/yui-includes.js +0 -57
- data/public/stylesheets/admin/david-admin.css +0 -210
- data/spec/controllers/admin/shipments_controller_spec.rb +0 -30
- data/spec/helpers/admin/configurations_helper_spec.rb +0 -11
- data/spec/helpers/admin/mail_settings_helper_spec.rb +0 -11
- data/spec/helpers/products_helper_spec.rb +0 -12
- data/spec/helpers/spree/base_helper_spec.rb +0 -30
- data/spec/models/country_spec.rb +0 -29
- data/spec/models/line_item_spec.rb +0 -78
- data/spec/models/preference_spec.rb +0 -185
- data/spec/models/product_spec.rb +0 -207
- data/spec/models/shipping_method_spec.rb +0 -59
- data/spec/models/state_event_spec.rb +0 -12
- data/spec/models/state_spec.rb +0 -28
- data/spec/models/variant_spec.rb +0 -98
- data/vendor/extensions/flat_rate_shipping/README.markdown +0 -3
- data/vendor/extensions/flat_rate_shipping/Rakefile +0 -120
- data/vendor/extensions/flat_rate_shipping/flat_rate_shipping_extension.rb +0 -11
- data/vendor/extensions/flat_rate_shipping/lib/flat_rate_shipping_configuration.rb +0 -7
- data/vendor/extensions/flat_rate_shipping/lib/spree/flat_rate_shipping/calculator.rb +0 -9
- data/vendor/extensions/flat_rate_shipping/lib/spree/flat_rate_shipping/config.rb +0 -22
- data/vendor/extensions/flat_rate_shipping/lib/tasks/flat_rate_shipping_extension_tasks.rake +0 -29
- data/vendor/extensions/flat_rate_shipping/spec/spec.opts +0 -6
- data/vendor/extensions/flat_rate_shipping/spec/spec_helper.rb +0 -37
- data/vendor/extensions/tax_calculator/README.markdown +0 -8
- data/vendor/extensions/tax_calculator/Rakefile +0 -120
- data/vendor/extensions/tax_calculator/app/controllers/admin/tax_rates_controller.rb +0 -27
- data/vendor/extensions/tax_calculator/app/views/admin/tax_rates/_form.html.erb +0 -20
- data/vendor/extensions/tax_calculator/config/locales/de.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/en-GB.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/en-US.yml +0 -32
- data/vendor/extensions/tax_calculator/config/locales/es.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/it.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/nb-NO.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/pl.yml +0 -30
- data/vendor/extensions/tax_calculator/config/locales/pt-BR.yml +0 -30
- data/vendor/extensions/tax_calculator/config/routes.rb +0 -4
- data/vendor/extensions/tax_calculator/lib/spree/sales_tax_calculator.rb +0 -31
- data/vendor/extensions/tax_calculator/lib/spree/tax/config.rb +0 -22
- data/vendor/extensions/tax_calculator/lib/spree/tax_calculator.rb +0 -18
- data/vendor/extensions/tax_calculator/lib/spree/vat_calculator.rb +0 -42
- data/vendor/extensions/tax_calculator/lib/tasks/tax_calculator_extension_tasks.rake +0 -18
- data/vendor/extensions/tax_calculator/lib/tax_configuration.rb +0 -7
- data/vendor/extensions/tax_calculator/spec/controllers/tax_calculator_spec.rb +0 -12
- data/vendor/extensions/tax_calculator/spec/helpers/admin/tax_rates_helper_spec.rb +0 -6
- data/vendor/extensions/tax_calculator/spec/helpers/products_helper_spec.rb +0 -88
- data/vendor/extensions/tax_calculator/spec/models/sales_tax_calculator_spec.rb +0 -53
- data/vendor/extensions/tax_calculator/spec/models/tax_calculator_spec.rb +0 -58
- data/vendor/extensions/tax_calculator/spec/models/tax_rate_spec.rb +0 -17
- data/vendor/extensions/tax_calculator/spec/models/vat_calculator_spec.rb +0 -56
- data/vendor/extensions/tax_calculator/spec/spec.opts +0 -6
- data/vendor/extensions/tax_calculator/spec/spec_helper.rb +0 -42
- data/vendor/extensions/tax_calculator/tax_calculator_extension.rb +0 -41
- data/vendor/plugins/resource_controller/test/Rakefile +0 -10
- data/vendor/plugins/resource_controller/test/app/controllers/accounts_controller.rb +0 -6
- data/vendor/plugins/resource_controller/test/app/controllers/application.rb +0 -7
- data/vendor/plugins/resource_controller/test/app/controllers/cms/options_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/cms/personnel_controller.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/controllers/cms/photos_controller.rb +0 -6
- data/vendor/plugins/resource_controller/test/app/controllers/cms/products_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/comments_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/images_controller.rb +0 -4
- data/vendor/plugins/resource_controller/test/app/controllers/options_controller.rb +0 -8
- data/vendor/plugins/resource_controller/test/app/controllers/people_controller.rb +0 -9
- data/vendor/plugins/resource_controller/test/app/controllers/photos_controller.rb +0 -11
- data/vendor/plugins/resource_controller/test/app/controllers/posts_controller.rb +0 -10
- data/vendor/plugins/resource_controller/test/app/controllers/projects_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/somethings_controller.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/controllers/tags_controller.rb +0 -13
- data/vendor/plugins/resource_controller/test/app/controllers/users_controller.rb +0 -12
- data/vendor/plugins/resource_controller/test/app/helpers/accounts_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/application_helper.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/helpers/cms/products_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/comments_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/images_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/options_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/people_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/photos_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/posts_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/projects_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/somethings_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/tags_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/helpers/users_helper.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/models/account.rb +0 -4
- data/vendor/plugins/resource_controller/test/app/models/comment.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/image.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/option.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/personnel.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/photo.rb +0 -5
- data/vendor/plugins/resource_controller/test/app/models/post.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/product.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/project.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/models/something.rb +0 -2
- data/vendor/plugins/resource_controller/test/app/models/tag.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/models/user.rb +0 -3
- data/vendor/plugins/resource_controller/test/app/views/accounts/_form.html.erb +0 -4
- data/vendor/plugins/resource_controller/test/app/views/accounts/edit.html.erb +0 -14
- data/vendor/plugins/resource_controller/test/app/views/accounts/new.html.erb +0 -12
- data/vendor/plugins/resource_controller/test/app/views/accounts/show.html.erb +0 -5
- data/vendor/plugins/resource_controller/test/app/views/cms/options/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/cms/options/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/cms/options/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/cms/options/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/cms/photos/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/cms/photos/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/cms/photos/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/cms/photos/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/cms/products/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/cms/products/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/cms/products/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/cms/products/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/comments/edit.rhtml +0 -27
- data/vendor/plugins/resource_controller/test/app/views/comments/index.rhtml +0 -24
- data/vendor/plugins/resource_controller/test/app/views/comments/new.rhtml +0 -26
- data/vendor/plugins/resource_controller/test/app/views/comments/show.rhtml +0 -18
- data/vendor/plugins/resource_controller/test/app/views/images/_form.html.erb +0 -4
- data/vendor/plugins/resource_controller/test/app/views/images/edit.html.erb +0 -14
- data/vendor/plugins/resource_controller/test/app/views/images/new.html.erb +0 -12
- data/vendor/plugins/resource_controller/test/app/views/layouts/comments.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/options.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/people.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/photos.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/projects.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/somethings.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/layouts/tags.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/options/_form.html.erb +0 -8
- data/vendor/plugins/resource_controller/test/app/views/options/edit.html.erb +0 -16
- data/vendor/plugins/resource_controller/test/app/views/options/index.html.erb +0 -21
- data/vendor/plugins/resource_controller/test/app/views/options/new.html.erb +0 -12
- data/vendor/plugins/resource_controller/test/app/views/options/show.html.erb +0 -10
- data/vendor/plugins/resource_controller/test/app/views/people/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/people/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/people/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/people/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/photos/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/photos/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/photos/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/photos/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/posts/edit.rhtml +0 -22
- data/vendor/plugins/resource_controller/test/app/views/posts/index.rhtml +0 -22
- data/vendor/plugins/resource_controller/test/app/views/posts/new.rhtml +0 -21
- data/vendor/plugins/resource_controller/test/app/views/posts/show.rhtml +0 -13
- data/vendor/plugins/resource_controller/test/app/views/projects/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/projects/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/projects/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/projects/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/somethings/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/somethings/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/somethings/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/somethings/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/tags/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/tags/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/tags/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/tags/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/app/views/users/edit.rhtml +0 -17
- data/vendor/plugins/resource_controller/test/app/views/users/index.rhtml +0 -20
- data/vendor/plugins/resource_controller/test/app/views/users/new.rhtml +0 -16
- data/vendor/plugins/resource_controller/test/app/views/users/show.rhtml +0 -8
- data/vendor/plugins/resource_controller/test/config/database.yml +0 -9
- data/vendor/plugins/resource_controller/test/config/environment.rb +0 -47
- data/vendor/plugins/resource_controller/test/config/environments/development.rb +0 -21
- data/vendor/plugins/resource_controller/test/config/environments/test.rb +0 -19
- data/vendor/plugins/resource_controller/test/config/initializers/inflections.rb +0 -14
- data/vendor/plugins/resource_controller/test/config/routes.rb +0 -61
- data/vendor/plugins/resource_controller/test/db/migrate/001_create_posts.rb +0 -12
- data/vendor/plugins/resource_controller/test/db/migrate/002_create_products.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/003_create_comments.rb +0 -13
- data/vendor/plugins/resource_controller/test/db/migrate/004_create_options.rb +0 -13
- data/vendor/plugins/resource_controller/test/db/migrate/005_create_photos.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/006_create_tags.rb +0 -17
- data/vendor/plugins/resource_controller/test/db/migrate/007_create_somethings.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/008_create_accounts.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/009_add_account_id_to_photos.rb +0 -9
- data/vendor/plugins/resource_controller/test/db/migrate/010_create_projects.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/011_create_images.rb +0 -12
- data/vendor/plugins/resource_controller/test/db/migrate/012_create_users.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/013_create_personnel.rb +0 -11
- data/vendor/plugins/resource_controller/test/db/migrate/014_add_personnel_id_to_photos.rb +0 -9
- data/vendor/plugins/resource_controller/test/db/schema.rb +0 -78
- data/vendor/plugins/resource_controller/test/script/console +0 -3
- data/vendor/plugins/resource_controller/test/script/destroy +0 -3
- data/vendor/plugins/resource_controller/test/script/generate +0 -3
- data/vendor/plugins/resource_controller/test/script/server +0 -3
- data/vendor/plugins/resource_controller/test/test/fixtures/accounts.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/comments.yml +0 -11
- data/vendor/plugins/resource_controller/test/test/fixtures/images.yml +0 -6
- data/vendor/plugins/resource_controller/test/test/fixtures/options.yml +0 -9
- data/vendor/plugins/resource_controller/test/test/fixtures/personnel.yml +0 -5
- data/vendor/plugins/resource_controller/test/test/fixtures/photos.yml +0 -9
- data/vendor/plugins/resource_controller/test/test/fixtures/photos_tags.yml +0 -3
- data/vendor/plugins/resource_controller/test/test/fixtures/posts.yml +0 -9
- data/vendor/plugins/resource_controller/test/test/fixtures/products.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/projects.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/somethings.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/tags.yml +0 -7
- data/vendor/plugins/resource_controller/test/test/fixtures/users.yml +0 -5
- data/vendor/plugins/resource_controller/test/test/functional/cms/options_controller_test.rb +0 -23
- data/vendor/plugins/resource_controller/test/test/functional/cms/photos_controller_test.rb +0 -43
- data/vendor/plugins/resource_controller/test/test/functional/cms/products_controller_test.rb +0 -23
- data/vendor/plugins/resource_controller/test/test/functional/comments_controller_test.rb +0 -26
- data/vendor/plugins/resource_controller/test/test/functional/images_controller_test.rb +0 -37
- data/vendor/plugins/resource_controller/test/test/functional/people_controller_test.rb +0 -34
- data/vendor/plugins/resource_controller/test/test/functional/photos_controller_test.rb +0 -130
- data/vendor/plugins/resource_controller/test/test/functional/posts_controller_test.rb +0 -34
- data/vendor/plugins/resource_controller/test/test/functional/projects_controller_test.rb +0 -18
- data/vendor/plugins/resource_controller/test/test/functional/somethings_controller_test.rb +0 -28
- data/vendor/plugins/resource_controller/test/test/functional/tags_controller_test.rb +0 -64
- data/vendor/plugins/resource_controller/test/test/functional/users_controller_test.rb +0 -24
- data/vendor/plugins/resource_controller/test/test/test_helper.rb +0 -12
- data/vendor/plugins/resource_controller/test/test/unit/accessors_test.rb +0 -110
- data/vendor/plugins/resource_controller/test/test/unit/account_test.rb +0 -7
- data/vendor/plugins/resource_controller/test/test/unit/action_options_test.rb +0 -109
- data/vendor/plugins/resource_controller/test/test/unit/base_test.rb +0 -11
- data/vendor/plugins/resource_controller/test/test/unit/comment_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/failable_action_options_test.rb +0 -77
- data/vendor/plugins/resource_controller/test/test/unit/helpers/current_objects_test.rb +0 -133
- data/vendor/plugins/resource_controller/test/test/unit/helpers/internal_test.rb +0 -106
- data/vendor/plugins/resource_controller/test/test/unit/helpers/nested_test.rb +0 -86
- data/vendor/plugins/resource_controller/test/test/unit/helpers/singleton_current_objects_test.rb +0 -68
- data/vendor/plugins/resource_controller/test/test/unit/helpers/singleton_nested_test.rb +0 -77
- data/vendor/plugins/resource_controller/test/test/unit/helpers/singleton_urls_test.rb +0 -67
- data/vendor/plugins/resource_controller/test/test/unit/helpers/urls_test.rb +0 -75
- data/vendor/plugins/resource_controller/test/test/unit/helpers_test.rb +0 -25
- data/vendor/plugins/resource_controller/test/test/unit/image_test.rb +0 -7
- data/vendor/plugins/resource_controller/test/test/unit/option_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/photo_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/post_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/project_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/response_collector_test.rb +0 -49
- data/vendor/plugins/resource_controller/test/test/unit/something_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/tag_test.rb +0 -10
- data/vendor/plugins/resource_controller/test/test/unit/urligence_test.rb +0 -203
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/Rakefile +0 -32
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/bin/convert_to_should_syntax +0 -40
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/init.rb +0 -3
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda.rb +0 -43
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/active_record_helpers.rb +0 -580
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/color.rb +0 -77
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/controller_tests/controller_tests.rb +0 -467
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/controller_tests/formats/html.rb +0 -201
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/controller_tests/formats/xml.rb +0 -170
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/gem/proc_extensions.rb +0 -14
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/gem/shoulda.rb +0 -239
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/general.rb +0 -118
- data/vendor/plugins/resource_controller/test/vendor/plugins/shoulda/lib/shoulda/private_helpers.rb +0 -22
data/config/locales/ru-RU.yml
CHANGED
@@ -1,98 +1,102 @@
|
|
1
1
|
---
|
2
2
|
ru-RU:
|
3
|
-
a_copy_of_all_mail_will_be_sent_to_the_following_addresses: Копии всех писем будут отосланы на следующие адреса
|
4
|
-
abbreviation: Аббревиатура
|
3
|
+
a_copy_of_all_mail_will_be_sent_to_the_following_addresses: "Копии всех писем будут отосланы на следующие адреса"
|
4
|
+
abbreviation: "Аббревиатура"
|
5
5
|
access_denied: "Доступ запрещен"
|
6
|
-
account: Учетная запись
|
7
|
-
account_updated: "
|
8
|
-
action: Действие
|
6
|
+
account: "Учетная запись"
|
7
|
+
account_updated: "Учетная запись обновлена!"
|
8
|
+
action: "Действие"
|
9
9
|
actions:
|
10
|
-
cancel: Отменить
|
11
|
-
create: Создать
|
12
|
-
destroy: Удалить
|
13
|
-
list: Показать
|
14
|
-
listing: Список
|
15
|
-
new: Новый
|
16
|
-
update: Изменить
|
10
|
+
cancel: "Отменить"
|
11
|
+
create: "Создать"
|
12
|
+
destroy: "Удалить"
|
13
|
+
list: "Показать"
|
14
|
+
listing: "Список"
|
15
|
+
new: "Новый"
|
16
|
+
update: "Изменить"
|
17
17
|
activerecord:
|
18
18
|
attributes:
|
19
19
|
address:
|
20
|
-
address1: Адрес
|
20
|
+
address1: "Адрес"
|
21
21
|
address2: "Адрес (2я строка)"
|
22
|
-
city: Город
|
22
|
+
city: "Город"
|
23
23
|
firstname: "Имя"
|
24
24
|
lastname: "Фамилия"
|
25
|
-
phone: Телефон
|
25
|
+
phone: "Телефон"
|
26
26
|
zipcode: "Индекс"
|
27
27
|
country:
|
28
|
-
iso: ISO
|
29
|
-
iso3: ISO3
|
28
|
+
iso: "ISO"
|
29
|
+
iso3: "ISO3"
|
30
30
|
iso_name: "Название ISO"
|
31
|
-
name: Название
|
31
|
+
name: "Название"
|
32
32
|
numcode: "Код ISO"
|
33
33
|
creditcard:
|
34
34
|
cc_type: "Тип"
|
35
|
-
month: Месяц
|
36
|
-
number: Номер
|
35
|
+
month: "Месяц"
|
36
|
+
number: "Номер"
|
37
37
|
verification_value: "Код верификации"
|
38
|
-
year: Год
|
38
|
+
year: "Год"
|
39
39
|
inventory_unit:
|
40
|
-
state: Состояние
|
40
|
+
state: "Состояние"
|
41
41
|
line_item:
|
42
|
-
price: Цена
|
43
|
-
quantity: Количество
|
42
|
+
price: "Цена"
|
43
|
+
quantity: "Количество"
|
44
44
|
order:
|
45
45
|
checkout_complete: "Заказ завершен"
|
46
|
-
ip_address: "IP
|
47
|
-
item_total: "
|
48
|
-
number: Номер
|
49
|
-
ship_amount: "Ship amount ???"
|
46
|
+
ip_address: "IP адрес"
|
47
|
+
item_total: "Всего товаров"
|
48
|
+
number: "Номер"
|
50
49
|
special_instructions: "Дополнительные инструкции"
|
51
|
-
state: Статус
|
52
|
-
|
53
|
-
total: Итого
|
50
|
+
state: "Статус"
|
51
|
+
total: "Итого"
|
54
52
|
product:
|
55
|
-
available_on: "
|
56
|
-
description: Описание
|
57
|
-
master_price: "
|
58
|
-
name: Name
|
59
|
-
on_hand: "
|
53
|
+
available_on: "Доступно с"
|
54
|
+
description: "Описание"
|
55
|
+
master_price: "Основная цена"
|
56
|
+
name: "Name"
|
57
|
+
on_hand: "В наличии"
|
60
58
|
shipping_category: "Категория доставки"
|
59
|
+
tax_category: "Налоговая категория"
|
61
60
|
property:
|
62
|
-
name: Наименование
|
63
|
-
presentation:
|
61
|
+
name: "Наименование"
|
62
|
+
presentation: "Отображение"
|
64
63
|
prototype:
|
65
|
-
name: Наименование
|
64
|
+
name: "Наименование"
|
66
65
|
role:
|
67
|
-
name: Наименование
|
66
|
+
name: "Наименование"
|
68
67
|
state:
|
69
|
-
abbr: Аббревиатура
|
70
|
-
name: Название
|
68
|
+
abbr: "Аббревиатура"
|
69
|
+
name: "Название"
|
70
|
+
tax_category:
|
71
|
+
description: "Описание"
|
72
|
+
name: "Наименование"
|
73
|
+
tax_rate:
|
74
|
+
amount: "Налоговая ставка"
|
71
75
|
taxon:
|
72
|
-
name: Наименование
|
73
|
-
permalink: Постоянная ссылка
|
74
|
-
position: Позиция
|
76
|
+
name: "Наименование"
|
77
|
+
permalink: "Постоянная ссылка"
|
78
|
+
position: "Позиция"
|
75
79
|
taxonomy:
|
76
|
-
name: Наименование
|
80
|
+
name: "Наименование"
|
77
81
|
user:
|
78
|
-
email: Email
|
82
|
+
email: "Email"
|
79
83
|
variant:
|
80
|
-
depth: Глубина
|
81
|
-
height: Высота
|
82
|
-
price: Цена
|
83
|
-
sku:
|
84
|
-
weight: Вес
|
85
|
-
width: Ширина
|
84
|
+
depth: "Глубина"
|
85
|
+
height: "Высота"
|
86
|
+
price: "Цена"
|
87
|
+
sku: "Артикул"
|
88
|
+
weight: "Вес"
|
89
|
+
width: "Ширина"
|
86
90
|
zone:
|
87
|
-
description: Описание
|
88
|
-
name: Наименование
|
91
|
+
description: "Описание"
|
92
|
+
name: "Наименование"
|
89
93
|
models:
|
90
94
|
address:
|
91
|
-
one: Адрес
|
92
|
-
other: Адреса
|
95
|
+
one: "Адрес"
|
96
|
+
other: "Адреса"
|
93
97
|
country:
|
94
|
-
one: Страна
|
95
|
-
other: Страны
|
98
|
+
one: "Страна"
|
99
|
+
other: "Страны"
|
96
100
|
creditcard:
|
97
101
|
one: "Кредитная карта"
|
98
102
|
other: "Кредитные карты"
|
@@ -109,415 +113,502 @@ ru-RU:
|
|
109
113
|
one: "Элемент списка"
|
110
114
|
other: "Элементы списка"
|
111
115
|
order:
|
112
|
-
one: Заказ
|
113
|
-
other: Заказы
|
116
|
+
one: "Заказ"
|
117
|
+
other: "Заказы"
|
114
118
|
payment:
|
115
|
-
one: Платеж
|
116
|
-
other: Платежи
|
119
|
+
one: "Платеж"
|
120
|
+
other: "Платежи"
|
117
121
|
product:
|
118
|
-
one: Продукт
|
119
|
-
other: Продукты
|
122
|
+
one: "Продукт"
|
123
|
+
other: "Продукты"
|
120
124
|
property:
|
121
|
-
one: Свойство
|
122
|
-
other: Свойства
|
125
|
+
one: "Свойство"
|
126
|
+
other: "Свойства"
|
123
127
|
prototype:
|
124
|
-
one: Прототип
|
125
|
-
other: Прототипы
|
128
|
+
one: "Прототип"
|
129
|
+
other: "Прототипы"
|
126
130
|
role:
|
127
|
-
one: Роль
|
128
|
-
other: Роли
|
129
|
-
shipping_category:
|
131
|
+
one: "Роль"
|
132
|
+
other: "Роли"
|
133
|
+
shipping_category:
|
130
134
|
one: "Категория доставки"
|
131
135
|
other: "Категории доставки"
|
132
136
|
state:
|
133
|
-
one: Статус
|
134
|
-
other: Статусы
|
137
|
+
one: "Статус"
|
138
|
+
other: "Статусы"
|
139
|
+
tax_category:
|
140
|
+
one: "Налоговая категория"
|
141
|
+
other: "Налоговые категории"
|
142
|
+
tax_rate:
|
143
|
+
one: "Налоговая ставка"
|
144
|
+
other: "Налоговые ставки"
|
135
145
|
taxon:
|
136
|
-
one: Таксон
|
137
|
-
other: Таксоны
|
146
|
+
one: "Таксон"
|
147
|
+
other: "Таксоны"
|
138
148
|
taxonomy:
|
139
|
-
one: Таксономия
|
140
|
-
other: Таксономии
|
149
|
+
one: "Таксономия"
|
150
|
+
other: "Таксономии"
|
141
151
|
user:
|
142
|
-
one: Пользователь
|
143
|
-
other: Пользователи
|
152
|
+
one: "Пользователь"
|
153
|
+
other: "Пользователи"
|
144
154
|
variant:
|
145
|
-
one: Вариант
|
146
|
-
other: Варианты
|
155
|
+
one: "Вариант"
|
156
|
+
other: "Варианты"
|
147
157
|
zone:
|
148
|
-
one: Зона
|
149
|
-
other: Зоны
|
150
|
-
add:
|
158
|
+
one: "Зона"
|
159
|
+
other: "Зоны"
|
160
|
+
add: "Добавить"
|
151
161
|
add_category: "Добавить категорию"
|
152
162
|
add_country: "Добавить страну"
|
153
|
-
add_option_type: "Добавить
|
154
|
-
add_option_types: "Добавить
|
163
|
+
add_option_type: "Добавить опцию"
|
164
|
+
add_option_types: "Добавить опции"
|
155
165
|
add_option_value: "Добавить значение опции"
|
156
166
|
add_product_properties: "Добавить свойства продукта"
|
157
|
-
add_state: "Добавить
|
158
|
-
add_to_cart: "
|
167
|
+
add_state: "Добавить субъект федерации"
|
168
|
+
add_to_cart: "Добавить в корзину"
|
159
169
|
add_zone: "Добавить зону"
|
160
|
-
|
170
|
+
additional_item: Additional Item Cost
|
171
|
+
address: "Адрес"
|
161
172
|
address_information: "Адресная информация"
|
162
|
-
adjustment: Поправка(Adjustment)
|
163
|
-
administration: Администрирование
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
173
|
+
adjustment: "Поправка(Adjustment)"
|
174
|
+
administration: "Администрирование"
|
175
|
+
all: "все"
|
176
|
+
allow_backorders: "Разрешить задолженные заказы"
|
177
|
+
allow_ssl_to_be_used_when_in_developement_and_test_modes: "Использовать SSL в development и test режимах"
|
178
|
+
allow_ssl_to_be_used_when_in_production_mode: "Использовать SSL в production"
|
179
|
+
allowed_ssl_in_production_mode: "SSL {{not}} будет использован в режиме production"
|
180
|
+
already_registered: "Уже зарегистрированы"
|
181
|
+
alternative_phone: "Дополнительный телефон"
|
182
|
+
amount: "Сумма"
|
169
183
|
are_you_sure: "Вы уверены"
|
170
184
|
are_you_sure_category: "Вы уверены, что хотите удалить эту категорию?"
|
171
185
|
are_you_sure_delete: "Вы уверены, что хотите удалить эту запись?"
|
172
186
|
are_you_sure_delete_image: "Вы уверены, что хотите удалить эту картинку?"
|
173
|
-
are_you_sure_option_type: "Вы уверены, что хотите удалить
|
187
|
+
are_you_sure_option_type: "Вы уверены, что хотите удалить эту товарную опцию?"
|
174
188
|
are_you_sure_you_want_to_capture: "Вы уверены, что хотите capture? ??"
|
175
|
-
assign_taxon: "
|
176
|
-
assign_taxons: "
|
189
|
+
assign_taxon: "Прикрепить к таксону"
|
190
|
+
assign_taxons: "прикрепить к таксонам"
|
177
191
|
authorization_failure: "Ошибка авторизации"
|
178
|
-
authorized: Авторизован
|
179
|
-
available_on: "Доступно
|
180
|
-
available_taxons: "Доступные таксоны
|
181
|
-
back: Назад
|
192
|
+
authorized: "Авторизован"
|
193
|
+
available_on: "Доступно с"
|
194
|
+
available_taxons: "Доступные таксоны"
|
195
|
+
back: "Назад"
|
182
196
|
back_to_store: "Назад к списку"
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
197
|
+
backordering_is_allowed: "Задолженные заказы {{not}} разрешены"
|
198
|
+
bill_address: "Платёжный адрес"
|
199
|
+
billing_address: "Платёжный адрес"
|
200
|
+
calculator: "Калькулятор"
|
201
|
+
calculator_settings_warning: "При изменении типа калькулятора, вы должны сохранить это изменение, прежде чем вы сможете изменить настройки калькулятора."
|
202
|
+
cancel: "Отмена"
|
203
|
+
canceled: "Отменен"
|
204
|
+
capture: "capture"
|
188
205
|
card_code: "Код карты"
|
189
206
|
card_number: "Номер карты"
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
207
|
+
card_type_is: "Тип карты"
|
208
|
+
cart: "Корзина"
|
209
|
+
categories: "Категории"
|
210
|
+
category: "Категория"
|
211
|
+
change: "Изменить"
|
194
212
|
change_language: "Сменить язык"
|
195
|
-
|
196
|
-
|
197
|
-
|
213
|
+
charge_total: Charge Total
|
214
|
+
charged: "Оплачено"
|
215
|
+
checkout: "Оформление заказа"
|
216
|
+
city: "Город"
|
217
|
+
code: "Кодовое слово"
|
218
|
+
combine: "Разрешить комбинировать"
|
198
219
|
comp_order: "Comp Order ??"
|
199
220
|
comp_order_confirmation: "Customer will not be charged. Are you sure you want to comp this order? ??"
|
200
|
-
|
201
|
-
|
221
|
+
complete: "Завершено"
|
222
|
+
complete_list: "Список настроек"
|
223
|
+
configuration: "Конфигурация"
|
202
224
|
configuration_options: "Опции конфигурации"
|
203
|
-
configurations:
|
204
|
-
confirm: Подтвердить
|
225
|
+
configurations: "Конфигурация"
|
226
|
+
confirm: "Подтвердить"
|
227
|
+
confirm_delete: "Подтверждение удаления"
|
205
228
|
confirm_password: "Подтверждение пароля"
|
206
|
-
continue: Продолжить
|
229
|
+
continue: "Продолжить"
|
207
230
|
continue_shopping: "Продолжить покупки"
|
208
|
-
copy_all_mails_to: Копировать все письма на
|
209
|
-
country: Страна
|
231
|
+
copy_all_mails_to: "Копировать все письма на"
|
232
|
+
country: "Страна"
|
210
233
|
country_based: "Страна"
|
211
|
-
|
234
|
+
coupon: "Купон"
|
235
|
+
coupon_code: "Кодовое слово"
|
236
|
+
coupons: "Купоны"
|
237
|
+
coupons_description: "Управление купонами"
|
238
|
+
create: "Создать"
|
212
239
|
create_a_new_account: "Создать новую учетную запись"
|
213
|
-
create_user_account:
|
240
|
+
create_user_account: "Создать нового пользователя"
|
214
241
|
created_successfully: "Успешно создана"
|
215
242
|
credit_card: "Кредитная карта"
|
216
243
|
credit_card_capture_complete: "Credit Card Was Captured ??"
|
217
244
|
credit_card_payment: "Платеж крелитной картой"
|
218
|
-
|
219
|
-
|
220
|
-
|
245
|
+
credit_total: Credit Total
|
246
|
+
creditcard: "Кредитная карта"
|
247
|
+
current: "Текущий"
|
248
|
+
customer: "Пользователь"
|
221
249
|
date_range: "Период времени"
|
222
|
-
delete: Удалить
|
223
|
-
depth: Глубина
|
224
|
-
description: Описание
|
225
|
-
destroy: Удалить
|
226
|
-
display: Показать
|
227
|
-
edit: Редактировать
|
250
|
+
delete: "Удалить"
|
251
|
+
depth: "Глубина"
|
252
|
+
description: "Описание"
|
253
|
+
destroy: "Удалить"
|
254
|
+
display: "Показать"
|
255
|
+
edit: "Редактировать"
|
228
256
|
editing_category: "Редактирование категории"
|
229
|
-
|
230
|
-
|
257
|
+
editing_coupon: "Редактировать купон"
|
258
|
+
editing_option_type: "Редактирование опции"
|
259
|
+
editing_option_types: "Редактирование опций"
|
231
260
|
editing_product: "Редактирование продукта"
|
232
261
|
editing_property: "Редактирование свойства"
|
233
262
|
editing_prototype: "Редактирование прототипа"
|
234
|
-
editing_shipping_category: "
|
235
|
-
editing_shipping_method: "
|
263
|
+
editing_shipping_category: "Редактирование категории доставки"
|
264
|
+
editing_shipping_method: "Редактирование способа доставки"
|
265
|
+
editing_shipping_rate: "Редактирование стоимости доставки"
|
236
266
|
editing_state: "Редактирование статуса"
|
237
267
|
editing_tax_category: "Редактирование категории налога"
|
268
|
+
editing_tax_rate: "Редактирование налоговой ставки"
|
238
269
|
editing_user: "Редактирование пользователя"
|
239
270
|
editing_zone: "Редактирование зоны"
|
240
|
-
email: Email
|
271
|
+
email: "Email"
|
241
272
|
email_address: "Email адрес"
|
242
273
|
email_server_settings_description: "Настройки сервера email."
|
243
274
|
empty_cart: "Очистить корзину"
|
244
|
-
enable_mail_delivery: Включить доставку почты
|
245
|
-
|
246
|
-
|
275
|
+
enable_mail_delivery: "Включить доставку почты"
|
276
|
+
enable_mail_queue: "Включить очередь почтовых сообщений"
|
277
|
+
enter_exactly_as_shown_on_card: "Пожалуйста, введите точно как показано на карте"
|
278
|
+
error: "ошибка"
|
279
|
+
event: "Событие"
|
247
280
|
existing_customer: "Для зарегистрированных пользователей"
|
248
|
-
expiration:
|
249
|
-
expiration_month: "Месяц
|
250
|
-
expiration_year: "Год
|
251
|
-
extension: Расширение
|
252
|
-
extensions: Расширения
|
253
|
-
filename: Имя
|
254
|
-
final_confirmation: "
|
281
|
+
expiration: "Окончание действия"
|
282
|
+
expiration_month: "Месяц окончания действия"
|
283
|
+
expiration_year: "Год окончания действия"
|
284
|
+
extension: "Расширение"
|
285
|
+
extensions: "Расширения"
|
286
|
+
filename: "Имя файла"
|
287
|
+
final_confirmation: "Окончательное подтверждение"
|
288
|
+
first_item: First Item Cost
|
255
289
|
first_name: "Имя"
|
256
|
-
|
257
|
-
|
258
|
-
|
290
|
+
flat_percent: "Фиксированный процент"
|
291
|
+
flat_rate_amount: "Сумма фиксированной ставки"
|
292
|
+
flat_rate_per_item: "Фиксированная ставка (за наименование)"
|
293
|
+
flat_rate_per_order: "Фиксированная ставка (за заказ)"
|
294
|
+
flexible_rate: "Гибкая ставка"
|
295
|
+
forgot_password: "Напомнить пароль"
|
296
|
+
full_name: "Полное имя"
|
297
|
+
gateway: "Платежный шлюз"
|
298
|
+
gateway_configuration: "Настройка платёжных шлюзов"
|
299
|
+
gateway_error: "Ошибка платежного шлюза"
|
259
300
|
gateway_setting_description: "Выберите платежный шлюз и настройте его."
|
260
|
-
general: "
|
301
|
+
general: "Основные"
|
261
302
|
general_settings: "Общие настройки"
|
262
|
-
general_settings_description: "Общие настройки
|
303
|
+
general_settings_description: "Общие настройки магазина."
|
263
304
|
google_analytics: "Google Analytics"
|
264
305
|
google_analytics_active: "Включено"
|
265
306
|
google_analytics_create: "Создать новую учетную запись Google Analytics"
|
266
|
-
google_analytics_id: "Analytics ID"
|
307
|
+
google_analytics_id: "Google Analytics ID"
|
267
308
|
google_analytics_new: "Новая учетная запись Google Analytics"
|
268
309
|
google_analytics_setting_description: "Управление Google Analytics ID"
|
269
|
-
guest_user_account:
|
270
|
-
height: Высота
|
310
|
+
guest_user_account: "Оформить покупку как гость"
|
311
|
+
height: "Высота"
|
271
312
|
hello_user: "Добро пожаловать"
|
272
|
-
history:
|
273
|
-
home: "
|
274
|
-
|
275
|
-
|
313
|
+
history: "История"
|
314
|
+
home: "Домой"
|
315
|
+
icons_by: "Иконки предоставлены"
|
316
|
+
image: "Картинка"
|
317
|
+
images: "Картинки"
|
318
|
+
images_for: "Картинки для"
|
276
319
|
in_progress: "В процессе"
|
277
320
|
invalid_search: "Неверный критерий поиска."
|
278
|
-
inventory:
|
279
|
-
inventory_adjustment: "
|
280
|
-
inventory_setting_description: "
|
281
|
-
inventory_settings: "
|
282
|
-
|
283
|
-
|
284
|
-
|
321
|
+
inventory: "Ассортимент "
|
322
|
+
inventory_adjustment: "Управление ассортиментом"
|
323
|
+
inventory_setting_description: "Управление ассортиментом, задолженные заказы, отображение отсутствующих товаров"
|
324
|
+
inventory_settings: "Настройки ассортимента"
|
325
|
+
issue_number: "Номер проблемы ??"
|
326
|
+
item: "Наименование"
|
327
|
+
item_description: "Описание товара"
|
328
|
+
item_total: "Продукция"
|
285
329
|
last_name: "Фамилия"
|
286
|
-
list: Список
|
330
|
+
list: "Список"
|
287
331
|
listing_categories: "Список категорий"
|
288
|
-
listing_option_types: "Список
|
289
|
-
listing_orders: "Список
|
332
|
+
listing_option_types: "Список опций"
|
333
|
+
listing_orders: "Список заказов"
|
290
334
|
listing_reports: "Список отчетов"
|
291
335
|
listing_tax_categories: "Список категорий налогов"
|
292
336
|
listing_users: "Список пользователей"
|
293
|
-
|
294
|
-
|
337
|
+
loading: "Загружается"
|
338
|
+
locale_changed: "Язык изменён"
|
339
|
+
log_in: "Вход для клиентов"
|
295
340
|
logged_in_as: "Пользователь"
|
296
|
-
logged_in_succesfully: "
|
297
|
-
logged_out: "
|
298
|
-
login_as_existing: "
|
299
|
-
login_failed: "
|
300
|
-
login_name: Логин
|
301
|
-
logout: Выйти
|
341
|
+
logged_in_succesfully: "Вы вошли в систему"
|
342
|
+
logged_out: "Вы вышли из системы."
|
343
|
+
login_as_existing: "Войти как покупатель"
|
344
|
+
login_failed: "Вход не выполнен."
|
345
|
+
login_name: "Логин"
|
346
|
+
logout: "Выйти"
|
347
|
+
maestro_or_solo_cards: "Кредитные карты Maestro/Solo"
|
302
348
|
mail_delivery_enabled: "Доставка почты включена"
|
303
349
|
mail_delivery_not_enabled: "Доставка почты не включена"
|
304
|
-
|
350
|
+
mail_queue_enabled: "Очередь почтовых сообщений включена."
|
351
|
+
mail_queue_not_enabled: "Очередь почтовых сообщений НЕ включена (email'ы доставляются немедленно)."
|
352
|
+
mail_server_preferences: "Настройки почтового сервера"
|
305
353
|
mail_server_settings: "Установки почтового сервера"
|
306
354
|
mark_shipped: "Отметить как доставленный"
|
307
|
-
master_price: "
|
308
|
-
|
309
|
-
|
310
|
-
|
355
|
+
master_price: "Основная цена"
|
356
|
+
max_items: Max Items
|
357
|
+
meta_description: "Описание"
|
358
|
+
meta_keywords: "Ключевые слова"
|
359
|
+
metadata: "Метаданные"
|
311
360
|
month: "Month"
|
312
361
|
my_account: "Моя учетная запись"
|
313
362
|
my_orders: "Мои заказы"
|
314
|
-
name: Название
|
315
|
-
new: Новый
|
363
|
+
name: "Название"
|
364
|
+
new: "Новый"
|
316
365
|
new_category: "Новая категория"
|
366
|
+
new_coupon: "Новый купон"
|
317
367
|
new_credit_card_payment: "Новый платеж по кредитной карте"
|
318
368
|
new_customer: "Для новых пользователей"
|
319
369
|
new_image: "Новая картинка"
|
320
|
-
new_option_type: "
|
321
|
-
new_option_value: "Новое
|
370
|
+
new_option_type: "Новая опция"
|
371
|
+
new_option_value: "Новое значение опции"
|
322
372
|
new_product: "Новый продукт"
|
323
373
|
new_property: "Новое свойство"
|
324
374
|
new_prototype: "Новый прототип"
|
325
|
-
new_shipment: "
|
375
|
+
new_shipment: "Новая доставка"
|
326
376
|
new_shipping_category: "Новая категория доставки"
|
327
377
|
new_shipping_method: "Новый способ доставки"
|
328
|
-
|
378
|
+
new_shipping_rate: "Новая ставка стоимости доставки"
|
379
|
+
new_state: "Новый субъект федерации"
|
329
380
|
new_tax_category: "Новая категория налогов"
|
330
381
|
new_tax_rate: "Новая ставка налога"
|
382
|
+
new_taxon: "Новый таксон"
|
331
383
|
new_taxonomy: "Новая таксономия"
|
332
384
|
new_user: "Новый пользователь"
|
333
385
|
new_variant: "Новый вариант"
|
334
386
|
new_zone: "Новая зона"
|
335
|
-
next:
|
387
|
+
next: "след."
|
388
|
+
no: "Нет"
|
336
389
|
no_items_in_cart: ""
|
337
390
|
no_match_found: "Совпадений не найдено"
|
338
|
-
no_user_found: "
|
339
|
-
none: Ни одного
|
391
|
+
no_user_found: "Пользователь с таким адресом email у нас не числится."
|
392
|
+
none: "Ни одного"
|
340
393
|
none_available: "Нет в наличии"
|
341
|
-
|
342
|
-
|
343
|
-
|
344
|
-
|
345
|
-
|
346
|
-
|
347
|
-
|
348
|
-
|
394
|
+
not: "не"
|
395
|
+
on_hand: "В наличии"
|
396
|
+
operation: "Операция"
|
397
|
+
option_Values: "Значения опции"
|
398
|
+
option_types: "Товарные опции"
|
399
|
+
option_values: "Возможные значения опции"
|
400
|
+
options: "Опции"
|
401
|
+
or: "или"
|
402
|
+
order: "Заказ"
|
349
403
|
order_confirmation_note: ""
|
350
404
|
order_date: "Дата заказа"
|
351
405
|
order_details: "Детали заказа"
|
352
406
|
order_email_resent: "Письмо с описанием заказа выслано повторно"
|
353
|
-
|
354
|
-
|
407
|
+
order_not_in_system: "Заказа с стаким номером у нас не существует."
|
408
|
+
order_number: "Заказ"
|
409
|
+
order_operation_authorize: "Авторизовать"
|
355
410
|
order_processed_successfully: "Ваш заказ был успешно обработан"
|
411
|
+
order_summary: "Сводка по заказу"
|
356
412
|
order_total: "Итого заказ"
|
357
413
|
order_total_message: "Полная сумма, снятая с вашей карточки, составит"
|
358
414
|
order_updated: "Заказ обновлен"
|
359
|
-
orders: Заказы
|
415
|
+
orders: "Заказы"
|
360
416
|
out_of_stock: "Нет в наличии"
|
361
|
-
overview: Обзор
|
362
|
-
|
417
|
+
overview: "Обзор"
|
418
|
+
page_only_viewable_when_logged_in: You attempted to visit a page which can only be viewed when you are logged in
|
419
|
+
page_only_viewable_when_logged_out: You attempted to visit a page which can only be viewed when you are logged out
|
420
|
+
paid: "Оплачен"
|
363
421
|
parent_category: "Родительская категория"
|
364
|
-
password: Пароль
|
365
|
-
password_reset_instructions: "
|
366
|
-
password_reset_instructions_are_mailed: "
|
367
|
-
password_reset_token_not_found: "
|
368
|
-
password_updated: "
|
369
|
-
path: Путь
|
370
|
-
pay: оплатить
|
371
|
-
payment: Платеж
|
422
|
+
password: "Пароль"
|
423
|
+
password_reset_instructions: "Инструкция по восстановлению пароля"
|
424
|
+
password_reset_instructions_are_mailed: "Инструкция по восстановлению пароля отправлена на ваш email. Пожалуйста, проверьте ваш email."
|
425
|
+
password_reset_token_not_found: "Извините, но ваша учётная запись не найдена. Если у Вас возникли вопросы, попробуйте скопировать и вставить URL, присланный по электронной почте, в ваш браузер или перезапустить процесс сброса пароля."
|
426
|
+
password_updated: "Пароль успешно обновлён"
|
427
|
+
path: "Путь"
|
428
|
+
pay: "оплатить"
|
429
|
+
payment: "Платеж"
|
372
430
|
payment_gateway: "Платежный шлюз"
|
373
431
|
payment_information: "Информация о платеже"
|
374
|
-
payments: Платежи
|
375
|
-
phone: Телефон
|
376
|
-
place_order:
|
377
|
-
please_create_user: "
|
378
|
-
|
379
|
-
|
380
|
-
|
432
|
+
payments: "Платежи"
|
433
|
+
phone: "Телефон"
|
434
|
+
place_order: "Разместить заказ"
|
435
|
+
please_create_user: "Пожалуйста, создайте учётную запись."
|
436
|
+
powered_by: "Работает на"
|
437
|
+
presentation: "Отображение"
|
438
|
+
previous: "пред."
|
439
|
+
price: "Цена"
|
381
440
|
problem_authorizing_card: "Проблема при авторизации Вашей кредитной карты"
|
382
441
|
problem_capturing_card: "Проблема при capture Вашей кредитной карты"
|
383
442
|
problems_processing_order: "При обработке Вашего заказа возникли проблемы"
|
384
|
-
proceed_as_guest: "
|
385
|
-
process: Обработать
|
386
|
-
product: Продукт
|
443
|
+
proceed_as_guest: "Нет, спасибо. Продолжить как гость."
|
444
|
+
process: "Обработать"
|
445
|
+
product: "Продукт"
|
387
446
|
product_details: "Описание продукта"
|
447
|
+
product_has_no_description: "У данного продукта нет описания."
|
388
448
|
product_properties: "Свойства продукта"
|
389
|
-
products: Продукты
|
390
|
-
|
391
|
-
|
392
|
-
|
393
|
-
|
394
|
-
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
|
449
|
+
products: "Продукты"
|
450
|
+
products_with_zero_inventory_display: "Отсутсвующие товары {{not}} будут отображаться"
|
451
|
+
properties: "Свойства"
|
452
|
+
property: "Свойство"
|
453
|
+
prototype: "Прототип"
|
454
|
+
prototypes: "Прототипы"
|
455
|
+
qty: "Кол-во"
|
456
|
+
rate: "Ставка"
|
457
|
+
register: "Зарегистрироваться как новый пользователь"
|
458
|
+
register_or_guest: "Оформить заказ как гость или зарегистрироваться"
|
459
|
+
registration: "Регистрация"
|
399
460
|
remember_me: "Запомнить меня"
|
400
|
-
remove: Убрать
|
401
|
-
reports:
|
402
|
-
|
403
|
-
|
461
|
+
remove: "Убрать"
|
462
|
+
reports: "Отчеты"
|
463
|
+
required_for_solo_and_maestro: "Обязательно для кредитных карт Solo и Maestro."
|
464
|
+
resend: "Отослать повторно"
|
465
|
+
reset_password: "Сбросить мой пароль"
|
404
466
|
response_code: "Response Code"
|
405
467
|
resume: "возобновить"
|
406
|
-
resumed: Возобновлен
|
407
|
-
return: возвратить
|
408
|
-
returned: Возвращенные
|
409
|
-
roles: Роли
|
410
|
-
|
468
|
+
resumed: "Возобновлен"
|
469
|
+
return: "возвратить"
|
470
|
+
returned: "Возвращенные"
|
471
|
+
roles: "Роли"
|
472
|
+
sales_tax: "Налог с продаж"
|
473
|
+
sales_total: "Итого"
|
411
474
|
sales_total_for_all_orders: "Продажи итого по всем заказам"
|
412
|
-
sales_totals: "
|
413
|
-
sales_totals_description: "
|
414
|
-
save_preferences: Сохранить настройки
|
415
|
-
search: Поиск
|
416
|
-
secure_connection_type: Тип защищенного соединения
|
417
|
-
select: Выбрать
|
475
|
+
sales_totals: "Итоги продаж"
|
476
|
+
sales_totals_description: "итоги продаж для всех заказов."
|
477
|
+
save_preferences: "Сохранить настройки"
|
478
|
+
search: "Поиск"
|
479
|
+
secure_connection_type: "Тип защищенного соединения"
|
480
|
+
select: "Выбрать"
|
418
481
|
select_from_prototype: "Выбрать из прототипов"
|
419
482
|
select_preferred_shipping_option: "Выберите предпочитаемый способ доставки"
|
420
|
-
send_copy_of_all_mails_to: Отсылать копии всех писем на
|
421
|
-
send_copy_of_orders_mails_to: Отсылать копии всех писем с заказами на
|
422
|
-
send_mails_as: Отсылать почту как
|
423
|
-
send_order_mails_as: Отсылать почту с заказами как
|
424
|
-
|
425
|
-
|
426
|
-
|
483
|
+
send_copy_of_all_mails_to: "Отсылать копии всех писем на"
|
484
|
+
send_copy_of_orders_mails_to: "Отсылать копии всех писем с заказами на"
|
485
|
+
send_mails_as: "Отсылать почту как"
|
486
|
+
send_order_mails_as: "Отсылать почту с заказами как"
|
487
|
+
server_error: "На сервере произошла ошибка"
|
488
|
+
settings: "Настройки"
|
489
|
+
ship: "доставка"
|
490
|
+
ship_address: "Адрес доставки"
|
491
|
+
shipment: "Доставка"
|
427
492
|
shipment_number: "Доставка #"
|
428
|
-
shipped: Доставлено
|
429
|
-
shipping: Доставка
|
493
|
+
shipped: "Доставлено"
|
494
|
+
shipping: "Доставка"
|
430
495
|
shipping_address: "Адрес доставки"
|
431
|
-
shipping_calculator: Калькулятор
|
432
496
|
shipping_categories: "Категории доставки"
|
433
497
|
shipping_categories_description: "Настройка категорий доставки - укажите, какие продукты могут быть доставлены какими способами"
|
434
|
-
|
498
|
+
shipping_category: "Категория доставки"
|
499
|
+
shipping_cost: "Стоимость"
|
435
500
|
shipping_error: "Ошибка при доставке"
|
436
|
-
|
501
|
+
shipping_instructions: "Иструкции по доставке"
|
502
|
+
shipping_method: "Способ"
|
437
503
|
shipping_methods: "Способы доставки"
|
438
504
|
shipping_methods_description: "Управление методами доставки"
|
439
|
-
|
440
|
-
|
505
|
+
shipping_rates: "Ставки стоимости доставки"
|
506
|
+
shipping_rates_description: "Управление ставками стоимости доставки"
|
507
|
+
shipping_total: "Доставка"
|
508
|
+
shop_by_taxonomy: "{{taxonomy}}"
|
441
509
|
shopping_cart: "Корзина"
|
442
510
|
show_deleted: "Показать удаленные"
|
443
511
|
show_incomplete_orders: "Показать необработанные заказы"
|
444
|
-
show_only_complete_orders: "
|
512
|
+
show_only_complete_orders: "Показывать только обработанные заказы"
|
445
513
|
show_out_of_stock_products: "Показать продукты, которых нет в наличии"
|
514
|
+
show_price_inc_vat: "Показывать цену с налогом"
|
446
515
|
sign_up: "Регистрация"
|
447
|
-
site_name: "
|
448
|
-
site_url: "
|
449
|
-
sku:
|
450
|
-
smtp: SMTP
|
451
|
-
smtp_authentication_type: "Тип SMTP
|
452
|
-
smtp_domain: SMTP
|
453
|
-
smtp_mail_host:
|
454
|
-
smtp_password:
|
455
|
-
smtp_port:
|
456
|
-
|
516
|
+
site_name: "Название магазина"
|
517
|
+
site_url: "Адрес магазина URL"
|
518
|
+
sku: "Артикул"
|
519
|
+
smtp: "SMTP"
|
520
|
+
smtp_authentication_type: "Тип SMTP аутентификации"
|
521
|
+
smtp_domain: "Домен SMTP "
|
522
|
+
smtp_mail_host: "Адрес сервера SMTP"
|
523
|
+
smtp_password: "Пароль"
|
524
|
+
smtp_port: "Порт"
|
525
|
+
smtp_send_all_emails_as_from_following_address: "Отправлять все сообщения от этого адреса."
|
526
|
+
smtp_send_copy_of_orders_to_this_addresses: "Отправлять копии всех заказов на этот адрес. Для использования нескольких адресов разделите их запятой."
|
527
|
+
smtp_send_copy_to_this_addresses: "Отправлять копии всех сообщений на этот адрес. Для использования нескольких адресов разделите их запятой."
|
528
|
+
smtp_send_order_mails_as_from_following_address: "Отправлять уведомления о заказах от этого адреса."
|
529
|
+
smtp_username: "Пользователь"
|
457
530
|
spree:
|
458
|
-
date: Дата
|
459
|
-
time: Время
|
460
|
-
|
461
|
-
|
531
|
+
date: "Дата"
|
532
|
+
time: "Время"
|
533
|
+
ssl_will_be_used_in_development_and_test_modes: "SSL шифрование будет включено в режимах development и test."
|
534
|
+
ssl_will_be_used_in_production_mode: "SSL шифрование будет включено в режиме production."
|
535
|
+
ssl_will_not_be_used_in_development_and_test_modes: "SSL шифрование НЕ будет включено в режимах development и test."
|
536
|
+
ssl_will_not_be_used_in_production_mode: "SSL шифрование НЕ будет включено в режиме production."
|
537
|
+
start: "Начало"
|
538
|
+
start_date: "Действительно с"
|
539
|
+
state: "Субъект федерации"
|
462
540
|
state_based: "есть области"
|
463
|
-
state_setting_description: "
|
464
|
-
states:
|
465
|
-
status: Статус
|
466
|
-
stop:
|
467
|
-
store: Сохранить
|
541
|
+
state_setting_description: "Список областей и городов, входящих в страны."
|
542
|
+
states: "Субъекты федерации"
|
543
|
+
status: "Статус"
|
544
|
+
stop: "Конец"
|
545
|
+
store: "Сохранить"
|
468
546
|
street_address: "Адрес"
|
469
547
|
street_address_2: "Адрес (строка 2)"
|
470
|
-
subtotal: Подитог
|
471
|
-
subtract:
|
472
|
-
system: Система
|
473
|
-
tax: Налог
|
548
|
+
subtotal: "Подитог"
|
549
|
+
subtract: "Вычет"
|
550
|
+
system: "Система"
|
551
|
+
tax: "Налог"
|
474
552
|
tax_categories: "Категории налогов"
|
475
|
-
tax_categories_setting_description: "
|
553
|
+
tax_categories_setting_description: "Установка категорий налогов для различных товаров."
|
476
554
|
tax_category: "Категория налогов"
|
477
|
-
|
555
|
+
tax_rates: "Налоговые ставки"
|
556
|
+
tax_rates_description: "Управление налоговыми ставками"
|
557
|
+
tax_settings: "Настройки налогообложения"
|
558
|
+
tax_settings_description: "Управление настройками налогообложения"
|
559
|
+
tax_total: "Налоги"
|
478
560
|
tax_type: "Тип налога"
|
479
|
-
taxon: Таксон
|
480
|
-
taxonomies:
|
481
|
-
taxonomies_setting_description: "
|
482
|
-
|
483
|
-
|
561
|
+
taxon: "Таксон"
|
562
|
+
taxonomies: "Таксономии"
|
563
|
+
taxonomies_setting_description: "Создание и редактирование таксономий"
|
564
|
+
taxonomy_edit: "Редактирование таксономии"
|
565
|
+
taxonomy_tree_error: "Запрашиваемое изменение не было осуществленно и дерево возвращено в предыдущее состояние. Пожалуйста, попытайтесь снова."
|
566
|
+
taxonomy_tree_instruction: "* Щёлкните правой кнопкой мыши на элеменете дерева для добавления, удаления или сортировки таксонов."
|
567
|
+
taxons: "Таксоны"
|
568
|
+
thank_you_for_your_order: "Спасибо за покупку!"
|
484
569
|
this_file_language: "Русский (RU)"
|
485
|
-
|
486
|
-
|
487
|
-
|
488
|
-
|
489
|
-
|
570
|
+
thumbnail: "Миниатюра"
|
571
|
+
to_add_variants_you_must_first_define: "Перед добавлением вариантов, вы должны определить"
|
572
|
+
total: "Итого"
|
573
|
+
tracking: "Отслеживание"
|
574
|
+
transaction: "Транзакция"
|
575
|
+
tree: "Дерево"
|
490
576
|
try_again: "Попробуйте еще раз"
|
491
|
-
type: Тип
|
492
|
-
unable_ship_method: "
|
493
|
-
unable_to_authorize_credit_card: "
|
577
|
+
type: "Тип"
|
578
|
+
unable_ship_method: "Не удалось создать методы доставки из-за ошибки на сервере."
|
579
|
+
unable_to_authorize_credit_card: "Не удалось авторизировать кредитную карту"
|
494
580
|
unable_to_capture_credit_card: "Unable to Capture Credit Card"
|
495
|
-
unable_to_save_order: "
|
496
|
-
|
497
|
-
|
498
|
-
|
499
|
-
|
500
|
-
|
581
|
+
unable_to_save_order: "Не удалось сохранить заказ"
|
582
|
+
unrecognized_card_type: "Неизвестный тип карты"
|
583
|
+
update: "Изменить"
|
584
|
+
update_password: "Обновить мой пароль и войти"
|
585
|
+
updated_successfully: "Запись успешна изменена"
|
586
|
+
updating: "Обновление"
|
587
|
+
usage_limit: "Максимальное количество использований"
|
588
|
+
use_as_shipping_address: "Использовать как адрес доставки"
|
589
|
+
use_billing_address: "Использовать адрес для фактурации"
|
501
590
|
use_different_shipping_address: "использовать другой адрес доставки"
|
502
|
-
user: Пользователь
|
503
|
-
user_account:
|
591
|
+
user: "Пользователь"
|
592
|
+
user_account: "Учетная запись пользователя"
|
504
593
|
user_details: "Дополнительно"
|
505
|
-
users: Пользователи
|
506
|
-
value: Значение
|
507
|
-
variants: Варианты
|
508
|
-
|
509
|
-
|
510
|
-
|
594
|
+
users: "Пользователи"
|
595
|
+
value: "Значение"
|
596
|
+
variants: "Варианты"
|
597
|
+
vat: "НДС"
|
598
|
+
version: "Версия"
|
599
|
+
website: "Сайт"
|
600
|
+
weight: "Вес"
|
511
601
|
welcome_to_sample_store: "Добро пожаловать в тестовый магазин"
|
512
602
|
what_is_a_cvv: "Что означает CVV ?"
|
513
603
|
what_is_this: "Что это ?"
|
514
604
|
whats_this: "Что это"
|
515
|
-
width: Ширина
|
516
|
-
year: "
|
517
|
-
|
605
|
+
width: "Ширина"
|
606
|
+
year: "Год"
|
607
|
+
yes: "Yes"
|
608
|
+
you_have_been_logged_out: "Вы вышли из системы. До свидания!"
|
518
609
|
your_cart_is_empty: "Ваша корзина пуста"
|
519
|
-
zip: Индекс
|
520
|
-
zone: Зона
|
610
|
+
zip: "Индекс"
|
611
|
+
zone: "Зона"
|
521
612
|
zone_based: "состоит из других зон"
|
522
|
-
zone_setting_description: "
|
523
|
-
zones: Зоны
|
613
|
+
zone_setting_description: "Список стран, областей и других георгафических зон."
|
614
|
+
zones: "Зоны"
|