spree_core 0.50.4 → 0.60.0.RC1

data/app/controllers/admin/adjustments_controller.rb

@@ -1,9 +1,10 @@
-class Admin::AdjustmentsController < Admin::BaseController
-  resource_controller
-  belongs_to :order
-
-  update.wants.html { redirect_to collection_url }
-  create.wants.html { redirect_to collection_url }
-  destroy.success.wants.js { @order.reload && render_js_for_destroy }
+class Admin::AdjustmentsController < Admin::ResourceController
+  belongs_to :order, :find_by => :number
+  destroy.after :reload_order
 
+  private
+  
+  def reload_order
+    @order.reload
+  end
 end

data/app/controllers/admin/base_controller.rb

@@ -1,47 +1,15 @@
 class Admin::BaseController < Spree::BaseController
   ssl_required
 
-  before_filter :check_alerts if Rails.env.production?
-
   helper :search
   helper 'admin/navigation'
   layout 'admin'
 
   protected
-  def check_alerts
-    return unless current_user and should_check_alerts?
-
-    unless session.has_key? :alerts
-      begin
-        session[:alerts] = Spree::Alert.current(request.host)
-        filter_dismissed_alerts
-        Spree::Config.set :last_check_for_spree_alerts => DateTime.now.to_s
-      rescue
-        session[:alerts] = nil
-      end
-    end
-  end
-
-  def should_check_alerts?
-    return false if not Spree::Config[:check_for_spree_alerts]
-
-    last_check = Spree::Config[:last_check_for_spree_alerts]
-    return true if last_check.blank?
-
-    DateTime.parse(last_check) < 12.hours.ago
-  end
-
-  def filter_dismissed_alerts
-    return unless session[:alerts]
-    dismissed = (Spree::Config[:dismissed_spree_alerts] || '').split(',')
-    session[:alerts].reject! { |a| dismissed.include? a.id.to_s }
-  end
-
   def render_js_for_destroy
     render :partial => "/admin/shared/destroy"
-    flash.notice = nil
   end
-
+  
   # Index request for JSON needs to pass a CSRF token in order to prevent JSON Hijacking
   def check_json_authenticity
     return unless request.format.js? or request.format.json?

data/app/controllers/admin/configurations_controller.rb

@@ -1,26 +1,2 @@
 class Admin::ConfigurationsController < Admin::BaseController
-  before_filter :initialize_extension_links, :only => :index
-
-  class << self
-    def add_link(text, path, description)
-      unless @@extension_links.any?{|link| link[:link_text] == text}
-        @@extension_links << {
-          :link => path,
-          :link_text => text,
-          :description => description,
-        }
-      end
-    end
-  end
-
-  protected
-
-  def initialize_extension_links
-    @extension_links = [
-      {:link => admin_shipping_methods_path, :link_text => t("shipping_methods"), :description => t("shipping_methods_description")},
-      {:link => admin_shipping_categories_path, :link_text => t("shipping_categories"), :description => t("shipping_categories_description")},
-    ] + @@extension_links
-  end
-
-  @@extension_links = []
 end

data/app/controllers/admin/images_controller.rb

@@ -1,29 +1,10 @@
-class Admin::ImagesController < Admin::BaseController
-  resource_controller
+class Admin::ImagesController < Admin::ResourceController
   before_filter :load_data
 
-  new_action.response do |wants|
-    wants.html {render :action => :new, :layout => false}
-  end
-
-  create.response do |wants|
-    wants.html {redirect_to admin_product_images_url(@product)}
-  end
-
-  update.response do |wants|
-    wants.html {redirect_to admin_product_images_url(@product)}
-  end
-
   create.before :set_viewable
   update.before :set_viewable
   destroy.before :destroy_before
 
-  destroy.response do |wants|
-    wants.html do
-      render :text => ""
-    end
-  end
-
   def update_positions
     params[:positions].each do |id, index|
       Image.update_all(['position=?', index], ['id=?', id])
@@ -35,6 +16,10 @@ class Admin::ImagesController < Admin::BaseController
   end
 
   private
+  
+  def location_after_save
+    admin_product_images_url(@product)
+  end
 
   def load_data
     @product = Product.find_by_permalink(params[:product_id])
@@ -47,18 +32,18 @@ class Admin::ImagesController < Admin::BaseController
   def set_viewable
     if params[:image].has_key? :viewable_id
       if params[:image][:viewable_id] == "All"
-        object.viewable = @product
+        @image.viewable = @product
       else
-        object.viewable_type = 'Variant'
-        object.viewable_id = params[:image][:viewable_id]
+        @image.viewable_type = 'Variant'
+        @image.viewable_id = params[:image][:viewable_id]
       end
     else
-      object.viewable = @product
+      @image.viewable = @product
     end
   end
 
   def destroy_before
-    @viewable = object.viewable
+    @viewable = @image.viewable
   end
 
 end

data/app/controllers/admin/line_items_controller.rb

@@ -1,46 +1,61 @@
 class Admin::LineItemsController < Admin::BaseController
-  resource_controller
-  belongs_to :order
 
-  actions :all, :except => :index
+  before_filter :load_order
+  before_filter :load_line_item, :only => [:destroy, :update]
 
-  create.flash nil
-  update.flash nil
-  destroy.flash nil
-
-  #override r_c create action as we want to use order#add_variant instead of creating line_item
   def create
-    load_object
     variant = Variant.find(params[:line_item][:variant_id])
-
-    before :create
-
     @order.add_variant(variant, params[:line_item][:quantity].to_i)
 
     if @order.save
-      after :create
-      set_flash :create
-      response_for :create
+      respond_to do |format|
+        format.html do
+          render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false
+        end
+      end
     else
-      after :create_fails
-      set_flash :create_fails
-      response_for :create_fails
     end
+  end
 
+  def destroy
+    if @line_item.destroy
+      respond_to do |format|
+        format.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false }
+      end
+    else
+      respond_to do |format|
+        format.html do
+          render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false
+        end
+      end
+    end
   end
 
-  destroy.success.wants.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false }
-  destroy.failure.wants.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false }
+  def new
+    respond_to do |format|
+      format.html { render :action => :new, :layout => false }
+    end
+  end
 
-  new_action.response do |wants|
-    wants.html {render :action => :new, :layout => false}
+  def update
+    if @line_item.update_attributes(params[:line_item])
+      respond_to do |format|
+        format.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false}
+      end
+    else
+      respond_to do |format|
+        format.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false}
+      end
+    end
   end
 
-  create.response do |wants|
-    wants.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false}
+
+  def load_order
+    @order = Order.find_by_number! params[:order_id]
   end
 
-  update.success.wants.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false}
-  update.failure.wants.html { render :partial => "admin/orders/form", :locals => {:order => @order.reload}, :layout => false}
+  def load_line_item
+    @line_item = @order.line_items.find params[:id]
+  end
 
 end

data/app/controllers/admin/mail_methods_controller.rb

@@ -1,13 +1,8 @@
-class Admin::MailMethodsController < Admin::BaseController
-  resource_controller
-
+class Admin::MailMethodsController < Admin::ResourceController
   after_filter :initialize_mail_settings
 
-  update.wants.html { redirect_to collection_url }
-  create.wants.html { redirect_to collection_url }
-
   private
   def initialize_mail_settings
     Spree::MailSettings.init
   end
-end
+end

data/app/controllers/admin/option_types_controller.rb

@@ -1,8 +1,5 @@
-class Admin::OptionTypesController < Admin::BaseController
-  resource_controller
-
-  before_filter :load_object, :only => [:selected, :available, :remove]
-  belongs_to :product
+class Admin::OptionTypesController < Admin::ResourceController
+  before_filter :load_product, :only => [:selected, :available, :remove]
 
   def available
     set_available_option_types
@@ -31,22 +28,6 @@ class Admin::OptionTypesController < Admin::BaseController
     end
   end
 
-  new_action.response do |wants|
-    wants.html {render :action => :new, :layout => !request.xhr?}
-  end
-
-  # redirect to index (instead of r_c default of show view)
-  create.response do |wants|
-    wants.html {redirect_to edit_object_url}
-  end
-
-  # redirect to index (instead of r_c default of show view)
-  update.response do |wants|
-    wants.html {redirect_to collection_url}
-  end
-
-  destroy.success.wants.js { render_js_for_destroy }
-
   # AJAX method for selecting an existing option type and associating with the current product
   def select
     @product = Product.find_by_param!(params[:product_id])
@@ -57,7 +38,22 @@ class Admin::OptionTypesController < Admin::BaseController
     set_available_option_types
   end
 
+  protected
+    
+    def location_after_save
+      if @option_type.created_at == @option_type.updated_at
+        edit_admin_option_type_url(@option_type)
+      else
+        admin_option_types_url
+      end
+    end
+
+
   private
+    def load_product
+      @product = Product.find_by_param!(params[:product_id])
+    end
+  
     def set_available_option_types
       @available_option_types = OptionType.all
       selected_option_types = []

data/app/controllers/admin/orders_controller.rb

@@ -1,37 +1,86 @@
 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, :history, :user]
-  before_filter :ensure_line_items, :only => [:update]
+  before_filter :load_order, :only => [:fire, :resend, :history, :user]
 
-  update do
-    flash nil
-    wants.html do
-      if !@order.line_items.empty?
-        unless @order.complete?
+  def index
+    params[:search] ||= {}
+    params[:search][:completed_at_is_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
+    @show_only_completed = params[:search][:completed_at_is_not_null].present?
+    params[:search][:meta_sort] ||= @show_only_completed ? 'completed_at.desc' : 'created_at.desc'
+
+    @search = Order.metasearch(params[:search])
+
+    if !params[:search][:created_at_greater_than].blank?
+      params[:search][:created_at_greater_than] = Time.zone.parse(params[:search][:created_at_greater_than]).beginning_of_day rescue ""
+    end
+
+    if !params[:search][:created_at_less_than].blank?
+      params[:search][:created_at_less_than] = Time.zone.parse(params[:search][:created_at_less_than]).end_of_day rescue ""
+    end
+
+    if @show_only_completed
+      params[:search][:completed_at_greater_than] = params[:search].delete(:created_at_greater_than)
+      params[:search][:completed_at_less_than] = params[:search].delete(:created_at_less_than)
+    end
 
-          if params[:order].key?(:email)
-            @order.shipping_method = @order.available_shipping_methods(:front_end).first
+    @orders = Order.metasearch(params[:search]).paginate(
+                                   :include  => [:user, :shipments, :payments],
+                                   :per_page => Spree::Config[:orders_per_page],
+                                   :page     => params[:page])
+  end
+
+  def show
+    load_order
+  end
+
+  def new
+    @order = Order.create
+  end
+
+  def edit
+    load_order
+  end
+
+  def update
+    return_path = nil
+    load_order
+    if @order.update_attributes(params[:order]) && @order.line_items.present?
+      unless @order.complete?
+      
+        if params[:order].key?(:email)
+          shipping_method = @order.available_shipping_methods(:front_end).first
+          if shipping_method
+            @order.shipping_method = shipping_method
             @order.create_shipment!
-            redirect_to edit_admin_order_shipment_path(@order, @order.shipment)
+            return_path = edit_admin_order_shipment_path(@order, @order.shipment)
           else
-            redirect_to user_admin_order_path(@order)
+            flash[:error] = t('errors.messages.no_shipping_methods_available')
+            return_path = user_admin_order_path(@order)
           end
-
         else
-          redirect_to admin_order_path(@order)
+          return_path = user_admin_order_path(@order)
         end
+        
       else
-        render :action => :new
+        return_path = admin_order_path(@order)
+      end
+    else
+      @order.errors.add(:line_items, t('errors.messages.blank'))
+    end
+    
+    respond_to do |format|
+      format.html do
+        if return_path
+          redirect_to return_path
+        else
+          render :action => :edit
+        end
       end
     end
   end
 
-  def new
-    @order = @object = Order.create
-  end
 
   def fire
     # TODO - possible security check here but right now any admin can before any transition (and the state machine
@@ -61,35 +110,9 @@ class Admin::OrdersController < Admin::BaseController
 
   private
 
-  def object
-    @object ||= Order.find_by_number(params[:id], :include => :adjustments) if params[:id]
-    return @object || current_order
-  end
-
-  def collection
-    params[:search] ||= {}
-    @show_only_completed = params[:search][:completed_at_is_not_null].present?
-    params[:search][:meta_sort] ||= @show_only_completed ? 'completed_at.desc' : 'created_at.desc'
-    
-    @search = Order.metasearch(params[:search])
-    
-    if !params[:search][:created_at_greater_than].blank?
-      params[:search][:created_at_greater_than] = Time.zone.parse(params[:search][:created_at_greater_than]).beginning_of_day rescue ""
-    end
-   
-    if !params[:search][:created_at_less_than].blank?
-      params[:search][:created_at_less_than] = Time.zone.parse(params[:search][:created_at_less_than]).end_of_day rescue ""
-    end
-
-    if @show_only_completed
-      params[:search][:completed_at_greater_than] = params[:search].delete(:created_at_greater_than)
-      params[:search][:completed_at_less_than] = params[:search].delete(:created_at_less_than)
-    end
-    
-    @collection = Order.metasearch(params[:search]).paginate(
-                                   :include  => [:user, :shipments, :payments],
-                                   :per_page => Spree::Config[:orders_per_page],
-                                   :page     => params[:page])
+  def load_order
+    @order ||= Order.find_by_number(params[:id], :include => :adjustments) if params[:id]
+    @order
   end
 
   # Allows extensions to add new forms of payment to provide their own display of transactions
@@ -102,12 +125,4 @@ class Admin::OrdersController < Admin::BaseController
     @order_events = %w{cancel resume}
   end
 
-  def ensure_line_items
-    load_object
-    if @order.line_items.empty?
-      @order.errors.add(:line_items, t('errors.messages.blank'))
-      render :edit
-    end
-  end
-
 end