spree_core 1.3.5 → 2.0.0.rc1

data/app/assets/stylesheets/store/spree_core.css

@@ -1,6 +0,0 @@
-/*
-* This is a manifest file that includes stylesheets for spree_core  
- *= require normalize
- *= require skeleton
- *= require store/screen
-*/

data/app/assets/stylesheets/store/variables.css.scss

@@ -1,62 +0,0 @@
-/*--------------------------------------*/
-/* Colors
-/*--------------------------------------*/
-$c_green:       #8dba53 !default;  /* Spree green    */
-$c_red:         #e45353 !default;  /* Error red      */
-
-$layout_background_color:   #FFFFFF !default;
-$title_text_color:          #404042 !default;
-$body_text_color:           #404042 !default;
-$link_text_color:           #00ADEE !default;
-
-$product_background_color:  #FFFFFF !default;
-$product_title_text_color:  #404042 !default;
-$product_body_text_color:   #404042 !default;
-$product_link_text_color:   #BBBBBB !default;
-
-/*--------------------------------------*/
-/* Fonts import from remote
-/*--------------------------------------*/
-@import url(//fonts.googleapis.com/css?family=Ubuntu:400,700,400italic,700italic|&subset=latin,cyrillic,greek,greek-ext,latin-ext,cyrillic-ext);
-
-/*--------------------------------------*/
-/* Font families
-/*--------------------------------------*/
-$ff_base:       'Ubuntu', sans-serif !default;
-
-/*--------------------------------------
-  | Font sizes
-  |--------------------------------------
-  |- Navigation                         
-  |                                    */
-      $header_navigation_font_size:           14px !default;
-      $horizontal_navigation_font_size:       16px !default;
-      $main_navigation_header_font_size:      14px !default;
-      $main_navigation_font_size:             12px !default;
-/*|------------------------------------
-  |- Product Listing                         
-  |                                  */
-      $product_list_name_font_size:           12px !default;
-      $product_list_price_font_size:          16px !default;
-      $product_list_header_font_size:         20px !default;
-      $product_list_search_font_size:         14px !default;
-/*|------------------------------------
-  |- Product Details
-  |                                  */
-      $product_detail_name_font_size:         24px !default;
-      $product_detail_description_font_size:  12px !default;
-      $product_detail_price_font_size:        20px !default;
-      $product_detail_title_font_size:        14px !default;
-/*|------------------------------------
-  |- Basic
-  |                                  */
-      $heading_font_size:                     24px !default;
-      $sub_heading_font_size:                 14px !default;
-      $button_font_size:                      12px !default;
-      $input_box_font_size:                   13px !default;
-      $base_font_size:                        12px !default;
-      $border_color:                          lighten($body_text_color, 60) !default;
-      $default_border:                        1px solid $border_color !default;
-      $button_border_color:                   rgba(0, 138, 189, .75) !default;
-      $table_head_color:                      lighten($body_text_color, 60) !default;
-

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

@@ -1,17 +0,0 @@
-module Spree
-  module Admin
-    class AdjustmentsController < ResourceController
-      belongs_to 'spree/order', :find_by => :number
-      destroy.after :reload_order
-
-      private
-      def reload_order
-        @order.reload
-      end
-
-      def collection
-        parent.adjustments.eligible
-      end
-    end
-  end
-end

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

@@ -1,14 +0,0 @@
-module Spree
-  module Admin
-    class BannersController < Spree::Admin::BaseController
-      def dismiss
-        if params[:id]
-          if user = try_spree_current_user
-            user.dismiss_banner(params[:id])
-          end
-        end
-        render :nothing => true
-      end
-    end
-  end
-end

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

@@ -1,78 +0,0 @@
-module Spree
-  module Admin
-    class BaseController < Spree::BaseController
-      ssl_required
-
-      helper 'spree/admin/navigation'
-      helper 'spree/admin/tables'
-      layout '/spree/layouts/admin'
-
-      before_filter :check_alerts
-      before_filter :authorize_admin
-
-      protected
-        def action
-          params[:action].to_sym
-        end
-
-        def authorize_admin
-          if respond_to?(:model_class, true) && model_class
-            record = model_class
-          else
-            record = Object
-          end
-          authorize! :admin, record
-          authorize! action, record
-        end
-
-        def check_alerts
-          return unless 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 !Rails.env.production? || !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 flash_message_for(object, event_sym)
-          resource_desc  = object.class.model_name.human
-          resource_desc += " \"#{object.name}\"" if object.respond_to?(:name) && object.name.present?
-          I18n.t(event_sym, :resource => resource_desc)
-        end
-
-        def render_js_for_destroy
-          render :partial => '/spree/admin/shared/destroy'
-        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?
-          return unless protect_against_forgery?
-          auth_token = params[request_forgery_protection_token]
-          unless (auth_token and form_authenticity_token == URI.unescape(auth_token))
-            raise(ActionController::InvalidAuthenticityToken)
-          end
-        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
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module Spree
-  module Admin
-    class CountriesController < ResourceController
-
-        def collection
-          super.order(:name)
-        end
-
-    end
-  end
-end

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

@@ -1,34 +0,0 @@
-module Spree
-  module Admin
-    class GeneralSettingsController < Spree::Admin::BaseController
-
-      def edit
-        @preferences_general = [:site_name, :default_seo_title, :default_meta_keywords,
-                        :default_meta_description, :site_url]
-        @preferences_security = [:allow_ssl_in_production,
-                        :allow_ssl_in_staging, :allow_ssl_in_development_and_test,
-                        :check_for_spree_alerts]
-        @preferences_currency = [:display_currency, :hide_cents]
-      end
-
-      def update
-        params.each do |name, value|
-          next unless Spree::Config.has_preference? name
-          Spree::Config[name] = value
-        end
-        flash[:success] = t(:successfully_updated, :resource => t(:general_settings))
-
-        redirect_to edit_admin_general_settings_path
-      end
-
-      def dismiss_alert
-        if request.xhr? and params[:alert_id]
-          dismissed = Spree::Config[:dismissed_spree_alerts] || ''
-          Spree::Config.set :dismissed_spree_alerts => dismissed.split(',').push(params[:alert_id]).join(',')
-          filter_dismissed_alerts
-          render :nothing => true
-        end
-      end
-    end
-  end
-end

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

@@ -1,66 +0,0 @@
-module Spree
-  module Admin
-    class ImageSettingsController < Spree::Admin::BaseController
-      def edit
-        @styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
-        @headers = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
-      end
-
-      def update
-        update_styles(params)
-        update_headers(params) if Spree::Config[:use_s3]
-
-        Spree::Config.set(params[:preferences])
-        update_paperclip_settings
-
-        respond_to do |format|
-          format.html {
-            flash[:success] = t(:image_settings_updated)
-            redirect_to edit_admin_image_settings_path
-          }
-        end
-      end
-
-
-      private
-
-      def update_styles(params)
-        params[:new_attachment_styles].each do |index, style|
-          params[:attachment_styles][style[:name]] = style[:value] unless style[:value].empty?
-        end if params[:new_attachment_styles].present?
-
-        styles = params[:attachment_styles]
-
-        Spree::Config[:attachment_styles] = ActiveSupport::JSON.encode(styles) unless styles.nil?
-      end
-
-      def update_headers(params)
-        params[:new_s3_headers].each do |index, header|
-          params[:s3_headers][header[:name]] = header[:value] unless header[:value].empty?
-        end if params[:new_s3_headers].present?
-
-        headers = params[:s3_headers]
-
-        Spree::Config[:s3_headers] = ActiveSupport::JSON.encode(headers) unless headers.nil?
-      end
-
-      def update_paperclip_settings
-        if Spree::Config[:use_s3]
-          s3_creds = { :access_key_id => Spree::Config[:s3_access_key], :secret_access_key => Spree::Config[:s3_secret], :bucket => Spree::Config[:s3_bucket] }
-          Spree::Image.attachment_definitions[:attachment][:storage] = :s3
-          Spree::Image.attachment_definitions[:attachment][:s3_credentials] = s3_creds
-          Spree::Image.attachment_definitions[:attachment][:s3_headers] = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
-          Spree::Image.attachment_definitions[:attachment][:bucket] = Spree::Config[:s3_bucket]
-        else
-          Spree::Image.attachment_definitions[:attachment].delete :storage
-        end
-
-        Spree::Image.attachment_definitions[:attachment][:styles] = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
-        Spree::Image.attachment_definitions[:attachment][:path] = Spree::Config[:attachment_path]
-        Spree::Image.attachment_definitions[:attachment][:default_url] = Spree::Config[:attachment_default_url]
-        Spree::Image.attachment_definitions[:attachment][:default_style] = Spree::Config[:attachment_default_style]
-      end
-    end
-  end
-end
-

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

@@ -1,39 +0,0 @@
-module Spree
-  module Admin
-    class ImagesController < ResourceController
-      before_filter :load_data
-
-      create.before :set_viewable
-      update.before :set_viewable
-      destroy.before :destroy_before
-
-      private
-
-        def location_after_destroy
-          admin_product_images_url(@product)
-        end
-
-        def location_after_save
-          admin_product_images_url(@product)
-        end
-
-        def load_data
-          @product = Product.find_by_permalink(params[:product_id])
-          @variants = @product.variants.collect do |variant|
-            [variant.options_text, variant.id]
-          end
-          @variants.insert(0, [I18n.t(:all), @product.master.id])
-        end
-
-        def set_viewable
-          @image.viewable_type = 'Spree::Variant'
-          @image.viewable_id = params[:image][:viewable_id]
-        end
-
-        def destroy_before
-          @viewable = @image.viewable
-        end
-
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-module Spree
-  module Admin
-    class InventorySettingsController < Spree::Admin::BaseController
-
-      def update
-        Spree::Config.set(params[:preferences])
-        flash[:success] = t(:successfully_updated, :resource => t(:inventory_settings))
-        redirect_to edit_admin_inventory_settings_path
-      end
-    end
-  end
-
-end

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

@@ -1,6 +0,0 @@
-module Spree
-  module Admin
-    class InventoryUnitsController < Spree::Admin::BaseController
-    end
-  end
-end

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

@@ -1,58 +0,0 @@
-module Spree
-  module Admin
-    class LineItemsController < Spree::Admin::BaseController
-      layout nil, :only => [:create, :destroy, :update]
-
-      before_filter :load_order
-      before_filter :load_line_item, :only => [:destroy, :update]
-
-      respond_to :html, :js
-
-      def create
-        variant = Variant.find(params[:line_item][:variant_id])
-        @line_item = @order.add_variant(variant, params[:line_item][:quantity].to_i)
-
-        if @order.save
-          respond_with(@line_item) do |format|
-            format.html { render :partial => 'spree/admin/orders/form', :locals => { :order => @order.reload } }
-          end
-        else
-          respond_with(@line_item) do |format|
-            format.js { render :action => 'create', :locals => { :order => @order.reload } }
-          end
-        end
-      end
-
-      def destroy
-        @line_item.destroy
-        respond_with(@line_item) do |format|
-          format.html { redirect_to edit_admin_order_path(@order) }
-          format.js { @order.reload }
-        end
-      end
-
-      def update
-        if @line_item.update_attributes(params[:line_item])
-          respond_with(@line_item) do |format|
-            format.html { render :partial => 'spree/admin/orders/form', :locals => { :order => @order.reload } }
-          end
-        else
-          respond_with(@line_item) do |format|
-            format.html { render :partial => 'spree/admin/orders/form', :locals => { :order => @order.reload } }
-          end
-        end
-      end
-
-      private
-
-        def load_order
-          @order = Order.find_by_number!(params[:order_id])
-          authorize! action, @order
-        end
-
-        def load_line_item
-          @line_item = @order.line_items.find(params[:id])
-        end
-    end
-  end
-end

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

@@ -1,32 +0,0 @@
-module Spree
-  module Admin
-    class MailMethodsController < ResourceController
-      after_filter :initialize_mail_settings
-
-      def update
-        if params[:mail_method][:preferred_smtp_password].blank?
-          params[:mail_method].delete(:preferred_smtp_password)
-        end
-        super
-      end
-
-      def testmail
-        @mail_method = Spree::MailMethod.find(params[:id])
-        if TestMailer.test_email(@mail_method, try_spree_current_user).deliver
-          flash[:success] = t('admin.mail_methods.testmail.delivery_success')
-        else
-          flash[:error] = t('admin.mail_methods.testmail.delivery_error')
-        end
-      rescue Exception => e
-        flash[:error] = t('admin.mail_methods.testmail.error') % {:e => e}
-      ensure
-        respond_with(@mail_method) { |format| format.html { redirect_to :back } }
-      end
-
-      private
-      def initialize_mail_settings
-        Spree::Core::MailSettings.init
-      end
-    end
-  end
-end

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

@@ -1,46 +0,0 @@
-module Spree
-  module Admin
-    class OptionTypesController < ResourceController
-      before_filter :setup_new_option_value, :only => [:edit]
-
-      def update_values_positions
-        params[:positions].each do |id, index|
-          OptionValue.where(:id => id).update_all(:position => index)
-        end
-
-        respond_to do |format|
-          format.html { redirect_to admin_product_variants_url(params[:product_id]) }
-          format.js  { render :text => 'Ok' }
-        end
-      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 setup_new_option_value
-          @option_type.option_values.build if @option_type.option_values.empty?
-        end
-
-        def set_available_option_types
-          @available_option_types = if @product.option_type_ids.any?
-            OptionType.where('id NOT IN (?)', @product.option_type_ids)
-          else
-            OptionType.all
-          end
-        end
-    end
-  end
-end

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

@@ -1,11 +0,0 @@
-module Spree
-  module Admin
-    class OptionValuesController < Spree::Admin::BaseController
-      def destroy
-        option_value = Spree::OptionValue.find(params[:id])
-        option_value.destroy
-        render :text => nil
-      end
-    end
-  end
-end

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

@@ -1,52 +0,0 @@
-module Spree
-  module Admin
-    module Orders
-      class CustomerDetailsController < Spree::Admin::BaseController
-        before_filter :load_order
-
-        def show
-          edit
-          render :action => :edit
-        end
-
-        def edit
-          country_id = Address.default.country.id
-          @order.build_bill_address(:country_id => country_id) if @order.bill_address.nil?
-          @order.build_ship_address(:country_id => country_id) if @order.ship_address.nil?
-        end
-
-        def update
-          if @order.update_attributes(params[:order])
-            shipping_method = @order.available_shipping_methods(:front_end).first
-            if shipping_method
-              @order.shipping_method = shipping_method
-
-              if params[:user_id].present?
-                @order.user_id = params[:user_id]
-                @order.user true
-              end
-              while @order.next; end
-
-              flash[:success] = t('customer_details_updated')
-              redirect_to edit_admin_order_shipment_path(@order, @order.shipment)
-            else
-              flash[:error] = t('errors.messages.no_shipping_methods_available')
-              redirect_to admin_order_customer_path(@order)
-            end
-
-          else
-            render :action => :edit
-          end
-
-        end
-
-        private
-
-          def load_order
-            @order = Order.find_by_number!(params[:order_id], :include => :adjustments)
-          end
-
-      end
-    end
-  end
-end

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

@@ -1,127 +0,0 @@
-module Spree
-  module Admin
-    class OrdersController < Spree::Admin::BaseController
-      require 'spree/core/gateway_error'
-      before_filter :initialize_order_events
-      before_filter :load_order, :only => [:show, :edit, :update, :fire, :resend]
-
-      respond_to :html
-
-      def index
-        params[:q] ||= {}
-        params[:q][:completed_at_not_null] ||= '1' if Spree::Config[:show_only_complete_orders_by_default]
-        @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]
-
-        params[:q].delete(:inventory_units_shipment_id_null) if params[:q][:inventory_units_shipment_id_null] == "0"
-
-        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
-
-        if !params[:q][:created_at_lt].blank?
-          params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue ""
-        end
-
-        if @show_only_completed
-          params[:q][:completed_at_gt] = params[:q].delete(:created_at_gt)
-          params[:q][:completed_at_lt] = params[:q].delete(:created_at_lt)
-        end
-
-        @search = Order.accessible_by(current_ability, :index).ransack(params[:q])
-        @orders = @search.result.includes([:user, :shipments, :payments]).
-          page(params[:page]).
-          per(params[:per_page] || 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
-
-      def show
-        respond_with(@order)
-      end
-
-      def new
-        @order = Order.create
-        respond_with(@order)
-      end
-
-      def edit
-        respond_with(@order)
-      end
-
-      def update
-        return_path = nil
-        if @order.update_attributes(params[:order]) && @order.line_items.present?
-          @order.update!
-          unless @order.complete?
-            # Jump to next step if order is not complete.
-            return_path = admin_order_customer_path(@order)
-          else
-            # Otherwise, go back to first page since all necessary information has been filled out.
-            return_path = admin_order_path(@order)
-          end
-        else
-          @order.errors.add(:line_items, t('errors.messages.blank')) if @order.line_items.empty?
-        end
-
-        respond_with(@order) do |format|
-          format.html do
-            if return_path
-              redirect_to return_path
-            else
-              render :action => :edit
-            end
-          end
-        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)
-        event = params[:e]
-        if @order.send("#{event}")
-          flash[:success] = t(:order_updated)
-        else
-          flash[:error] = t(:cannot_perform_operation)
-        end
-      rescue Spree::Core::GatewayError => ge
-        flash[:error] = "#{ge.message}"
-      ensure
-        respond_with(@order) { |format| format.html { redirect_to :back } }
-      end
-
-      def resend
-        OrderMailer.confirm_email(@order.id, true).deliver
-        flash[:success] = t(:order_email_resent)
-
-        respond_with(@order) { |format| format.html { redirect_to :back } }
-      end
-
-      private
-
-        def load_order
-          @order = Order.find_by_number!(params[:id], :include => :adjustments) if params[:id]
-          authorize! action, @order
-        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
-
-        def model_class
-          Spree::Order
-        end
-    end
-  end
-end