spree_core 1.0.1 → 1.0.2

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

@@ -1,10 +1,14 @@
 module Spree
   module Admin
     class BaseController < Spree::BaseController
+      ssl_required
+
       helper 'spree/search'
       helper 'spree/admin/navigation'
       layout '/spree/layouts/admin'
 
+      before_filter :check_alerts unless Rails.env.development?
+
       protected
         def check_alerts
           return unless current_user and should_check_alerts?

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

@@ -4,6 +4,7 @@ class Spree::Admin::ResourceController < Spree::Admin::BaseController
   helper_method :new_object_url, :edit_object_url, :object_url, :collection_url
   prepend_before_filter :load_resource
   rescue_from ActiveRecord::RecordNotFound, :with => :resource_not_found
+  rescue_from CanCan::AccessDenied, :with => :unauthorized
 
   respond_to :html
   respond_to :js, :except => [:show, :index]

data/app/models/spree/preference.rb

@@ -19,7 +19,7 @@ class Spree::Preference < ActiveRecord::Base
       when :integer
         self[:value].to_i
       when :boolean
-        (self[:value].to_s =~ /^t/i) != nil
+        (self[:value].to_s =~ /^[t|1]/i) != nil
       end
     else
       self[:value]

data/app/models/spree/return_authorization.rb

@@ -65,7 +65,7 @@ module Spree
 
       def process_return
         inventory_units.each &:return!
-        credit = Adjustment.create(:source => self, :order_id => self.order.id, :amount => self.amount.abs * -1, :label => I18n.t(:rma_credit))
+        credit = Adjustment.create(:source => self, :adjustable => order, :amount => self.amount.abs * -1, :label => I18n.t(:rma_credit))
         self.order.update!
       end
 

data/app/views/spree/admin/shared/_address_form.html.erb

@@ -5,7 +5,8 @@
         <%= name %>
         <span class="right">
           <% if use_billing %>
-            <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address)) %> <%= t(:use_billing_address) %>
+            <%= check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.eql?(@order.ship_address)) %> 
+            <%= label_tag 'order[use_billing]', t(:use_billing_address) %>
           <% end %>
         </span>
       </th>

data/config/locales/en.yml

@@ -284,7 +284,7 @@ en:
   cancel_my_account: Cancel my account
   cancel_my_account_description: "Unhappy?"
   canceled: Canceled
-  cannot_create_returns: Cannot create returns as this order no shipped units.
+  cannot_create_returns: Cannot create returns as this order has no shipped units.
   cannot_perform_operation: "Cannot perform requested operation"
   capture: Capture
   card_code: "Card Code"

data/lib/spree/core/engine.rb

@@ -71,7 +71,7 @@ module Spree
 
       # sets the manifests / assets to be precompiled
       initializer "spree.assets.precompile" do |app|
-        app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/orders/edit_form.js', 'admin/orders/address_states.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js', 'jquery.jstree/themes/apple/*']
+        app.config.assets.precompile += ['store/all.*', 'admin/all.*', 'admin/orders/edit_form.js', 'admin/address_states.js', 'jqPlot/excanvas.min.js', 'admin/images/new.js', 'jquery.jstree/themes/apple/*']
       end
 
       initializer "spree.asset.pipeline" do |app|

data/lib/spree/core/testing_support/factories/order_factory.rb

@@ -19,4 +19,14 @@ FactoryGirl.define do
       Factory(:inventory_unit, :order => order, :state => 'shipped')
     end
   end
+
+  factory :completed_order_with_totals, :parent => :order_with_totals do
+    bill_address { Factory(:address) }
+    ship_address { Factory(:address) }
+    after_create do |order|
+      Factory(:inventory_unit, :order => order, :state => 'shipped')
+    end
+    state 'complete'
+    completed_at Time.now
+  end
 end

data/lib/spree/core/testing_support/factories/variant_factory.rb

@@ -7,6 +7,7 @@ FactoryGirl.define do
     height { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
     width  { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
     depth  { BigDecimal.new("#{rand(200)}.#{rand(99)}") }
+    on_hand 5
 
     # associations:
     product { |p| p.association(:product) }

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "1.0.1"
+    "1.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-04 00:00:00.000000000 Z
+date: 2012-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
-  requirement: &70264868578960 !ruby/object:Gem::Requirement
+  requirement: &70356948181000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70264868578960
+  version_requirements: *70356948181000
 - !ruby/object:Gem::Dependency
   name: nested_set
-  requirement: &70264868605240 !ruby/object:Gem::Requirement
+  requirement: &70356948179640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,10 +32,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70264868605240
+  version_requirements: *70356948179640
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70264868603300 !ruby/object:Gem::Requirement
+  requirement: &70356947444680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -46,10 +46,10 @@ dependencies:
         version: 1.0.19
   type: :runtime
   prerelease: false
-  version_requirements: *70264868603300
+  version_requirements: *70356947444680
 - !ruby/object:Gem::Dependency
   name: highline
-  requirement: &70264868601820 !ruby/object:Gem::Requirement
+  requirement: &70356947442220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -57,10 +57,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70264868601820
+  version_requirements: *70356947442220
 - !ruby/object:Gem::Dependency
   name: state_machine
-  requirement: &70264868601240 !ruby/object:Gem::Requirement
+  requirement: &70356947440240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -68,10 +68,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70264868601240
+  version_requirements: *70356947440240
 - !ruby/object:Gem::Dependency
   name: ffaker
-  requirement: &70264868600580 !ruby/object:Gem::Requirement
+  requirement: &70356947438620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -79,10 +79,10 @@ dependencies:
         version: 1.12.0
   type: :runtime
   prerelease: false
-  version_requirements: *70264868600580
+  version_requirements: *70356947438620
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70264868599680 !ruby/object:Gem::Requirement
+  requirement: &70356947452740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -90,10 +90,10 @@ dependencies:
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70264868599680
+  version_requirements: *70356947452740
 - !ruby/object:Gem::Dependency
   name: meta_search
-  requirement: &70264868619680 !ruby/object:Gem::Requirement
+  requirement: &70356947451720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -101,10 +101,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70264868619680
+  version_requirements: *70356947451720
 - !ruby/object:Gem::Dependency
   name: activemerchant
-  requirement: &70264868618920 !ruby/object:Gem::Requirement
+  requirement: &70356947450920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -112,10 +112,10 @@ dependencies:
         version: 1.20.1
   type: :runtime
   prerelease: false
-  version_requirements: *70264868618920
+  version_requirements: *70356947450920
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70264868618320 !ruby/object:Gem::Requirement
+  requirement: &70356947449720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -126,10 +126,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70264868618320
+  version_requirements: *70356947449720
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70264868617520 !ruby/object:Gem::Requirement
+  requirement: &70356947447900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -137,10 +137,10 @@ dependencies:
         version: 0.13.0
   type: :runtime
   prerelease: false
-  version_requirements: *70264868617520
+  version_requirements: *70356947447900
 - !ruby/object:Gem::Dependency
   name: deface
-  requirement: &70264868617000 !ruby/object:Gem::Requirement
+  requirement: &70356947446980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -148,10 +148,10 @@ dependencies:
         version: 0.7.2
   type: :runtime
   prerelease: false
-  version_requirements: *70264868617000
+  version_requirements: *70356947446980
 - !ruby/object:Gem::Dependency
   name: stringex
-  requirement: &70264868616380 !ruby/object:Gem::Requirement
+  requirement: &70356947445860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -159,7 +159,7 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70264868616380
+  version_requirements: *70356947445860
 description: Required dependency for Spree
 email: sean@spreecommerce.com
 executables: []
@@ -973,7 +973,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2163052679988616471
+      hash: -2957388299349255017
 requirements:
 - none
 rubyforge_project: spree_core