spree_terms_and_conditions 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e6a60ec7f0264210fc9a7afcb2427eabda6151c
-  data.tar.gz: ec39009bfd0666394e079095bda8948debd9376c
+  metadata.gz: e19522352849fc3a96c4a72adb2e15a501972509
+  data.tar.gz: 60bc578de3a4cfe8b70b1ed9987b258f43b7536f
 SHA512:
-  metadata.gz: 70ef6bde9dc17ebc6717b5240238570b81663c930fc5a3c1434a2824534964c76df704a15162d97af04e569bd482fdcecc1f02609f09ed9e0fdd4e9663dc90c1
-  data.tar.gz: b0bff45a9dd594625b3130b76ae2e1238b247e484808c7b343c150e6988a249f241c910510b65e77f4dfdbd915e540e6f319945ca430088297beb6a6799e7d33
+  metadata.gz: 34aa6d52bb535b081d5160ad365340a22f7a2f4b11cbea3b3c8b35925573939e28480cea1f64811dd90d4fec52beb1dbe023a642633fae30afe2199c087630b3
+  data.tar.gz: 91f780212c6b8ffe980c93fe31f899ad380dae4259098622eebf85e70c8445f3e7f0a6e2770dc2b6601ff3fa1e0483dfdef560f9e87f11a69b94472a1b9cb1c5

data/app/assets/stylesheets/store/terms_and_conditions.scss

@@ -1,13 +1,7 @@
-#terms_and_conditions {
-  legend {
-    text-transform: uppercase;
-    font-weight: bold;
-    font-size: 14px;
-    padding: 5px;
-    margin-left: 15px;
-  }
+#terms-and-conditions {
+  margin: 0;
 
-  label {
-    margin-left: 10px;
+  a {
+    text-decoration: underline !important;
   }
 }

data/app/views/spree/checkout/_terms_and_conditions_checkbox.haml

@@ -1,10 +1,5 @@
-%fieldset#terms_and_conditions
-  %legend(align="center")
-    = Spree.t(:terms_and_conditions)
-  .field
-    = form.check_box :terms_and_conditions
-    = form.label :terms_and_conditions do
-      I accept the
-      = link_to('terms and conditions', '/terms_and_conditions', target: '_blank').html_safe
-      for the website
+%p#terms-and-conditions
+  By clicking 'Save and Continue', you are accepting the
+  = link_to('terms and conditions', '/terms_and_conditions', target: '_blank').html_safe
+  for the website
 

data/spree_terms_and_conditions.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_terms_and_conditions'
-  s.version     = '2.1.5'
+  s.version     = '2.1.6'
   s.summary     = 'Add terms and conditions checkbox in delivery stage of checkout'
   s.description = ''
   s.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_terms_and_conditions
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Francisco Trindade
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -251,7 +251,6 @@ files:
 - app/assets/stylesheets/admin/spree_terms_and_conditions.css
 - app/assets/stylesheets/store/spree_terms_and_conditions.css
 - app/assets/stylesheets/store/terms_and_conditions.scss
-- app/models/spree/order_decorator.rb
 - app/overrides/terms_and_conditions_checkbox.rb
 - app/views/spree/checkout/_terms_and_conditions_checkbox.haml
 - bin/rails
@@ -265,7 +264,6 @@ files:
 - lib/spree_terms_and_conditions.rb
 - lib/spree_terms_and_conditions/engine.rb
 - lib/spree_terms_and_conditions/factories.rb
-- spec/models/order_spec.rb
 - spec/spec_helper.rb
 - spree_terms_and_conditions.gemspec
 homepage: 
@@ -296,5 +294,4 @@ test_files:
 - features/spree/terms_and_conditions.feature
 - features/step_definitions/terms_and_conditions.rb
 - features/support/env.rb
-- spec/models/order_spec.rb
 - spec/spec_helper.rb

data/app/models/spree/order_decorator.rb

@@ -1,12 +0,0 @@
-Spree::Order.class_eval do
-
-  def valid_terms_and_conditions?
-    self.errors[:terms_and_conditions] << 'must be accepted' unless self.terms_and_conditions == true
-    self.errors[:terms_and_conditions].empty? ? true : false
-  end
-
-end
-
-Spree::PermittedAttributes.checkout_attributes << :terms_and_conditions
-
-Spree::Order.state_machine.before_transition :to => :payment, :do => :valid_terms_and_conditions?

data/spec/models/order_spec.rb

@@ -1,18 +0,0 @@
-require 'spec_helper'
-
-describe Spree::Order do
-
-  let(:order){Spree::Order.new}
-
-  it 'should validate presence of tc_accepted' do
-    order.valid_terms_and_conditions?.should be_false
-    order.errors[:terms_and_conditions].should == ["must be accepted"]
-  end
-
-  it 'should be valid if terms and conditions are accepted' do
-    order.terms_and_conditions = true
-    order.valid_terms_and_conditions?.should be_true
-    order.errors[:terms_and_conditions].should be_empty
-  end
-
-end