spree_core 1.1.0.rc1 → 1.1.0.rc2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/app/assets/javascripts/admin/shipping_methods.js +3 -2
- data/app/assets/javascripts/admin/spree_core.js +0 -2
- data/app/assets/javascripts/store/spree_core.js +0 -2
- data/app/controllers/spree/admin/option_types_controller.rb +6 -8
- data/app/controllers/spree/admin/payments_controller.rb +1 -2
- data/app/controllers/spree/admin/products_controller.rb +13 -4
- data/app/controllers/spree/products_controller.rb +1 -1
- data/app/controllers/spree/states_controller.rb +1 -1
- data/app/helpers/spree/base_helper.rb +9 -7
- data/app/helpers/spree/products_helper.rb +0 -6
- data/app/mailers/spree/order_mailer.rb +4 -4
- data/app/mailers/spree/shipment_mailer.rb +2 -2
- data/app/models/spree/address.rb +25 -15
- data/app/models/spree/calculator/per_item.rb +4 -1
- data/app/models/spree/calculator.rb +1 -1
- data/app/models/spree/creditcard.rb +8 -184
- data/app/models/spree/gateway/bogus.rb +1 -1
- data/app/models/spree/gateway.rb +3 -1
- data/app/models/spree/inventory_unit.rb +3 -3
- data/app/models/spree/line_item.rb +14 -14
- data/app/models/spree/mail_method.rb +6 -1
- data/app/models/spree/payment/processing.rb +179 -0
- data/app/models/spree/payment.rb +3 -22
- data/app/models/spree/payment_method.rb +2 -2
- data/app/models/spree/product.rb +11 -10
- data/app/models/spree/product_property.rb +2 -0
- data/app/models/spree/return_authorization.rb +9 -7
- data/app/models/spree/shipment.rb +7 -6
- data/app/models/spree/shipping_method.rb +6 -5
- data/app/models/spree/shipping_rate.rb +2 -2
- data/app/models/spree/state.rb +1 -1
- data/app/models/spree/tax_category.rb +2 -2
- data/app/models/spree/tax_rate.rb +7 -7
- data/app/models/spree/taxon.rb +4 -4
- data/app/models/spree/taxonomy.rb +3 -3
- data/app/models/spree/variant.rb +19 -8
- data/app/models/spree/zone.rb +10 -10
- data/app/views/spree/admin/products/index.html.erb +1 -1
- data/app/views/spree/admin/shared/_additional_field.html.erb +1 -1
- data/app/views/spree/admin/shared/_head.html.erb +0 -1
- data/app/views/spree/admin/tax_rates/_form.html.erb +5 -5
- data/app/views/spree/admin/variants/index.html.erb +1 -1
- data/app/views/spree/layouts/spree_application.html.erb +1 -1
- data/app/views/spree/products/_cart_form.html.erb +1 -1
- data/app/views/spree/shared/_head.html.erb +1 -1
- data/config/locales/en.yml +2 -2
- data/db/migrate/20120315064358_migrate_images_from_products_to_variants.rb +1 -1
- data/db/migrate/20120416233427_rename_attachment_size_to_attachment_file_size.rb +5 -0
- data/lib/generators/spree/install/templates/app/assets/javascripts/admin/all.js +2 -0
- data/lib/generators/spree/install/templates/app/assets/javascripts/store/all.js +2 -0
- data/lib/spree/core/controller_helpers.rb +0 -1
- data/lib/spree/core/engine.rb +5 -1
- data/lib/spree/core/search/base.rb +1 -1
- data/lib/spree/core/testing_support/controller_requests.rb +60 -0
- data/lib/spree/core/testing_support/factories.rb +1 -2
- data/lib/spree/core/version.rb +1 -1
- metadata +35 -33
- data/app/helpers/spree/hook_helper.rb +0 -11
data/app/models/spree/variant.rb
CHANGED
@@ -1,7 +1,9 @@
|
|
1
1
|
module Spree
|
2
2
|
class Variant < ActiveRecord::Base
|
3
3
|
belongs_to :product
|
4
|
-
delegate_belongs_to :product, :name, :description, :permalink, :available_on,
|
4
|
+
delegate_belongs_to :product, :name, :description, :permalink, :available_on,
|
5
|
+
:tax_category_id, :shipping_category_id, :meta_description,
|
6
|
+
:meta_keywords, :tax_category
|
5
7
|
|
6
8
|
attr_accessible :name, :presentation, :cost_price,
|
7
9
|
:position, :on_hand, :option_value_ids,
|
@@ -32,7 +34,7 @@ module Spree
|
|
32
34
|
|
33
35
|
# Returns number of inventory units for this variant (new records haven't been saved to database, yet)
|
34
36
|
def on_hand
|
35
|
-
Spree::Config[:track_inventory_levels] ?
|
37
|
+
Spree::Config[:track_inventory_levels] ? count_on_hand : (1.0 / 0) # Infinity
|
36
38
|
end
|
37
39
|
|
38
40
|
# Adjusts the inventory units to match the given new level.
|
@@ -44,7 +46,7 @@ module Spree
|
|
44
46
|
if new_level > on_hand
|
45
47
|
# fill backordered orders before creating new units
|
46
48
|
backordered_units = inventory_units.with_state('backordered')
|
47
|
-
backordered_units.slice(0, new_level).each
|
49
|
+
backordered_units.slice(0, new_level).each(&:fill_backorder)
|
48
50
|
new_level -= backordered_units.length
|
49
51
|
end
|
50
52
|
|
@@ -57,7 +59,7 @@ module Spree
|
|
57
59
|
# strips all non-price-like characters from the price.
|
58
60
|
def price=(price)
|
59
61
|
if price.present?
|
60
|
-
self[:price] = price.to_s.gsub(/[^0-9\.-]/,'').to_f
|
62
|
+
self[:price] = price.to_s.gsub(/[^0-9\.-]/, '').to_f
|
61
63
|
end
|
62
64
|
end
|
63
65
|
|
@@ -74,24 +76,33 @@ module Spree
|
|
74
76
|
alias in_stock in_stock?
|
75
77
|
|
76
78
|
def self.additional_fields
|
79
|
+
ActiveSupport::Deprecation.warn("[SPREE] Spree::Variant.additional_fields will be deprecated in Spree 1.2. Please use Deface and decorators as an alternative to this functionality now.")
|
77
80
|
@fields
|
78
81
|
end
|
79
82
|
|
80
83
|
def self.additional_fields=(new_fields)
|
84
|
+
ActiveSupport::Deprecation.warn("[SPREE] Spree::Variant.additional_fields= will be deprecated in Spree 1.2. Please use Deface and decorators as an alternative to this functionality now.")
|
85
|
+
attr_accessible *new_fields
|
81
86
|
@fields = new_fields
|
82
87
|
end
|
83
88
|
|
84
89
|
# returns true if this variant is allowed to be placed on a new order
|
85
90
|
def available?
|
86
|
-
Spree::Config[:track_inventory_levels] ? (Spree::Config[:allow_backorders] ||
|
91
|
+
Spree::Config[:track_inventory_levels] ? (Spree::Config[:allow_backorders] || in_stock?) : true
|
87
92
|
end
|
88
93
|
|
89
94
|
def options_text
|
90
|
-
self.option_values.
|
95
|
+
values = self.option_values.sort_by(&:position)
|
96
|
+
|
97
|
+
values.map! do |ov|
|
98
|
+
"#{ov.option_type.presentation}: #{ov.presentation}"
|
99
|
+
end
|
100
|
+
|
101
|
+
values.to_sentence({ :words_connector => ", ", :two_words_connector => ", " })
|
91
102
|
end
|
92
103
|
|
93
104
|
def gross_profit
|
94
|
-
|
105
|
+
cost_price.nil? ? 0 : (price - cost_price)
|
95
106
|
end
|
96
107
|
|
97
108
|
# use deleted? rather than checking the attribute directly. this
|
@@ -104,7 +115,7 @@ module Spree
|
|
104
115
|
private
|
105
116
|
# Ensures a new variant takes the product master price when price is not supplied
|
106
117
|
def check_price
|
107
|
-
if
|
118
|
+
if price.nil?
|
108
119
|
raise 'Must supply price for variant or master.price for product.' if self == product.master
|
109
120
|
self.price = product.master.price
|
110
121
|
end
|
data/app/models/spree/zone.rb
CHANGED
@@ -14,7 +14,7 @@ module Spree
|
|
14
14
|
attr_accessible :name, :description, :default_tax, :kind, :zone_members, :zone_members_attributes
|
15
15
|
|
16
16
|
def kind
|
17
|
-
member =
|
17
|
+
member = members.last
|
18
18
|
|
19
19
|
case member && member.zoneable_type
|
20
20
|
when 'Spree::State' then 'state'
|
@@ -46,7 +46,7 @@ module Spree
|
|
46
46
|
# Returns the matching zone with the highest priority zone type (State, Country, Zone.)
|
47
47
|
# Returns nil in the case of no matches.
|
48
48
|
def self.match(address)
|
49
|
-
return unless matches = self.order(
|
49
|
+
return unless matches = self.order('created_at').select { |zone| zone.include? address }
|
50
50
|
|
51
51
|
['state', 'country'].each do |zone_kind|
|
52
52
|
if match = matches.detect { |zone| zone_kind == zone.kind }
|
@@ -87,16 +87,16 @@ module Spree
|
|
87
87
|
# Indicates whether the specified zone falls entirely within the zone performing
|
88
88
|
# the check.
|
89
89
|
def contains?(target)
|
90
|
-
return false if
|
91
|
-
return false if
|
90
|
+
return false if kind == 'state' && target.kind == 'country'
|
91
|
+
return false if zone_members.empty? || target.zone_members.empty?
|
92
92
|
|
93
|
-
if
|
93
|
+
if kind == target.kind
|
94
94
|
target.zoneables.each do |target_zoneable|
|
95
|
-
return false unless
|
95
|
+
return false unless zoneables.include?(target_zoneable)
|
96
96
|
end
|
97
97
|
else
|
98
98
|
target.zoneables.each do |target_state|
|
99
|
-
return false unless
|
99
|
+
return false unless zoneables.include?(target_state.country)
|
100
100
|
end
|
101
101
|
end
|
102
102
|
true
|
@@ -105,15 +105,15 @@ module Spree
|
|
105
105
|
private
|
106
106
|
def remove_defunct_members
|
107
107
|
zone_members.each do |zone_member|
|
108
|
-
zone_member.destroy if zone_member.zoneable_id.nil? || zone_member.zoneable_type != "Spree::#{
|
108
|
+
zone_member.destroy if zone_member.zoneable_id.nil? || zone_member.zoneable_type != "Spree::#{kind.capitalize}"
|
109
109
|
end
|
110
110
|
end
|
111
111
|
|
112
112
|
def remove_previous_default
|
113
|
-
return unless
|
113
|
+
return unless default_tax
|
114
114
|
|
115
115
|
Zone.all.each do |zone|
|
116
|
-
zone.update_attribute
|
116
|
+
zone.update_attribute 'default_tax', false unless zone == self
|
117
117
|
end
|
118
118
|
end
|
119
119
|
end
|
@@ -17,7 +17,7 @@
|
|
17
17
|
<tr data-hook="admin_products_index_headers">
|
18
18
|
<th><%= t(:sku) %></th>
|
19
19
|
<th><%= sort_link @search,:name, t(:name), { :default_order => "desc" }, {:title => 'admin_products_listing_name_title'} %></th>
|
20
|
-
<th><%= sort_link @search,:master_price, t(:master_price) %></th>
|
20
|
+
<th><%= sort_link @search,:master_price, t(:master_price), {}, {:title => 'admin_products_listing_price_title'} %></th>
|
21
21
|
<th data-hook="admin_products_index_header_actions"></th>
|
22
22
|
</tr>
|
23
23
|
<% @collection.each do |product| %>
|
@@ -1,5 +1,5 @@
|
|
1
1
|
<p>
|
2
|
-
<%= label controller.controller_name.singularize, field[:name], t('activerecord.attributes.variant.' + field[:name].downcase, :default => field[:name].titleize) %><br />
|
2
|
+
<%= label controller.controller_name.singularize, field[:name], t('activerecord.attributes.spree/variant.' + field[:name].downcase, :default => field[:name].titleize) %><br />
|
3
3
|
<%= additional_field_for(controller, field) %>
|
4
4
|
<%= error_message_on controller.controller_name.singularize, attribute_name_for(field[:name]) %>
|
5
5
|
</p>
|
@@ -2,7 +2,6 @@
|
|
2
2
|
<%= csrf_meta_tags %>
|
3
3
|
<title><%= "Spree #{t('administration')}: " %>
|
4
4
|
<%= t(controller.controller_name, :default => controller.controller_name.titleize) %></title>
|
5
|
-
|
6
5
|
<%= javascript_tag do %>
|
7
6
|
ajax_urls = <%== {
|
8
7
|
:product_search_json => spree.admin_products_url(:format => 'json'),
|
@@ -1,18 +1,18 @@
|
|
1
1
|
<table data-hook="tax_rates">
|
2
2
|
<tr data-hook="zone">
|
3
|
-
<td><%= t(:zone)
|
3
|
+
<td><%= f.label :zone, t(:zone) %></td>
|
4
4
|
<td><%= f.collection_select(:zone_id, @available_zones, :id, :name) %></td>
|
5
5
|
</tr>
|
6
6
|
<tr data-hook="category">
|
7
|
-
<td><%= t(:tax_category)
|
7
|
+
<td><%= f.label :tax_category_id, t(:tax_category) %></td>
|
8
8
|
<td><%= f.collection_select(:tax_category_id, @available_categories,:id, :name) %></td>
|
9
9
|
</tr>
|
10
10
|
<tr data-hook="included">
|
11
|
-
<td><%= t(:included_in_price) %></td>
|
11
|
+
<td><%= f.label :included_in_price, t(:included_in_price) %></td>
|
12
12
|
<td><%= f.check_box :included_in_price %></td>
|
13
13
|
</tr>
|
14
|
-
<tr="rate">
|
15
|
-
<td><%= t(:rate)
|
14
|
+
<tr data-hook="rate">
|
15
|
+
<td><%= f.label :amount, t(:rate) %></td>
|
16
16
|
<td><%= f.text_field :amount %></td>
|
17
17
|
</tr>
|
18
18
|
</table>
|
@@ -8,7 +8,7 @@
|
|
8
8
|
<th><%= t(:price) %></th>
|
9
9
|
<th><%= t(:sku) %></th>
|
10
10
|
<% Spree::Variant.additional_fields.select { |f| f[:only].nil? || f[:only].include?(:variant) }.each do |field| %>
|
11
|
-
<th><%= t('activerecord.attributes.variant.' + field[:name].downcase, :default => field[:name].titleize) %></th>
|
11
|
+
<th><%= t('activerecord.attributes.spree/variant.' + field[:name].downcase, :default => field[:name].titleize) %></th>
|
12
12
|
<% end %>
|
13
13
|
<th><%= t(:on_hand) %></th>
|
14
14
|
<th><%= t(:action) %></th>
|
@@ -38,7 +38,7 @@
|
|
38
38
|
<% if @product.has_stock? || Spree::Config[:allow_backorders] %>
|
39
39
|
<%= number_field_tag (@product.has_variants? ? :quantity : "variants[#{@product.master.id}]"),
|
40
40
|
1, :class => 'title', :in => 1..@product.on_hand %>
|
41
|
-
<%= button_tag :class => 'large primary', :id => 'add-to-cart-button' do %>
|
41
|
+
<%= button_tag :class => 'large primary', :id => 'add-to-cart-button', :type => :submit do %>
|
42
42
|
<%= t(:add_to_cart) %>
|
43
43
|
<% end %>
|
44
44
|
<% else %>
|
data/config/locales/en.yml
CHANGED
@@ -24,9 +24,9 @@ en:
|
|
24
24
|
city: City
|
25
25
|
country: "Country"
|
26
26
|
firstname: "First Name"
|
27
|
-
|
27
|
+
first_name_start: "First Name Begins With"
|
28
28
|
lastname: "Last Name"
|
29
|
-
|
29
|
+
last_name_start: "Last Name Begins With"
|
30
30
|
phone: Phone
|
31
31
|
state: "State"
|
32
32
|
zipcode: "Zip Code"
|
@@ -18,7 +18,7 @@ class MigrateImagesFromProductsToVariants < ActiveRecord::Migration
|
|
18
18
|
images = select_all("SELECT spree_assets.* FROM spree_assets
|
19
19
|
JOIN spree_variants
|
20
20
|
ON spree_variants.id = spree_assets.viewable_id
|
21
|
-
AND spree_variants.is_master = #{
|
21
|
+
AND spree_variants.is_master = #{quoted_true}
|
22
22
|
WHERE spree_assets.type IN ('Spree::Image')
|
23
23
|
AND spree_assets.viewable_type = 'Spree::Variant'")
|
24
24
|
|
@@ -4,6 +4,8 @@
|
|
4
4
|
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
|
5
5
|
// the compiled file.
|
6
6
|
//
|
7
|
+
//= require jquery
|
8
|
+
//= require jquery_ujs
|
7
9
|
<% if options[:lib_name] == 'spree' %>
|
8
10
|
//= require admin/spree_core
|
9
11
|
//= require admin/spree_auth
|
@@ -4,6 +4,8 @@
|
|
4
4
|
// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
|
5
5
|
// the compiled file.
|
6
6
|
//
|
7
|
+
//= require jquery
|
8
|
+
//= require jquery_ujs
|
7
9
|
<% if options[:lib_name] == 'spree' %>
|
8
10
|
//= require store/spree_core
|
9
11
|
//= require store/spree_auth
|
@@ -3,7 +3,6 @@ module Spree
|
|
3
3
|
module ControllerHelpers
|
4
4
|
def self.included(receiver)
|
5
5
|
receiver.send :layout, :get_layout
|
6
|
-
receiver.send :helper, 'spree/hook'
|
7
6
|
receiver.send :before_filter, 'instantiate_controller_and_action_names'
|
8
7
|
receiver.send :before_filter, 'set_user_language'
|
9
8
|
|
data/lib/spree/core/engine.rb
CHANGED
@@ -71,7 +71,7 @@ module Spree
|
|
71
71
|
|
72
72
|
# sets the manifests / assets to be precompiled
|
73
73
|
initializer "spree.assets.precompile" do |app|
|
74
|
-
app
|
74
|
+
Spree::Core::Engine.add_assets_to_precompile_list!(app)
|
75
75
|
end
|
76
76
|
|
77
77
|
initializer "spree.mail.settings" do |app|
|
@@ -80,6 +80,10 @@ module Spree
|
|
80
80
|
Mail.register_interceptor(Spree::Core::MailInterceptor)
|
81
81
|
end
|
82
82
|
end
|
83
|
+
|
84
|
+
def self.add_assets_to_precompile_list!(app)
|
85
|
+
app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/orders/edit_form.js', 'admin/address_states.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js', 'jquery.jstree/themes/apple/*']
|
86
|
+
end
|
83
87
|
end
|
84
88
|
end
|
85
89
|
end
|
@@ -0,0 +1,60 @@
|
|
1
|
+
# Use this module to easily test Spree actions within Spree components
|
2
|
+
# or inside your application to test routes for the mounted Spree engine.
|
3
|
+
#
|
4
|
+
# Inside your spec_helper.rb, include this module inside the RSpec.configure
|
5
|
+
# block by doing this:
|
6
|
+
#
|
7
|
+
# require 'spree/core/testing_support/controller_requests'
|
8
|
+
# RSpec.configure do |c|
|
9
|
+
# c.include Spree::Core::TestingSupport::ControllerRequests, :type => :controller
|
10
|
+
# end
|
11
|
+
#
|
12
|
+
# Then, in your controller tests, you can access spree routes like this:
|
13
|
+
#
|
14
|
+
# require 'spec_helper'
|
15
|
+
#
|
16
|
+
# describe Spree::ProductsController do
|
17
|
+
# it "can see all the products" do
|
18
|
+
# spree_get :index
|
19
|
+
# end
|
20
|
+
# end
|
21
|
+
#
|
22
|
+
# Use spree_get, spree_post, spree_put or spree_delete to make requests
|
23
|
+
# to the Spree engine, and use regular get, post, put or delete to make
|
24
|
+
# requests to your application.
|
25
|
+
#
|
26
|
+
module Spree
|
27
|
+
module Core
|
28
|
+
module TestingSupport
|
29
|
+
module ControllerRequests
|
30
|
+
def spree_get(action, parameters = nil, session = nil, flash = nil)
|
31
|
+
process_spree_action(action, parameters, session, flash, "GET")
|
32
|
+
end
|
33
|
+
|
34
|
+
# Executes a request simulating POST HTTP method and set/volley the response
|
35
|
+
def spree_post(action, parameters = nil, session = nil, flash = nil)
|
36
|
+
process_spree_action(action, parameters, session, flash, "POST")
|
37
|
+
end
|
38
|
+
|
39
|
+
# Executes a request simulating PUT HTTP method and set/volley the response
|
40
|
+
def spree_put(action, parameters = nil, session = nil, flash = nil)
|
41
|
+
process_spree_action(action, parameters, session, flash, "PUT")
|
42
|
+
end
|
43
|
+
|
44
|
+
# Executes a request simulating DELETE HTTP method and set/volley the response
|
45
|
+
def spree_delete(action, parameters = nil, session = nil, flash = nil)
|
46
|
+
process_spree_action(action, parameters, session, flash, "DELETE")
|
47
|
+
end
|
48
|
+
|
49
|
+
private
|
50
|
+
|
51
|
+
def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = "GET")
|
52
|
+
parameters ||= {}
|
53
|
+
process(action, parameters.merge!(:use_route => :spree), session, flash, method)
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
57
|
+
end
|
58
|
+
end
|
59
|
+
|
60
|
+
|
data/lib/spree/core/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.0.
|
4
|
+
version: 1.1.0.rc2
|
5
5
|
prerelease: 6
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-04-
|
12
|
+
date: 2012-04-20 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: acts_as_list
|
16
|
-
requirement: &
|
16
|
+
requirement: &70210733556780 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - =
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: 0.1.4
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *70210733556780
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: nested_set
|
27
|
-
requirement: &
|
27
|
+
requirement: &70210733555720 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - =
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: 1.7.0
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *70210733555720
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: jquery-rails
|
38
|
-
requirement: &
|
38
|
+
requirement: &70210733554680 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ~>
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: 2.0.0
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *70210733554680
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: highline
|
49
|
-
requirement: &
|
49
|
+
requirement: &70210733553740 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - =
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: 1.6.11
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *70210733553740
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: state_machine
|
60
|
-
requirement: &
|
60
|
+
requirement: &70210733569000 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - =
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: 1.1.2
|
66
66
|
type: :runtime
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *70210733569000
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: ffaker
|
71
|
-
requirement: &
|
71
|
+
requirement: &70210733568120 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ~>
|
@@ -76,21 +76,21 @@ dependencies:
|
|
76
76
|
version: 1.12.0
|
77
77
|
type: :runtime
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *70210733568120
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: paperclip
|
82
|
-
requirement: &
|
82
|
+
requirement: &70210733567180 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ~>
|
86
86
|
- !ruby/object:Gem::Version
|
87
|
-
version: 2.7
|
87
|
+
version: '2.7'
|
88
88
|
type: :runtime
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *70210733567180
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: aws-sdk
|
93
|
-
requirement: &
|
93
|
+
requirement: &70210733565980 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - ~>
|
@@ -98,10 +98,10 @@ dependencies:
|
|
98
98
|
version: 1.3.4
|
99
99
|
type: :runtime
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *70210733565980
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: ransack
|
104
|
-
requirement: &
|
104
|
+
requirement: &70210733564060 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
107
|
- - ~>
|
@@ -109,21 +109,21 @@ dependencies:
|
|
109
109
|
version: 0.6.0
|
110
110
|
type: :runtime
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *70210733564060
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: activemerchant
|
115
|
-
requirement: &
|
115
|
+
requirement: &70210733562620 !ruby/object:Gem::Requirement
|
116
116
|
none: false
|
117
117
|
requirements:
|
118
118
|
- - =
|
119
119
|
- !ruby/object:Gem::Version
|
120
|
-
version: 1.20.
|
120
|
+
version: 1.20.4
|
121
121
|
type: :runtime
|
122
122
|
prerelease: false
|
123
|
-
version_requirements: *
|
123
|
+
version_requirements: *70210733562620
|
124
124
|
- !ruby/object:Gem::Dependency
|
125
125
|
name: rails
|
126
|
-
requirement: &
|
126
|
+
requirement: &70210733576920 !ruby/object:Gem::Requirement
|
127
127
|
none: false
|
128
128
|
requirements:
|
129
129
|
- - ! '>='
|
@@ -134,10 +134,10 @@ dependencies:
|
|
134
134
|
version: 3.2.3
|
135
135
|
type: :runtime
|
136
136
|
prerelease: false
|
137
|
-
version_requirements: *
|
137
|
+
version_requirements: *70210733576920
|
138
138
|
- !ruby/object:Gem::Dependency
|
139
139
|
name: kaminari
|
140
|
-
requirement: &
|
140
|
+
requirement: &70210733575300 !ruby/object:Gem::Requirement
|
141
141
|
none: false
|
142
142
|
requirements:
|
143
143
|
- - ! '>='
|
@@ -145,10 +145,10 @@ dependencies:
|
|
145
145
|
version: 0.13.0
|
146
146
|
type: :runtime
|
147
147
|
prerelease: false
|
148
|
-
version_requirements: *
|
148
|
+
version_requirements: *70210733575300
|
149
149
|
- !ruby/object:Gem::Dependency
|
150
150
|
name: deface
|
151
|
-
requirement: &
|
151
|
+
requirement: &70210733573900 !ruby/object:Gem::Requirement
|
152
152
|
none: false
|
153
153
|
requirements:
|
154
154
|
- - ! '>='
|
@@ -156,10 +156,10 @@ dependencies:
|
|
156
156
|
version: 0.8.0
|
157
157
|
type: :runtime
|
158
158
|
prerelease: false
|
159
|
-
version_requirements: *
|
159
|
+
version_requirements: *70210733573900
|
160
160
|
- !ruby/object:Gem::Dependency
|
161
161
|
name: stringex
|
162
|
-
requirement: &
|
162
|
+
requirement: &70210733572420 !ruby/object:Gem::Requirement
|
163
163
|
none: false
|
164
164
|
requirements:
|
165
165
|
- - ~>
|
@@ -167,7 +167,7 @@ dependencies:
|
|
167
167
|
version: 1.3.2
|
168
168
|
type: :runtime
|
169
169
|
prerelease: false
|
170
|
-
version_requirements: *
|
170
|
+
version_requirements: *70210733572420
|
171
171
|
description: Required dependency for Spree
|
172
172
|
email: sean@spreecommerce.com
|
173
173
|
executables: []
|
@@ -379,7 +379,6 @@ files:
|
|
379
379
|
- app/helpers/spree/admin/zones_helper.rb
|
380
380
|
- app/helpers/spree/base_helper.rb
|
381
381
|
- app/helpers/spree/checkout_helper.rb
|
382
|
-
- app/helpers/spree/hook_helper.rb
|
383
382
|
- app/helpers/spree/orders_helper.rb
|
384
383
|
- app/helpers/spree/products_helper.rb
|
385
384
|
- app/helpers/spree/search_helper.rb
|
@@ -416,6 +415,7 @@ files:
|
|
416
415
|
- app/models/spree/option_type.rb
|
417
416
|
- app/models/spree/option_value.rb
|
418
417
|
- app/models/spree/order.rb
|
418
|
+
- app/models/spree/payment/processing.rb
|
419
419
|
- app/models/spree/payment.rb
|
420
420
|
- app/models/spree/payment_method/check.rb
|
421
421
|
- app/models/spree/payment_method.rb
|
@@ -718,6 +718,7 @@ files:
|
|
718
718
|
- lib/spree/core/ssl_requirement.rb
|
719
719
|
- lib/spree/core/store_helpers.rb
|
720
720
|
- lib/spree/core/testing_support/common_rake.rb
|
721
|
+
- lib/spree/core/testing_support/controller_requests.rb
|
721
722
|
- lib/spree/core/testing_support/env.rb
|
722
723
|
- lib/spree/core/testing_support/factories/activator_factory.rb
|
723
724
|
- lib/spree/core/testing_support/factories/address_factory.rb
|
@@ -866,6 +867,7 @@ files:
|
|
866
867
|
- db/migrate/20120203001428_rename_state_events_to_state_changes.rb
|
867
868
|
- db/migrate/20120203153759_add_deleted_at_to_tax_category.rb
|
868
869
|
- db/migrate/20120315064358_migrate_images_from_products_to_variants.rb
|
870
|
+
- db/migrate/20120416233427_rename_attachment_size_to_attachment_file_size.rb
|
869
871
|
- db/sample/users.rb
|
870
872
|
- db/seeds.rb
|
871
873
|
- vendor/assets/images/datepicker/cal.gif
|
@@ -1,11 +0,0 @@
|
|
1
|
-
module Spree
|
2
|
-
module HookHelper
|
3
|
-
# This method is deprecated, left in place
|
4
|
-
# to prevent views from breaking
|
5
|
-
def hook(hook_name, locals = {}, &block)
|
6
|
-
warn "[DEPRECATION] `hook` is deprecated"
|
7
|
-
content = block_given? ? capture(&block) : ''
|
8
|
-
content
|
9
|
-
end
|
10
|
-
end
|
11
|
-
end
|