spree 0.8.5 → 0.9.0

data/app/controllers/admin/prototypes_controller.rb

@@ -14,7 +14,9 @@ class Admin::PrototypesController < Admin::BaseController
   end
   
   new_action.response do |wants|
-    wants.html {render :action => :new, :layout => false}
+    wants.html {
+      render :action => :new, :layout => !request.xhr?
+    }
   end
     
   # redirect to index (instead of r_c default of show view)

data/app/controllers/admin/reports_controller.rb

@@ -11,16 +11,16 @@ class Admin::ReportsController < Admin::BaseController
   
   def sales_total
 
-    @search = Order.new_search(params[:search])
+    @search = Order.search(params[:search])
+
     #set order by to default or form result
-    @search.order_by ||= :created_at
-    @search.order_as ||= "DESC"
+    @search.order ||= "descend_by_created_at"
     
     @orders = @search.find(:all)    
 
     @item_total = @search.sum(:item_total)
-    @ship_total = @search.sum(:ship_amount)
-    @tax_total = @search.sum(:tax_amount)
+    @charge_total = @search.sum(:adjustment_total)
+    @credit_total = @search.sum(:credit_total)
     @sales_total = @search.sum(:total)
   end
 
@@ -29,4 +29,4 @@ class Admin::ReportsController < Admin::BaseController
 
   end  
 
-end
+end

data/app/controllers/admin/shipments_controller.rb

@@ -9,6 +9,17 @@ class Admin::ShipmentsController < Admin::BaseController
     failure.wants.html { redirect_to new_object_url }
   end
 
+  edit.before do # copy into instance variable before editing
+    @shipment.special_instructions = @order.checkout.special_instructions
+  end
+
+  update.after do # copy back to order if instructions are enabled
+    if Spree::Config[:shipping_instructions]
+      @order.checkout.special_instructions = object_params[:special_instructions] 
+      @order.save
+    end
+  end
+
   update do
     wants.html { redirect_to edit_object_url }
   end 
@@ -34,4 +45,4 @@ class Admin::ShipmentsController < Admin::BaseController
     @countries = [Country.find(Spree::Config[:default_country_id])] if @countries.empty?
   end
 
-end
+end

data/app/controllers/admin/shipping_methods_controller.rb

@@ -1,19 +1,19 @@
 class Admin::ShippingMethodsController < Admin::BaseController    
-    resource_controller
-    before_filter :load_data
-    layout 'admin'
-    
-    update.response do |wants|
-      wants.html { redirect_to collection_url }
-    end
-    
-    
-    create.response do |wants|
-      wants.html { redirect_to collection_url }
-    end
-    
-    private 
-    def load_data     
-      @available_zones = Zone.find :all, :order => :name
-    end
+  resource_controller
+  before_filter :load_data
+  
+  update.wants.html { redirect_to edit_object_url }
+  create.wants.html { redirect_to edit_object_url }
+  
+  private       
+  def build_object
+    @object ||= end_of_association_chain.send((parent? ? :build : :new), object_params)
+    @object.calculator = params[:shipping_method][:calculator_type].constantize.new if params[:shipping_method]
+    @object
+  end
+  
+  def load_data
+    @available_zones = Zone.find :all, :order => :name                      
+    @calculators = ShippingMethod.calculators
+  end    
 end

data/app/controllers/admin/shipping_rates_controller.rb

@@ -0,0 +1,20 @@
+class Admin::ShippingRatesController < Admin::BaseController
+  resource_controller
+  before_filter :load_data
+
+  update.wants.html { redirect_to edit_object_url }
+  create.wants.html { redirect_to edit_object_url }
+    
+  private 
+  def build_object
+    @object ||= end_of_association_chain.send((parent? ? :build : :new), object_params)
+    @object.calculator = params[:tax_rate][:calculator_type].constantize.new if params[:tax_rate]
+    @object.calculator ||= ShippingRate.calculators.first.new
+    @object
+  end  
+  def load_data
+    @shipping_methods = ShippingMethod.find(:all, :order => :name)
+    @shipping_categories = ShippingCategory.find(:all, :order => :name)
+    @calculators = ShippingRate.calculators
+  end
+end

data/app/controllers/admin/tax_rates_controller.rb

@@ -0,0 +1,28 @@
+class Admin::TaxRatesController < Admin::BaseController
+  resource_controller
+  before_filter :load_data
+                                                          
+  create.success.wants.html { redirect_to collection_url }
+  update.success.wants.html { redirect_to collection_url }
+  
+  update.after do
+    Rails.cache.delete('vat_rates')
+  end
+
+  create.after do
+    Rails.cache.delete('vat_rates')
+  end
+    
+  private 
+  def build_object
+    @object ||= end_of_association_chain.send((parent? ? :build : :new), object_params)
+    @object.calculator = params[:tax_rate][:calculator_type].constantize.new if params[:tax_rate]
+    @object.calculator ||= Calculator::SalesTax.new
+    @object
+  end  
+  def load_data
+    @available_zones = Zone.find :all, :order => :name
+    @available_categories = TaxCategory.find :all, :order => :name
+    @calculators = TaxRate.calculators
+  end
+end

data/{vendor/extensions/tax_calculator/app → app}/controllers/admin/tax_settings_controller.rb

@@ -1,7 +1,7 @@
 class Admin::TaxSettingsController < Admin::BaseController
 
   def update
-    Spree::Tax::Config.set(params[:preferences])
+    Spree::Config.set(params[:preferences])
     
     respond_to do |format|
       format.html {

data/app/controllers/admin/taxons_controller.rb

@@ -4,99 +4,45 @@ class Admin::TaxonsController < Admin::BaseController
   before_filter :load_object, :only => [:selected, :available, :remove]
   belongs_to :product
   
-  create.wants.js {render :text => @taxon.to_json()}
-  update.wants.js {render :text => @taxon.name}
-  destroy.wants.js {render :text => ""}
+  create.wants.html {render :text => @taxon.id}
+  update.wants.html {render :text => @taxon.name}
+  destroy.wants.html {render :text => ""}
   
   create.before do 
     @taxon.taxonomy_id = params[:taxonomy_id]
-    @taxon.position = Taxon.find(@taxon.parent_id).children.length
   end
   
   update.before do
-   
-    if params[:taxon].include? "parent_id" #taxon being moved to new parent
-      @previous_parent_id = @taxon.parent_id
-      
-      if params[:taxon].include? "position" #taxon being moved up or down aswell as new parent
-       
-        #get taxons that's been forced out of the way
-        taxons = Taxon.find_all_by_parent_id(params[:taxon][:parent_id])
-        taxons = taxons.reject{ |t| t.id == @taxon.id}
-          
-        taxons.each do |taxon|
-          if taxon.position >= params[:taxon][:position].to_f
-            taxon.position += 1
-          end
-          taxon.save!
-        end
-      end
-      
-    elsif params[:taxon].include? "position" #taxon being moved up or down (same parent)
-      #get all taxons under same parent
-      taxons = Taxon.find_all_by_parent_id(@taxon.parent_id)
-      total_taxons = taxons.length
-      taxons = taxons.reject{ |t| t.id == @taxon.id}
-      
-      if params[:taxon][:position].to_f == total_taxons #being moved/dropped at the end of the children list
-        taxons.each do |taxon|
-          if taxon.position >= @taxon.position #only affects node higher that node being moved
-            taxon.position += -1
-            taxon.save!
-          end
-        end
-      elsif params[:taxon][:position].to_f == 0 #being moved/dropped at the start of the children list
-        taxons.each do |taxon|
-          if taxon.position <= @taxon.position #only affects node lower that node being moved
-            taxon.position += 1
-            taxon.save!
-          end
-        end
-      else  #being moved/dropped BEFORE the end of the list.
-        
-        if @taxon.position > params[:taxon][:position].to_f #old position greater than new postion
-          #up
-          taxons.each do |taxon|
-            if taxon.position <= @taxon.position && taxon.position >= params[:taxon][:position].to_f
-              taxon.position += 1
-              taxon.save!
-            end
-          end
-        elsif @taxon.position < params[:taxon][:position].to_f #old position less than new position
-          #down
-          taxons.each do |taxon|
-            if taxon.position >= @taxon.position && taxon.position <= params[:taxon][:position].to_f
-              taxon.position += -1
-              taxon.save!              
-            end
-          end
-        end
-        
+    parent_id = params[:taxon][:parent_id]
+    position = params[:taxon][:position]
+
+    if parent_id || position #taxon is being moved
+      parent = parent_id.nil? ? @taxon.parent : Taxon.find(parent_id.to_i)
+      position = position.nil? ? -1 : position.to_i 
+
+      @taxon.move_to(parent, position)
+      if parent_id
+        @taxon.reload
+        @taxon.permalink = nil
+        @taxon.save!
+        @update_children = true
       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.reload
         taxon.permalink = nil
         taxon.save!
       end
     end    
   end
-  
-  destroy.after do
-    reposition_taxons(Taxon.find_all_by_parent_id(@taxon.parent_id, :order => "position ASC"))
 
-  end
-    
   def selected 
     @taxons = @product.taxons
   end
@@ -138,4 +84,4 @@ class Admin::TaxonsController < Admin::BaseController
         taxon.save!
     end
   end
-end
+end

data/app/controllers/admin/users_controller.rb

@@ -13,14 +13,14 @@ class Admin::UsersController < Admin::BaseController
                 
   private
   def collection   
-    @search = User.new_search(params[:search])
+    @search = User.search(params[:search])
+
     #set order by to default or form result
-    @search.order_by ||= :email
-    @search.order_as ||= "ASC"
-    #set results per page to default or form result
-    @search.per_page = Spree::Config[:admin_products_per_page]
+    @search.order ||= "ascend_by_email"
 
-    @collection, @collection_count = @search.all, @search.count
+    @collection_count = @search.count
+    @collection = @search.paginate(:per_page => Spree::Config[:admin_products_per_page],
+                                   :page     => params[:page])
 
     #scope = scope.conditions "lower(email) = ?", @filter.email.downcase unless @filter.email.blank?
   end

data/app/controllers/admin/zones_controller.rb

@@ -19,10 +19,10 @@ class Admin::ZonesController < Admin::BaseController
   end
 
   def collection
-    @search = end_of_association_chain.new_search(params[:search])
-    @search.order_by ||= :name
-    @search.per_page = Spree::Config[:orders_per_page]
-    @collection, @collection_count = @search.all, @search.count
+    @search = end_of_association_chain.search(params[:search])
+    @search.order ||= "ascend_by_name"
+    @collection_count = @search.count
+    @collection = @search.paginate(:per_page => Spree::Config[:orders_per_page], :page => params[:page])
   end  
 
   def load_data

data/app/controllers/application.rb

@@ -34,7 +34,7 @@ class ApplicationController < ActionController::Base
   def require_user
     unless current_user
       store_location
-      flash[:notice] = "You must be logged in to access this page"
+      flash[:notice] = I18n.t("page_only_viewable_when_logged_in")
       redirect_to new_user_session_url
       return false
     end
@@ -43,8 +43,8 @@ class ApplicationController < ActionController::Base
   def require_no_user
     if current_user
       store_location
-      flash[:notice] = "You must be logged out to access this page"
-      redirect_to account_url
+      flash[:notice] = I18n.t("page_only_viewable_when_logged_out")
+      redirect_to root_url
       return false
     end
   end

data/app/controllers/checkouts_controller.rb

@@ -0,0 +1,158 @@
+class CheckoutsController < Spree::BaseController 
+  include ActionView::Helpers::NumberHelper # Needed for JS usable rate information
+  before_filter :load_data
+  
+  resource_controller :singleton
+  belongs_to :order             
+  
+  layout 'application'   
+  ssl_required :update, :edit
+
+  # alias original r_c method so we can handle any (gateway) exceptions that might be thrown
+  alias :rc_update :update
+  def update 
+    begin
+      rc_update
+    rescue Spree::GatewayError => ge
+      flash[:error] = t("unable_to_authorize_credit_card") + ": #{ge.message}"
+      redirect_to edit_object_url and return
+    rescue Exception => oe
+      flash[:error] = t("unable_to_authorize_credit_card") + ": #{oe.message}"
+      logger.unknown "#{flash[:error]}  #{oe.backtrace.join("\n")}"
+      redirect_to edit_object_url and return
+    end
+  end
+ 
+  update do
+    flash nil
+    
+    success.wants.html do  
+      if @order.checkout_complete 
+        if current_user
+          current_user.update_attribute(:bill_address, @order.bill_address)
+          current_user.update_attribute(:ship_address, @order.ship_address)
+        end
+        flash[:notice] = t('order_processed_successfully')
+        order_params = {:checkout_complete => true}
+        order_params[:order_token] = @order.token unless @order.user
+        session[:order_id] = nil 
+        redirect_to order_url(@order, order_params) and next 
+      else
+        # this means a failed filter which should have thrown an exception
+        flash[:notice] = "Unexpected error condition -- please contact site support"
+        redirect_to edit_object_url and next
+      end 
+    end 
+
+    success.wants.js do   
+      @order.reload
+      render :json => { :order_total => number_to_currency(@order.total),
+                        :charge_total => number_to_currency(@order.charge_total),
+                        :credit_total => number_to_currency(@order.credit_total),
+                        :charges => charge_hash,  
+                        :credits => credit_hash,
+                        :available_methods => rate_hash}.to_json,
+             :layout => false
+    end
+
+    failure.wants.html do
+      flash[:notice] = "Unexpected failure in card authorization -- please contact site support"
+      redirect_to edit_object_url and next
+    end
+    failure.wants.js do   
+      render :json => "Unexpected failure in card authorization -- please contact site support"
+    end
+  end
+  
+  update.before do
+    # update user to current one if user has logged in
+    @order.update_attribute(:user, current_user) if current_user 
+
+    if (checkout_info = params[:checkout]) and not checkout_info[:coupon_code]
+      # overwrite any earlier guest checkout email if user has since logged in
+      checkout_info[:email] = current_user.email if current_user 
+
+      # and set the ip_address to the most recent one
+      checkout_info[:ip_address] = request.env['REMOTE_ADDR']
+
+      # check whether the bill address has changed, and start a fresh record if 
+      # we were using the address stored in the current user.
+      if checkout_info[:bill_address_attributes] and @checkout.bill_address
+        # always include the id of the record we must write to - ajax can't refresh the form
+        checkout_info[:bill_address_attributes][:id] = @checkout.bill_address.id
+        new_address = Address.new checkout_info[:bill_address_attributes]
+        if not @checkout.bill_address.same_as?(new_address) and
+             current_user and @checkout.bill_address == current_user.bill_address
+          # need to start a new record, so replace the existing one with a blank
+          checkout_info[:bill_address_attributes].delete :id  
+          @checkout.bill_address = Address.new
+        end
+      end
+
+      # check whether the ship address has changed, and start a fresh record if 
+      # we were using the address stored in the current user.
+      if checkout_info[:shipment_attributes][:address_attributes] and @order.shipment.address
+        # always include the id of the record we must write to - ajax can't refresh the form
+        checkout_info[:shipment_attributes][:address_attributes][:id] = @order.shipment.address.id
+        new_address = Address.new checkout_info[:shipment_attributes][:address_attributes]
+        if not @order.shipment.address.same_as?(new_address) and 
+             current_user and @order.shipment.address == current_user.ship_address 
+          # need to start a new record, so replace the existing one with a blank
+          checkout_info[:shipment_attributes][:address_attributes].delete :id
+          @order.shipment.address = Address.new
+        end
+      end
+
+    end
+  end 
+  
+  update.after do
+    @order.save!		# expect messages here
+  end   
+    
+  private
+  def object
+    return @object if @object
+    @object = parent_object.checkout                                                  
+    unless params[:checkout] and params[:checkout][:coupon_code]
+      # do not create these defaults if we're merely updating coupon code, otherwise we'll have a validation error
+      if user = parent_object.user || current_user
+        @object.shipment.address ||= user.ship_address 
+        @object.bill_address     ||= user.bill_address
+      end
+      @object.shipment.address ||= Address.default
+      @object.bill_address     ||= Address.default
+      @object.creditcard       ||= Creditcard.new(:month => Date.today.month, :year => Date.today.year)
+    end
+    @object         
+  end
+  
+  def load_data     
+    @countries = Country.find(:all).sort  
+    @shipping_countries = parent_object.shipping_countries.sort
+    if current_user && current_user.bill_address
+      default_country = current_user.bill_address.country 
+    else
+      default_country = Country.find Spree::Config[:default_country_id]	
+    end 
+    @states = default_country.states.sort
+  end
+  
+  def rate_hash       
+    fake_shipment = Shipment.new :order => @order, :address => @order.ship_address
+    @order.shipping_methods.collect do |ship_method|
+      fake_shipment.shipping_method = ship_method
+      { :id   => ship_method.id, 
+        :name => ship_method.name, 
+        :rate => number_to_currency(ship_method.calculate_cost(fake_shipment)) }
+    end
+  end
+  
+  def charge_hash
+    Hash[*@order.charges.collect { |c| [c.description, number_to_currency(c.amount)] }.flatten]    
+  end           
+  
+  def credit_hash
+    Hash[*@order.credits.select {|c| c.amount !=0 }.collect { |c| [c.description, number_to_currency(c.amount)] }.flatten]    
+  end
+end