spree_promo 1.0.0.rc3 → 1.0.0.rc4
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -27,11 +27,7 @@ module Spree
|
|
|
27
27
|
|
|
28
28
|
class << self
|
|
29
29
|
def advertised
|
|
30
|
-
|
|
31
|
-
#all for now
|
|
32
|
-
scoped
|
|
33
|
-
#includes(:stored_preferences)
|
|
34
|
-
#includes(:stored_preferences).where(:spree_preferences => {:name => 'advertise', :value => '1'})
|
|
30
|
+
where(:advertise => true)
|
|
35
31
|
end
|
|
36
32
|
end
|
|
37
33
|
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: spree_promo
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.0.
|
|
4
|
+
version: 1.0.0.rc4
|
|
5
5
|
prerelease: 6
|
|
6
6
|
platform: ruby
|
|
7
7
|
authors:
|
|
@@ -9,30 +9,30 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2012-
|
|
12
|
+
date: 2012-02-06 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: spree_core
|
|
16
|
-
requirement: &
|
|
16
|
+
requirement: &70121130062120 !ruby/object:Gem::Requirement
|
|
17
17
|
none: false
|
|
18
18
|
requirements:
|
|
19
19
|
- - =
|
|
20
20
|
- !ruby/object:Gem::Version
|
|
21
|
-
version: 1.0.0.
|
|
21
|
+
version: 1.0.0.rc4
|
|
22
22
|
type: :runtime
|
|
23
23
|
prerelease: false
|
|
24
|
-
version_requirements: *
|
|
24
|
+
version_requirements: *70121130062120
|
|
25
25
|
- !ruby/object:Gem::Dependency
|
|
26
26
|
name: spree_auth
|
|
27
|
-
requirement: &
|
|
27
|
+
requirement: &70121130076380 !ruby/object:Gem::Requirement
|
|
28
28
|
none: false
|
|
29
29
|
requirements:
|
|
30
30
|
- - =
|
|
31
31
|
- !ruby/object:Gem::Version
|
|
32
|
-
version: 1.0.0.
|
|
32
|
+
version: 1.0.0.rc4
|
|
33
33
|
type: :runtime
|
|
34
34
|
prerelease: false
|
|
35
|
-
version_requirements: *
|
|
35
|
+
version_requirements: *70121130076380
|
|
36
36
|
description: Required dependency for Spree
|
|
37
37
|
email: david@spreecommerce.com
|
|
38
38
|
executables: []
|
|
@@ -51,7 +51,6 @@ files:
|
|
|
51
51
|
- app/controllers/spree/admin/promotions_controller.rb
|
|
52
52
|
- app/controllers/spree/checkout_controller_decorator.rb
|
|
53
53
|
- app/controllers/spree/content_controller_decorator.rb
|
|
54
|
-
- app/controllers/spree/orders_controller_decorator.rb
|
|
55
54
|
- app/helpers/spree/promotion_rules_helper.rb
|
|
56
55
|
- app/models/spree/adjustment_decorator.rb
|
|
57
56
|
- app/models/spree/calculator/free_shipping.rb
|
|
@@ -1,17 +0,0 @@
|
|
|
1
|
-
Spree::OrdersController.class_eval do
|
|
2
|
-
def update
|
|
3
|
-
@order = current_order
|
|
4
|
-
if @order.update_attributes(params[:order])
|
|
5
|
-
|
|
6
|
-
if @order.coupon_code.present?
|
|
7
|
-
fire_event('spree.checkout.coupon_code_added', :coupon_code => @order.coupon_code)
|
|
8
|
-
end
|
|
9
|
-
|
|
10
|
-
@order.line_items = @order.line_items.select {|li| li.quantity > 0 }
|
|
11
|
-
fire_event('spree.order.contents_changed')
|
|
12
|
-
respond_with(@order) { |format| format.html { redirect_to cart_path } }
|
|
13
|
-
else
|
|
14
|
-
respond_with(@order)
|
|
15
|
-
end
|
|
16
|
-
end
|
|
17
|
-
end
|