solidus_core 1.0.0.pre2 → 1.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37901081f12d468225a333297e72fc9b18aa4a8e
-  data.tar.gz: 7ffcaa00028db2e02b2f8ba38a81365cb5f3b47c
+  metadata.gz: 7c8aa521a33c27c10cdec65089ae5d044c1aa62e
+  data.tar.gz: c5b6055ae2ce9a0050d2fa9a1afdf938df77cca5
 SHA512:
-  metadata.gz: 90851a4dcb9df999a887eeb75c380a2ef27b1da6d063e34dd9a8daf2b40a1121e45e9983bb547f812f767e19f1f49bb562264fb42e57f70879eb6885b6178a47
-  data.tar.gz: b444a9f7a55c7c698d912b2dab2d6bb64c76729f4df514ba821a5d2bf922e99e514c4f2fa8e2a58977da6b9645a0b7eb8a9cf7be77f5b25685e47c4c5ff8262e
+  metadata.gz: 38bf62e7f2f12a3da4b897b6b144faf9a5bece9d80fd7fa321e70277ddd1b16b44c9dc7c490b196459100ad246903826c43e4e7162d77ce4d9e30802b6120912
+  data.tar.gz: b7247c74c10e6a276f20c20127073b958004f1177e75a6e0e5913eb19001d25fce59bdb923273ae8d288a7e6b2bb93c856539d2073c3e31dbcb97c81c0d590bd

data/app/models/spree/ability.rb

@@ -10,6 +10,8 @@ module Spree
     class_attribute :abilities
     self.abilities = Set.new
 
+    attr_reader :user
+
     # Allows us to go beyond the standard cancan initialize method which makes it difficult for engines to
     # modify the default +Ability+ of an application.  The +ability+ argument must be a class that includes
     # the +CanCan::Ability+ module.  The registered ability should behave properly as a stand-alone class
@@ -22,8 +24,19 @@ module Spree
       self.abilities.delete(ability)
     end
 
-    def initialize(user)
-      self.clear_aliased_actions
+    def initialize(current_user)
+      @user = current_user || Spree.user_class.new
+
+      alias_actions
+      grant_default_permissions
+      register_extension_abilities
+      activate_permission_sets
+    end
+
+    private
+
+    def alias_actions
+      clear_aliased_actions
 
       # override cancan default aliasing (we don't want to differentiate between read and index)
       alias_action :delete, to: :destroy
@@ -32,44 +45,54 @@ module Spree
       alias_action :new_action, to: :create
       alias_action :show, to: :read
       alias_action :index, :read, to: :display
+    end
 
-
-      user ||= Spree.user_class.new
-
+    def grant_default_permissions
+      # if the user is a "super user" give them full permissions, otherwise give them the permissions
+      # required to checkout and use the frontend.
       if user.respond_to?(:has_spree_role?) && user.has_spree_role?('admin')
         can :manage, :all
       else
-        can :display, Country
-        can :display, OptionType
-        can :display, OptionValue
-        can :create, Order
-        can [:read, :update], Order do |order, token|
-          order.user == user || order.guest_token && token == order.guest_token
-        end
-        can :create, ReturnAuthorization do |return_authorization|
-          return_authorization.order.user == user
-        end
-        can :display, CreditCard, user_id: user.id
-        can :display, Product
-        can :display, ProductProperty
-        can :display, Property
-        can :create, Spree.user_class
-        can [:read, :update, :destroy], Spree.user_class, id: user.id
-        can :display, State
-        can :display, StockItem, stock_location: { active: true }
-        can :display, StockLocation, active: true
-        can :display, Taxon
-        can :display, Taxonomy
-        can [:display, :view_out_of_stock], Variant
-        can :display, Zone
+        grant_generic_user_permissions
       end
+    end
 
-      # Include any abilities registered by extensions, etc.
+    def grant_generic_user_permissions
+      can :display, Country
+      can :display, OptionType
+      can :display, OptionValue
+      can :create, Order
+      can [:read, :update], Order do |order, token|
+        order.user == user || order.guest_token && token == order.guest_token
+      end
+      can :create, ReturnAuthorization do |return_authorization|
+        return_authorization.order.user == user
+      end
+      can [:display, :update], CreditCard, user_id: user.id
+      can :display, Product
+      can :display, ProductProperty
+      can :display, Property
+      can :create, Spree.user_class
+      can [:read, :update, :destroy], Spree.user_class, id: user.id
+      can :display, State
+      can :display, StockItem, stock_location: { active: true }
+      can :display, StockLocation, active: true
+      can :display, Taxon
+      can :display, Taxonomy
+      can [:display, :view_out_of_stock], Variant
+      can :display, Zone
+    end
+
+    # Before, this was the only way to extend this ability. Permission sets have been added since.
+    # It is recommended to use them instead for extension purposes if possible.
+    def register_extension_abilities
       Ability.abilities.each do |clazz|
         ability = clazz.send(:new, user)
         @rules = rules + ability.send(:rules)
       end
+    end
 
+    def activate_permission_sets
       Spree::RoleConfiguration.instance.activate_permissions! self, user
     end
   end

data/app/models/spree/address.rb

@@ -7,6 +7,7 @@ module Spree
 
     has_many :shipments, inverse_of: :address
     has_many :cartons, inverse_of: :address
+    has_many :credit_cards, inverse_of: :address
 
     validates :firstname, :lastname, :address1, :city, :country, presence: true
     validates :zipcode, presence: true, if: :require_zipcode?

data/app/models/spree/app_configuration.rb

@@ -128,6 +128,11 @@ module Spree
     #   @return [String] URL of logo used on frontend (default: +'logo/solidus_logo.png'+)
     preference :logo, :string, default: 'logo/solidus_logo.png'
 
+    # @!attribute [rw] order_bill_address_used
+    #   @return [Boolean] Use the order's bill address, as opposed to storing
+    #   bill addresses on payment sources. (default: +true+)
+    preference :order_bill_address_used, :boolean, default: true
+
     # @!attribute [rw] order_capturing_time_window
     #   @return [Integer] the number of days to look back for fully-shipped/cancelled orders in order to charge for them
     preference :order_capturing_time_window, :integer, default: 14
@@ -220,12 +225,13 @@ module Spree
     preference :credit_to_new_allocation, :boolean, default: false
 
     # searcher_class allows spree extension writers to provide their own Search class
+    attr_writer :searcher_class
     def searcher_class
       @searcher_class ||= Spree::Core::Search::Base
     end
 
-    def searcher_class=(sclass)
-      @searcher_class = sclass
+    def static_model_preferences
+      @static_model_preferences ||= Spree::Preferences::StaticModelPreferences.new
     end
 
     # all the following can be deprecated when store prefs are no longer supported

data/app/models/spree/base.rb

@@ -2,7 +2,9 @@ class Spree::Base < ActiveRecord::Base
   include Spree::Preferences::Preferable
   serialize :preferences, Hash
   after_initialize do
-    self.preferences = default_preferences.merge(preferences) if has_attribute?(:preferences)
+    if has_attribute?(:preferences)
+      self.preferences = default_preferences.merge(preferences)
+    end
   end
 
   if Kaminari.config.page_method_name != :page

data/app/models/spree/credit_card.rb

@@ -2,12 +2,15 @@ module Spree
   class CreditCard < Spree::Base
     belongs_to :payment_method
     belongs_to :user, class_name: Spree.user_class, foreign_key: 'user_id'
+    belongs_to :address, inverse_of: :credit_cards
     has_many :payments, as: :source
 
     before_save :set_last_digits
 
     after_save :ensure_one_default
 
+    accepts_nested_attributes_for :address
+
     attr_accessor :encrypted_data,
                     :number,
                     :imported,

data/app/models/spree/gateway.rb

@@ -26,7 +26,7 @@ module Spree
     end
 
     def options
-      self.preferences.inject({}){ |memo, (key, value)| memo[key.to_sym] = value; memo }
+      preferences.to_hash
     end
 
     def method_missing(method, *args)

data/app/models/spree/gateway/bogus.rb

@@ -13,10 +13,6 @@ module Spree
       self.class
     end
 
-    def preferences
-      {}
-    end
-
     def create_profile(payment)
       return if payment.source.has_payment_profile?
       # simulate the storage of credit card profile using remote service

data/app/models/spree/order.rb

@@ -256,8 +256,6 @@ module Spree
         self.class.unscoped.where(id: id).update_all(attrs_to_set)
       end
 
-      attrs_to_set[:ship_address_attributes] = user.ship_address.attributes.except('id', 'updated_at', 'created_at') if user.try(:ship_address)
-      attrs_to_set[:bill_address_attributes] = user.bill_address.attributes.except('id', 'updated_at', 'created_at') if user.try(:bill_address)
       assign_attributes(attrs_to_set)
     end
 
@@ -551,6 +549,8 @@ module Spree
     end
 
     def restart_checkout_flow
+      return if self.state == 'cart'
+
       self.update_columns(
         state: 'cart',
         updated_at: Time.now,

data/app/models/spree/payment_method.rb

@@ -11,6 +11,8 @@ module Spree
     has_many :payments, class_name: "Spree::Payment", inverse_of: :payment_method
     has_many :credit_cards, class_name: "Spree::CreditCard"
 
+    include Spree::Preferences::StaticallyConfigurable
+
     def self.providers
       Rails.application.config.spree.payment_methods
     end

data/app/models/spree/permission_sets/base.rb

@@ -1,17 +1,30 @@
 module Spree
   module PermissionSets
+    # This is the base class used for crafting permission sets.
+    #
+    # This is used by {Spree::RoleConfiguration} when adding custom behavior to {Spree::Ability}.
+    # See one of the subclasses for example structure such as {Spree::PermissionSets::UserDisplay}
+    #
+    # @see Spree::RoleConfiguration
+    # @see Spree::PermissionSets
     class Base
+      # @param ability [CanCan::Ability]
+      #   The ability that will be extended with the current permission set.
+      #   The ability passed in must respond to #user
       def initialize ability
         @ability = ability
       end
 
+      # Activate permissions on the ability. Put your can and cannot statements here.
+      # Must be overriden by subclasses
       def activate!
         raise NotImplementedError.new
       end
 
       private
 
-      delegate :can, :cannot, to: :@ability
+      attr_reader :ability
+      delegate :can, :cannot, :user, to: :ability
     end
   end
 end

data/app/models/spree/permission_sets/restricted_transfer_management.rb

@@ -0,0 +1,35 @@
+module Spree
+  module PermissionSets
+    # This is a permission set that offers an alternative to {StockManagement}.
+    #
+    # Instead of allowing management access for all stock transfers and items, only allow
+    # the management of stock transfers for locations the user is associated with.
+    #
+    # Users can be associated with stock locations via the admin user interface.
+    #
+    # @see Spree::PermissionSets::Base
+    class RestrictedTransferManagement < PermissionSets::Base
+      def activate!
+        can [:display, :admin], Spree::StockItem
+        can [:display, :admin], Spree::StockTransfer
+
+        if user.stock_locations.any?
+          can :transfer, Spree::StockLocation, id: location_ids
+          can :update, Spree::StockItem, stock_location_id: location_ids
+          can :manage, Spree::StockTransfer, source_location_id: location_ids, destination_location_id: location_ids
+          can :manage, Spree::TransferItem, stock_transfer: {
+            source_location_id: location_ids,
+            destination_location_id: location_ids
+          }
+        end
+      end
+
+      private
+
+      def location_ids
+        # either source_location_id or destination_location_id can be nil.
+        @ids ||= user.stock_locations.pluck(:id) + [nil]
+      end
+    end
+  end
+end

data/app/models/spree/permission_sets/user_management.rb

@@ -3,6 +3,7 @@ module Spree
     class UserManagement < PermissionSets::Base
       def activate!
         can :manage, Spree.user_class
+        cannot [:delete, :destroy], Spree.user_class
         can :manage, Spree::StoreCredit
         can :display, Spree::Role
       end

data/app/models/spree/preferences/static_model_preferences.rb

@@ -0,0 +1,47 @@
+module Spree
+  module Preferences
+    class StaticModelPreferences
+      class Definition
+        attr_reader :preferences
+
+        def initialize(klass, hash)
+          hash = hash.symbolize_keys
+          hash.keys.each do |key|
+            if !klass.defined_preferences.include?(key)
+              raise "Preference #{key.inspect} is not defined on #{klass}"
+            end
+          end
+          @preferences = hash
+        end
+
+        def fetch(key, &block)
+          @preferences.fetch(key, &block)
+        end
+
+        def []=(key, value)
+          # ignores assignment
+        end
+
+        def to_hash
+          @preferences.deep_dup
+        end
+      end
+
+      def initialize
+        @store = Hash.new do |h,klass|
+          h[klass] = {}
+        end
+      end
+
+      def add(klass, name, preferences)
+        # We use class name instead of class to allow reloading in dev
+        raise "Static model preference '#{name}' on #{klass} is already defined" if @store[klass.to_s][name]
+        @store[klass.to_s][name] = Definition.new(klass, preferences)
+      end
+
+      def for_class(klass)
+        @store[klass.to_s]
+      end
+    end
+  end
+end

data/app/models/spree/preferences/statically_configurable.rb

@@ -0,0 +1,37 @@
+module Spree
+  module Preferences
+    module StaticallyConfigurable
+      extend ActiveSupport::Concern
+
+      class_methods do
+        def preference_sources
+          Spree::Config.static_model_preferences.for_class(self)
+        end
+
+        def available_preference_sources
+          preference_sources.keys
+        end
+      end
+
+      # override assignment to cast empty string to nil
+      def preference_source=(val)
+        super(val.presence)
+      end
+
+      def preferences
+        if respond_to?(:preference_source) && preference_source
+          self.class.preference_sources[preference_source] || {}
+        else
+          super
+        end
+      end
+
+      def preferences=(val)
+        if respond_to?(:preference_source) && preference_source
+        else
+          super
+        end
+      end
+    end
+  end
+end

data/app/models/spree/product.rb

@@ -237,6 +237,15 @@ module Spree
       super || variants_including_master.with_deleted.where(is_master: true).first
     end
 
+    # Image that can be used for the product.
+    #
+    # Will first search for images on the product, then those belonging to the
+    # variants. If all else fails, will return a new image object.
+    # @return [Spree::Image] the image to display
+    def display_image
+      images.first || variant_images.first || Spree::Image.new
+    end
+
     private
 
     def add_associations_from_prototype

data/app/models/spree/promotion/rules/nth_order.rb

@@ -0,0 +1,45 @@
+module Spree
+  class Promotion
+    module Rules
+      class NthOrder < PromotionRule
+        preference :nth_order, :integer, default: 2
+        # It does not make sense to have this apply to the first order using preferred_nth_order == 1
+        # Instead we could use the first_order rule
+        validates :preferred_nth_order, numericality: { only_integer: true, greater_than: 1 }
+
+        # This promotion is applicable to orders only.
+        def applicable?(promotable)
+          promotable.is_a?(Spree::Order)
+        end
+
+        # This is never eligible if the order does not have a user, and that user does not have any previous completed orders.
+        #
+        # Use the first order rule if you want a promotion to be applied to the first order for a user.
+        # @param order [Spree::Order]
+        # @option options
+        def eligible?(order, options = {})
+          return false unless order.user
+
+          nth_order?(order)
+        end
+
+        private
+
+        def completed_order_count order
+          order.
+            user.
+            orders.
+            complete.
+            where(Spree::Order.arel_table[:completed_at].lt(order.completed_at || Time.now)).
+            count
+        end
+
+        def nth_order? order
+          count = completed_order_count(order) + 1
+          count == preferred_nth_order
+        end
+      end
+    end
+  end
+end
+

data/app/models/spree/shipment.rb

@@ -2,8 +2,6 @@ require 'ostruct'
 
 module Spree
   class Shipment < Spree::Base
-    belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :shipments
-
     belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :shipments
     belongs_to :address, class_name: 'Spree::Address', inverse_of: :shipments
     belongs_to :stock_location, class_name: 'Spree::StockLocation'

data/app/models/spree/store.rb

@@ -10,8 +10,8 @@ module Spree
 
     scope :by_url, lambda { |url| where("url like ?", "%#{url}%") }
 
-    def self.current(domain = nil)
-      current_store = domain ? Store.by_url(domain).first : nil
+    def self.current(store_key = nil)
+      current_store = Store.find_by(code: store_key) || Store.by_url(store_key).first
       current_store || Store.default
     end
 

data/app/models/spree/variant.rb

@@ -304,8 +304,16 @@ module Spree
       self.track_inventory? && Spree::Config.track_inventory_levels
     end
 
-    def display_image
-      images.first || Spree::Image.new
+    # Image that can be used for the variant.
+    #
+    # Will first search for images on the variant. If it doesn't find any,
+    # it'll fallback to any variant image (unless +fallback+ is +false+) or to
+    # a new {Spree::Image}.
+    # @param fallback [Boolean] whether or not we should fallback to an image
+    #   not from this variant
+    # @return [Spree::Image] the image to display
+    def display_image(fallback: true)
+      images.first || (fallback && product.variant_images.first) || Spree::Image.new
     end
 
     private

data/config/locales/en.yml

@@ -570,7 +570,7 @@ en:
     both: Both
     calculated_reimbursements: Calculated Reimbursements
     calculator: Calculator
-    calculator_settings_warning: If you are changing the calculator type, you must save first before you can edit the calculator settings
+    calculator_settings_warning: If you are changing the calculator type or preference source, you must save first before you can edit the calculator settings
     cancel: cancel
     cancel_inventory: 'Cancel Inventory'
     canceled: canceled
@@ -1042,7 +1042,6 @@ en:
     order: Order
     order_adjustments: Order adjustments
     order_already_completed: Order is already completed
-    order_already_updated: The order has already been updated.
     order_approved: Order approved
     order_canceled: Order canceled
     order_completed: Order completed
@@ -1149,6 +1148,8 @@ en:
     price: Price
     price_range: Price Range
     price_sack: Price Sack
+    preference_source_none: '(custom)'
+    preference_source_using: 'Using static preferences "%{name}"'
     process: Process
     product: Product
     product_details: Product Details
@@ -1212,6 +1213,10 @@ en:
       taxon:
         description: Order includes products with specified taxon(s)
         name: Taxon(s)
+      nth_order:
+        description: Apply a promotion to every nth order a user has completed.
+        name: Nth Order
+        form_text: "Apply this promotion on the users Nth order: "
     promotions: Promotions
     promotion_successfully_created: Promotion has been successfully created!
     promotion_total_changed_before_complete: "One or more of the promotions on your order have become ineligible and were removed. Please check the new order amounts and try again."

data/db/migrate/20140309023735_migrate_old_preferences.rb

@@ -1,8 +1,10 @@
 class MigrateOldPreferences < ActiveRecord::Migration
+  disable_ddl_transaction!
+
   def up
     migrate_preferences(Spree::Calculator)
-    migrate_preferences(Spree::PaymentMethod)
     migrate_preferences(Spree::PromotionRule)
+    migrate_preferences(Spree::PaymentMethod)
   end
 
   def down
@@ -11,13 +13,39 @@ class MigrateOldPreferences < ActiveRecord::Migration
   private
   def migrate_preferences klass
     klass.reset_column_information
-    klass.find_each do |record|
-      store = Spree::Preferences::ScopedStore.new(record.class.name.underscore, record.id)
-      record.defined_preferences.each do |key|
-        value = store.fetch(key){}
-        record.preferences[key] = value unless value.nil?
+    klass.find_in_batches do |batch|
+      ActiveRecord::Base.transaction do
+        batch.each do |record|
+          keys = record.class.defined_preferences
+
+          # Batch load preferences for this record.
+          preferences = Hash[Spree::Preference.where(
+            key: keys.map{ |k| cache_key(record, k) }
+          ).pluck(:key, :value)]
+
+          # Copy preferences to the record.
+          keys.each do |key|
+            value = preferences[cache_key(record, key)]
+            record.preferences[key] = value unless value.nil?
+          end
+
+          # Persist the preferences.
+          record.update_column(:preferences, record.preferences)
+        end
       end
-      record.save!
     end
   end
+
+  def cache_key model, key
+    [
+      ENV["RAILS_CACHE_ID"],
+      class_underscore_cache[model.type],
+      key,
+      model.id
+    ].compact.join("/")
+  end
+
+  def class_underscore_cache
+    @class_underscore_cache ||= Hash.new{ |h,k| h[k] = k.underscore }
+  end
 end

data/db/migrate/20140410150358_correct_some_polymorphic_index_and_add_more_missing.rb

@@ -2,65 +2,62 @@ class CorrectSomePolymorphicIndexAndAddMoreMissing < ActiveRecord::Migration
   def change
     add_index :spree_addresses, :country_id
     add_index :spree_addresses, :state_id
+
     remove_index :spree_adjustments, [:source_type, :source_id]
     add_index :spree_adjustments, [:source_id, :source_type]
-    add_index :spree_credit_cards, :address_id
-    add_index :spree_gateways, :active
-    add_index :spree_gateways, :test_mode
+
     add_index :spree_inventory_units, :return_authorization_id
-    add_index :spree_line_items, :tax_category_id
+
     add_index :spree_log_entries, [:source_id, :source_type]
+
     add_index :spree_orders, :approver_id
-    add_index :spree_orders, :bill_address_id
-    add_index :spree_orders, :confirmation_delivered
-    add_index :spree_orders, :considered_risky
     add_index :spree_orders, :created_by_id
     add_index :spree_orders, :ship_address_id
-    add_index :spree_orders, :shipping_method_id
+    add_index :spree_orders, :bill_address_id
+    add_index :spree_orders, :considered_risky
+
     add_index :spree_orders_promotions, [:order_id, :promotion_id]
+
     add_index :spree_payments, [:source_id, :source_type]
-    add_index :spree_prices, :deleted_at
+
     add_index :spree_product_option_types, :position
+
     add_index :spree_product_properties, :position
     add_index :spree_product_properties, :property_id
-    add_index :spree_products, :shipping_category_id
-    add_index :spree_products, :tax_category_id
+
     add_index :spree_promotion_action_line_items, :promotion_action_id
     add_index :spree_promotion_action_line_items, :variant_id
+
     add_index :spree_promotion_rules, :promotion_id
+
     add_index :spree_promotions, :advertise
+
     add_index :spree_return_authorizations, :number
     add_index :spree_return_authorizations, :order_id
     add_index :spree_return_authorizations, :stock_location_id
+
     add_index :spree_shipments, :address_id
-    add_index :spree_shipping_methods, :deleted_at
+
     add_index :spree_shipping_methods, :tax_category_id
-    add_index :spree_shipping_rates, :selected
-    add_index :spree_shipping_rates, :tax_rate_id
+
     add_index :spree_state_changes, [:stateful_id, :stateful_type]
     add_index :spree_state_changes, :user_id
-    add_index :spree_stock_items, :backorderable
-    add_index :spree_stock_locations, :active
-    add_index :spree_stock_locations, :backorderable_default
+
     add_index :spree_stock_locations, :country_id
-    add_index :spree_stock_locations, :propagate_all_variants
     add_index :spree_stock_locations, :state_id
-    add_index :spree_tax_categories, :deleted_at
-    add_index :spree_tax_categories, :is_default
+
     add_index :spree_tax_rates, :deleted_at
-    add_index :spree_tax_rates, :included_in_price
-    add_index :spree_tax_rates, :show_rate_in_label
     add_index :spree_tax_rates, :tax_category_id
     add_index :spree_tax_rates, :zone_id
+
     add_index :spree_taxonomies, :position
+
     add_index :spree_taxons, :position
-    add_index :spree_trackers, :active
-    add_index :spree_variants, :deleted_at
-    add_index :spree_variants, :is_master
+
     add_index :spree_variants, :position
     add_index :spree_variants, :track_inventory
+
     add_index :spree_zone_members, :zone_id
     add_index :spree_zone_members, [:zoneable_id, :zoneable_type]
-    add_index :spree_zones, :default_tax
   end
 end

data/db/migrate/20141101231208_fix_adjustment_order_presence.rb

@@ -6,7 +6,7 @@ class FixAdjustmentOrderPresence < ActiveRecord::Migration
       if adjustable.is_a? Spree::Order
         adjustment.update_attributes!(order_id: adjustable.id)
       else
-        adjustment.update_attributes!(adjustable: adjustable.order)
+        adjustment.update_attributes!(order_id: adjustable.order.id)
       end
     end
   end

data/db/migrate/20150506181611_create_spree_store_credit_payment_method.rb

@@ -1,6 +1,10 @@
 class CreateSpreeStoreCreditPaymentMethod < ActiveRecord::Migration
+  class PaymentMethod < ActiveRecord::Base
+    self.table_name = 'spree_payment_methods'
+    self.inheritance_column = :_type_disabled
+  end
   def up
-    Spree::PaymentMethod.create_with(
+    PaymentMethod.create_with(
       name: Spree.t("store_credit.store_credit"),
       description: Spree.t("store_credit.store_credit"),
       active: true,

data/db/migrate/20150616204659_add_preference_source_to_spree_payment_methods.rb

@@ -0,0 +1,5 @@
+class AddPreferenceSourceToSpreePaymentMethods < ActiveRecord::Migration
+  def change
+    add_column :spree_payment_methods, :preference_source, :string
+  end
+end

data/db/migrate/20150629175931_add_address_id_to_credit_card.rb

@@ -0,0 +1,5 @@
+class AddAddressIdToCreditCard < ActiveRecord::Migration
+  def change
+    add_column :spree_credit_cards, :address_id, :integer
+  end
+end

data/db/migrate/20150630175644_copy_order_bill_address_to_credit_card.rb

@@ -0,0 +1,12 @@
+class CopyOrderBillAddressToCreditCard < ActiveRecord::Migration
+  # Prevent everything from running in one giant transaction in postrgres.
+  disable_ddl_transaction!
+
+  def up
+    Rake::Task["spree:migrations:copy_order_bill_address_to_credit_card:up"].invoke
+  end
+
+  def down
+    Rake::Task["spree:migrations:copy_order_bill_address_to_credit_card:down"].invoke
+  end
+end

data/db/migrate/20150723224133_remove_unnecessary_indexes.rb

@@ -0,0 +1,72 @@
+# All of these indexes were originally added in
+# 20140410150358_correct_some_polymorphic_index_and_add_more_missing.rb
+# However, most are necessary and were removed from that migration. This
+# migration deletes any of the indexes left around in stores using the
+# out-dated version of that migration
+class RemoveUnnecessaryIndexes < ActiveRecord::Migration
+  def up
+    safe_remove_index :spree_credit_cards, :address_id
+    safe_remove_index :spree_gateways, :active
+    safe_remove_index :spree_gateways, :test_mode
+    safe_remove_index :spree_inventory_units, :return_authorization_id
+    safe_remove_index :spree_line_items, :tax_category_id
+    safe_remove_index :spree_orders, :shipping_method_id
+    safe_remove_index :spree_orders, :confirmation_delivered
+    safe_remove_index :spree_prices, :deleted_at
+    safe_remove_index :spree_products, :shipping_category_id
+    safe_remove_index :spree_products, :tax_category_id
+    safe_remove_index :spree_shipping_methods, :deleted_at
+    safe_remove_index :spree_shipping_rates, :selected
+    safe_remove_index :spree_shipping_rates, :tax_rate_id
+    safe_remove_index :spree_stock_items, :backorderable
+    safe_remove_index :spree_stock_locations, :active
+    safe_remove_index :spree_stock_locations, :backorderable_default
+    safe_remove_index :spree_stock_locations, :propagate_all_variants
+    safe_remove_index :spree_tax_categories, :is_default
+    safe_remove_index :spree_tax_categories, :deleted_at
+    safe_remove_index :spree_tax_rates, :show_rate_in_label
+    safe_remove_index :spree_tax_rates, :included_in_price
+    safe_remove_index :spree_trackers, :active
+    safe_remove_index :spree_variants, :is_master
+    safe_remove_index :spree_variants, :deleted_at
+    safe_remove_index :spree_zones, :default_tax
+  end
+
+  def down
+    safe_add_index :spree_credit_cards, :address_id
+    safe_add_index :spree_gateways, :active
+    safe_add_index :spree_gateways, :test_mode
+    safe_add_index :spree_inventory_units, :return_authorization_id
+    safe_add_index :spree_line_items, :tax_category_id
+    safe_add_index :spree_orders, :shipping_method_id
+    safe_add_index :spree_orders, :confirmation_delivered
+    safe_add_index :spree_prices, :deleted_at
+    safe_add_index :spree_products, :shipping_category_id
+    safe_add_index :spree_products, :tax_category_id
+    safe_add_index :spree_shipping_methods, :deleted_at
+    safe_add_index :spree_shipping_rates, :selected
+    safe_add_index :spree_shipping_rates, :tax_rate_id
+    safe_add_index :spree_stock_items, :backorderable
+    safe_add_index :spree_stock_locations, :active
+    safe_add_index :spree_stock_locations, :backorderable_default
+    safe_add_index :spree_stock_locations, :propagate_all_variants
+    safe_add_index :spree_tax_categories, :is_default
+    safe_add_index :spree_tax_categories, :deleted_at
+    safe_add_index :spree_tax_rates, :show_rate_in_label
+    safe_add_index :spree_tax_rates, :included_in_price
+    safe_add_index :spree_trackers, :active
+    safe_add_index :spree_variants, :is_master
+    safe_add_index :spree_variants, :deleted_at
+    safe_add_index :spree_zones, :default_tax
+  end
+
+  private
+
+  def safe_remove_index(table, column)
+    remove_index(table, column) if index_exists?(table, column)
+  end
+
+  def safe_add_index(table, column)
+    add_index(table, column) if column_exists?(table, column)
+  end
+end

data/db/migrate/20150724163716_remove_state_lock_version_from_order.rb

@@ -0,0 +1,11 @@
+class RemoveStateLockVersionFromOrder < ActiveRecord::Migration
+  def up
+    if column_exists? :spree_orders, :state_lock_version
+      remove_column :spree_orders, :state_lock_version
+    end
+  end
+
+  def down
+    add_column :spree_orders, :state_lock_version, :integer, default: 0, null: false
+  end
+end

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -36,6 +36,18 @@ Spree.config do |config|
 
   # Custom logo for the admin
   # config.admin_interface_logo = "logo/solidus_logo.png"
+
+  # Gateway credentials can be configured statically here and referenced from
+  # the admin. They can also be fully configured from the admin.
+  #
+  # config.static_model_preferences.add(
+  #   Spree::Gateway::StripeGateway,
+  #   'stripe_env_credentials',
+  #   secret_key: ENV['STRIPE_SECRET_KEY'],
+  #   publishable_key: ENV['STRIPE_PUBLISHABLE_KEY'],
+  #   server: Rails.env.production? ? 'production' : 'test',
+  #   test: !Rails.env.production?
+  # )
 end
 
 Spree.user_class = <%= (options[:user_class].blank? ? "Spree::LegacyUser" : options[:user_class]).inspect %>

data/lib/spree/core.rb

@@ -81,6 +81,7 @@ require 'spree/core/delegate_belongs_to'
 require 'spree/core/importer'
 require 'spree/core/permalinks'
 require 'spree/core/product_duplicator'
+require 'spree/core/current_store'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/order'

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

@@ -4,13 +4,19 @@ module Spree
       module Store
         extend ActiveSupport::Concern
 
+        # @!attribute [rw] current_store_class
+        #   @!scope class
+        #   Extension point for overriding how the current store is chosen.
+        #   Defaults to checking headers and server name
+        #   @return [#store] class used to help find the current store
         included do
+          class_attribute :current_store_class
+          self.current_store_class = Spree::Core::CurrentStore
 
           def current_store
-            @current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
+            @current_store ||= current_store_class.new(request).store
           end
           helper_method :current_store
-
         end
 
       end

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

@@ -10,12 +10,24 @@ module Spree
                  to: :permitted_attributes,
                  prefix: :permitted
 
+        def permitted_credit_card_update_attributes
+          permitted_attributes.credit_card_update_attributes + [
+            address_attributes: permitted_address_attributes,
+          ]
+        end
+
         def permitted_payment_attributes
           permitted_attributes.payment_attributes + [
             source_attributes: permitted_source_attributes
           ]
         end
 
+        def permitted_source_attributes
+          permitted_attributes.source_attributes + [
+            address_attributes: permitted_address_attributes,
+          ]
+        end
+
         def permitted_checkout_attributes
           permitted_attributes.checkout_attributes + [
             bill_address_attributes: permitted_address_attributes,

data/lib/spree/core/current_store.rb

@@ -0,0 +1,26 @@
+# Default class for deciding what the current store is, given an HTTP request
+# This is an extension point used in Spree::Core::ControllerHelpers::Store
+# Custom versions of this class must respond to a store instance method
+module Spree
+  module Core
+    class CurrentStore
+      def initialize(request)
+        @request = request
+      end
+
+      # Chooses the current store based on a request.
+      # Checks request headers for HTTP_SPREE_STORE and falls back to
+      # looking up by the requesting server's name.
+      # @return [Spree::Store]
+      def store
+        Spree::Store.current(store_key)
+      end
+
+      private
+
+      def store_key
+        @request.headers['HTTP_SPREE_STORE'] || @request.env['SERVER_NAME']
+      end
+    end
+  end
+end

data/lib/spree/core/engine.rb

@@ -85,6 +85,7 @@ module Spree
           Spree::Promotion::Rules::UserLoggedIn,
           Spree::Promotion::Rules::OneUsePerUser,
           Spree::Promotion::Rules::Taxon,
+          Spree::Promotion::Rules::NthOrder
         ]
       end
 

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

@@ -12,6 +12,7 @@ module Spree
 
             create_params = params.slice :currency
             order = Spree::Order.create! create_params
+            order.store ||= Spree::Store.default
             order.associate_user!(user)
             order.save!
 

data/lib/spree/permitted_attributes.rb

@@ -6,6 +6,7 @@ module Spree
     ATTRIBUTES = [
       :address_attributes,
       :checkout_attributes,
+      :credit_card_update_attributes,
       :customer_return_attributes,
       :image_attributes,
       :inventory_unit_attributes,
@@ -44,6 +45,10 @@ module Spree
       :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing
     ]
 
+    @@credit_card_update_attributes = [
+      :month, :year, :expiry, :first_name, :last_name, :name,
+    ]
+
     @@customer_return_attributes = [:stock_location_id, return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount, :reception_status_event, :acceptance_status, :exchange_variant_id, :resellable]]
 
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]

data/lib/spree/testing_support/factories/payment_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :payment, class: Spree::Payment do
+  factory :payment, aliases: [:credit_card_payment], class: Spree::Payment do
     amount 45.75
     association(:payment_method, factory: :credit_card_payment_method)
     association(:source, factory: :credit_card)

data/lib/spree/testing_support/order_walkthrough.rb

@@ -15,7 +15,10 @@ class OrderWalkthrough
       end
     end
 
-    order = Spree::Order.create!(email: "spree@example.com")
+    order = Spree::Order.create!(
+      email: "spree@example.com",
+      store: Spree::Store.first || FactoryGirl.create(:store)
+    )
     add_line_item!(order)
     order.next!
 

data/lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake

@@ -0,0 +1,117 @@
+namespace 'spree:migrations:copy_order_bill_address_to_credit_card' do
+  # This copies the billing address from the order associated with a
+  # credit card's most recent payment to the credit card.
+
+  # Used in the migration CopyOrderBillAddressToCreditCard and made available as a
+  # rake task to allow running it a second time after deploying the new code, in
+  # case some order->credit card data was missed between the time that the
+  # migration was run and the application servers were restarted with the new
+  # code.
+
+  # This task should be safe to run multiple times.
+
+  task up: :environment do
+    puts "Copying order bill addresses to credit cards"
+
+    if Spree::CreditCard.connection.adapter_name =~ /postgres/i
+      postgres_copy
+    else
+      ruby_copy
+    end
+  end
+
+  task down: :environment do
+    Spree::CreditCard.update_all(address_id: nil)
+  end
+
+  def ruby_copy
+    scope = Spree::CreditCard.where(address_id: nil).includes(payments: :order)
+
+    scope.find_each(batch_size: 500) do |cc|
+      # remove payments that lack a bill address
+      payments = cc.payments.select { |p| p.order.bill_address_id }
+
+      payment = payments.sort_by do |p|
+        [
+          %w(failed invalid).include?(p.state) ? 0 : 1, # prioritize valid payments
+          p.created_at, # prioritize more recent payments
+        ]
+      end.last
+
+      next if payment.nil?
+
+      cc.update_column(:address_id, payment.order.bill_address_id)
+      puts "Successfully associated billing address (#{payment.order.bill_address_id}) with credit card (#{cc.id})"
+    end
+  end
+
+  # This was 20x faster for us but the syntax is postgres-specific. I'm sure
+  # there are equivalent versions for other DBs if someone wants to write them.
+  # I took a quick stab at crafting a cross-db compatible version but it was
+  # slow.
+  def postgres_copy
+    batch_size = 10_000
+
+    puts "last id: #{last_credit_card_id}"
+
+    current_start_id = 1
+
+    while current_start_id <= last_credit_card_id
+      current_end_id = current_start_id + batch_size
+      puts "updating #{current_start_id} to #{current_end_id}"
+
+      # first try to find a valid payment for each credit card
+      Spree::CreditCard.connection.execute(
+        postgres_sql(
+          start_id: current_start_id,
+          end_id: current_end_id,
+          payment_state: "not in ('failed', 'invalid')",
+        )
+      )
+
+      # fall back to using invalid payments for each credit card
+      Spree::CreditCard.connection.execute(
+        postgres_sql(
+          start_id: current_start_id,
+          end_id: current_end_id,
+          payment_state: "in ('failed', 'invalid')",
+        )
+      )
+
+      current_start_id += batch_size
+    end
+  end
+
+  def postgres_sql(start_id:, end_id:, payment_state:)
+    <<-SQL
+      update spree_credit_cards c
+      set address_id = o.bill_address_id
+      from spree_payments p
+      inner join spree_orders o
+        on  o.id = p.order_id
+        and o.bill_address_id is not null
+      left join (
+        select p2.*
+        from spree_payments p2
+        inner join spree_orders o2
+          on  o2.id = p2.order_id
+          and o2.bill_address_id is not null
+      ) more_recent_payment
+        on  more_recent_payment.source_id = p.source_id
+        and more_recent_payment.source_type = 'Spree::CreditCard'
+        and more_recent_payment.created_at > p.created_at
+        and more_recent_payment.state #{payment_state}
+      where c.address_id is null
+        and p.source_id = c.id
+        and p.source_type = 'Spree::CreditCard'
+        and p.state #{payment_state}
+        and more_recent_payment.id is null
+        and o.bill_address_id is not null
+        and c.id between #{start_id} and #{end_id}
+    SQL
+  end
+
+  def last_credit_card_id
+    Spree::CreditCard.last.try!(:id) || 0
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre2
+  version: 1.0.0.pre3
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemerchant
@@ -461,6 +461,7 @@ files:
 - app/models/spree/permission_sets/promotion_display.rb
 - app/models/spree/permission_sets/promotion_management.rb
 - app/models/spree/permission_sets/report_display.rb
+- app/models/spree/permission_sets/restricted_transfer_management.rb
 - app/models/spree/permission_sets/stock_display.rb
 - app/models/spree/permission_sets/stock_management.rb
 - app/models/spree/permission_sets/user_display.rb
@@ -470,6 +471,8 @@ files:
 - app/models/spree/preferences/preferable.rb
 - app/models/spree/preferences/preferable_class_methods.rb
 - app/models/spree/preferences/scoped_store.rb
+- app/models/spree/preferences/static_model_preferences.rb
+- app/models/spree/preferences/statically_configurable.rb
 - app/models/spree/preferences/store.rb
 - app/models/spree/price.rb
 - app/models/spree/product.rb
@@ -484,6 +487,7 @@ files:
 - app/models/spree/promotion/actions/free_shipping.rb
 - app/models/spree/promotion/rules/first_order.rb
 - app/models/spree/promotion/rules/item_total.rb
+- app/models/spree/promotion/rules/nth_order.rb
 - app/models/spree/promotion/rules/one_use_per_user.rb
 - app/models/spree/promotion/rules/option_value.rb
 - app/models/spree/promotion/rules/product.rb
@@ -794,7 +798,6 @@ files:
 - db/migrate/20141007230328_add_cancel_audit_fields_to_spree_orders.rb
 - db/migrate/20141009204607_add_store_id_to_orders.rb
 - db/migrate/20141012083513_create_spree_taxons_prototypes.rb
-- db/migrate/20141021194502_add_state_lock_version_to_order.rb
 - db/migrate/20141023005240_add_counter_cache_from_spree_variants_to_spree_stock_items.rb
 - db/migrate/20141101231208_fix_adjustment_order_presence.rb
 - db/migrate/20141105213646_update_classifications_positions.rb
@@ -848,6 +851,7 @@ files:
 - db/migrate/20150610182638_add_id_to_spree_option_values_variants.rb
 - db/migrate/20150611200247_add_frontend_viewable_to_spree_orders.rb
 - db/migrate/20150612205731_remove_spree_configurations.rb
+- db/migrate/20150616204659_add_preference_source_to_spree_payment_methods.rb
 - db/migrate/20150618191713_remove_credit_card_address_id.rb
 - db/migrate/20150618212517_create_spree_store_credit_update_reasons.rb
 - db/migrate/20150619160613_create_adjustment_reason.rb
@@ -856,6 +860,10 @@ files:
 - db/migrate/20150623214058_seed_store_credit_update_reasons.rb
 - db/migrate/20150626200816_remove_shipping_method_id_from_spree_orders.rb
 - db/migrate/20150626214817_remove_counter_cache_from_spree_variants_to_spree_stock_items.rb
+- db/migrate/20150629175931_add_address_id_to_credit_card.rb
+- db/migrate/20150630175644_copy_order_bill_address_to_credit_card.rb
+- db/migrate/20150723224133_remove_unnecessary_indexes.rb
+- db/migrate/20150724163716_remove_state_lock_version_from_order.rb
 - db/seeds.rb
 - lib/generators/spree/custom_user/custom_user_generator.rb
 - lib/generators/spree/custom_user/templates/authentication_helpers.rb.tt
@@ -885,6 +893,7 @@ files:
 - lib/spree/core/controller_helpers/search.rb
 - lib/spree/core/controller_helpers/store.rb
 - lib/spree/core/controller_helpers/strong_parameters.rb
+- lib/spree/core/current_store.rb
 - lib/spree/core/delegate_belongs_to.rb
 - lib/spree/core/engine.rb
 - lib/spree/core/environment.rb
@@ -985,6 +994,7 @@ files:
 - lib/tasks/core.rake
 - lib/tasks/email.rake
 - lib/tasks/exchanges.rake
+- lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake
 - lib/tasks/migrations/copy_shipped_shipments_to_cartons.rake
 - lib/tasks/order_capturing.rake
 - vendor/assets/javascripts/jquery-migrate-1.0.0.js

data/db/migrate/20141021194502_add_state_lock_version_to_order.rb

@@ -1,5 +0,0 @@
-class AddStateLockVersionToOrder < ActiveRecord::Migration
-  def change
-    add_column :spree_orders, :state_lock_version, :integer, default: 0, null: false
-  end
-end