spree_core 1.3.5 → 2.0.0.rc1

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

@@ -1,27 +0,0 @@
-module Spree
-  module Admin
-    class SearchController < Spree::Admin::BaseController
-      # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
-      before_filter :check_json_authenticity, :only => :index
-      respond_to :json
-
-      # TODO: Clean this up by moving searching out to user_class_extensions
-      # And then JSON building with something like Active Model Serializers
-      def users
-        if params[:ids]
-          @users = Spree.user_class.where(:id => params[:ids].split(','))
-        else
-          @users = Spree.user_class.ransack({
-            :m => 'or',
-            :email_start => params[:q],
-            :ship_address_firstname_start => params[:q],
-            :ship_address_lastname_start => params[:q],
-            :bill_address_firstname_start => params[:q],
-            :bill_address_lastname_start => params[:q]
-          }).result.limit(10)
-        end
-      end
-    end
-  end
-end
-

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

@@ -1,102 +0,0 @@
-module Spree
-  module Admin
-    class ShipmentsController < Spree::Admin::BaseController
-      before_filter :load_shipping_methods, :except => [:country_changed, :index]
-
-      respond_to :html
-
-      def index
-        @shipments = order.shipments
-        respond_with(@shipments)
-      end
-
-      def new
-        build_shipment
-        respond_with(shipment)
-      end
-
-      def create
-        build_shipment
-        assign_inventory_units
-        if shipment.save
-          flash[:success] = flash_message_for(shipment, :successfully_created)
-          respond_with(shipment) do |format|
-            format.html { redirect_to edit_admin_order_shipment_path(order, shipment) }
-          end
-        else
-          respond_with(shipment) { |format| format.html { render :action => 'new' } }
-        end
-      end
-
-      def edit
-        shipment.special_instructions = order.special_instructions
-        respond_with(shipment)
-      end
-
-      def update
-        assign_inventory_units
-        if shipment.update_attributes params[:shipment]
-          # copy back to order if instructions are enabled
-          order.special_instructions = params[:shipment][:special_instructions] if Spree::Config[:shipping_instructions]
-          order.shipping_method = order.shipment.shipping_method
-          order.save
-
-          flash[:success] = flash_message_for(shipment, :successfully_updated)
-          return_path = order.completed? ? edit_admin_order_shipment_path(order, shipment) : admin_order_adjustments_path(order)
-          respond_with(@object) do |format|
-            format.html { redirect_to return_path }
-          end
-        else
-          respond_with(shipment) { |format| format.html { render :action => 'edit' } }
-        end
-      end
-
-      def destroy
-        shipment.destroy
-        respond_with(shipment) { |format| format.js { render_js_for_destroy } }
-      end
-
-      def fire
-        if shipment.send("#{params[:e]}")
-          flash[:success] = t(:shipment_updated)
-        else
-          flash[:error] = t(:cannot_perform_operation)
-        end
-
-        respond_with(shipment) { |format| format.html { redirect_to :back } }
-      end
-
-      private
-
-      def load_shipping_methods
-        @shipping_methods = ShippingMethod.all_available(order, :back_end)
-      end
-
-      def assign_inventory_units
-        return unless params.has_key? :inventory_units
-        shipment.inventory_unit_ids = params[:inventory_units].keys
-      end
-
-      def order
-        @order ||= Order.find_by_number(params[:order_id])
-        authorize! action, @order
-      end
-
-      def shipment
-        @shipment ||= order.shipments.find_by_number(params[:id])
-      end
-
-      def build_shipment
-        @shipment = order.shipments.build
-        @shipment.address ||= order.ship_address
-        @shipment.address ||= Address.new(:country_id => Spree::Config[:default_country_id])
-        @shipment.shipping_method ||= order.shipping_method
-        @shipment.attributes = params[:shipment]
-      end
-
-      def model_class
-        Spree::Shipment
-      end
-    end
-  end
-end

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

@@ -1,6 +0,0 @@
-module Spree
-  module Admin
-    class ShippingCategoriesController < ResourceController
-    end
-  end
-end

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

@@ -1,37 +0,0 @@
-module Spree
-  module Admin
-    class ShippingMethodsController < ResourceController
-      before_filter :load_data, :except => [:index]
-      before_filter :set_shipping_category, :only => [:create, :update]
-
-      def destroy
-        @object.touch :deleted_at
-
-        flash[:success] = flash_message_for(@object, :successfully_removed)
-
-        respond_with(@object) do |format|
-          format.html { redirect_to collection_url }
-          format.js  { render_js_for_destroy }
-        end
-      end
-
-      private
-
-      def set_shipping_category
-        return true if params[:shipping_method][:shipping_category_id] == ""
-        @shipping_method.shipping_category = Spree::ShippingCategory.find(params[:shipping_method][:shipping_category_id])
-        @shipping_method.save
-        params[:shipping_method].delete(:shipping_category_id)
-      end
-
-      def location_after_save
-        edit_admin_shipping_method_path(@shipping_method)
-      end
-
-      def load_data
-        @available_zones = Zone.order(:name)
-        @calculators = ShippingMethod.calculators.sort_by(&:name)
-      end
-    end
-  end
-end

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

@@ -1,29 +0,0 @@
-module Spree
-  module Admin
-    class StatesController < ResourceController
-      belongs_to 'spree/country'
-      before_filter :load_data
-
-      def index
-        respond_with(@collection) do |format|
-          format.html
-          format.js { render :partial => 'state_list' }
-        end
-      end
-
-      protected
-
-        def location_after_save
-          admin_country_states_url(@country)
-        end
-
-        def collection
-          super.order(:name)
-        end
-
-        def load_data
-          @countries = Country.order(:name)
-        end
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-module Spree
-  module Admin
-    class TaxCategoriesController < ResourceController
-      def destroy
-        if @object.mark_deleted!
-          flash[:success] = flash_message_for(@object, :successfully_removed)
-          respond_with(@object) do |format|
-            format.html { redirect_to collection_url }
-            format.js   { render :partial => "spree/admin/shared/destroy" }
-          end
-        else
-          respond_with(@object) do |format|
-            format.html { redirect_to collection_url }
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-module Spree
-  module Admin
-    class TaxRatesController < ResourceController
-      before_filter :load_data
-
-      update.after :update_after
-      create.after :create_after
-
-      private
-
-      def load_data
-        @available_zones = Zone.order(:name)
-        @available_categories = TaxCategory.order(:name)
-        @calculators = TaxRate.calculators.sort_by(&:name)
-      end
-
-      def update_after
-        Rails.cache.delete('vat_rates')
-      end
-
-      def create_after
-        Rails.cache.delete('vat_rates')
-      end
-    end
-  end
-end

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

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

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

@@ -1,23 +0,0 @@
-module Spree
-  module Admin
-    class TaxonomiesController < ResourceController
-      respond_to :json, :only => [:get_children]
-
-      def get_children
-        @taxons = Taxon.find(params[:parent_id]).children
-
-        respond_with(@taxons)
-      end
-
-      private
-
-      def location_after_save
-        if @taxonomy.created_at == @taxonomy.updated_at
-          edit_admin_taxonomy_url(@taxonomy)
-        else
-          admin_taxonomies_url
-        end
-      end
-    end
-  end
-end

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

@@ -1,114 +0,0 @@
-module Spree
-  module Admin
-    class TaxonsController < Spree::Admin::BaseController
-
-      respond_to :html, :json, :js
-
-      def search
-        if params[:ids]
-          @taxons = Spree::Taxon.where(:id => params[:ids].split(','))
-        else
-          @taxons = Spree::Taxon.limit(20).search(:name_cont => params[:q]).result
-        end
-      end
-
-      def create
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
-        @taxon = @taxonomy.taxons.build(params[:taxon])
-        if @taxon.save
-          respond_with(@taxon) do |format|
-            format.json {render :json => @taxon.to_json }
-          end
-        else
-          flash[:error] = t('errors.messages.could_not_create_taxon')
-          respond_with(@taxon) do |format|
-            format.html { redirect_to @taxonomy ? edit_admin_taxonomy_url(@taxonomy) : admin_taxonomies_url }
-          end
-        end
-      end
-
-      def edit
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
-        @taxon = @taxonomy.taxons.find(params[:id])
-        @permalink_part = @taxon.permalink.split("/").last
-
-        respond_with(:admin, @taxon)
-      end
-
-      def update
-        @taxonomy = Taxonomy.find(params[:taxonomy_id])
-        @taxon = @taxonomy.taxons.find(params[:id])
-        parent_id = params[:taxon][:parent_id]
-        new_position = params[:taxon][:position]
-
-        if parent_id || new_position #taxon is being moved
-          new_parent = parent_id.nil? ? @taxon.parent : Taxon.find(parent_id.to_i)
-          new_position = new_position.nil? ? -1 : new_position.to_i
-
-          # Bellow is a very complicated way of finding where in nested set we
-          # should actually move the taxon to achieve sane results,
-          # JS is giving us the desired position, which was awesome for previous setup,
-          # but now it's quite complicated to find where we should put it as we have
-          # to differenciate between moving to the same branch, up down and into
-          # first position.
-          new_siblings = new_parent.children
-          if new_position <= 0 && new_siblings.empty?
-            @taxon.move_to_child_of(new_parent)
-          elsif new_parent.id != @taxon.parent_id
-            if new_position == 0
-              @taxon.move_to_left_of(new_siblings.first)
-            else
-              @taxon.move_to_right_of(new_siblings[new_position-1])
-            end
-          elsif new_position < new_siblings.index(@taxon)
-            @taxon.move_to_left_of(new_siblings[new_position]) # we move up
-          else
-            @taxon.move_to_right_of(new_siblings[new_position-1]) # we move down
-          end
-          # Reset legacy position, if any extensions still rely on it
-          new_parent.children.reload.each{|t| t.update_column(:position, t.position)}
-
-          if parent_id
-            @taxon.reload
-            @taxon.set_permalink
-            @taxon.save!
-            @update_children = true
-          end
-        end
-
-        if params.key? "permalink_part"
-          parent_permalink = @taxon.permalink.split("/")[0...-1].join("/")
-          parent_permalink += "/" unless parent_permalink.blank?
-          params[:taxon][:permalink] = parent_permalink + params[:permalink_part]
-        end
-        #check if we need to rename child taxons if parent name or permalink changes
-        @update_children = true if params[:taxon][:name] != @taxon.name || params[:taxon][:permalink] != @taxon.permalink
-
-        if @taxon.update_attributes(params[:taxon])
-          flash[:success] = flash_message_for(@taxon, :successfully_updated)
-        end
-
-        #rename child taxons
-        if @update_children
-          @taxon.descendants.each do |taxon|
-            taxon.reload
-            taxon.set_permalink
-            taxon.save!
-          end
-        end
-
-        respond_with(@taxon) do |format|
-          format.html {redirect_to edit_admin_taxonomy_url(@taxonomy) }
-          format.json {render :json => @taxon.to_json }
-        end
-      end
-
-      def destroy
-        @taxon = Taxon.find(params[:id])
-        @taxon.destroy
-        render :text => "", :status => 204
-      end
-
-    end
-  end
-end

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

@@ -1,6 +0,0 @@
-module Spree
-  module Admin
-    class TrackersController < ResourceController
-    end
-  end
-end

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

@@ -1,96 +0,0 @@
-module Spree
-  module Admin
-    class UsersController < ResourceController
-
-      if Spree.user_class.const_defined?("DestroyWithOrdersError")
-        rescue_from "#{Spree.user_class}::DestroyWithOrdersError".constantize, :with => :user_destroy_with_orders_error
-      end
-
-      # http://spreecommerce.com/blog/2010/11/02/json-hijacking-vulnerability/
-      before_filter :check_json_authenticity, :only => :index
-      before_filter :load_roles, :only => [:edit, :new, :update, :create, :generate_api_key, :clear_api_key]
-      update.after :sign_in_if_change_own_password
-      before_filter :load_roles, :only => [:edit, :new, :update, :create]
-
-      def index
-        respond_with(@collection) do |format|
-          format.html
-          format.json { render :json => json_data }
-        end
-      end
-
-      def generate_api_key
-        if @user.generate_spree_api_key!
-          flash.notice = t('key_generated', :scope => 'spree.api')
-        end
-        redirect_to edit_admin_user_path(@user)
-      end
-
-      def clear_api_key
-        if @user.clear_spree_api_key!
-          flash.notice = t('key_cleared', :scope => 'spree.api')
-        end
-        redirect_to edit_admin_user_path(@user)
-      end
-
-      protected
-
-        def sign_in_if_change_own_password
-          if spree_current_user == @user && @user.password.present?
-            sign_in(@user, :event => :authentication, :bypass => true)
-          end
-        end
-
-        def load_roles
-          @roles = Spree::Role.scoped
-        end
-
-        def model_class
-          Spree.user_class
-        end
-
-        def collection
-          return @collection if @collection.present?
-          unless request.xhr?
-            @search = Spree.user_class.registered.ransack(params[:q])
-            @collection = @search.result.page(params[:page]).per(Spree::Config[:admin_products_per_page])
-          else
-            #disabling proper nested include here due to rails 3.1 bug
-            #@collection = User.includes(:bill_address => [:state, :country], :ship_address => [:state, :country]).
-            @collection = Spree.user_class.includes(:bill_address, :ship_address).
-                              where("spree_users.email #{LIKE} :search
-                                     OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
-                                     OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.bill_address_id)
-                                     OR (spree_addresses.firstname #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)
-                                     OR (spree_addresses.lastname  #{LIKE} :search AND spree_addresses.id = spree_users.ship_address_id)",
-              { :search => "#{params[:q].strip}%" }).
-                limit(params[:limit] || 100)
-            end
-          end
-
-      private
-
-        # handling raise from Spree::Admin::ResourceController#destroy
-        def user_destroy_with_orders_error
-          invoke_callbacks(:destroy, :fails)
-          render :status => :forbidden, :text => t(:error_user_destroy_with_orders)
-        end
-
-        # Allow different formats of json data to suit different ajax calls
-        def json_data
-          json_format = params[:json_format] or 'default'
-          case json_format
-          when 'basic'
-            collection.map { |u| { 'id' => u.id, 'name' => u.email } }.to_json
-          else
-            address_fields = [:firstname, :lastname, :address1, :address2, :city, :zipcode, :phone, :state_name, :state_id, :country_id]
-            includes = { :only => address_fields , :include => { :state => { :only => :name }, :country => { :only => :name } } }
-
-            collection.to_json(:only => [:id, :email], :include =>
-                               { :bill_address => includes, :ship_address => includes })
-          end
-        end
-
-    end
-  end
-end

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

@@ -1,63 +0,0 @@
-module Spree
-  module Admin
-    class VariantsController < ResourceController
-      belongs_to 'spree/product', :find_by => :permalink
-      create.before :create_before
-      new_action.before :new_before
-
-      def index
-        respond_with(collection)
-      end
-
-      def search
-        search_params = { :product_name_cont => params[:q], :sku_cont => params[:q] }
-        @variants = Spree::Variant.ransack(search_params.merge(:m => 'or')).result
-      end
-
-      # override the destory method to set deleted_at value
-      # instead of actually deleting the product.
-      def destroy
-        @variant = Variant.find(params[:id])
-        @variant.deleted_at = Time.now()
-        if @variant.save
-          flash[:success] = I18n.t('notice_messages.variant_deleted')
-        else
-          flash[:success] = I18n.t('notice_messages.variant_not_deleted')
-        end
-
-        respond_with(@variant) do |format|
-          format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-          format.js  { render_js_for_destroy }
-        end
-      end
-
-      protected
-
-        def create_before
-          option_values = params[:new_variant]
-          option_values.each_value {|id| @object.option_values << OptionValue.find(id)}
-          @object.save
-        end
-
-
-        def new_before
-          @object.attributes = @object.product.master.attributes.except('id', 'created_at', 'deleted_at',
-                                                                        'sku', 'is_master', 'count_on_hand')
-          # Shallow Clone of the default price to populate the price field.
-          @object.default_price = @object.product.master.default_price.clone
-        end
-
-        def collection
-          @deleted = (params.key?(:deleted) && params[:deleted] == "on") ? "checked" : ""
-
-          if @deleted.blank?
-            @collection ||= super
-          else
-            @collection ||= Variant.where(:product_id => parent.id).deleted
-          end
-          @collection
-        end
-    end
-  end
-end
-

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

@@ -1,27 +0,0 @@
-module Spree
-  module Admin
-    class ZonesController < ResourceController
-      before_filter :load_data, :except => [:index]
-
-      def new
-        @zone.zone_members.build
-        respond_with(@zone)
-      end
-
-      protected
-
-        def collection
-          params[:q] ||= {}
-          params[:q][:s] ||= "ascend_by_name"
-          @search = super.ransack(params[:q])
-          @zones = @search.result.page(params[:page]).per(Spree::Config[:orders_per_page])
-        end
-
-        def load_data
-          @countries = Country.order(:name)
-          @states = State.order(:name)
-          @zones = Zone.order(:name)
-        end
-    end
-  end
-end