spree_core 3.0.0.rc4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4cbd5f726167f74ffe46561c736107c5da112b96
-  data.tar.gz: ba1d064375e342db1715d81d5405977dec6cf607
+  metadata.gz: 3affc0ac5855ce03665194985d21e1bf01bcda44
+  data.tar.gz: ad8218d37fb42edea1f6e34e0554fced3aa4758b
 SHA512:
-  metadata.gz: a6f1ee67cf444eecc36036df3237aa6c00b51e882df1a838ec34664f4b7faca7e252acfdced21c2d3a56e2778acc98a4d2c8a0470b0e4335ec540805d76a51d4
-  data.tar.gz: 929b702b204003e0e1ce8e90b809285a330b6810deea0e3d610276a9376c203ab4e2bc80d441d1ae229c2796bf5fc39ed8209adb10ce673e04c621fcb58d4a30
+  metadata.gz: fac94f550dc92e07f5ecbdefe2151853b8f7963ecf5378bcc61bccc6cb47063792185175041551ff301f810100a4f43873480b0d9d75673f1ad3376532e0ac65
+  data.tar.gz: 60c7dd641591eaaf0f80bcb48d8fb169fb9e150fe31e87705f3a537a13d107826bb2138ea3019d6f97ba3ebe63c682873a62e3e34e60c3be0b6d58e59e1ca071

data/app/mailers/spree/base_mailer.rb

@@ -2,7 +2,7 @@ module Spree
   class BaseMailer < ActionMailer::Base
 
     def from_address
-      Spree::Config[:mails_from]
+      Spree::Store.current.mail_from_address
     end
 
     def money(amount, currency = Spree::Config[:currency])

data/app/models/concerns/spree/number_generator.rb

@@ -8,7 +8,7 @@ module Spree
 
     included do
       before_validation :generate_number, on: :create # generate number before make_permalink
-      validates :number, uniqueness: true
+      validates :number, presence: true, uniqueness: true
     end
 
     def self.by_number(number)

data/app/models/spree/app_configuration.rb

@@ -61,7 +61,6 @@ module Spree
 
     # Default mail headers settings
     preference :send_core_emails, :boolean, default: true
-    preference :mails_from, :string, default: 'spree@example.com'
 
     # searcher_class allows spree extension writers to provide their own Search class
     def searcher_class

data/app/models/spree/option_type.rb

@@ -1,5 +1,7 @@
 module Spree
   class OptionType < Spree::Base
+    acts_as_list
+
     has_many :option_values, -> { order(:position) }, dependent: :destroy, inverse_of: :option_type
     has_many :product_option_types, dependent: :destroy, inverse_of: :option_type
     has_many :products, through: :product_option_types

data/app/models/spree/promotion.rb

@@ -41,8 +41,8 @@ module Spree
     end
 
     def self.active
-      where('starts_at IS NULL OR starts_at < ?', Time.now).
-        where('expires_at IS NULL OR expires_at > ?', Time.now)
+      where('spree_promotions.starts_at IS NULL OR spree_promotions.starts_at < ?', Time.now).
+        where('spree_promotions.expires_at IS NULL OR spree_promotions.expires_at > ?', Time.now)
     end
 
     def self.order_activatable?(order)

data/app/models/spree/refund.rb

@@ -46,6 +46,7 @@ module Spree
 
       self.transaction_id = @response.authorization
       update_columns(transaction_id: transaction_id)
+      update_order
     end
 
     # return an activemerchant response object if successful or else raise an error
@@ -77,5 +78,9 @@ module Spree
         errors.add(:amount, :greater_than_allowed)
       end
     end
+
+    def update_order
+      payment.order.updater.update
+    end
   end
 end

data/app/models/spree/zone_member.rb

@@ -2,10 +2,5 @@ module Spree
   class ZoneMember < Spree::Base
     belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true, inverse_of: :zone_members
     belongs_to :zoneable, polymorphic: true
-
-    def name
-      return nil if zoneable.nil?
-      zoneable.name
-    end
   end
 end

data/config/initializers/user_class_extensions.rb

@@ -3,6 +3,7 @@ Spree::Core::Engine.config.to_prepare do
     Spree.user_class.class_eval do
 
       include Spree::UserApiAuthentication
+      include Spree::UserPaymentSource
       include Spree::UserReporting
 
       has_and_belongs_to_many :spree_roles,

data/db/migrate/20150309161154_ensure_payments_have_numbers.rb

@@ -0,0 +1,8 @@
+class EnsurePaymentsHaveNumbers < ActiveRecord::Migration
+  def change
+    Spree::Payment.where(number: nil).find_each do |payment|
+      payment.generate_number
+      payment.save
+    end
+  end
+end

data/lib/spree/core/controller_helpers/order.rb

@@ -7,7 +7,6 @@ module Spree
         included do
           before_filter :set_current_order
 
-          helper_method :current_currency
           helper_method :current_order
           helper_method :simple_current_order
         end
@@ -64,10 +63,6 @@ module Spree
           end
         end
 
-        def current_currency
-          Spree::Config[:currency]
-        end
-
         def ip_address
           request.remote_ip
         end

data/lib/spree/core/controller_helpers/store.rb

@@ -5,14 +5,17 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-
-          def current_store
-            @current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
-          end
+          helper_method :current_currency
           helper_method :current_store
+        end
 
+        def current_currency
+          Spree::Config[:currency]
         end
 
+        def current_store
+          @current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
+        end
       end
     end
   end

data/lib/spree/core/search/base.rb

@@ -89,7 +89,11 @@ module Spree
 
             per_page = params[:per_page].to_i
             @properties[:per_page] = per_page > 0 ? per_page : Spree::Config[:products_per_page]
-            @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i
+            if params[:page].respond_to?(:to_i)
+              @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i
+            else
+              @properties[:page] = 1
+            end
           end
       end
     end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
   def self.version
-    "3.0.0.rc4"
+    "3.0.0"
   end
 end

data/lib/spree/testing_support/order_walkthrough.rb

@@ -1,5 +1,10 @@
 class OrderWalkthrough
   def self.up_to(state)
+    # A default store must exist to provide store settings
+    unless Spree::Store.exists?
+      FactoryGirl.create(:store)
+    end
+
     # A payment method must exist for an order to proceed through the Address state
     unless Spree::PaymentMethod.exists?
       FactoryGirl.create(:check_payment_method)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc4
+  version: 3.0.0
 platform: ruby
 authors:
 - Sean Schofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-03 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -775,6 +775,7 @@ files:
 - db/migrate/20150128032538_remove_environment_from_tracker.rb
 - db/migrate/20150128060325_remove_spree_configurations.rb
 - db/migrate/20150216173445_add_index_to_spree_stock_items_variant_id.rb
+- db/migrate/20150309161154_ensure_payments_have_numbers.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt