spree_core 1.2.5 → 1.3.0.rc1

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

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

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

@@ -55,4 +55,6 @@ $ff_base:       'Ubuntu', sans-serif !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_border:                        1px solid $border_color;
       $button_border_color:                   rgba(0, 138, 189, .75) !default;

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

@@ -5,13 +5,9 @@ module Spree
       destroy.after :reload_order
 
       private
-      def reload_order
-        @order.reload
-      end
-
-      def collection
-        parent.adjustments.eligible
-      end
+        def reload_order
+          @order.reload
+        end
     end
   end
 end

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

@@ -3,8 +3,8 @@ module Spree
     class BaseController < Spree::BaseController
       ssl_required
 
-      helper 'spree/search'
       helper 'spree/admin/navigation'
+      helper 'spree/admin/tables'
       layout '/spree/layouts/admin'
 
       before_filter :check_alerts

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

@@ -0,0 +1,11 @@
+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,16 +1,14 @@
 module Spree
   module Admin
     class GeneralSettingsController < Spree::Admin::BaseController
-      def show
-        @preferences = ['site_name', 'default_seo_title', 'default_meta_keywords',
-                        'default_meta_description', 'site_url']
-      end
 
       def edit
-        @preferences = [:site_name, :default_seo_title, :default_meta_keywords,
-                        :default_meta_description, :site_url, :allow_ssl_in_production,
+        @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, :display_currency]
+                        :check_for_spree_alerts]
+        @preferences_currency = [:display_currency, :hide_cents]
       end
 
       def update
@@ -18,8 +16,9 @@ module Spree
           next unless Spree::Config.has_preference? name
           Spree::Config[name] = value
         end
+        flash[:success] = t(:successfully_updated, :resource => t(:general_settings))
 
-        redirect_to admin_general_settings_path
+        redirect_to edit_admin_general_settings_path
       end
 
       def dismiss_alert

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

@@ -1,11 +1,6 @@
 module Spree
   module Admin
     class ImageSettingsController < Spree::Admin::BaseController
-      def show
-        styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
-        @styles_list = styles.collect { |k, v| k }.join(", ")
-      end
-
       def edit
         @styles = ActiveSupport::JSON.decode(Spree::Config[:attachment_styles])
         @headers = ActiveSupport::JSON.decode(Spree::Config[:s3_headers])
@@ -20,8 +15,8 @@ module Spree
 
         respond_to do |format|
           format.html {
-            flash[:notice] = t(:image_settings_updated)
-            redirect_to admin_image_settings_path
+            flash[:success] = t(:image_settings_updated)
+            redirect_to edit_admin_image_settings_path
           }
         end
       end

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

@@ -4,12 +4,8 @@ module Spree
 
       def update
         Spree::Config.set(params[:preferences])
-
-        respond_to do |format|
-          format.html {
-            redirect_to admin_inventory_settings_path
-          }
-        end
+        flash[:success] = t(:successfully_updated, :resource => t(:inventory_settings))
+        redirect_to edit_admin_inventory_settings_path
       end
     end
   end

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

@@ -13,7 +13,7 @@ module Spree
       def testmail
         @mail_method = Spree::MailMethod.find(params[:id])
         if TestMailer.test_email(@mail_method, try_spree_current_user).deliver
-          flash.notice = t('admin.mail_methods.testmail.delivery_success')
+          flash[:success] = t('admin.mail_methods.testmail.delivery_success')
         else
           flash[:error] = t('admin.mail_methods.testmail.delivery_error')
         end

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

@@ -25,15 +25,14 @@ module Spree
                 @order.user_id = params[:user_id]
                 @order.user true
               end
-
-              while @order.next; end 
-              flash[:notice] = t('customer_details_updated')
+              @order.save
+              @order.create_shipment!
+              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

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

@@ -2,7 +2,6 @@ module Spree
   module Admin
     class OrdersController < Spree::Admin::BaseController
       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]
 
@@ -91,7 +90,7 @@ module Spree
         # itself will make sure transitions are not applied in the wrong state)
         event = params[:e]
         if @order.send("#{event}")
-          flash.notice = t(:order_updated)
+          flash[:success] = t(:order_updated)
         else
           flash[:error] = t(:cannot_perform_operation)
         end
@@ -102,8 +101,8 @@ module Spree
       end
 
       def resend
-        OrderMailer.confirm_email(@order.id, true).deliver
-        flash.notice = t(:order_email_resent)
+        OrderMailer.confirm_email(@order, true).deliver
+        flash[:success] = t(:order_email_resent)
 
         respond_with(@order) { |format| format.html { redirect_to :back } }
       end
@@ -114,11 +113,6 @@ module Spree
           @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
-
         # 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}

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

@@ -4,13 +4,15 @@ module Spree
       skip_before_filter :load_resource, :only => [:create]
       before_filter :load_data
 
+      respond_to :html
+
       def create
         @payment_method = params[:payment_method].delete(:type).constantize.new(params[:payment_method])
         @object = @payment_method
         invoke_callbacks(:create, :before)
         if @payment_method.save
           invoke_callbacks(:create, :after)
-          flash.notice = I18n.t(:successfully_created, :resource => I18n.t(:payment_method))
+          flash[:success] = I18n.t(:successfully_created, :resource => I18n.t(:payment_method))
           respond_with(@payment_method, :location => edit_admin_payment_method_path(@payment_method))
         else
           invoke_callbacks(:create, :fails)
@@ -33,9 +35,10 @@ module Spree
             attributes.delete(k)
           end
         end
+
         if @payment_method.update_attributes(attributes)
           invoke_callbacks(:update, :after)
-          flash.notice = I18n.t(:successfully_updated, :resource => I18n.t(:payment_method))
+          flash[:success] = I18n.t(:successfully_updated, :resource => I18n.t(:payment_method))
           respond_with(@payment_method, :location => edit_admin_payment_method_path(@payment_method))
         else
           invoke_callbacks(:update, :fails)

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

@@ -32,7 +32,7 @@ module Spree
 
           if @order.completed?
             @payment.process!
-            flash.notice = flash_message_for(@payment, :successfully_created)
+            flash[:success] = flash_message_for(@payment, :successfully_created)
 
             respond_with(@payment) { |format| format.html { redirect_to admin_order_payments_path(@order) } }
           else
@@ -40,7 +40,7 @@ module Spree
             until @order.completed?
               @order.next!
             end
-            flash.notice = t(:new_order_completed)
+            flash[:success] = t(:new_order_completed)
             respond_with(@payment) { |format| format.html { redirect_to admin_order_url(@order) } }
           end
 
@@ -56,7 +56,7 @@ module Spree
         # Because we have a transition method also called void, we do this to avoid conflicts.
         event = "void_transaction" if event == "void"
         if @payment.send("#{event}!")
-          flash.notice = t(:payment_updated)
+          flash[:success] = t(:payment_updated)
         else
           flash[:error] = t(:cannot_perform_operation)
         end
@@ -77,7 +77,7 @@ module Spree
 
       def load_data
         @amount = params[:amount] || load_order.total
-        @payment_methods = PaymentMethod.available(:back_end)
+        @payment_methods = PaymentMethod.available
         if @payment and @payment.payment_method
           @payment_method = @payment.payment_method
         else

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

@@ -5,18 +5,6 @@ module Spree
       before_filter :find_properties
       before_filter :setup_property, :only => [:index]
 
-      # We use a "custom" finder in destroy
-      # Because the request is scoped without a product
-      # on account of the request coming from the "link_to_remove_fields"
-      # helper on the admin/product_properties view
-      skip_before_filter :load_resource, :only => [:destroy]
-
-      def destroy
-        product_property = Spree::ProductProperty.find(params[:id])
-        product_property.destroy
-        render :text => nil
-      end
-
       private
         def find_properties
           @properties = Spree::Property.pluck(:name)

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

@@ -3,7 +3,7 @@ module Spree
     class ProductsController < ResourceController
       helper 'spree/products'
 
-      before_filter :check_json_authenticity, :only => :index
+#      before_filter :check_json_authenticity, :only => :index
       before_filter :load_data, :except => :index
       create.before :create_before
       update.before :update_before
@@ -13,10 +13,7 @@ module Spree
       end
 
       def index
-        respond_with(@collection) do |format|
-          format.html
-          format.json { render :json => json_data }
-        end
+        respond_with(@collection)
       end
 
       def update
@@ -60,19 +57,6 @@ module Spree
           edit_admin_product_url(@product)
         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 {|p| {'id' => p.id, 'name' => p.name}}.to_json
-          else
-            collection.to_json(:include => {:variants => {:include => {:option_values => {:include => :option_type},
-                                                          :images => {:only => [:id], :methods => :mini_url}}},
-                                                          :images => {:only => [:id], :methods => :mini_url}, :master => {}})
-          end
-        end
-
         def load_data
           @taxons = Taxon.order(:name)
           @option_types = OptionType.order(:name)
@@ -82,33 +66,21 @@ module Spree
 
         def collection
           return @collection if @collection.present?
+          params[:q] ||= {}
+          params[:q][:deleted_at_null] ||= "1"
 
-          unless request.xhr?
-            params[:q] ||= {}
-            params[:q][:deleted_at_null] ||= "1"
-
-            params[:q][:s] ||= "name asc"
+          params[:q][:s] ||= "name asc"
 
-            @search = super.ransack(params[:q])
-            @collection = @search.result.
-              group_by_products_id.
-              includes([:master, {:variants => [:images, :option_values]}]).
-              page(params[:page]).
-              per(Spree::Config[:admin_products_per_page])
+          @search = super.ransack(params[:q])
+          @collection = @search.result.
+            group_by_products_id.
+            includes(product_includes).
+            page(params[:page]).
+            per(Spree::Config[:admin_products_per_page])
 
-              # PostgreSQL compatibility
-              if params[:q][:s].include?("master_price")
-                @collection = @collection.group("spree_variants.price")
-              end
-          else
-            includes = [{:variants => [:images,  {:option_values => :option_type}]}, {:master => :images}]
-
-            @collection = super.where(["name #{LIKE} ?", "%#{params[:q]}%"])
-            @collection = @collection.includes(includes).limit(params[:limit] || 10)
-
-            tmp = super.where(["#{Variant.table_name}.sku #{LIKE} ?", "%#{params[:q]}%"])
-            tmp = tmp.includes(:variants_including_master).limit(params[:limit] || 10)
-            @collection.concat(tmp).uniq!
+          if params[:q][:s].include?("master_default_price_amount")
+            # PostgreSQL compatibility
+            @collection = @collection.group("spree_prices.amount")
           end
           @collection
         end
@@ -123,6 +95,11 @@ module Spree
           return unless params[:clear_product_properties]
           params[:product] ||= {}
         end
+
+        def product_includes
+         [{:variants => [:images, {:option_values => :option_type}]}, {:master => [:images, :default_price]}]
+        end
+
     end
   end
 end

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

@@ -5,8 +5,8 @@ module Spree
       # Looks like this action is unused
       def filtered
         @properties = Property.where('lower(name) LIKE ?', "%#{params[:q].mb_chars.downcase}%").order(:name)
-        respond_with(@properties) do |format| 
-          format.html { render :template => "spree/admin/properties/filtered", :formats => [:html], :handlers => [:erb], :layout => false } 
+        respond_with(@properties) do |format|
+          format.html { render :template => "spree/admin/properties/filtered", :formats => [:html], :handlers => [:erb], :layout => false }
         end
       end
     end

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

@@ -1,8 +1,6 @@
 module Spree
   module Admin
     class PrototypesController < ResourceController
-      after_filter :set_habtm_associations, :only => [:create, :update]
-
       def show
         if request.xhr?
           render :layout => false
@@ -26,12 +24,6 @@ module Spree
         respond_with(@prototypes)
       end
 
-      private
-
-        def set_habtm_associations
-          @prototype.property_ids = params[:property].blank? ? [] : params[:property][:id]
-          @prototype.option_type_ids = params[:option_type].blank? ? [] : params[:option_type][:id]
-        end
     end
   end
 end

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

@@ -35,11 +35,14 @@ module Spree
 
         @search = Order.complete.ransack(params[:q])
         @orders = @search.result
-        @item_total = @orders.sum(:item_total)
-        @adjustment_total = @orders.sum(:adjustment_total)
-        @sales_total = @orders.sum(:total)
 
-        respond_with
+        @totals = {}
+        @orders.each do |order|
+          @totals[order.currency] = { :item_total => ::Money.new(0, order.currency), :adjustment_total => ::Money.new(0, order.currency), :sales_total => ::Money.new(0, order.currency) } unless @totals[order.currency]
+          @totals[order.currency][:item_total] += order.display_item_total.money
+          @totals[order.currency][:adjustment_total] += order.display_adjustment_total.money
+          @totals[order.currency][:sales_total] += order.display_total.money
+        end
       end
 
     end

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

@@ -27,7 +27,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     invoke_callbacks(:update, :before)
     if @object.update_attributes(params[object_name])
       invoke_callbacks(:update, :after)
-      flash.notice = flash_message_for(@object, :successfully_updated)
+      flash[:success] = flash_message_for(@object, :successfully_updated)
       respond_with(@object) do |format|
         format.html { redirect_to location_after_save }
         format.js   { render :layout => false }
@@ -42,7 +42,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     invoke_callbacks(:create, :before)
     if @object.save
       invoke_callbacks(:create, :after)
-      flash.notice = flash_message_for(@object, :successfully_created)
+      flash[:success] = flash_message_for(@object, :successfully_created)
       respond_with(@object) do |format|
         format.html { redirect_to location_after_save }
         format.js   { render :layout => false }
@@ -67,7 +67,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
     invoke_callbacks(:destroy, :before)
     if @object.destroy
       invoke_callbacks(:destroy, :after)
-      flash.notice = flash_message_for(@object, :successfully_removed)
+      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" }