spree_core 0.50.0 → 0.50.1

data/app/controllers/content_controller.rb

@@ -1,22 +1,15 @@
 class ContentController < Spree::BaseController
-
-  before_filter :render_404, :if => :static_asset
+  # Don't serve local files or static assets
+  before_filter { render_404 if params[:path] =~ /(\.|\\)/ }
 
   rescue_from ActionView::MissingTemplate, :with => :render_404
   caches_page :show, :index, :if => Proc.new { Spree::Config[:cache_static_content] }
 
   def show
-    render params[:path]
+    render :template => params[:path]
   end
 
   def cvv
     render "cvv", :layout => false
   end
-
-  private
-  # Determines if the requested resource has a path similar to that of a static asset.  In this case do not go through the
-  # overhead of trying to render a template or whatever.
-  def static_asset
-    params[:path] =~ /^\/([^.]+)$/
-  end
 end

data/app/controllers/orders_controller.rb

@@ -50,6 +50,7 @@ class OrdersController < Spree::BaseController
 
   def empty
     if @order = current_order
+      @order.promotion_credits.destroy_all
       @order.line_items.destroy_all
     end
     redirect_to cart_path

data/app/models/payment.rb

@@ -81,7 +81,8 @@ class Payment < ActiveRecord::Base
   end
 
   def payment_source
-    source.is_a?(Payment) ? source.source : source
+    res = source.is_a?(Payment) ? source.source : source
+    res || payment_method
   end
 
   private

data/app/models/payment_method/check.rb

@@ -1,2 +1,27 @@
 class PaymentMethod::Check < PaymentMethod
-end
+  def actions
+    %w{capture void}
+  end
+  
+  # Indicates whether its possible to capture the payment
+  def can_capture?(payment)
+    ['checkout', 'pending'].include?(payment.state)
+  end
+  
+  # Indicates whether its possible to void the payment.
+  def can_void?(payment)
+    payment.state != 'void'
+  end
+  
+  def capture(payment)
+    payment.update_attribute(:state, 'pending') if payment.state == 'checkout'
+    payment.complete
+    true
+  end
+  
+  def void(payment)
+    payment.update_attribute(:state, 'pending') if payment.state == 'checkout'
+    payment.void
+    true
+  end
+end

data/lib/spree/current_order.rb

@@ -14,7 +14,9 @@ module Spree
     # The current incomplete order from the session for use in cart and during checkout
     def current_order(create_order_if_necessary = false)
       return @current_order if @current_order
-      @current_order ||= Order.find_by_id(session[:order_id], :include => :adjustments)
+      if session[:order_id]
+        @current_order = Order.find_by_id(session[:order_id], :include => :adjustments)
+      end
       if create_order_if_necessary and (@current_order.nil? or @current_order.completed?)
         @current_order = Order.new
         before_save_new_order

data/lib/spree_core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "0.50.0"
+    "0.50.1"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spree_core
 version: !ruby/object:Gem::Version 
-  hash: 215
-  prerelease: false
+  hash: 213
+  prerelease: 
   segments: 
   - 0
   - 50
-  - 0
-  version: 0.50.0
+  - 1
+  version: 0.50.1
 platform: ruby
 authors: 
 - Sean Schofield
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -04:00
+date: 2011-04-19 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -200,11 +200,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: -1876988247
+        hash: 1923831917
         segments: 
         - 3
         - 0
-        - pre2
+        - pre
+        - 2
         version: 3.0.pre2
   type: :runtime
   version_requirements: *id012
@@ -216,12 +217,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 11
         segments: 
         - 3
         - 0
-        - 5
-        version: 3.0.5
+        - 6
+        version: 3.0.6
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -1125,7 +1126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - none
 rubyforge_project: spree_core
-rubygems_version: 1.3.7
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Core e-commerce functionality for the Spree project.