spree_zoned 0.5.30 → 0.5.31
Sign up to get free protection for your applications and to get access to all the features.
- data/Gemfile +4 -0
- data/app/assets/javascripts/store/spree_zoned.js +1 -0
- data/app/assets/stylesheets/store/spree_zoned.css +4 -0
- data/app/models/spree/order_decorator.rb +9 -0
- data/app/views/spree/zoned/_billing.html.erb +28 -8
- data/config/locales/de.yml +16 -1
- data/config/locales/en.yml +16 -1
- data/config/locales/nl-NL.yml +16 -1
- data/spree_zoned.gemspec +1 -1
- metadata +3 -2
data/Gemfile
CHANGED
@@ -1,5 +1,24 @@
|
|
1
|
-
<
|
2
|
-
|
1
|
+
<script type="text/javascript">
|
2
|
+
$(document).ready(function() {
|
3
|
+
var $agbtext = '<%= t(:termstext) -%>';
|
4
|
+
var $parsedagb = $agbtext.replace(/_/g, '<br />');
|
5
|
+
var $agb = $('<div></div>')
|
6
|
+
.html($parsedagb)
|
7
|
+
.dialog({
|
8
|
+
autoOpen: false,
|
9
|
+
modal: true,
|
10
|
+
draggable: true,
|
11
|
+
buttons: { "OK": function() { $(this).dialog("close"); } },
|
12
|
+
title: '<%= t(:terms) -%>'
|
13
|
+
});
|
14
|
+
$('#opentos').click(function() {
|
15
|
+
$agb.dialog('open');
|
16
|
+
return false; // prevent the default action, e.g. following a link
|
17
|
+
});
|
18
|
+
});
|
19
|
+
</script>
|
20
|
+
<div class="inner" data-hook="billing_inner">
|
21
|
+
<fieldset id="billing" data-hook>
|
3
22
|
<%= form.fields_for :bill_address do |bill_form| %>
|
4
23
|
<legend><%= t(:billing_address) %></legend>
|
5
24
|
<p class="field" id="bfirstname">
|
@@ -75,10 +94,11 @@
|
|
75
94
|
<%= bill_form.text_field :alternative_phone %>
|
76
95
|
</p>
|
77
96
|
<% end %>
|
97
|
+
<p class="field checkbox" id="bterms">
|
98
|
+
<%= label_tag :order_accept, "#{t(:iaccept)}", :id => 'accept' -%>
|
99
|
+
<a id="opentos" href=""><%= t(:terms) -%></a><span class="req">*</span><br />
|
100
|
+
<%= check_box_tag "order[accept]", '1', false, :class => 'required' %>
|
101
|
+
</p>
|
78
102
|
<% end %>
|
79
|
-
|
80
|
-
|
81
|
-
<%= check_box_tag "accept" %>
|
82
|
-
</p>
|
83
|
-
</div>
|
84
|
-
</fieldset>
|
103
|
+
</fieldset>
|
104
|
+
</div>
|
data/config/locales/de.yml
CHANGED
@@ -7,4 +7,19 @@ de:
|
|
7
7
|
backtocountry: "Wieder ins Land"
|
8
8
|
master_price: "Master - Preis"
|
9
9
|
country_price: "Länderpreis"
|
10
|
-
language: "Sprache"
|
10
|
+
language: "Sprache"
|
11
|
+
iaccept: "Ich akzeptiere die "
|
12
|
+
plsaccept: "Bitte akzeptieren Sie die "
|
13
|
+
terms: "AGB"
|
14
|
+
acceptfield: "Ich_akzeptiere_die_AGB"
|
15
|
+
termstext: |
|
16
|
+
Das hier sind die deutschen AGB__\
|
17
|
+
Lorem\nipsum dolor sit amet,_\
|
18
|
+
consetetur sadipscing elitr, "sed" diam nonumy eirmod tempor invidunt \
|
19
|
+
ut labore et dolore magna aliquyam erat, sed diam voluptua. \
|
20
|
+
At vero eos et accusam et justo duo dolores et ea rebum. \
|
21
|
+
Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \
|
22
|
+
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, \
|
23
|
+
sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, \
|
24
|
+
sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. \
|
25
|
+
Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
|
data/config/locales/en.yml
CHANGED
@@ -6,4 +6,19 @@ en:
|
|
6
6
|
deletefc: "Delete from country"
|
7
7
|
backtocountry: "Reassign to country"
|
8
8
|
country_price: "Country-specific price"
|
9
|
-
language: "Language"
|
9
|
+
language: "Language"
|
10
|
+
iaccept: "I accept the "
|
11
|
+
plsaccept: "Please accept our Terms of Service"
|
12
|
+
terms: "Terms of Service"
|
13
|
+
acceptfield: "Accept_Terms_of_Service"
|
14
|
+
termstext: |
|
15
|
+
These are the English Terms of Service__\
|
16
|
+
Lorem\nipsum dolor sit amet,_\
|
17
|
+
consetetur sadipscing elitr, "sed" diam nonumy eirmod tempor invidunt \
|
18
|
+
ut labore et dolore magna aliquyam erat, sed diam voluptua. \
|
19
|
+
At vero eos et accusam et justo duo dolores et ea rebum. \
|
20
|
+
Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \
|
21
|
+
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, \
|
22
|
+
sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, \
|
23
|
+
sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. \
|
24
|
+
Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
|
data/config/locales/nl-NL.yml
CHANGED
@@ -6,4 +6,19 @@ nl-NL:
|
|
6
6
|
deletefc: "Verwijderen van dit land"
|
7
7
|
backtocountry: "Terug naar dit land"
|
8
8
|
country_price: "Prijs voor dit land"
|
9
|
-
language: "Taal"
|
9
|
+
language: "Taal"
|
10
|
+
iaccept: "Ik accepteer de "
|
11
|
+
plsaccept: "Accepteer onze AVV a.u.b."
|
12
|
+
terms: "AVV"
|
13
|
+
acceptfield: "Ik accepteer de AVV"
|
14
|
+
termstext: |
|
15
|
+
Hier zijn de nederlandse AVV:__\
|
16
|
+
Lorem\nipsum dolor sit amet,_\
|
17
|
+
consetetur sadipscing elitr, "sed" diam nonumy eirmod tempor invidunt \
|
18
|
+
ut labore et dolore magna aliquyam erat, sed diam voluptua. \
|
19
|
+
At vero eos et accusam et justo duo dolores et ea rebum. \
|
20
|
+
Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \
|
21
|
+
Lorem ipsum dolor sit amet, consetetur sadipscing elitr, \
|
22
|
+
sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, \
|
23
|
+
sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. \
|
24
|
+
Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet.
|
data/spree_zoned.gemspec
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
Gem::Specification.new do |s|
|
3
3
|
s.platform = Gem::Platform::RUBY
|
4
4
|
s.name = 'spree_zoned'
|
5
|
-
s.version = '0.5.
|
5
|
+
s.version = '0.5.31'
|
6
6
|
s.summary = 'A Spree extension to make your store zoned'
|
7
7
|
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."
|
8
8
|
s.required_ruby_version = '>= 1.9.2'
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_zoned
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.5.
|
4
|
+
version: 0.5.31
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-09-
|
12
|
+
date: 2012-09-19 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: spree_core
|
@@ -139,6 +139,7 @@ files:
|
|
139
139
|
- app/helpers/spree/admin/products_helper_decorator.rb
|
140
140
|
- app/helpers/spree/base_helper_decorator.rb
|
141
141
|
- app/helpers/spree/products_helper_decorator.rb
|
142
|
+
- app/models/spree/order_decorator.rb
|
142
143
|
- app/models/spree/product_decorator.rb
|
143
144
|
- app/models/spree/zoned/product.rb
|
144
145
|
- app/overrides/add_country_selectbox.rb
|