effective_orders 1.2.5 → 1.2.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: c1e228be4429904e02e51771125e189f2c917642
4
- data.tar.gz: 60ca8ea9cb693199784c7bfaf6d1424fc6bd6412
3
+ metadata.gz: 2e18ac05ae929a3e8cba5f191a3d72cbc834b72b
4
+ data.tar.gz: 3fb8c09f1ccab9fa69eb7fc56b93273fa46fd28d
5
5
  SHA512:
6
- metadata.gz: 89ab63b17901c6dd25e2f590f78d77427bde9dcaec50ff36d86760b57b1c24356ef7c4b3b6bf086dbb744b73e2e962a8f04fa8a8022d136a94a6921d9d9c31b1
7
- data.tar.gz: f1714b29a9588dd1b78c034f74ad95305876713e5780def64c82bffe59153ed86a716d593f3853eb5bb0a325900b9b2e64a4efbcd3db8c95d24cc945208e596c
6
+ metadata.gz: cfca6b00e5f4d62f7a156ec33d91daef472091adc30f234aa493aaf0856ac4912089e6a3692ed580f4bc64d2be821a4201c873e1b4a502d5396af5f5b7aa2b99
7
+ data.tar.gz: 8cb50d9d1f38a76d715e32840249ed53c0cac14dcea8bdd10c908e071dbec2132d77ffa4069b5df52260c6c97f04e2f2155c3cc71020f43997574c05e65b9bde
@@ -5,7 +5,8 @@
5
5
 
6
6
  %hr
7
7
  = link_to 'Home', root_url, :class => 'btn btn-primary'
8
- = link_to 'Order History', effective_orders.my_purchases_path, :class => 'btn btn-default'
8
+ - if EffectiveOrders.show_order_history_button
9
+ = link_to 'Order History', effective_orders.my_purchases_path, class: 'btn btn-default'
9
10
 
10
11
  - else
11
12
  %p Your cart has #{@cart.cart_items.length} items.
@@ -15,4 +16,5 @@
15
16
  %hr
16
17
  = link_to_checkout :class => 'btn btn-primary pull-right'
17
18
  = link_to_empty_cart
18
- = link_to 'Order History', effective_orders.my_purchases_path, :class => 'btn btn-default', :rel => :nofollow
19
+ - if EffectiveOrders.show_order_history_button
20
+ = link_to 'Order History', effective_orders.my_purchases_path, class: 'btn btn-default', rel: :nofollow
@@ -38,6 +38,8 @@ module EffectiveOrders
38
38
  mattr_accessor :paypal_enabled
39
39
  mattr_accessor :moneris_enabled
40
40
 
41
+ mattr_accessor :show_order_history_button
42
+
41
43
  # application fee is required if stripe_connect_enabled is true
42
44
  mattr_accessor :stripe_enabled
43
45
 
@@ -1,3 +1,3 @@
1
1
  module EffectiveOrders
2
- VERSION = '1.2.5'.freeze
2
+ VERSION = '1.2.6'.freeze
3
3
  end
@@ -80,6 +80,8 @@ EffectiveOrders.setup do |config|
80
80
  config.allow_pretend_purchase_in_production = false
81
81
  config.allow_pretend_purchase_in_production_message = '* payment information is not required to process this order at this time.'
82
82
 
83
+ # Show/hide the 'Order History' button on the 'Cart Page'
84
+ config.show_order_history_button = true
83
85
 
84
86
  # Layout Settings
85
87
  # Configure the Layout per controller, or all at once
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: effective_orders
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.5
4
+ version: 1.2.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Code and Effect
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-01-07 00:00:00.000000000 Z
11
+ date: 2015-01-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -66,6 +66,20 @@ dependencies:
66
66
  - - ">="
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
+ - !ruby/object:Gem::Dependency
70
+ name: sass-rails
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - ">="
74
+ - !ruby/object:Gem::Version
75
+ version: '0'
76
+ type: :runtime
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - ">="
81
+ - !ruby/object:Gem::Version
82
+ version: '0'
69
83
  - !ruby/object:Gem::Dependency
70
84
  name: migrant
71
85
  requirement: !ruby/object:Gem::Requirement
@@ -264,7 +278,7 @@ files:
264
278
  - app/assets/javascripts/effective_orders/shipping_address_toggle.js.coffee
265
279
  - app/assets/javascripts/effective_orders/stripe_charges.js.coffee
266
280
  - app/assets/javascripts/effective_orders/stripe_subscriptions.js.coffee
267
- - app/assets/stylesheets/effective_orders.css.scss
281
+ - app/assets/stylesheets/effective_orders.scss
268
282
  - app/assets/stylesheets/effective_orders/_order.scss
269
283
  - app/controllers/admin/customers_controller.rb
270
284
  - app/controllers/admin/orders_controller.rb