spree_zoned 0.5.29 → 0.5.30

data/app/overrides/replace_billing.rb

@@ -0,0 +1,6 @@
+Deface::Override.new(
+  :name             => "replace_billing",
+  :virtual_path     => "spree/checkout/_address",
+  :replace_contents => "[data-hook='billing_fieldset_wrapper']",
+  :partial          => "spree/zoned/billing",
+)

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

@@ -0,0 +1,84 @@
+<fieldset id="billing" data-hook>
+  <div class="inner" data-hook="billing_inner">
+    <%= form.fields_for :bill_address do |bill_form| %>
+      <legend><%= t(:billing_address) %></legend>
+      <p class="field" id="bfirstname">
+        <%= bill_form.label :firstname, t(:first_name) %><span class="req">*</span><br />
+        <%= bill_form.text_field :firstname, :class => 'required' %>
+      </p>
+      <p class="field" id="blastname">
+        <%= bill_form.label :lastname, t(:last_name) %><span class="req">*</span><br />
+        <%= bill_form.text_field :lastname, :class => 'required' %>
+      </p>
+      <% if Spree::Config[:company] %>
+        <p class="field" id="bcompany">
+          <%= bill_form.label :company, t(:company) %><br />
+          <%= bill_form.text_field :company %>
+        </p>
+      <% end %>
+      <p class="field" id="baddress1">
+        <%= bill_form.label :address1, t(:street_address) %><span class="req">*</span><br />
+        <%= bill_form.text_field :address1, :class => 'required' %>
+      </p>
+      <p class="field" id="baddress2">
+        <%= bill_form.label :address2, t(:street_address_2) %><br />
+        <%= bill_form.text_field :address2 %>
+      </p>
+
+      <p class="field" id="bcity">
+        <%= bill_form.label :city, t(:city) %><span class="req">*</span><br />
+        <%= bill_form.text_field :city, :class => 'required' %>
+      </p>
+
+      <p class="field" id="bcountry">
+        <%= bill_form.label :country_id, t(:country) %><span class="req">*</span><br />
+        <span id="bcountry">
+          <%= bill_form.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'required'} %>
+        </span>
+      </p>
+
+      <% if Spree::Config[:address_requires_state] %>
+        <p class="field" id="bstate">
+          <% have_states = !@order.bill_address.country.states.empty? %>
+          <%= bill_form.label :state, t(:state) %><span class="req">*</span><br />
+          <noscript>
+            <%= bill_form.text_field :state_name, :class => 'required' %>
+          </noscript>
+          <% state_elements = [
+             bill_form.collection_select(:state_id, @order.bill_address.country.states,
+                                :id, :name,
+                                {:include_blank => true},
+                                {:class => have_states ? 'required' : 'hidden',
+                                :disabled => !have_states}) +
+             bill_form.text_field(:state_name,
+                                :class => !have_states ? 'required' : 'hidden',
+                                :disabled => have_states)
+             ].join.gsub('"', "'").gsub("\n", "")
+          %>
+          <%= javascript_tag do -%>
+            document.write("<%== state_elements %>");
+          <% end -%>
+        </p>
+      <% end %>
+
+      <p class="field" id="bzipcode">
+        <%= bill_form.label :zipcode, t(:zip) %><span class="req">*</span><br />
+        <%= bill_form.text_field :zipcode, :class => 'required' %>
+      </p>
+      <p class="field" id="bphone">
+        <%= bill_form.label :phone, t(:phone) %><span class="req">*</span><br />
+        <%= bill_form.text_field :phone, :class => 'required' %>
+      </p>
+      <% if Spree::Config[:alternative_billing_phone] %>
+        <p class="field" id="baltphone">
+          <%= bill_form.label :alternative_phone, t(:alternative_phone) %><br />
+          <%= bill_form.text_field :alternative_phone %>
+        </p>
+      <% end %>
+    <% end %>
+    <p class"field" id="accepttsandcs">
+      <%= label_tag "Ich akzeptiere die AGB" %>
+      <%= check_box_tag "accept" %>
+    </p>
+  </div>
+</fieldset>

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.29'
+  s.version     = '0.5.30'
   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.29
+  version: 0.5.30
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -144,6 +144,7 @@ files:
 - app/overrides/add_country_selectbox.rb
 - app/overrides/add_prd_country.rb
 - app/overrides/replace_admin_product_right.rb
+- app/overrides/replace_billing.rb
 - app/overrides/replace_index_rows.rb
 - app/overrides/replace_product_price.rb
 - app/overrides/zone_shared_product.rb
@@ -152,6 +153,7 @@ files:
 - app/views/spree/admin/zoned/_productright.html.erb
 - app/views/spree/admin/zoned/setcountry.js.erb
 - app/views/spree/shared/_products_list_item.html.erb
+- app/views/spree/zoned/_billing.html.erb
 - app/views/spree/zoned/_countryselect.html.erb
 - app/views/spree/zoned/_product_price.html.erb
 - app/views/spree/zoned/setcountry.js.erb