spree_address_book 0.50.0 → 0.50.1

data/app/controllers/addresses_controller.rb

@@ -1,12 +1,33 @@
 class AddressesController < Spree::BaseController
-  def destroy
-    @address = Address.find(params[:id])
-    if @address && @address.user == current_user
-      if @address.can_be_deleted?
-        @address.destroy
-      else
-        @address.update_attribute(:deleted_at, Time.now)
+  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
+  load_and_authorize_resource
+  
+  def edit
+    session["user_return_to"] = request.env['HTTP_REFERER']
+  end
+  
+  def update
+    if @address.editable?
+      if @address.update_attributes(params[:address])
+        flash[:notice] = I18n.t(:successfully_updated, :resource => I18n.t(:address))
+      end
+    else
+      new_address = @address.clone
+      new_address.attributes = params[:address]
+      @address.update_attribute(:deleted_at, Time.now)
+      if new_address.save
+        flash[:notice] = I18n.t(:successfully_updated, :resource => I18n.t(:address))
       end
     end
+    redirect_back_or_default(account_path)
+  end
+
+  def destroy
+    if @address.can_be_deleted?
+      @address.destroy
+    else
+      @address.update_attribute(:deleted_at, Time.now)
+    end
+    redirect_to(request.env['HTTP_REFERER'] || account_path) unless request.xhr?
   end
 end

data/app/models/user_decorator.rb

@@ -1,3 +1,3 @@
 User.class_eval do
-  has_many :addresses, :conditions => {:deleted_at => nil}
+  has_many :addresses, :conditions => {:deleted_at => nil}, :order => "updated_at DESC"
 end

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

@@ -0,0 +1,18 @@
+<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; }
+  form p.field span.req { float: none; }
+</style>
+<%= form_for @address do |f| %>
+<fieldset>
+  <div class="inner">
+    <%= render :partial => 'addresses/form', :locals => {
+      :address_name => 'address',
+      :address_form => f,
+      :address => @address
+    } %>
+  </div>
+  <%= f.submit t(:update) %>
+</fieldset>
+<% end %>

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

@@ -4,6 +4,8 @@
   .hidden { display: none; }
   div#checkout #checkout_form_address #billing .select_address label { float:none; }
   div#checkout #checkout_form_address #shipping .select_address label { float:none; }
+  div#checkout #checkout_form_address #billing input[type=radio] { width: auto; }
+  div#checkout #checkout_form_address #shipping input[type=radio] { width: auto; }
 </style>
 
 <% ['billing', 'shipping'].each do |address_type|
@@ -21,9 +23,9 @@
   <div class="select_address">
     <p class="field">
       <% if @addresses.present? %>
-        <% @addresses.each do |address| %>
+        <% @addresses.each_with_index do |address, idx| %>
         <span id="<%= [address_type, dom_id(address)].join('_') %>">
-          <label><%= form.radio_button "#{address_name}_id", address.id %> <%= address %></label> <%= link_to t(:remove), address, :method => :delete, :remote => true %><br />
+          <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 %>
         <label><%= form.radio_button "#{address_name}_id", 0 %> <%= t('other_address') %></label>
@@ -36,7 +38,7 @@
       <%= render :partial => 'addresses/form', :locals => {
         :address_name => address_name,
         :address_form => address_form,
-        :address => @order.send(address_name)
+        :address => Address.default
       } %>    
     </div>
   <% end %>

data/app/views/users/_addresses.html.erb

@@ -0,0 +1,20 @@
+<% if current_user.addresses.present? %>
+<h2><%= Address.human_name(:count => 2) %></h2>
+<table class="order-summary" width="545">
+  <thead>
+    <tr>
+      <th><%= Address.human_name %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+  <% current_user.addresses.each do |address| %>
+    <tr class="<%= cycle('even', 'odd') %>">
+      <td><%= address %></td>
+      <td><%= link_to t(:edit), edit_address_path(address) %></td>
+      <td><%= link_to t(:remove), address_path(address), :method => :delete, :confirm => t(:are_you_sure) %></td>
+    </tr>
+  <% end %>
+  </tbody>
+</table>
+<% end %>

data/lib/address_ability.rb

@@ -0,0 +1,9 @@
+class AddressAbility
+  include CanCan::Ability
+
+  def initialize(user)
+    can :manage, Address do |address|
+      address.user == user
+    end
+  end
+end

data/lib/spree_address_book.rb

@@ -10,6 +10,7 @@ module SpreeAddressBook
       Dir.glob(File.join(File.dirname(__FILE__), "../app/**/*_decorator*.rb")) do |c|
         Rails.env.production? ? require(c) : load(c)
       end
+      Ability.register_ability(AddressAbility)
     end
 
     config.to_prepare &method(:activate).to_proc

data/lib/spree_address_book_hooks.rb

@@ -1,3 +1,3 @@
 class SpreeAddressBookHooks < Spree::ThemeSupport::HookListener
-  # custom hooks go here
-end
+  insert_after :account_my_orders, :partial => 'users/addresses'
+end

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.0'
+  s.version     = '0.50.1'
   s.summary     = 'Adds address book for users to Spree'
   #s.description = 'Add (optional) gem description here'
   s.required_ruby_version = '>= 1.8.7'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 50
-  - 0
-  version: 0.50.0
+  - 1
+  version: 0.50.1
 platform: ruby
 authors: 
 - Roman Smirnov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 +04:00
+date: 2011-05-12 00:00:00 +04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,9 @@ files:
 - app/models/user_decorator.rb
 - app/views/addresses/_form.html.erb
 - app/views/addresses/destroy.js.erb
+- app/views/addresses/edit.html.erb
 - app/views/checkout/_address.html.erb
+- app/views/users/_addresses.html.erb
 - config/initializers/address_fields.rb
 - config/locales/en.yml
 - config/locales/ru.yml
@@ -76,6 +78,7 @@ files:
 - features/step_definitions/address_book_steps.rb
 - features/support/env.rb
 - features/support/paths.rb
+- lib/address_ability.rb
 - lib/spree_address_book.rb
 - lib/spree_address_book_hooks.rb
 - lib/tasks/install.rake