spree 0.5.1 → 0.6.0

data/CHANGELOG

@@ -1,9 +1,60 @@
-== 0.5.1
-
-* #139: Spree command not working if Rails 2.2.2 installed on the same system
-* #138: Support all Rails 2.1.x versions (not just 2.1.2)
-* #140: Fix active_merchant deprecation warnings
-* #141: Fix deprecation warnings for Dependencies
+== 0.6.0
+
+* #	129 - Public extension assets don't respect order when mirrored.
+* #	131 - Core specs keeps being overriden by extension specs.
+* #	132 - Add support for use routes.rb files inside extensions instead of using class_eval.
+* #	133 - Make extension gems be installed by the same gem tasks that installs the system gems.
+* #	136 - SEO Friendly URL's for Taxonomy
+* #	142 - Spree don't bootstrap from inside skeleton root dir.
+* #	145 - Remove legacy FLAT_SHIPPING_RATE variable
+* #	146 - All actions in the admin order list view should be confirmed
+* #	147 - Params[:id] in OrdersController used for both product id and order id
+* #	149 - Bootstrap task should load sample data from SPREE_ROOT instead of RAILS_ROOT
+* #	150 - Allow users to configure SSL settings for all modes.
+* #	151 - Switch from attachment_fu to paperclip.
+* #	152 - Allow extensions to add tabs to products admin UI
+* #	153 - Allow adding fields to either products or variants
+* #	156 - New taxonomy is created with a nil permalink
+* #	158 - CamelCased migration name results in incorrect migration file name
+* #	159 - Make the number of products that are displayed on the admin interface configurable.
+* #	160 - Renaming a product causes exception
+* #	161 - Borders not appearing correctly on cart view (Safari Only)
+* #	162 - Paranoid deletion of products.
+* #	163 - Allow user to configure default tax category for products
+* #	164 - Validation error messages for tax category and shipping category.
+* #	165 - Child taxon permalinks can get out of date when parent updates
+* #	167 - Improper zone matching for tax calculations if shipping zones are also configured
+* #	168 - Product named_scopes should use table names
+* #	169 - Old taxons route needs to be repositioned
+* #	171 - Order status filter does not work with certain state names.
+* #	172 - Allow user to configure the logo in the admin user interface
+* #	173 - Allow shipping of backordered items.
+* #	174 - Allow orders to be searched by name
+* #	175 - Show default "No Image Available" placeholder when a product doesn't have any images.
+* #	176 - Order search results are not preserved when paging
+* #	177 - Searching on products and associated models can be slow
+* #	178 - Standardize security model
+* #	179 - Unauthorized users are redirected to login page.
+* #	180 - Allow usesr to view their order history
+* #	181 - My account should not show incomplete orders
+* #	184 - add variant
+* #	185 - When executing rake specs from inside an extension only its specs should be executed
+* #	186 - Add paging to admin/users
+* #	187 - Allow admin to assign user roles
+* #	189 - Text Bug
+* #	190 - Add "Resume" event for undoing canceled orders, etc.
+* #	191 - Country list on address form is firing ajax queries too frequently.
+* #	192 - shared/form_address partial hard codes the address_country_id field id
+* #	193 - Allow admin to search existing users
+* #	194 - Allow orders per page to be configurable
+* #	197 - Disable bootstrap task in production
+* #	203 - Create a rake task for keeping translation files in sync with en-US.yml
+* #	210 - Error when attemtping to create new taxonomy
+* #	216 - New rake task for creating new translations
+* #	221 - Rake tasks fail if activemerchant gem is not up to date
+* #	222 - New demo mode for use in the online demo
+* #	224 - BCC email is not sent if only one the bcc fields is configured
+* #	229 - generate_secret is deprecated
 
 == 0.5.0
 

data/app/controllers/admin/base_controller.rb

@@ -1,4 +1,17 @@
 class Admin::BaseController < Spree::BaseController
   helper :search
   layout 'admin'
+  
+  before_filter :initialize_product_admin_tabs
+  before_filter :initialize_order_admin_tabs
+  
+  #used to add tabs / partials to product admin interface
+  def initialize_product_admin_tabs
+    @product_admin_tabs = []
+  end
+
+  #used to add tabs / partials to order admin interface
+  def initialize_order_admin_tabs
+    @order_admin_tabs = []
+  end
 end

data/app/controllers/admin/creditcard_payments_controller.rb

@@ -0,0 +1,96 @@
+class Admin::CreditcardPaymentsController < Admin::BaseController
+  before_filter :load_data
+  before_filter :load_amount, :except => :country_changed
+  before_filter :validate_payment, :only => :create
+  resource_controller
+  belongs_to :order
+  ssl_required
+
+  # override the r_c defauult since he have the special presenter logic and we need to capture before storing cc info.
+  def create
+    creditcard = @payment_presenter.creditcard
+    creditcard.address = @payment_presenter.address
+    creditcard.order = @order
+    begin
+      creditcard.purchase(params[:amount])
+    rescue Spree::GatewayError => ge
+      flash.now[:error] = "Authorization Error: #{ge.message}"
+      render :action => "new" and return 
+    end
+    @order.creditcards << creditcard
+    # TODO - eventually the amount should be passed as a parameter
+    @order.save
+    redirect_to admin_order_payments_url(@order)
+  end
+  
+  # override r_c default with special presenter logic
+  def edit 
+    @payment_presenter = PaymentPresenter.new(:creditcard => object.creditcard, :address => object.creditcard.address)    
+  end
+  
+  # override r_c default with special presenter logic
+  def update
+    load_payment_presenter
+    creditcard = @creditcard_payment.creditcard
+    creditcard.address = @payment_presenter.address
+    creditcard.save
+    flash[:notice] = t("Updated Successfully")
+    redirect_to edit_object_url 
+  end
+
+  def cvv
+    render :layout => false
+  end
+  
+  def country_changed
+    render :partial => "shared/states", :locals => {:presenter_type => "payment"}
+  end
+         
+  def capture       
+    if @creditcard_payment.can_capture?      
+      creditcard = @creditcard_payment.creditcard
+      authorization = @creditcard_payment.find_authorization
+      creditcard.capture(authorization)
+      @creditcard_payment.amount = authorization.amount
+      @creditcard_payment.save
+      flash[:notice] = t("credit_card_capture_complete")
+    else  
+      flash[:error] = t("unable_to_capture_credit_card")    
+    end 
+    redirect_to edit_object_url
+  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.creditcards.last.address.country_id unless @order.creditcards.empty?
+    @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 load_amount
+    @amount = params[:amount] || @order.total
+  end
+
+  def build_object
+    address = parent_object.ship_address ? parent_object.ship_address : Address.new
+    @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  
+end

data/app/controllers/admin/general_settings_controller.rb

@@ -0,0 +1,13 @@
+class Admin::GeneralSettingsController < Admin::BaseController
+
+  def update
+    Spree::Config.set(params[:preferences])
+    
+    respond_to do |format|
+      format.html {
+        redirect_to admin_general_settings_path
+      }
+    end
+  end
+
+end

data/app/controllers/admin/orders_controller.rb

@@ -2,26 +2,20 @@ class Admin::OrdersController < Admin::BaseController
   require 'spree/gateway_error'
   resource_controller
   before_filter :initialize_txn_partials
+  before_filter :initialize_order_events
   before_filter :load_object, :only => [:fire, :resend]
 
-  in_place_edit_for :address, :firstname
-  in_place_edit_for :address, :lastname
-  in_place_edit_for :address, :address1
-  in_place_edit_for :address, :address2
-  in_place_edit_for :address, :city
-  in_place_edit_for :address, :zipcode
-  in_place_edit_for :address, :phone
   in_place_edit_for :user, :email
-  
+
   def fire   
     # TODO - possible security check here but right now any admin can before any transition (and the state machine 
     # itself will make sure transitions are not applied in the wrong state)
     event = params[:e]
     Order.transaction do 
+      @order.state_events.create(:name => t(event), :user => current_user, :previous_state => @order.state)
       @order.send("#{event}!")
-      @order.state_events.create(:name => t(event), :user => current_user)
     end
-    flash[:notice] = t('Order Updated')
+    flash[:notice] = t('order_updated')
   rescue Spree::GatewayError => ge
     flash[:error] = "#{ge.message}"
   ensure
@@ -36,30 +30,30 @@ class Admin::OrdersController < Admin::BaseController
   
   private
   def collection   
-    @filter = params.has_key?(:filter) ? OrderFilter.new(params[:filter]) : OrderFilter.new(:checkout => "1")
- 
-    scopes = []
-    if params[:filter] and @filter.valid?
-      default_stop = (Date.today + 1).to_s(:db)
-     
-      scopes << [ :by_number, @filter.number ] unless @filter.number.blank?
-      scopes << [ :by_customer, @filter.customer ] unless @filter.customer.blank?
-      scopes << [ :between, @filter.start, (@filter.stop.blank? ? default_stop : @filter.stop) ] unless @filter.start.blank?
-      scopes << [ :by_state, @filter.state.tableize.singularize.gsub(" ", "_") ] unless @filter.state.blank?
-      scopes << [ :checkout_completed, @filter.checkout=='1' ? true : false] unless @filter.checkout.blank?  
-    else
-      scopes << [ :checkout_completed, true]  
-    end
-    
-    
-    @collection = (scopes.inject(Order) {|m,v| m.scopes[v.shift].call(m, *v) }).find(:all, :order => 'orders.created_at DESC', :include => :user,
-       :page => {:size => 15, :current =>params[:p], :first => 1})
+    default_stop = (Date.today + 1).to_s(:db)
+    @filter = params.has_key?(:filter) ? OrderFilter.new(params[:filter]) : OrderFilter.new
+
+    scope = Order.scoped(:include => [:shipments, {:creditcards => :address}])
+    scope = scope.by_number @filter.number unless @filter.number.blank?
+    scope = scope.by_customer @filter.customer unless @filter.customer.blank?
+    scope = scope.between(@filter.start, (@filter.stop.blank? ? default_stop : @filter.stop)) unless @filter.start.blank?
+    scope = scope.by_state @filter.state.classify.downcase.gsub(" ", "_") unless @filter.state.blank?
+    scope = scope.conditions "lower(addresses.firstname) LIKE ?", "%#{@filter.firstname.downcase}%" unless @filter.firstname.blank?
+    scope = scope.conditions "lower(addresses.lastname) LIKE ?", "%#{@filter.lastname.downcase}%" unless @filter.lastname.blank?
+    scope = scope.checkout_completed(@filter.checkout == '1' ? false : true)
 
+    @collection = scope.find(:all, :order => 'orders.created_at DESC', :include => :user, :page => {:size => Spree::Config[:orders_per_page], :current =>params[:p], :first => 1})
   end
   
   # Allows extensions to add new forms of payment to provide their own display of transactions
   def initialize_txn_partials
     @txn_partials = []
   end
+  
+  # Used for extensions which need to provide their own custom event links on the order details view.
+  def initialize_order_events
+    @order_events = %w{cancel resume}
+  end
+  
 
 end

data/app/controllers/admin/payments_controller.rb

@@ -0,0 +1,5 @@
+class Admin::PaymentsController < Admin::BaseController
+  resource_controller
+  belongs_to :order
+  ssl_required
+end

data/app/controllers/admin/products_controller.rb

@@ -3,6 +3,12 @@ class Admin::ProductsController < Admin::BaseController
   before_filter :load_data
   after_filter :set_image, :only => [:create, :update]
 
+  # set the default tax_category if applicable
+  new_action.before do
+    next unless Spree::Config[:default_tax_category]
+    @product.tax_category = TaxCategory.find_by_name Spree::Config[:default_tax_category]
+  end
+  
   update.before do
     # note: we only reset the product properties if we're receiving a post from the form on that tab
     next unless params[:clear_product_properties] 
@@ -12,7 +18,28 @@ class Admin::ProductsController < Admin::BaseController
 
   update.response do |wants| 
     # override the default redirect behavior of r_c
-    wants.html {redirect_to edit_object_url}
+    # need to reload Product in case name / permalink has changed
+    wants.html {redirect_to edit_admin_product_url(Product.find(@product.id)) }
+  end
+  
+  # override the destory method to set deleted_at value 
+  # instead of actually deleting the product.
+  def destroy
+    @product = Product.find_by_permalink(params[:id])
+    @product.deleted_at = Time.now()
+    
+    @product.variants.each do |v|   
+      v.deleted_at = Time.now()
+      v.save
+    end
+    
+    if @product.save
+      flash[:notice] = "Product has been deleted"
+    else
+      flash[:notice] = "Product could not be deleted"
+    end
+    
+    redirect_to collection_url
   end
   
   private
@@ -23,7 +50,7 @@ class Admin::ProductsController < Admin::BaseController
 
     def set_image
       return unless params[:image]
-      return if params[:image][:uploaded_data].blank?    
+      return if params[:image][:attachment].blank?    
       image = Image.create params[:image] if params[:image]
       object.images << image
     end
@@ -31,10 +58,20 @@ class Admin::ProductsController < Admin::BaseController
     def collection
       @name = params[:name] || ""
       @sku = params[:sku] || ""
+      @deleted =  (params.key?(:deleted)  && params[:deleted] == "on") ? "checked" : ""
+      
       if @sku.blank?
-        @collection ||= end_of_association_chain.by_name(@name).find(:all, :order => :name, :page => {:start => 1, :size => 10, :current => params[:p]})
+        if @deleted.blank?
+          @collection ||= end_of_association_chain.active.by_name(@name).find(:all, :order => :name, :page => {:start => 1, :size => Spree::Config[:admin_products_per_page], :current => params[:p]})
+        else
+          @collection ||= end_of_association_chain.deleted.by_name(@name).find(:all, :order => :name, :page => {:start => 1, :size => Spree::Config[:admin_products_per_page], :current => params[:p]})  
+        end
       else
-        @collection ||= end_of_association_chain.by_name(@name).by_sku(@sku).find(:all, :order => :name, :page => {:start => 1, :size => 10, :current => params[:p]})
+        if @deleted.blank?
+          @collection ||= end_of_association_chain.active.by_name(@name).by_sku(@sku).find(:all, :order => :name, :page => {:start => 1, :size => Spree::Config[:admin_products_per_page], :current => params[:p]})
+        else
+          @collection ||= end_of_association_chain.deleted.by_name(@name).by_sku(@sku).find(:all, :order => :name, :page => {:start => 1, :size => Spree::Config[:admin_products_per_page], :current => params[:p]})
+        end
       end
     end
 
@@ -47,5 +84,6 @@ class Admin::ProductsController < Admin::BaseController
       end
       @object.variant.sku = params[:product] ? params[:product][:sku] : ""
       @object
-    end    
+    end   
+  
 end

data/app/controllers/admin/reports_controller.rb

@@ -1,4 +1,5 @@
 class Admin::ReportsController < Admin::BaseController
+  before_filter :load_data  
   
   AVAILABLE_REPORTS = {
     :sales_total => {:name => "Sales Total", :description => "Sales Total For All Orders"}
@@ -8,45 +9,26 @@ class Admin::ReportsController < Admin::BaseController
     @reports = AVAILABLE_REPORTS
   end
   
-  def sales_total
-    c = build_conditions
-    @item_total = Order.sum(:item_total, :conditions => c)
-    @ship_total = Order.sum(:ship_amount, :conditions => c)
-    @tax_total = Order.sum(:tax_amount, :conditions => c)
-    @sales_total = Order.sum(:total, :conditions => c)
+  def sales_total    
+    scope = Order.scoped({})
+    scope = scope.between(@filter.start, (@filter.stop.blank? ? @default_stop : @filter.stop.to_date + 1 )) unless @filter.start.blank?
+
+    @orders = scope.find(:all, :order => 'orders.created_at DESC', :page => {:size => Spree::Config[:orders_per_page], :current =>params[:p], :first => 1})    
+
+    @item_total = scope.sum(:item_total)
+    @ship_total = scope.sum(:ship_amount)
+    @tax_total = scope.sum(:tax_amount)
+    @sales_total = scope.sum(:total)
   end
 
   private 
-  
-      def date_conditions
-        return nil unless params[:search]
-        
-        @search = SearchCriteria.new(params[:search])
-        
-        unless @search.valid?
-          flash.now[:error] = "Invalid search criteria.  Please check your results."
-          return nil
-        end
+  def load_data
+    @filter = params.has_key?(:filter) ? OrderFilter.new(params[:filter]) : OrderFilter.new
+    unless @filter.valid?
+      flash.now[:error] = t('invalid_search')
+      return nil
+    end
+    @default_stop = (Date.today + 1).to_s(:db)    
+  end  
 
-        p = {}
-        c = []
-        if not @search.start.blank?
-          c << "(orders.created_at between :start and :stop)"
-          p.merge! :start => @search.start.to_date
-          @search.stop = Date.today + 1 if @search.stop.blank?
-          p.merge! :stop => @search.stop.to_date + 1.day 
-        end
-        
-        return nil if c.empty? 
-        
-        {:conditions => c, :parameters => p}
-      end
-  
-      def build_conditions
-        dc = date_conditions
-        return nil if dc.nil?
-        c = dc[:conditions]
-        p = dc[:parameters]
-        [(c.to_sentence :skip_last_comma=>true).gsub(",", " and "), p]
-      end
 end

data/app/controllers/admin/taxons_controller.rb

@@ -1,6 +1,6 @@
 class Admin::TaxonsController < Admin::BaseController
+  include Railslove::Plugins::FindByParam::SingletonMethods
   resource_controller
-  
   before_filter :load_object, :only => [:selected, :available, :remove]
   belongs_to :product
   
@@ -53,13 +53,10 @@ class Admin::TaxonsController < Admin::BaseController
           end
         end
       else  #being moved/dropped BEFORE the end of the list.
-        logger.debug("#{@taxon.position} > #{params[:taxon][:position].to_f}")
-        logger.debug("#{@taxon.position} < #{params[:taxon][:position].to_f}")
         
         if @taxon.position > params[:taxon][:position].to_f #old position greater than new postion
           #up
           taxons.each do |taxon|
-            logger.debug("#{taxon.position} <= #{@taxon.position} && #{taxon.position} >= #{params[:taxon][:position].to_f}")
             if taxon.position <= @taxon.position && taxon.position >= params[:taxon][:position].to_f
               taxon.position += 1
               taxon.save!
@@ -68,7 +65,6 @@ class Admin::TaxonsController < Admin::BaseController
         elsif @taxon.position < params[:taxon][:position].to_f #old position less than new position
           #down
           taxons.each do |taxon|
-            logger.debug  ("#{taxon.position} >= #{@taxon.position} && #{taxon.position} <= #{params[:taxon][:position].to_f}")
             if taxon.position >= @taxon.position && taxon.position <= params[:taxon][:position].to_f
               taxon.position += -1
               taxon.save!              
@@ -77,14 +73,23 @@ class Admin::TaxonsController < Admin::BaseController
         end
         
       end
-    
-        
-    end 
+    end
+     
+    #check if we need to rename child taxons if parent name changes
+    @update_children = params[:taxon][:name] == @taxon.name ? false : true
   end
   
   update.after do
     #reposition old parent's children after move to new parent
     reposition_taxons(Taxon.find_all_by_parent_id(@previous_parent_id, :order => "position ASC")) if @previous_parent_id
+    
+    #rename child taxons                  
+    if @update_children
+      @taxon.descendents.each do |taxon|
+        taxon.permalink = nil
+        taxon.save!
+      end
+    end    
   end
   
   destroy.after do
@@ -129,7 +134,6 @@ class Admin::TaxonsController < Admin::BaseController
   private 
   def reposition_taxons(taxons)
     taxons.each_with_index do |taxon, i|
-        logger.debug("DID YOU I IS NOW: #{taxon.position} = #{i}")
         taxon.position = i
         taxon.save!
     end