spree_core 1.1.6 → 1.2.0.rc1

data/app/controllers/spree/admin/orders/customer_details_controller.rb

@@ -41,9 +41,9 @@ module Spree
 
         private
 
-        def load_order
-          @order = Order.find_by_number(params[:order_id], :include => :adjustments)
-        end
+          def load_order
+            @order = Order.find_by_number!(params[:order_id], :include => :adjustments)
+          end
 
       end
     end

data/app/controllers/spree/admin/orders_controller.rb

@@ -4,7 +4,7 @@ module Spree
       require 'spree/core/gateway_error'
       before_filter :initialize_txn_partials
       before_filter :initialize_order_events
-      before_filter :load_order, :only => [:show, :edit, :update, :fire, :resend, :history, :user]
+      before_filter :load_order, :only => [:show, :edit, :update, :fire, :resend]
 
       respond_to :html
 
@@ -14,6 +14,12 @@ module Spree
         @show_only_completed = params[:q][:completed_at_not_null].present?
         params[:q][:s] ||= @show_only_completed ? 'completed_at desc' : 'created_at desc'
 
+        # As date params are deleted if @show_only_completed, store
+        # the original date so we can restore them into the params
+        # after the search
+        created_at_gt = params[:q][:created_at_gt]
+        created_at_lt = params[:q][:created_at_lt]
+
         if !params[:q][:created_at_gt].blank?
           params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue ""
         end
@@ -29,6 +35,11 @@ module Spree
 
         @search = Order.ransack(params[:q])
         @orders = @search.result.includes([:user, :shipments, :payments]).page(params[:page]).per(Spree::Config[:orders_per_page])
+
+        # Restore dates
+        params[:q][:created_at_gt] = created_at_gt
+        params[:q][:created_at_lt] = created_at_lt
+
         respond_with(@orders)
       end
 
@@ -71,7 +82,6 @@ module Spree
         end
       end
 
-
       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)
@@ -96,20 +106,19 @@ module Spree
 
       private
 
-      def load_order
-        @order ||= Order.find_by_number(params[:id], :include => :adjustments) if params[:id]
-        @order
-      end
+        def load_order
+          @order = Order.find_by_number!(params[:id], :include => :adjustments) if params[:id]
+        end
 
-      # Allows extensions to add new forms of payment to provide their own display of transactions
-      def initialize_txn_partials
-        @txn_partials = []
-      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
+        # 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
   end

data/app/controllers/spree/admin/payment_methods_controller.rb

@@ -27,13 +27,7 @@ module Spree
         end
 
         payment_method_params = params[ActiveModel::Naming.param_key(@payment_method)] || {}
-        attributes = params[:payment_method].merge(payment_method_params)
-        attributes.each do |k,v|
-          if k.include?("password") && attributes[k].blank?
-            attributes.delete(k)
-          end
-        end
-        if @payment_method.update_attributes(attributes)
+        if @payment_method.update_attributes(params[:payment_method].merge(payment_method_params))
           invoke_callbacks(:update, :after)
           flash.notice = I18n.t(:successfully_updated, :resource => I18n.t(:payment_method))
           respond_with(@payment_method, :location => edit_admin_payment_method_path(@payment_method))

data/app/controllers/spree/admin/payments_controller.rb

@@ -21,7 +21,7 @@ module Spree
       def create
         @payment = @order.payments.build(object_params)
         if @payment.payment_method.is_a?(Spree::Gateway) && @payment.payment_method.payment_profiles_supported? && params[:card].present? and params[:card] != 'new'
-          @payment.source = Creditcard.find_by_id(params[:card])
+          @payment.source = CreditCard.find_by_id(params[:card])
         end
 
         begin
@@ -46,7 +46,7 @@ module Spree
 
         rescue Spree::Core::GatewayError => e
           flash[:error] = "#{e.message}"
-          respond_with(@payment) { |format| format.html { redirect_to new_admin_payment_path(@order) } }
+          respond_with(@payment) { |format| format.html { redirect_to new_admin_order_payment_path(@order) } }
         end
       end
 
@@ -83,15 +83,15 @@ module Spree
         else
           @payment_method = @payment_methods.first
         end
-        @previous_cards = @order.creditcards.with_payment_profile
+        @previous_cards = @order.credit_cards.with_payment_profile
       end
 
       def load_order
-        @order ||= Order.find_by_number! params[:order_id]
+        @order = Order.find_by_number!(params[:order_id])
       end
 
       def load_payment
-        @payment ||= Payment.find params[:id]
+        @payment = Payment.find(params[:id])
       end
 
     end

data/app/controllers/spree/admin/products_controller.rb

@@ -19,9 +19,13 @@ module Spree
         end
       end
 
+      # override the destory method to set deleted_at value
+      # instead of actually deleting the product.
       def destroy
-        @product = Product.where(:permalink => params[:id]).first!
-        @product.delete
+        @product = Product.find_by_permalink!(params[:id])
+        @product.update_column(:deleted_at, Time.now)
+
+        @product.variants_including_master.update_all(:deleted_at => Time.now)
 
         flash.notice = I18n.t('notice_messages.product_deleted')
 
@@ -67,6 +71,8 @@ module Spree
         end
 
         def load_data
+          @taxons = Taxon.order(:name)
+          @option_types = OptionType.order(:name)
           @tax_categories = TaxCategory.order(:name)
           @shipping_categories = ShippingCategory.order(:name)
         end
@@ -86,9 +92,13 @@ module Spree
               includes([:master, {:variants => [:images, :option_values]}]).
               page(params[:page]).
               per(Spree::Config[:admin_products_per_page])
-              if params[:q][:s].include?("master_price")
-                @collection = @collection.group("spree_variants.price")
-              end
+
+            if params[:q][:s].include?("master_price")
+              # By applying the group in the main query we get an undefined method gsub for Arel::Nodes::Descending
+              # It seems to only work when the price is actually being sorted in the query
+              # To be investigated later.
+              @collection = @collection.group("spree_variants.price")
+            end
           else
             includes = [{:variants => [:images,  {:option_values => :option_type}]}, {:master => :images}]
 

data/app/controllers/spree/admin/prototypes_controller.rb

@@ -29,8 +29,8 @@ module Spree
       private
 
         def set_habtm_associations
-          @prototype.property_ids = params[:option_type].blank? ? [] : params[:property][:id]
-          @prototype.option_type_ids = params[:option_type].blank? ? [] : params[:option_type][:id]
+          @prototype.property_ids = params[:property][:id] if params[:property]
+          @prototype.option_type_ids = params[:option_type][:id] if params[:option_type]
         end
     end
   end

data/app/controllers/spree/admin/reports_controller.rb

@@ -1,11 +1,10 @@
 module Spree
   module Admin
     class ReportsController < Spree::Admin::BaseController
-      before_filter :load_data
       respond_to :html
 
       AVAILABLE_REPORTS = {
-        :sales_total => {:name => I18n.t(:sales_total), :description => I18n.t(:sales_total_description)}
+        :sales_total => { :name => I18n.t(:sales_total), :description => I18n.t(:sales_total_description) }
       }
 
       def index
@@ -43,11 +42,6 @@ module Spree
         respond_with
       end
 
-      private
-      def load_data
-
-      end
-
     end
   end
 end

data/app/controllers/spree/admin/resource_controller.rb

@@ -2,7 +2,7 @@ require 'spree/core/action_callbacks'
 
 class Spree::Admin::ResourceController < Spree::Admin::BaseController
   helper_method :new_object_url, :edit_object_url, :object_url, :collection_url
-  prepend_before_filter :load_resource
+  before_filter :load_resource
   rescue_from ActiveRecord::RecordNotFound, :with => :resource_not_found
 
   respond_to :html
@@ -12,14 +12,14 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     invoke_callbacks(:new_action, :before)
     respond_with(@object) do |format|
       format.html { render :layout => !request.xhr? }
-      format.js { render :layout => false }
+      format.js   { render :layout => false }
     end
   end
 
   def edit
     respond_with(@object) do |format|
       format.html { render :layout => !request.xhr? }
-      format.js { render :layout => false }
+      format.js   { render :layout => false }
     end
   end
 
@@ -72,169 +72,169 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
 
   protected
 
-  def resource_not_found
-    flash[:error] = flash_message_for(model_class.new, :not_found)
-    redirect_to collection_url
-  end
+    def resource_not_found
+      flash[:error] = flash_message_for(model_class.new, :not_found)
+      redirect_to collection_url
+    end
 
-  class << self
-    attr_accessor :parent_data
-    attr_accessor :callbacks
+    class << self
+      attr_accessor :parent_data
+      attr_accessor :callbacks
 
-    def belongs_to(model_name, options = {})
-      @parent_data ||= {}
-      @parent_data[:model_name] = model_name
-      @parent_data[:model_class] = model_name.to_s.classify.constantize
-      @parent_data[:find_by] = options[:find_by] || :id
-    end
+      def belongs_to(model_name, options = {})
+        @parent_data ||= {}
+        @parent_data[:model_name] = model_name
+        @parent_data[:model_class] = model_name.to_s.classify.constantize
+        @parent_data[:find_by] = options[:find_by] || :id
+      end
 
-    def new_action
-      @callbacks ||= {}
-      @callbacks[:new_action] ||= Spree::ActionCallbacks.new
-    end
+      def new_action
+        @callbacks ||= {}
+        @callbacks[:new_action] ||= Spree::ActionCallbacks.new
+      end
 
-    def create
-      @callbacks ||= {}
-      @callbacks[:create] ||= Spree::ActionCallbacks.new
-    end
+      def create
+        @callbacks ||= {}
+        @callbacks[:create] ||= Spree::ActionCallbacks.new
+      end
 
-    def update
-      @callbacks ||= {}
-      @callbacks[:update] ||= Spree::ActionCallbacks.new
-    end
+      def update
+        @callbacks ||= {}
+        @callbacks[:update] ||= Spree::ActionCallbacks.new
+      end
 
-    def destroy
-      @callbacks ||= {}
-      @callbacks[:destroy] ||= Spree::ActionCallbacks.new
+      def destroy
+        @callbacks ||= {}
+        @callbacks[:destroy] ||= Spree::ActionCallbacks.new
+      end
     end
-  end
 
-  def model_class
-    "Spree::#{controller_name.classify}".constantize
-  end
+    def model_class
+      "Spree::#{controller_name.classify}".constantize
+    end
 
-  def model_name
-    parent_data[:model_name].gsub('spree/', '')
-  end
+    def model_name
+      parent_data[:model_name].gsub('spree/', '')
+    end
 
-  def object_name
-    controller_name.singularize
-  end
+    def object_name
+      controller_name.singularize
+    end
 
-  def load_resource
-    if member_action?
-      @object ||= load_resource_instance
-      instance_variable_set("@#{object_name}", @object)
-    else
-      @collection ||= collection
-      instance_variable_set("@#{controller_name}", @collection)
+    def load_resource
+      if member_action?
+        @object ||= load_resource_instance
+        instance_variable_set("@#{object_name}", @object)
+      else
+        @collection ||= collection
+        instance_variable_set("@#{controller_name}", @collection)
+      end
     end
-  end
 
-  def load_resource_instance
-    if new_actions.include?(params[:action].to_sym)
-      build_resource
-    elsif params[:id]
-      find_resource
+    def load_resource_instance
+      if new_actions.include?(params[:action].to_sym)
+        build_resource
+      elsif params[:id]
+        find_resource
+      end
     end
-  end
 
-  def parent_data
-    self.class.parent_data
-  end
+    def parent_data
+      self.class.parent_data
+    end
 
-  def parent
-    if parent_data.present?
-      @parent ||= parent_data[:model_class].where(parent_data[:find_by] => params["#{model_name}_id"]).first
-      instance_variable_set("@#{model_name}", @parent)
-    else
-      nil
+    def parent
+      if parent_data.present?
+        @parent ||= parent_data[:model_class].where(parent_data[:find_by] => params["#{model_name}_id"]).first
+        instance_variable_set("@#{model_name}", @parent)
+      else
+        nil
+      end
     end
-  end
 
-  def find_resource
-    if parent_data.present?
-      parent.send(controller_name).find(params[:id])
-    else
-      model_class.find(params[:id])
+    def find_resource
+      if parent_data.present?
+        parent.send(controller_name).find(params[:id])
+      else
+        model_class.find(params[:id])
+      end
     end
-  end
 
-  def build_resource
-    if parent_data.present?
-      parent.send(controller_name).build(params[object_name])
-    else
-      model_class.new(params[object_name])
+    def build_resource
+      if parent_data.present?
+        parent.send(controller_name).build(params[object_name])
+      else
+        model_class.new(params[object_name])
+      end
     end
-  end
 
-  def collection
-    return parent.send(controller_name) if parent_data.present?
-    if model_class.respond_to?(:accessible_by) && !current_ability.has_block?(params[:action], model_class)
-      model_class.accessible_by(current_ability)
-    else
-      model_class.scoped
+    def collection
+      return parent.send(controller_name) if parent_data.present?
+      if model_class.respond_to?(:accessible_by) && !current_ability.has_block?(params[:action], model_class)
+        model_class.accessible_by(current_ability)
+      else
+        model_class.scoped
+      end
     end
-  end
 
-  def location_after_save
-    collection_url
-  end
+    def location_after_save
+      collection_url
+    end
 
-  def invoke_callbacks(action, callback_type)
-    callbacks = self.class.callbacks || {}
-    return if callbacks[action].nil?
-    case callback_type.to_sym
-      when :before then callbacks[action].before_methods.each {|method| send method }
-      when :after  then callbacks[action].after_methods.each  {|method| send method }
-      when :fails  then callbacks[action].fails_methods.each  {|method| send method }
+    def invoke_callbacks(action, callback_type)
+      callbacks = self.class.callbacks || {}
+      return if callbacks[action].nil?
+      case callback_type.to_sym
+        when :before then callbacks[action].before_methods.each {|method| send method }
+        when :after  then callbacks[action].after_methods.each  {|method| send method }
+        when :fails  then callbacks[action].fails_methods.each  {|method| send method }
+      end
     end
-  end
 
-  # URL helpers
+    # URL helpers
 
-  def new_object_url(options = {})
-    if parent_data.present?
-      spree.new_polymorphic_url([:admin, parent, model_class], options)
-    else
-      spree.new_polymorphic_url([:admin, model_class], options)
+    def new_object_url(options = {})
+      if parent_data.present?
+        spree.new_polymorphic_url([:admin, parent, model_class], options)
+      else
+        spree.new_polymorphic_url([:admin, model_class], options)
+      end
     end
-  end
 
-  def edit_object_url(object, options = {})
-    if parent_data.present?
-      spree.send "edit_admin_#{model_name}_#{object_name}_url", parent, object, options
-    else
-      spree.send "edit_admin_#{object_name}_url", object, options
+    def edit_object_url(object, options = {})
+      if parent_data.present?
+        spree.send "edit_admin_#{model_name}_#{object_name}_url", parent, object, options
+      else
+        spree.send "edit_admin_#{object_name}_url", object, options
+      end
     end
-  end
 
-  def object_url(object = nil, options = {})
-    target = object ? object : @object
-    if parent_data.present?
-      spree.send "admin_#{model_name}_#{object_name}_url", parent, target, options
-    else
-      spree.send "admin_#{object_name}_url", target, options
+    def object_url(object = nil, options = {})
+      target = object ? object : @object
+      if parent_data.present?
+        spree.send "admin_#{model_name}_#{object_name}_url", parent, target, options
+      else
+        spree.send "admin_#{object_name}_url", target, options
+      end
     end
-  end
 
-  def collection_url(options = {})
-    if parent_data.present?
-      spree.polymorphic_url([:admin, parent, model_class], options)
-    else
-      spree.polymorphic_url([:admin, model_class], options)
+    def collection_url(options = {})
+      if parent_data.present?
+        spree.polymorphic_url([:admin, parent, model_class], options)
+      else
+        spree.polymorphic_url([:admin, model_class], options)
+      end
     end
-  end
 
-  def collection_actions
-    [:index]
-  end
+    def collection_actions
+      [:index]
+    end
 
-  def member_action?
-    !collection_actions.include? params[:action].to_sym
-  end
+    def member_action?
+      !collection_actions.include? params[:action].to_sym
+    end
 
-  def new_actions
-    [:new, :create]
-  end
+    def new_actions
+      [:new, :create]
+    end
 end