spree 0.5.1 → 0.6.0

data/app/controllers/admin/users_controller.rb

@@ -1,3 +1,34 @@
-class Admin::UsersController < Spree::BaseController
-  resource_controller
+class Admin::UsersController < Admin::BaseController
+  resource_controller                                                             
+  before_filter :initialize_extension_partials
+  before_filter :load_roles, :only => [:edit, :new, :update, :create]
+  
+  create.after do   
+    save_user_roles
+  end
+
+  update.before do
+    save_user_roles
+  end
+                
+  private
+  def collection   
+    @filter = UserFilter.new(params[:filter])
+
+    scope = User.scoped({})
+    scope = scope.conditions "lower(email) = ?", @filter.email.downcase unless @filter.email.blank?
+    @collection = scope.find(:all, :order => 'email', :page => {:size => 15, :current =>params[:p], :first => 1})
+  end
+
+  def load_roles
+    @roles = Role.all
+  end
+  
+  def save_user_roles
+    return unless params[:user]
+    @user.roles.delete_all
+    Role.find(:all).each { |role|
+      @user.roles << role if !params[:user]['role_' + role.name].blank?
+    }
+  end
 end

data/app/controllers/admin/variants_controller.rb

@@ -1,8 +1,7 @@
 class Admin::VariantsController < Admin::BaseController
   resource_controller
   belongs_to :product
-  before_filter :load_data, :only => [:index, :edit, :new]
-  
+
   new_action.response do |wants|
     wants.html {render :action => :new, :layout => false}
   end
@@ -23,10 +22,29 @@ class Admin::VariantsController < Admin::BaseController
     wants.html {redirect_to collection_url}
   end
   
-  private
-  def load_data
-    # this allows extensions to provide their own additional columns in the index and edit views
-    @additional_fields = Variant.column_names - ["id", "price", "sku", "product_id"]
+  # override the destory method to set deleted_at value 
+  # instead of actually deleting the product.
+  def destroy
+    @variant = Variant.find(params[:id])
+      
+    @variant.deleted_at = Time.now()
+    if @variant.save
+      flash[:notice] = "Variant has been deleted"
+    else
+      flash[:notice] = "Variant could not be deleted"
+    end
+    
+    redirect_to admin_product_variants_url(params[:product_id])
   end
   
+  private 
+  def collection
+    @deleted =  (params.key?(:deleted)  && params[:deleted] == "on") ? "checked" : ""
+    
+    if @deleted.blank?
+      @collection ||= end_of_association_chain.active.find(:all)
+    else
+      @collection ||= end_of_association_chain.deleted.find(:all)
+    end
+  end
 end

data/app/controllers/application.rb

@@ -15,6 +15,7 @@ class ApplicationController < ActionController::Base
   include AuthenticatedSystem
   include RoleRequirementSystem
   include EasyRoleRequirementSystem
+  include SslRequirement
   
   private 
   
@@ -24,5 +25,5 @@ class ApplicationController < ActionController::Base
     
     @taxonomies = Taxonomy.find(:all, :include => {:root => :children})
   end
-  
+
 end

data/app/controllers/creditcards_controller.rb

@@ -0,0 +1,73 @@
+class CreditcardsController < Spree::BaseController
+  before_filter :load_data
+  before_filter :validate_payment, :only => :create   
+  before_filter :state_check, :except => [:country_changed, :cvv]  
+  ssl_required :new, :create
+  layout 'application'
+  resource_controller
+  
+  belongs_to :order
+  actions :new, :create
+
+  # override the r_c create since we need special logic to deal with the presenter in the create case
+  def create
+    creditcard = @payment_presenter.creditcard
+    creditcard.address = @payment_presenter.address
+    creditcard.order = @order
+    
+    begin
+      creditcard.authorize(@order.total)
+    rescue Spree::GatewayError => ge
+      flash.now[:error] = "Authorization Error: #{ge.message}"
+      render :action => "new" and return 
+    end
+    creditcard.save
+    @order.next!
+    redirect_to checkout_order_url(@order)
+  end
+
+  def cvv
+    render :layout => false
+  end
+  
+  def country_changed
+    render :partial => "shared/states", :locals => {:presenter_type => "creditcard"}
+  end
+  
+  private
+  def load_data 
+    load_object
+    @selected_country_id = params[:payment_presenter][:address_country_id].to_i if params.has_key?('payment_presenter')
+    @selected_country_id ||= @order.ship_address.country_id unless @order.nil? || @order.ship_address.nil?  
+    @selected_country_id ||= Spree::Config[:default_country_id]
+ 
+    @states = State.find_all_by_country_id(@selected_country_id, :order => 'name')  
+    @countries = Country.find(:all)
+  end
+  
+  def build_object
+    address = parent_object.ship_address ? parent_object.ship_address : Address.new(:country_id => @selected_country_id)
+    @payment_presenter ||= PaymentPresenter.new(:address => address)    
+  end
+  
+  def validate_payment
+    # load the object so that its available to the form in the event of a validation error
+    load_object
+    load_payment_presenter
+    render :action => "new" unless @payment_presenter.valid?
+  end
+  
+  def load_payment_presenter
+    payment_presenter = PaymentPresenter.new(params[:payment_presenter]) 
+    payment_presenter.creditcard.first_name = payment_presenter.address.firstname
+    payment_presenter.creditcard.last_name = payment_presenter.address.lastname
+    @payment_presenter = payment_presenter
+  end
+  
+  def state_check
+    if @order.checkout_complete
+      # if order has already completed user shouldn't be able to enter new cc information
+      redirect_to checkout_order_url(@order) and return 
+    end
+  end  
+end

data/app/controllers/orders_controller.rb

@@ -1,15 +1,20 @@
-class OrdersController < Admin::BaseController
-  before_filter :login_required, :only => [:checkout]
-  before_filter :load_object, :only => [:checkout]
+class OrdersController < Spree::BaseController
+  before_filter :require_user_account, :only => [:checkout]
+  before_filter :load_object, :only => [:checkout]          
+  before_filter :prevent_editing_complete_order, :only => [:edit, :update]            
+
+  ssl_required :show
+
+  resource_controller
+  actions :all, :except => :index
+
   layout 'application'
   
   helper :products
-  
-  resource_controller
 
   create.after do    
     # add the specified product to the order
-    @order.add_variant(Variant.find(params[:id]))    
+    @order.add_variant(Variant.find(params[:variant][:id]))
     @order.save
   end
 
@@ -18,9 +23,8 @@ class OrdersController < Admin::BaseController
     flash nil 
     wants.html {redirect_to edit_order_url(@order)}
   end
-  
-  # override the default r_c behavior (r_c doesn't realize we're in a multi step process here)
-  edit.before {@order.edit!}
+                                                                           
+  edit.before { @order.edit! }
   
   def checkout
     if @order.state == "in_progress"
@@ -31,7 +35,7 @@ class OrdersController < Admin::BaseController
     if object.checkout_complete
       # remove the order from the session
       session[:order_id] = nil
-      redirect_to object_url and return
+      redirect_to object_url(:checkout_complete => true) and return
     else
       # note: controllers participating in checkout process are responsible for calling Order#next! 
       next_url = self.send("new_order_#{object.state}_url", @order)
@@ -51,19 +55,10 @@ class OrdersController < Admin::BaseController
   end
 
   protected
-  # Custom access denied action for orders.  In the case of an order, we'd like the user to be presented with a user 
-  # signup screen (as opposed to login) since its likely the user does not yet have an account.  The signup screen 
-  # also contains a link to the login screen if they already have an account.
-  def access_denied
-    respond_to do |format|
-      format.html do
-        store_location
-        redirect_to signup_path
-      end
-      format.xml do
-        request_http_basic_authentication 'Web Password'
-      end
-    end
+  def require_user_account
+    return if logged_in?
+    store_location
+    redirect_to signup_path 
   end
     
   private
@@ -82,5 +77,9 @@ class OrdersController < Admin::BaseController
       end
     end
     find_order
+  end   
+  
+  def prevent_editing_complete_order
+    redirect_to object_url unless @order.can_edit?
   end
 end

data/app/controllers/products_controller.rb

@@ -1,6 +1,7 @@
 class ProductsController < Spree::BaseController
-  helper :taxons
   resource_controller
+  helper :taxons
+  before_filter :load_data, :only => :show
   actions :show, :index
 
   index do
@@ -16,18 +17,23 @@ class ProductsController < Spree::BaseController
   end
 
   private
+  def load_data
+    
+    return unless permalink = params[:taxon_path]
+    @taxon = Taxon.find_by_permalink(params[:taxon_path].join("/") + "/")
+  end
+  
+  def collection
+    if params[:taxon]
+      @taxon = Taxon.find(params[:taxon])
 
-    def collection
-      if params[:taxon]
-        @taxon = Taxon.find(params[:taxon])
-
-        @collection ||= Product.available.find(
-          :all, 
-          :conditions => ["products.id in (select product_id from products_taxons where taxon_id in (" +  @taxon.descendents.inject( @taxon.id.to_s) { |clause, t| clause += ', ' + t.id.to_s} + "))" ], 
-          :page => {:start => 1, :size => 10, :current => params[:p]}, 
-          :include => :images)
-      else
-        @collection ||= Product.available.find(:all, :page => {:start => 1, :size => 10, :current => params[:p]}, :include => :images)
-      end
+      @collection ||= Product.active.find(
+        :all, 
+        :conditions => ["products.id in (select product_id from products_taxons where taxon_id in (" +  @taxon.descendents.inject( @taxon.id.to_s) { |clause, t| clause += ', ' + t.id.to_s} + "))" ], 
+        :page => {:start => 1, :size => Spree::Config[:products_per_page], :current => params[:p]}, 
+        :include => :images)
+    else
+      @collection ||= Product.active.find(:all, :page => {:start => 1, :size => Spree::Config[:products_per_page], :current => params[:p]}, :include => :images)
     end
+  end
 end

data/app/controllers/taxons_controller.rb

@@ -12,8 +12,12 @@ class TaxonsController < Spree::BaseController
   
   private
   def load_data
-    @products ||= object.products.available.find(:all, :page => {:start => 1, :size => 10, :current => params[:p]}, :include => :images)
+    @products ||= object.products.active.find(:all, :page => {:start => 1, :size => Spree::Config[:products_per_page], :current => params[:p]}, :include => :images)
     @product_cols = 3
   end
   
+  def object
+    objects ||= end_of_association_chain.find_by_permalink(params[:id].join("/") + "/")
+  end
+ 
 end

data/app/controllers/users_controller.rb

@@ -1,10 +1,14 @@
 class UsersController < Spree::BaseController
   
-  before_filter :login_required, :except => [:new, :create]
+#  before_filter :login_required, :except => [:new, :create]
   before_filter :initialize_extension_partials
-  before_filter :can_only_edit_self, :only => [:edit, :update, :show]
   
   resource_controller
+  actions :all, :except => [:index, :destroy]
+  
+  show.before do
+    @orders = Order.checkout_completed(true).find_all_by_user_id(current_user.id)
+  end
 
   create.after do   
     self.current_user = @user       
@@ -14,10 +18,4 @@ class UsersController < Spree::BaseController
     wants.html { redirect_back_or_default(products_path) }         
   end
   
-  protected
-  
-  def can_only_edit_self
-    access_denied unless current_user.id == params[:id].to_i || current_user.has_role?("admin")
-  end
-  
 end

data/app/helpers/admin/base_helper.rb

@@ -1,11 +1,27 @@
 module Admin::BaseHelper
   
   def link_to_edit(resource)
-    link_to t("Edit"), edit_object_url(resource)
+    link_to t("edit"), edit_object_url(resource)
   end
   
   def link_to_delete(resource)
-    link_to t("Delete"), object_url(resource), :confirm => "Are you sure you want to delete this record?", :method => :delete 
+    link_to t("delete"), object_url(resource), :confirm => t('are_you_sure'), :method => :delete 
+  end
+  
+  def get_additional_field_value(controller, field)  
+    attribute = field[:name].gsub(" ", "_").downcase
+
+    value = eval("@" + controller.controller_name.singularize + "." + attribute)  
+    
+    if value.nil? && controller.controller_name == "variants"
+      value = @variant.product.has_attribute?(attribute) ? @variant.product[attribute] : nil
+    end
+
+    if value.nil?
+      return value
+    else
+      return field.key?(:format) ? sprintf(field[:format], value) : value
+    end
   end
   
 end

data/app/helpers/admin/orders_helper.rb

@@ -1,17 +1,4 @@
 module Admin::OrdersHelper
-
-  # Gets the list of available transitions for the specified state
-  def available_events(order)
-    #TODO - optimize this with some form of cacheing (should be a finite list that would only change after new code)
-    state_machine = Order.state_machines['state']
-    available = []
-    events = state_machine.events.keys
-    events.each do |event|
-      available << (link_to event, fire_admin_order_url(order, :e => event), :method => :put) if order.send("can_#{event}?")
-    end
-    return "" if available.empty?
-    available.join(' &nbsp;')
-  end
   
   # Renders all the txn partials that may have been specified in the extensions
   def render_txn_partials(order)
@@ -20,4 +7,14 @@ module Admin::OrdersHelper
     end
   end
   
+  # Renders all the extension partials that may have been specified in the extensions
+  def event_links
+    links = []
+    @order_events.sort.each do |event| 
+      links << (link_to event, fire_admin_order_url(@order, :e => event), {:method => :put, :confirm => "Are you sure you want to #{event}?"}) if @order.send("can_#{event}?")
+    end
+    return "" if links.empty?
+    links.join(' &nbsp;')    
+  end
+  
 end

data/app/helpers/admin/users_helper.rb

@@ -1,2 +1,5 @@
-module Admin::UsersHelper
+module Admin::UsersHelper        
+  def list_roles(user)
+    user.roles.collect {|role| role.name}.join ", "    
+  end
 end

data/app/helpers/application_helper.rb

@@ -23,11 +23,22 @@ module ApplicationHelper
   # Renders all the extension partials that may have been specified in the extensions
   def render_extra_partials(f)
     @extension_partials.inject("") do |extras, partial|
-      extras += render :partial => partial, :locals => {:form => f}
+      extras += render :partial => partial, :locals => {:f => f}
     end
   end
   
   def flag_image(code)
     "#{code.to_s.split("-").last.downcase}.png"
+  end                      
+  
+  # Takes a filter and converts it into a hash of name/value pairs that can be used in query string
+  def generate_search_options(filter)
+    options = {}
+    filter.attributes.each do |key, value|
+      filter_key = "filter[#{key.to_s}]"
+      options[filter_key] = value
+    end
+    options
   end
+  
 end

data/app/helpers/products_helper.rb

@@ -16,9 +16,9 @@ module ProductsHelper
     diff = product_price(variant, :format_as_currency => false) - product_price(variant.product, :format_as_currency => false)
     return nil if diff == 0
     if diff > 0
-      "(#{t("Add")}: #{format_price diff.abs})"
+      "(#{t("add")}: #{format_price diff.abs})"
     else
-      "(#{t("Subtract")}: #{format_price diff.abs})"
+      "(#{t("subtract")}: #{format_price diff.abs})"
     end
   end
   
@@ -31,4 +31,11 @@ module ProductsHelper
     product.description.gsub(/^(.*)$/, '<p>\1</p>')
   end  
   
+  # generates nested url to product based on supplied taxon
+  def seo_url(taxon, product = nil)
+    return '/t/' + taxon.permalink if product.nil?
+    
+    '/t/' + taxon.permalink + "p/" + product.permalink
+  end
+  
 end