spree_zoned 0.5.29 → 0.5.30

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -0,0 +1,6 @@
1
+ Deface::Override.new(
2
+ :name => "replace_billing",
3
+ :virtual_path => "spree/checkout/_address",
4
+ :replace_contents => "[data-hook='billing_fieldset_wrapper']",
5
+ :partial => "spree/zoned/billing",
6
+ )
@@ -0,0 +1,84 @@
1
+ <fieldset id="billing" data-hook>
2
+ <div class="inner" data-hook="billing_inner">
3
+ <%= form.fields_for :bill_address do |bill_form| %>
4
+ <legend><%= t(:billing_address) %></legend>
5
+ <p class="field" id="bfirstname">
6
+ <%= bill_form.label :firstname, t(:first_name) %><span class="req">*</span><br />
7
+ <%= bill_form.text_field :firstname, :class => 'required' %>
8
+ </p>
9
+ <p class="field" id="blastname">
10
+ <%= bill_form.label :lastname, t(:last_name) %><span class="req">*</span><br />
11
+ <%= bill_form.text_field :lastname, :class => 'required' %>
12
+ </p>
13
+ <% if Spree::Config[:company] %>
14
+ <p class="field" id="bcompany">
15
+ <%= bill_form.label :company, t(:company) %><br />
16
+ <%= bill_form.text_field :company %>
17
+ </p>
18
+ <% end %>
19
+ <p class="field" id="baddress1">
20
+ <%= bill_form.label :address1, t(:street_address) %><span class="req">*</span><br />
21
+ <%= bill_form.text_field :address1, :class => 'required' %>
22
+ </p>
23
+ <p class="field" id="baddress2">
24
+ <%= bill_form.label :address2, t(:street_address_2) %><br />
25
+ <%= bill_form.text_field :address2 %>
26
+ </p>
27
+
28
+ <p class="field" id="bcity">
29
+ <%= bill_form.label :city, t(:city) %><span class="req">*</span><br />
30
+ <%= bill_form.text_field :city, :class => 'required' %>
31
+ </p>
32
+
33
+ <p class="field" id="bcountry">
34
+ <%= bill_form.label :country_id, t(:country) %><span class="req">*</span><br />
35
+ <span id="bcountry">
36
+ <%= bill_form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %>
37
+ </span>
38
+ </p>
39
+
40
+ <% if Spree::Config[:address_requires_state] %>
41
+ <p class="field" id="bstate">
42
+ <% have_states = !@order.bill_address.country.states.empty? %>
43
+ <%= bill_form.label :state, t(:state) %><span class="req">*</span><br />
44
+ <noscript>
45
+ <%= bill_form.text_field :state_name, :class => 'required' %>
46
+ </noscript>
47
+ <% state_elements = [
48
+ bill_form.collection_select(:state_id, @order.bill_address.country.states,
49
+ :id, :name,
50
+ {:include_blank => true},
51
+ {:class => have_states ? 'required' : 'hidden',
52
+ :disabled => !have_states}) +
53
+ bill_form.text_field(:state_name,
54
+ :class => !have_states ? 'required' : 'hidden',
55
+ :disabled => have_states)
56
+ ].join.gsub('"', "'").gsub("\n", "")
57
+ %>
58
+ <%= javascript_tag do -%>
59
+ document.write("<%== state_elements %>");
60
+ <% end -%>
61
+ </p>
62
+ <% end %>
63
+
64
+ <p class="field" id="bzipcode">
65
+ <%= bill_form.label :zipcode, t(:zip) %><span class="req">*</span><br />
66
+ <%= bill_form.text_field :zipcode, :class => 'required' %>
67
+ </p>
68
+ <p class="field" id="bphone">
69
+ <%= bill_form.label :phone, t(:phone) %><span class="req">*</span><br />
70
+ <%= bill_form.text_field :phone, :class => 'required' %>
71
+ </p>
72
+ <% if Spree::Config[:alternative_billing_phone] %>
73
+ <p class="field" id="baltphone">
74
+ <%= bill_form.label :alternative_phone, t(:alternative_phone) %><br />
75
+ <%= bill_form.text_field :alternative_phone %>
76
+ </p>
77
+ <% end %>
78
+ <% end %>
79
+ <p class"field" id="accepttsandcs">
80
+ <%= label_tag "Ich akzeptiere die AGB" %>
81
+ <%= check_box_tag "accept" %>
82
+ </p>
83
+ </div>
84
+ </fieldset>
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.29'
5
+ s.version = '0.5.30'
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.29
4
+ version: 0.5.30
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 00:00:00.000000000 Z
12
+ date: 2012-09-16 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_core
@@ -144,6 +144,7 @@ files:
144
144
  - app/overrides/add_country_selectbox.rb
145
145
  - app/overrides/add_prd_country.rb
146
146
  - app/overrides/replace_admin_product_right.rb
147
+ - app/overrides/replace_billing.rb
147
148
  - app/overrides/replace_index_rows.rb
148
149
  - app/overrides/replace_product_price.rb
149
150
  - app/overrides/zone_shared_product.rb
@@ -152,6 +153,7 @@ files:
152
153
  - app/views/spree/admin/zoned/_productright.html.erb
153
154
  - app/views/spree/admin/zoned/setcountry.js.erb
154
155
  - app/views/spree/shared/_products_list_item.html.erb
156
+ - app/views/spree/zoned/_billing.html.erb
155
157
  - app/views/spree/zoned/_countryselect.html.erb
156
158
  - app/views/spree/zoned/_product_price.html.erb
157
159
  - app/views/spree/zoned/setcountry.js.erb