spree_address_book 0.50.2 → 0.60.0

data/app/controllers/addresses_controller.rb

@@ -1,4 +1,5 @@
 class AddressesController < Spree::BaseController
+  helper AddressesHelper
   rescue_from ActiveRecord::RecordNotFound, :with => :render_404
   load_and_authorize_resource
   

data/app/controllers/checkout_controller_decorator.rb

@@ -1,4 +1,6 @@
 CheckoutController.class_eval do
+  helper AddressesHelper
+  
   after_filter :normalize_addresses, :only => :update
   before_filter :set_addresses, :only => :update
   
@@ -24,6 +26,9 @@ CheckoutController.class_eval do
     return unless params[:state] == "address" && @order.bill_address_id && @order.ship_address_id
     @order.bill_address.reload
     @order.ship_address.reload
+    # ensure that there is no validation errors and addresses was saved
+    return unless @order.bill_address && @order.ship_address
+    
     if @order.bill_address_id != @order.ship_address_id && @order.bill_address.same_as?(@order.ship_address)
       @order.bill_address.destroy
       @order.update_attribute(:bill_address_id, @order.ship_address.id)

data/app/helpers/{checkout_helper_decorator.rb → addresses_helper.rb}

@@ -1,4 +1,4 @@
-CheckoutHelper.module_eval do
+module AddressesHelper
   def address_field(form, method, id_prefix = "b", &handler)
     content_tag :p, :id => [id_prefix, method].join, :class => "field" do
       if handler

data/app/views/addresses/edit.html.erb

@@ -1,7 +1,7 @@
 <style>
   form p.field input[type=text], form p.field select { width: 80%; float: none; }
   .hidden { display: none; }
-  div.inner label { width: 15%; display: inline-block; }
+  div.inner label { width: auto; padding-right: 5px; display: inline-block; }
   form p.field span.req { float: none; }
 </style>
 <%= form_for @address do |f| %>

data/app/views/checkout/_address.html.erb

@@ -20,18 +20,17 @@
       </label>
     </p>
   <% end %>
-  <div class="select_address" data-role="fieldcontain">
-    <fieldset data-role="controlgroup">
+  <div class="select_address">
+    <p class="field">
       <% if @addresses.present? %>
         <% @addresses.each_with_index do |address, idx| %>
-          <%= form.radio_button "#{address_name}_id", address.id, :checked => (idx == 0) %> 
-          <%= form.label ["#{address_name}_id", address.id], address.to_s %>
-          <%= link_to t(:edit), edit_address_path(address) %><br />
+        <span id="<%= [address_type, dom_id(address)].join('_') %>">
+          <label><%= form.radio_button "#{address_name}_id", address.id, :checked => (idx == 0) %> <%= address %></label> <%= link_to t(:edit), edit_address_path(address) %><br />
+        </span>
         <% end %>
-        <%= form.radio_button "#{address_name}_id", 0 %>
-        <%= form.label ["#{address_name}_id", 0], t('other_address') %>
+        <label><%= form.radio_button "#{address_name}_id", 0 %> <%= t('other_address') %></label>
       <% end %>
-    </fieldset>
+    </p>
   </div>
   <%= form.fields_for address_name do |address_form| %>
     <div class="inner">

data/spree_address_book.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_address_book'
-  s.version     = '0.50.2'
+  s.version     = '0.60.0'
   s.summary     = 'Adds address book for users to Spree'
   #s.description = 'Add (optional) gem description here'
   s.required_ruby_version = '>= 1.8.7'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_address_book
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 239
+  prerelease: 
   segments: 
   - 0
-  - 50
-  - 2
-  version: 0.50.2
+  - 60
+  - 0
+  version: 0.60.0
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -14,16 +15,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-25 00:00:00 +04:00
-default_executable: 
+date: 2012-07-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spree_core
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 215
         segments: 
         - 0
         - 50
@@ -35,9 +37,11 @@ dependencies:
   name: spree_auth
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 215
         segments: 
         - 0
         - 50
@@ -61,7 +65,7 @@ files:
 - Versionfile
 - app/controllers/addresses_controller.rb
 - app/controllers/checkout_controller_decorator.rb
-- app/helpers/checkout_helper_decorator.rb
+- app/helpers/addresses_helper.rb
 - app/models/address_decorator.rb
 - app/models/order_decorator.rb
 - app/models/user_decorator.rb
@@ -88,7 +92,6 @@ files:
 - spec/models/address_spec.rb
 - spec/spec_helper.rb
 - spree_address_book.gemspec
-has_rdoc: true
 homepage: http://github.com/romul/spree_address_book
 licenses: []
 
@@ -98,25 +101,29 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 57
       segments: 
       - 1
       - 8
       - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - none
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Adds address book for users to Spree