spree 0.10.2 → 0.11.0

data/app/controllers/admin/payments_controller.rb

@@ -14,7 +14,7 @@ class Admin::PaymentsController < Admin::BaseController
       return
     end
 
-    begin 
+    begin
 
       if @order.checkout.state == "complete"
         object.process!
@@ -25,7 +25,7 @@ class Admin::PaymentsController < Admin::BaseController
         until @order.checkout.state == "complete"
           @order.checkout.next!
         end
-        flash = t('new_order_completed')
+        self.notice = t('new_order_completed')
         redirect_to admin_order_url(@order)
       end
 
@@ -42,21 +42,21 @@ class Admin::PaymentsController < Admin::BaseController
     Payment.transaction do
       @payment.source.send("#{event}", @payment)
     end
-    flash[:notice] = t('payment_updated')
+    self.notice = t('payment_updated')
   rescue Spree::GatewayError => ge
     flash[:error] = "#{ge.message}"
   ensure
     redirect_to collection_path
-  end  
+  end
 
   def finalize
     object.finalize!
     redirect_to collection_path
   end
-  
+
   private
 
-  def object    
+  def object
     @object ||= Payment.find(param) unless param.nil?
     @object
   end
@@ -70,7 +70,7 @@ class Admin::PaymentsController < Admin::BaseController
 
   def load_data
     load_object
-    @payment_methods = PaymentMethod.available   
+    @payment_methods = PaymentMethod.available(:back_end)
     if object and object.payment_method
       @payment_method = object.payment_method
     else

data/app/controllers/admin/products_controller.rb

@@ -13,8 +13,6 @@ class Admin::ProductsController < Admin::BaseController
 
   update.before :update_before
 
-  create.before :create_before
-
   create.response do |wants|
     # go to edit form after creating as new product
     wants.html {redirect_to edit_admin_product_url(Product.find(@product.id)) }
@@ -38,9 +36,9 @@ class Admin::ProductsController < Admin::BaseController
     end
 
     if @product.save
-      flash[:notice] = I18n.t("notice_messages.product_deleted")
+      self.notice = I18n.t("notice_messages.product_deleted")
     else
-      flash[:notice] = I18n.t("notice_messages.product_not_deleted")
+      self.notice = I18n.t("notice_messages.product_not_deleted")
     end
 
     respond_to do |format|
@@ -54,9 +52,9 @@ class Admin::ProductsController < Admin::BaseController
     @new = @product.duplicate
 
     if @new.save
-      flash[:notice] = I18n.t("notice_messages.product_cloned")
+      self.notice = I18n.t("notice_messages.product_cloned")
     else
-      flash[:notice] = I18n.t("notice_messages.product_not_cloned")
+      self.notice = I18n.t("notice_messages.product_not_cloned")
     end
 
     redirect_to edit_admin_product_url(@new)
@@ -69,9 +67,9 @@ class Admin::ProductsController < Admin::BaseController
     end
 
     def collection
-      unless request.xhr?
-        base_scope = end_of_association_chain
+      base_scope = end_of_association_chain
 
+      unless request.xhr?
         # Note: the SL scopes are on/off switches, so we need to select "not_deleted" explicitly if the switch is off
         # QUERY - better as named scope or as SL scope?
         if params[:search].nil? || params[:search][:deleted_at_not_null].blank?
@@ -81,29 +79,20 @@ class Admin::ProductsController < Admin::BaseController
         @search = base_scope.group_by_products_id.searchlogic(params[:search])
         @search.order ||= "ascend_by_name"
 
-        @collection = @search.paginate(:include  => {:variants => [:images, :option_values]},
-                                       :per_page => Spree::Config[:admin_products_per_page],
-                                       :page     => params[:page])
+        @collection = @search.paginate(:include   => {:variants => [:images, :option_values]},
+                                       :per_page  => Spree::Config[:admin_products_per_page],
+                                       :page      => params[:page])
       else
-        @collection = Product.find( :all,
-                                    :conditions => ["name like ?", "%#{params[:q]}%"],
-                                    :include =>  [{:variants => [:images,  {:option_values => :option_type}]}, :master, :images])
+        includes = [{:variants => [:images,  {:option_values => :option_type}]}, :master, :images]
 
-        @collection.concat Product.find( :all,
-                                    :conditions => ["variants.sku like ?", "%#{params[:q]}%"],
-                                    :include =>  [{:variants => [:images,  {:option_values => :option_type}]}, :master, :images])
+        @collection = base_scope.name_contains(params[:q]).all(:include => includes, :limit => 10)
+        @collection.concat base_scope.group_by_products_id.variants_including_master_sku_contains(params[:q]).all(:include => includes, :limit => 10)
 
         @collection.uniq!
       end
 
     end
 
-    # set the default tax_category if applicable
-    def create_before
-      return unless Spree::Config[:default_tax_category]
-      @product.tax_category ||= TaxCategory.find_by_name Spree::Config[:default_tax_category]
-    end
-
     def update_before
       # note: we only reset the product properties if we're receiving a post from the form on that tab
       return unless params[:clear_product_properties]

data/app/controllers/admin/reports_controller.rb

@@ -1,6 +1,6 @@
 class Admin::ReportsController < Admin::BaseController
-  before_filter :load_data  
-  
+  before_filter :load_data
+
   AVAILABLE_REPORTS = {
     :sales_total => {:name => "Sales Total", :description => "Sales Total For All Orders"}
   }
@@ -8,15 +8,27 @@ class Admin::ReportsController < Admin::BaseController
   def index
     @reports = AVAILABLE_REPORTS
   end
-  
+
   def sales_total
+    params[:search] = {} unless params[:search]
+
+    if params[:search][:created_at_after].blank?
+      params[:search][:created_at_after] = Time.zone.now.beginning_of_month
+    else
+      params[:search][:created_at_after] = Time.zone.parse(params[:search][:created_at_after]).beginning_of_day rescue Time.zone.now.beginning_of_month
+    end
+
+    if params[:search] && !params[:search][:created_at_before].blank?
+      params[:search][:created_at_before] = Time.zone.parse(params[:search][:created_at_before]).end_of_day rescue ""
+    end
+
 
     @search = Order.searchlogic(params[:search])
     @search.checkout_complete = true
     #set order by to default or form result
     @search.order ||= "descend_by_created_at"
-    
-    @orders = @search.find(:all)    
+
+    @orders = @search.find(:all)
 
     @item_total = @search.sum(:item_total)
     @charge_total = @search.sum(:adjustment_total)
@@ -24,9 +36,9 @@ class Admin::ReportsController < Admin::BaseController
     @sales_total = @search.sum(:total)
   end
 
-  private 
+  private
   def load_data
 
-  end  
+  end
 
 end

data/app/controllers/admin/return_authorizations_controller.rb

@@ -16,7 +16,7 @@ class Admin::ReturnAuthorizationsController < Admin::BaseController
   def fire
     load_object
     @return_authorization.send("#{params[:e]}!")
-    flash[:notice] = t('return_authorization_updated')
+    self.notice = t('return_authorization_updated')
     redirect_to :back
   end
 

data/app/controllers/admin/shipments_controller.rb

@@ -7,7 +7,7 @@ class Admin::ShipmentsController < Admin::BaseController
 
   update.wants.html do
     if @order.in_progress?
-      redirect_to new_admin_order_payment_url(@order)
+      redirect_to admin_order_adjustments_url(@order)
     else
       redirect_to edit_object_url
     end
@@ -29,16 +29,17 @@ class Admin::ShipmentsController < Admin::BaseController
 
   def fire
     @shipment.send("#{params[:e]}!")
-    flash[:notice] = t('shipment_updated')
+    self.notice = t('shipment_updated')
     redirect_to :back
   end
 
   private
   def build_object
-    @object ||= end_of_association_chain.send parent? ? :build : :new, object_params
+    @object ||= end_of_association_chain.send parent? ? :build : :new
     @object.address ||= @order.ship_address
     @object.address ||= Address.new(:country_id => Spree::Config[:default_country_id])
     @object.shipping_method ||= @order.shipping_method
+    @object.attributes = object_params
     @object
   end
 
@@ -59,17 +60,16 @@ class Admin::ShipmentsController < Admin::BaseController
   end
 
   def update_after # copy back to order if instructions are enabled
-    if Spree::Config[:shipping_instructions]
-      @order.checkout.special_instructions = object_params[:special_instructions]
-      @order.save
-    end
+    @order.checkout.special_instructions = object_params[:special_instructions] if Spree::Config[:shipping_instructions]
+    @order.checkout.shipping_method = @order.shipment.shipping_method
+    @order.save
     recalculate_order
   end
 
   def assign_inventory_units
     return unless params.has_key? :inventory_units
-
-    params[:inventory_units].each { |id, value| @shipment.inventory_units << InventoryUnit.find(id) }
+    #params[:inventory_units].each { |id, value| @shipment.inventory_units << InventoryUnit.find(id) }
+    @shipment.inventory_unit_ids = params[:inventory_units].keys
   end
 
   def recalculate_order

data/app/controllers/admin/users_controller.rb

@@ -9,6 +9,8 @@ class Admin::UsersController < Admin::BaseController
     wants.html { render :action => :index }
     wants.json { render :json => @collection.to_json(:include => {:bill_address => {:include => [:state, :country]}, :ship_address => {:include => [:state, :country]}}) }
   end
+  
+  destroy.success.wants.js { render_js_for_destroy }
 
   private
   def collection
@@ -31,7 +33,7 @@ class Admin::UsersController < Admin::BaseController
                                             OR addresses.firstname like :search
                                             OR addresses.lastname like :search
                                             OR ship_addresses_users.firstname like :search
-                                            OR ship_addresses_users.lastname like :search", {:search => "%#{params[:q]}%"}])
+                                            OR ship_addresses_users.lastname like :search", {:search => "#{params[:q].strip}%"}], :limit => 20)
     end
   end
 

data/app/controllers/admin/variants_controller.rb

@@ -25,9 +25,9 @@ class Admin::VariantsController < Admin::BaseController
       
     @variant.deleted_at = Time.now()
     if @variant.save
-      flash[:notice] = I18n.t("notice_messages.variant_deleted")
+      self.notice = I18n.t("notice_messages.variant_deleted")
     else
-      flash[:notice] = I18n.t("notice_messages.variant_not_deleted")
+      self.notice = I18n.t("notice_messages.variant_not_deleted")
     end
 
     respond_to do |format|

data/app/controllers/checkouts_controller.rb

@@ -5,6 +5,7 @@ class CheckoutsController < Spree::BaseController
   before_filter :load_data
   before_filter :set_state
   before_filter :enforce_registration, :except => :register
+  before_filter :ensure_order_assigned_to_user, :except => :register
   before_filter :ensure_payment_methods
   helper :users
 
@@ -24,20 +25,20 @@ class CheckoutsController < Spree::BaseController
   update.before :clear_payments_if_in_payment_state
 
   # customized verison of the standard r_c update method (since we need to handle gateway errors, etc)
-  def update      
+  def update
     load_object
 
     # call the edit hooks for the current step in case we experience validation failure and need to edit again
     edit_hooks
     @checkout.enable_validation_group(@checkout.state.to_sym)
     @prev_state = @checkout.state
-    
+
     before :update
 
     begin
-      if object.update_attributes object_params
+      if @checkout.update_attributes object_params
         update_hooks
-        @order.update_totals!
+        @checkout.order.update_totals!
         after :update
         next_step
         if @checkout.completed_at
@@ -143,7 +144,8 @@ class CheckoutsController < Spree::BaseController
   end
 
   def next_step
-    @checkout.next!
+    @checkout.next! 
+    flash[:analytics] = "/checkout/#{object.state}"
     # call edit hooks for this next step since we're going to just render it (instead of issuing a redirect)
     edit_hooks
   end
@@ -158,9 +160,9 @@ class CheckoutsController < Spree::BaseController
       @checkout.payments.clear
     end
   end
-  
-  def load_available_payment_methods 
-    @payment_methods = PaymentMethod.available   
+
+  def load_available_payment_methods
+    @payment_methods = PaymentMethod.available(:front_end)
     if @checkout.payment and @checkout.payment.payment_method
       @payment_method = @checkout.payment.payment_method
     else
@@ -174,17 +176,17 @@ class CheckoutsController < Spree::BaseController
 
   def complete_order
     if @checkout.order.out_of_stock_items.empty?
-      flash[:notice] = t('order_processed_successfully')
+      self.notice = t('order_processed_successfully')
     else
-      flash[:notice] = t('order_processed_but_following_items_are_out_of_stock')
-      flash[:notice] += '<ul>'
+      self.notice = t('order_processed_but_following_items_are_out_of_stock')
+      self.notice += '<ul>'
       @checkout.order.out_of_stock_items.each do |item|
-        flash[:notice] += '<li>' + t(:count_of_reduced_by,
+        self.notice += '<li>' + t(:count_of_reduced_by,
                               :name => item[:line_item].variant.name,
                               :count => item[:count]) +
                           '</li>'
       end
-      flash[:notice] += '<ul>'
+      self.notice += '<ul>'
     end
   end
 
@@ -194,8 +196,9 @@ class CheckoutsController < Spree::BaseController
         @checkout.shipment.shipping_method = ship_method
         { :id => ship_method.id,
           :name => ship_method.name,
-          :rate => number_to_currency(ship_method.calculate_cost(@checkout.shipment)) }
-      end
+          :cost => ship_method.calculate_cost(@checkout.shipment)
+        }
+      end.sort_by{|r| r[:cost]}
     rescue Spree::ShippingError => ship_error
       flash[:error] = ship_error.to_s
       []
@@ -212,13 +215,21 @@ class CheckoutsController < Spree::BaseController
   def accurate_title
     I18n.t(:checkout)
   end
-  
+
   def ensure_payment_methods
-    if PaymentMethod.available.none?
+    if PaymentMethod.available(:front_end).none?
       flash[:error] = t(:no_payment_methods_available)
       redirect_to edit_order_path(params[:order_id])
       false
     end
   end
-  
+
+  # Make sure that the order is assigned to the current user if logged in
+  def ensure_order_assigned_to_user
+    load_object
+    if current_user and @order.user != current_user
+      @order.update_attribute(:user, current_user)
+    end
+  end
+
 end

data/app/controllers/content_controller.rb

@@ -1,6 +1,6 @@
 class ContentController < Spree::BaseController
   rescue_from ActionView::MissingTemplate, :with => :render_404
-  caches_page :show, :index
+  caches_page :show, :index, :if => Proc.new { Spree::Config[:cache_static_content] }
 
   def show
     render :action => params[:path].join('/')

data/{vendor/extensions/localization/app → app}/controllers/locale_controller.rb

@@ -7,7 +7,7 @@ class LocaleController < ApplicationController
     if params[:locale] && AVAILABLE_LOCALES.include?(params[:locale])
       I18n.locale = params[:locale]
       session[:locale] = params[:locale]
-      flash[:notice] = t("locale_changed")
+      self.notice = t("locale_changed")
     else
       flash[:error] = t("locale_not_changed")
     end

data/app/controllers/orders_controller.rb

@@ -1,34 +1,38 @@
-class OrdersController < Spree::BaseController     
+class OrdersController < Spree::BaseController
   prepend_before_filter :reject_unknown_object,  :only => [:show, :edit, :update, :checkout]
-  before_filter :prevent_editing_complete_order, :only => [:edit, :update, :checkout]            
+  before_filter :prevent_editing_complete_order, :only => [:edit, :update, :checkout]
   before_filter :set_user
 
   ssl_required :show
 
   resource_controller
-  actions :all, :except => :index
-  
+
   helper :products
 
   create.before :create_before
 
   # override the default r_c behavior (remove flash - redirect to edit details instead of show)
   create do
-    flash nil 
-		success.wants.html {redirect_to edit_order_url(@order)}
-		failure.wants.html { render :template => "orders/edit" }
-  end     
+    flash nil
+    success.wants.html {redirect_to edit_order_url(@order)}
+    failure.wants.html { render :template => "orders/edit" }
+  end
+
+  update.before do
+    # Temporary workaround for problem in Rails 2.3.8 where updating with nested attributes doesn't work if the collection isn't loaded
+    object.line_items(true)
+  end
 
   # override the default r_c flash behavior
-  update do  
-		flash nil
-		success.wants.html { redirect_to edit_order_url(object) }
-		failure.wants.html { render :template => "orders/edit" }
-  end  
- 
+  update do
+    flash nil
+    success.wants.html { redirect_to edit_order_url(object) }
+    failure.wants.html { render :template => "orders/edit" }
+  end
+
   #override r_c default b/c we don't want to actually destroy, we just want to clear line items
   def destroy
-    flash[:notice] = I18n.t(:basket_successfully_cleared)
+    self.notice = I18n.t(:basket_successfully_cleared)
     @order.line_items.clear
     @order.update_totals!
     after :destroy
@@ -37,32 +41,32 @@ class OrdersController < Spree::BaseController
   end
 
   destroy.response do |wants|
-    wants.html { redirect_to(edit_object_url) } 
+    wants.html { redirect_to(edit_object_url) }
   end
-  
+
   def can_access?
-    return true unless order = load_object    
+    return true unless order = load_object
     session[:order_token] ||= params[:order_token]
     order.grant_access?(session[:order_token])
   end
-    
+
   private
   def build_object
     @object ||= find_order
   end
-  
+
   def object
     @object ||= Order.find_by_number(params[:id], :include => :adjustments) if params[:id]
     return @object || find_order
   end
-  
+
   def create_before
     params[:products].each do |product_id,variant_id|
       quantity = params[:quantity].to_i if !params[:quantity].is_a?(Array)
       quantity = params[:quantity][variant_id].to_i if params[:quantity].is_a?(Array)
       @order.add_variant(Variant.find(variant_id), quantity) if quantity > 0
     end if params[:products]
-    
+
     params[:variants].each do |variant_id, quantity|
       quantity = quantity.to_i
       @order.add_variant(Variant.find(variant_id), quantity) if quantity > 0
@@ -71,21 +75,20 @@ class OrdersController < Spree::BaseController
     # store order token in the session
     session[:order_token] = @order.token
   end
-  
-  def prevent_editing_complete_order      
+
+  def prevent_editing_complete_order
     load_object
     redirect_to object_url if @order.checkout_complete
   end
-  
+
   def set_user
-    if @order && @order.user != current_user
-      if @order.checkout 
-        @order.checkout.update_attribute(:email, current_user && current_user.email)
-      end
+    #only if the user is blank and the order is in_progress
+    if @order && @order.user.nil? && @order.in_progress?
+      @order.checkout.update_attribute(:email, current_user && current_user.email) if @order.checkout
       @order.update_attribute(:user, current_user)
     end
   end
-  
+
   def accurate_title
     I18n.t(:shopping_cart)
   end