spree_zoned 0.5.30 → 0.5.31

data/Gemfile

@@ -6,4 +6,8 @@ else
   gem 'ruby-debug19'
 end
 
+group :assets do
+  gem 'jquery-ui-rails'
+end
+
 gemspec

data/app/assets/javascripts/store/spree_zoned.js

@@ -1 +1,2 @@
 //= require store/spree_core
+//= require jquery.ui.all

data/app/assets/stylesheets/store/spree_zoned.css

@@ -1,2 +1,6 @@
+/*
+ *= require jquery.ui.all
+ */
+
 div#zoned-countryselect { text-align: right; }
 div#zoned-countryselect label { color: #a33; font-weight: bold; font-size: 125% }

data/app/models/spree/order_decorator.rb

@@ -0,0 +1,9 @@
+module Spree
+  Order.class_eval do
+
+    attr_accessible :accept
+
+  	#validates :accept, :presence => true
+
+  end
+end

data/app/views/spree/zoned/_billing.html.erb

@@ -1,5 +1,24 @@
-<fieldset id="billing" data-hook>
-  <div class="inner" data-hook="billing_inner">
+<script type="text/javascript">
+$(document).ready(function() {
+  var $agbtext = '<%= t(:termstext) -%>';
+  var $parsedagb = $agbtext.replace(/_/g, '<br />');
+  var $agb = $('<div></div>')
+    .html($parsedagb)
+    .dialog({
+      autoOpen: false,
+      modal: true,
+      draggable: true,
+      buttons: { "OK": function() { $(this).dialog("close"); } },
+      title: '<%= t(:terms) -%>'
+    });
+  $('#opentos').click(function() {
+    $agb.dialog('open');
+    return false; // prevent the default action, e.g. following a link
+  });
+});
+</script>
+<div class="inner" data-hook="billing_inner">
+  <fieldset id="billing" data-hook>
     <%= form.fields_for :bill_address do |bill_form| %>
       <legend><%= t(:billing_address) %></legend>
       <p class="field" id="bfirstname">
@@ -75,10 +94,11 @@
           <%= bill_form.text_field :alternative_phone %>
         </p>
       <% end %>
+      <p class="field checkbox" id="bterms">
+        <%= label_tag :order_accept, "#{t(:iaccept)}", :id => 'accept' -%>
+        <a id="opentos" href=""><%= t(:terms) -%></a><span class="req">*</span><br />
+        <%= check_box_tag "order[accept]", '1', false, :class => 'required' %> 
+      </p>
     <% end %>
-    <p class"field" id="accepttsandcs">
-      <%= label_tag "Ich akzeptiere die AGB" %>
-      <%= check_box_tag "accept" %>
-    </p>
-  </div>
-</fieldset>
+  </fieldset>
+</div>

data/config/locales/de.yml

@@ -7,4 +7,19 @@ de:
   backtocountry: "Wieder ins Land"
   master_price: "Master - Preis"
   country_price: "Länderpreis"
-  language: "Sprache"
+  language: "Sprache"
+  iaccept: "Ich akzeptiere die "
+  plsaccept: "Bitte akzeptieren Sie die "
+  terms: "AGB"
+  acceptfield: "Ich_akzeptiere_die_AGB"
+  termstext: |
+    Das hier sind die deutschen AGB__\
+    Lorem\nipsum dolor sit amet,_\
+    consetetur sadipscing elitr, "sed" diam nonumy eirmod tempor invidunt \
+    ut labore et dolore magna aliquyam erat, sed diam voluptua. \
+    At vero eos et accusam et justo duo dolores et ea rebum. \
+    Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \
+    Lorem ipsum dolor sit amet, consetetur sadipscing elitr, \
+    sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, \
+    sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. \
+    Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

data/config/locales/en.yml

@@ -6,4 +6,19 @@ en:
   deletefc: "Delete from country"
   backtocountry: "Reassign to country"
   country_price: "Country-specific price"
-  language: "Language"
+  language: "Language"
+  iaccept: "I accept the "
+  plsaccept: "Please accept our Terms of Service"
+  terms: "Terms of Service"
+  acceptfield: "Accept_Terms_of_Service"
+  termstext: |
+    These are the English Terms of Service__\
+    Lorem\nipsum dolor sit amet,_\
+    consetetur sadipscing elitr, "sed" diam nonumy eirmod tempor invidunt \
+    ut labore et dolore magna aliquyam erat, sed diam voluptua. \
+    At vero eos et accusam et justo duo dolores et ea rebum. \
+    Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \
+    Lorem ipsum dolor sit amet, consetetur sadipscing elitr, \
+    sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, \
+    sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. \
+    Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

data/config/locales/nl-NL.yml

@@ -6,4 +6,19 @@ nl-NL:
   deletefc: "Verwijderen van dit land"
   backtocountry: "Terug naar dit land"
   country_price: "Prijs voor dit land"
-  language: "Taal"
+  language: "Taal"
+  iaccept: "Ik accepteer de "
+  plsaccept: "Accepteer onze AVV a.u.b."
+  terms: "AVV"
+  acceptfield: "Ik accepteer de AVV"
+  termstext: |
+    Hier zijn de nederlandse AVV:__\
+    Lorem\nipsum dolor sit amet,_\
+    consetetur sadipscing elitr, "sed" diam nonumy eirmod tempor invidunt \
+    ut labore et dolore magna aliquyam erat, sed diam voluptua. \
+    At vero eos et accusam et justo duo dolores et ea rebum. \
+    Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \
+    Lorem ipsum dolor sit amet, consetetur sadipscing elitr, \
+    sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, \
+    sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. \
+    Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.

data/spree_zoned.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_zoned'
-  s.version     = '0.5.30'
+  s.version     = '0.5.31'
   s.summary     = 'A Spree extension to make your store zoned'
   s.description = "Everything you need for a zoned Spree store: zoned pricing, zoned products, zoned product ordering, zoned locales, ...\nProbalbly essential to you if you operate outside of the US."
   s.required_ruby_version = '>= 1.9.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_zoned
 version: !ruby/object:Gem::Version
-  version: 0.5.30
+  version: 0.5.31
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -139,6 +139,7 @@ files:
 - app/helpers/spree/admin/products_helper_decorator.rb
 - app/helpers/spree/base_helper_decorator.rb
 - app/helpers/spree/products_helper_decorator.rb
+- app/models/spree/order_decorator.rb
 - app/models/spree/product_decorator.rb
 - app/models/spree/zoned/product.rb
 - app/overrides/add_country_selectbox.rb