spree_core 1.2.0 → 1.2.2
Sign up to get free protection for your applications and to get access to all the features.
- data/app/assets/javascripts/admin/admin.js.erb +10 -9
- data/app/assets/javascripts/admin/checkouts/edit.js +4 -4
- data/app/assets/javascripts/admin/product_autocomplete.js.erb +5 -5
- data/app/assets/javascripts/admin/taxon_autocomplete.js.erb +34 -0
- data/app/assets/javascripts/admin/taxonomy.js +11 -11
- data/app/assets/javascripts/store/cart.js.coffee +5 -2
- data/app/assets/javascripts/store/checkout.js.coffee +8 -4
- data/app/assets/stylesheets/admin/admin-form.css.erb +4 -0
- data/app/assets/stylesheets/store/screen.css.scss +1 -1
- data/app/controllers/spree/admin/banners_controller.rb +2 -2
- data/app/controllers/spree/admin/mail_methods_controller.rb +7 -0
- data/app/controllers/spree/admin/orders_controller.rb +3 -1
- data/app/controllers/spree/admin/payment_methods_controller.rb +7 -1
- data/app/controllers/spree/admin/products_controller.rb +11 -6
- data/app/controllers/spree/admin/prototypes_controller.rb +1 -1
- data/app/controllers/spree/admin/search_controller.rb +11 -31
- data/app/controllers/spree/admin/taxons_controller.rb +8 -0
- data/app/controllers/spree/checkout_controller.rb +7 -1
- data/app/controllers/spree/home_controller.rb +1 -0
- data/app/controllers/spree/orders_controller.rb +18 -5
- data/app/controllers/spree/products_controller.rb +1 -0
- data/app/controllers/spree/taxons_controller.rb +1 -0
- data/app/helpers/spree/admin/general_settings_helper.rb +1 -1
- data/app/helpers/spree/base_helper.rb +1 -1
- data/app/models/spree/ability.rb +5 -0
- data/app/models/spree/app_configuration.rb +1 -0
- data/app/models/spree/calculator/price_sack.rb +5 -3
- data/app/models/spree/credit_card.rb +2 -2
- data/app/models/spree/image.rb +2 -1
- data/app/models/spree/inventory_unit.rb +11 -3
- data/app/models/spree/line_item.rb +3 -2
- data/app/models/spree/order.rb +52 -9
- data/app/models/spree/order/checkout.rb +5 -8
- data/app/models/spree/payment.rb +1 -1
- data/app/models/spree/payment/processing.rb +21 -16
- data/app/models/spree/payment_method.rb +1 -1
- data/app/models/spree/preference.rb +1 -1
- data/app/models/spree/preferences/preferable_class_methods.rb +2 -0
- data/app/models/spree/preferences/store.rb +20 -2
- data/app/models/spree/product.rb +16 -0
- data/app/models/spree/product/scopes.rb +19 -8
- data/app/models/spree/return_authorization.rb +1 -0
- data/app/models/spree/shipment.rb +6 -4
- data/app/models/spree/shipping_method.rb +5 -6
- data/app/models/spree/tax_rate.rb +4 -2
- data/app/models/spree/taxon.rb +7 -0
- data/app/models/spree/variant.rb +26 -15
- data/app/views/spree/admin/banners/_gateway.html.erb +14 -0
- data/app/views/spree/admin/general_settings/edit.html.erb +13 -4
- data/app/views/spree/admin/orders/_form.html.erb +1 -1
- data/app/views/spree/admin/orders/customer_details/_form.html.erb +1 -1
- data/app/views/spree/admin/product_properties/index.html.erb +1 -1
- data/app/views/spree/admin/products/_form.html.erb +7 -8
- data/app/views/spree/admin/products/new.html.erb +1 -1
- data/app/views/spree/admin/return_authorizations/_form.html.erb +17 -33
- data/app/views/spree/admin/search/users.rabl +32 -0
- data/app/views/spree/admin/shared/_head.html.erb +3 -13
- data/app/views/spree/admin/shared/_routes.html.erb +8 -0
- data/app/views/spree/admin/shared/_translations.html.erb +26 -0
- data/app/views/spree/admin/tax_rates/_form.html.erb +8 -0
- data/app/views/spree/admin/tax_rates/index.html.erb +5 -1
- data/app/views/spree/admin/taxonomies/edit.erb +2 -2
- data/app/views/spree/admin/taxonomies/get_children.json.erb +1 -1
- data/app/views/spree/admin/taxons/search.rabl +5 -0
- data/app/views/spree/checkout/_confirm.html.erb +1 -0
- data/app/views/spree/checkout/payment/_gateway.html.erb +1 -1
- data/app/views/spree/orders/_adjustments.html.erb +1 -1
- data/app/views/spree/orders/edit.html.erb +3 -1
- data/app/views/spree/products/_cart_form.html.erb +3 -3
- data/app/views/spree/products/_thumbnails.html.erb +1 -1
- data/app/views/spree/shared/_head.html.erb +0 -2
- data/app/views/spree/shared/_order_details.html.erb +2 -2
- data/app/views/spree/shared/_products.html.erb +1 -1
- data/app/views/spree/shared/_taxonomies.html.erb +1 -1
- data/app/views/spree/shipment_mailer/shipped_email.text.erb +1 -1
- data/config/initializers/check_for_orphaned_preferences.rb +1 -1
- data/config/initializers/rails_5868.rb +8 -0
- data/config/locales/en.yml +4 -0
- data/config/routes.rb +13 -0
- data/db/default/spree/countries.yml +6 -0
- data/db/migrate/20120905145253_add_tax_rate_label.rb +5 -0
- data/db/migrate/20120905151823_add_toggle_tax_rate_display.rb +5 -0
- data/db/migrate/20121009142519_add_lock_version_to_variant.rb +5 -0
- data/db/migrate/20121017010007_remove_not_null_constraint_from_products_on_hand.rb +11 -0
- data/lib/generators/spree/custom_user/custom_user_generator.rb +4 -1
- data/lib/spree/core.rb +3 -2
- data/lib/spree/core/mail_settings.rb +2 -1
- data/lib/spree/core/permalinks.rb +1 -2
- data/lib/spree/core/search/base.rb +1 -0
- data/lib/spree/core/testing_support/authorization_helpers.rb +30 -0
- data/lib/spree/core/testing_support/factories/product_factory.rb +1 -1
- data/lib/spree/core/testing_support/flash.rb +17 -0
- data/lib/spree/core/testing_support/preferences.rb +26 -0
- data/lib/spree/core/version.rb +1 -1
- data/lib/spree/money.rb +4 -1
- metadata +69 -46
- data/config/initializers/workarounds_for_ruby19.rb +0 -72
- data/lib/spree/core/testing_support/env.rb +0 -2
@@ -1,72 +0,0 @@
|
|
1
|
-
# encoding: utf-8
|
2
|
-
if RUBY_VERSION.to_f >= 1.9
|
3
|
-
|
4
|
-
class String
|
5
|
-
def mb_chars
|
6
|
-
self.force_encoding(Encoding::UTF_8)
|
7
|
-
end
|
8
|
-
|
9
|
-
alias_method(:orig_concat, :concat)
|
10
|
-
def concat(value)
|
11
|
-
orig_concat value.frozen? || !value.respond_to?(:force_encoding) ? value : value.force_encoding(Encoding::UTF_8)
|
12
|
-
end
|
13
|
-
end
|
14
|
-
|
15
|
-
module ActionView
|
16
|
-
module Renderable #:nodoc:
|
17
|
-
private
|
18
|
-
def compile!(render_symbol, local_assigns)
|
19
|
-
locals_code = local_assigns.keys.map { |key| "#{key} = local_assigns[:#{key}];" }.join
|
20
|
-
|
21
|
-
source = <<-end_src
|
22
|
-
def #{render_symbol}(local_assigns)
|
23
|
-
old_output_buffer = output_buffer;#{locals_code};#{compiled_source}
|
24
|
-
ensure
|
25
|
-
self.output_buffer = old_output_buffer
|
26
|
-
end
|
27
|
-
end_src
|
28
|
-
source.force_encoding(Encoding::UTF_8) if source.respond_to?(:force_encoding)
|
29
|
-
|
30
|
-
begin
|
31
|
-
ActionView::Base::CompiledTemplates.module_eval(source, filename, 0)
|
32
|
-
rescue Errno::ENOENT => e
|
33
|
-
raise e # Missing template file, re-raise for Base to rescue
|
34
|
-
rescue Exception => e # errors from template code
|
35
|
-
if logger = defined?(ActionController) && Base.logger
|
36
|
-
logger.debug "ERROR: compiling #{render_symbol} RAISED #{e}"
|
37
|
-
logger.debug "Function body: #{source}"
|
38
|
-
logger.debug "Backtrace: #{e.backtrace.join("\n")}"
|
39
|
-
end
|
40
|
-
|
41
|
-
raise ActionView::TemplateError.new(self, {}, e)
|
42
|
-
end
|
43
|
-
end
|
44
|
-
end
|
45
|
-
end
|
46
|
-
|
47
|
-
if defined?(Mysql::Result)
|
48
|
-
class Mysql::Result
|
49
|
-
def encode(value, encoding = "utf-8")
|
50
|
-
String === value ? value.force_encoding(encoding) : value
|
51
|
-
end
|
52
|
-
|
53
|
-
def each_utf8(&block)
|
54
|
-
each_orig do |row|
|
55
|
-
yield row.map {|col| encode(col) }
|
56
|
-
end
|
57
|
-
end
|
58
|
-
alias each_orig each
|
59
|
-
alias each each_utf8
|
60
|
-
|
61
|
-
def each_hash_utf8(&block)
|
62
|
-
each_hash_orig do |row|
|
63
|
-
row.each {|k, v| row[k] = encode(v) }
|
64
|
-
yield(row)
|
65
|
-
end
|
66
|
-
end
|
67
|
-
alias each_hash_orig each_hash
|
68
|
-
alias each_hash each_hash_utf8
|
69
|
-
end
|
70
|
-
end
|
71
|
-
|
72
|
-
end
|