solidus_core 1.3.2 → 1.4.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11dfded4cc7b83741076ed919b7e304c7c4f3cf6
-  data.tar.gz: 93326ebc65ba22635c8dc11cd971d84c5a457b85
+  metadata.gz: 8aa4c3e58ebb0c1418f96f55061e429329292ed3
+  data.tar.gz: 90e3439877e5e1632c288d009a442a05bce4631d
 SHA512:
-  metadata.gz: 897b31dab736b86bf7606a03312e623aaab7a144110d832df807f33fab4046a43466c81b18c634eb7fe24e3d1e92280567dfb93531785f201bc25c70e78bf166
-  data.tar.gz: 2a91a9348afeb72e55c48efacbc00dcb260422f04734ba0aea8e8c13eae0e0b100202c6b9fa3bba56bef3f8ad7888a2e32ac0e564bed7b60b7f5584ba1f0b54c
+  metadata.gz: cc8e9cba50b0b5eb46b7305513e28e395194d01f4b8304d1929eff3bf2db019d8f6b683691df073890aaf955946a3fdd7bf57d5e935c91c403f2dd68d9dd4488
+  data.tar.gz: 4b98fa39ceb46b0ccf5c85163bf1fc778f6641eafe8d2e99dd8a249b0657d5232ff74fc025593e3cb14c1ff40b430dc666896d666fd60e7733d404444eac2d05

data/README.md

@@ -0,0 +1,15 @@
+# solidus\_core
+
+Core contains all the models and the majority of the logic for the Solidus
+ecommerce system.
+
+
+## Testing
+
+Create the test site
+
+    bundle exec rake test_app
+
+Run the tests
+
+    bundle exec rake spec

data/app/helpers/spree/base_helper.rb

@@ -66,7 +66,7 @@ module Spree
       nil
     end
 
-    def breadcrumbs(taxon, separator = " » ", breadcrumb_class = "inline")
+    def taxon_breadcrumbs(taxon, separator = " » ", breadcrumb_class = "inline")
       return "" if current_page?("/") || taxon.nil?
 
       crumbs = [[Spree.t(:home), spree.root_path]]
@@ -153,6 +153,10 @@ module Spree
       end
     end
 
+    def plural_resource_name(resource_class)
+      resource_class.model_name.human(count: Spree::I18N_GENERIC_PLURAL)
+    end
+
     private
 
     # Returns style of image or nil
@@ -170,7 +174,7 @@ module Spree
 
     def define_image_method(style)
       self.class.send :define_method, "#{style}_image" do |product, *options|
-        ActiveSupport::Deprecation.warn "Spree image helpers will be deprecated in the near future. Use the provided resource to access the intendend image directly.", caller
+        Spree::Deprecation.warn "Spree image helpers will be deprecated in the near future. Use the provided resource to access the intendend image directly.", caller
         options = options.first || {}
         if product.images.empty?
           if !product.is_a?(Spree::Variant) && !product.variant_images.empty?

data/app/mailers/spree/base_mailer.rb

@@ -4,7 +4,7 @@ module Spree
       if store
         store.mail_from_address
       else
-        ActiveSupport::Deprecation.warn "A Spree::Store should be provided to determine the from address.", caller
+        Spree::Deprecation.warn "A Spree::Store should be provided to determine the from address.", caller
         Spree::Config[:mails_from]
       end
     end

data/app/mailers/spree/carton_mailer.rb

@@ -15,7 +15,7 @@ module Spree
     #   def shipped_email(carton:, order:, resend: false)
     def shipped_email(options, deprecated_options = {})
       if options.is_a?(Integer)
-        ActiveSupport::Deprecation.warn "Calling shipped_email with a carton_id is DEPRECATED. Instead use CartonMailer.shipped_email(order: order, carton: carton)"
+        Spree::Deprecation.warn "Calling shipped_email with a carton_id is DEPRECATED. Instead use CartonMailer.shipped_email(order: order, carton: carton)"
         @carton = Carton.find(options)
         @order = @carton.orders.first # assume first order
         @manifest = @carton.manifest # use the entire manifest, since we don't know the precise order

data/app/mailers/spree/order_mailer.rb

@@ -30,14 +30,14 @@ module Spree
       if order.respond_to?(:id)
         order
       else
-        ActiveSupport::Deprecation.warn("Calling OrderMailer with an id is deprecated. Pass the Spree::Order object instead.")
+        Spree::Deprecation.warn("Calling OrderMailer with an id is deprecated. Pass the Spree::Order object instead.")
         Spree::Order.find(order)
       end
     end
 
     def build_subject(subject_text, resend)
       resend_text = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-      "#{resend_text}#{Spree::Store.current.name} #{subject_text} ##{@order.number}"
+      "#{resend_text}#{@order.store.name} #{subject_text} ##{@order.number}"
     end
   end
 end

data/app/mailers/spree/reimbursement_mailer.rb

@@ -1,11 +1,11 @@
 module Spree
   class ReimbursementMailer < BaseMailer
-      def reimbursement_email(reimbursement, resend = false)
-        @reimbursement = reimbursement.respond_to?(:id) ? reimbursement : Spree::Reimbursement.find(reimbursement)
-        store = @reimbursement.order.store
-        subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
-        subject += "#{store.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@reimbursement.order.number}"
-        mail(to: @reimbursement.order.email, from: from_address(store), subject: subject)
-      end
+    def reimbursement_email(reimbursement, resend = false)
+      @reimbursement = reimbursement.respond_to?(:id) ? reimbursement : Spree::Reimbursement.find(reimbursement)
+      store = @reimbursement.order.store
+      subject = (resend ? "[#{Spree.t(:resend).upcase}] " : '')
+      subject += "#{store.name} #{Spree.t('reimbursement_mailer.reimbursement_email.subject')} ##{@reimbursement.order.number}"
+      mail(to: @reimbursement.order.email, from: from_address(store), subject: subject)
+    end
   end
 end

data/app/mailers/spree/test_mailer.rb

@@ -1,8 +1,9 @@
 module Spree
   class TestMailer < BaseMailer
     def test_email(email)
-      subject = "#{Spree::Store.current.name} #{Spree.t('test_mailer.test_email.subject')}"
-      mail(to: email, from: from_address(Spree::Store.current), subject: subject)
+      store = Spree::Store.default
+      subject = "#{store.name} #{Spree.t('test_mailer.test_email.subject')}"
+      mail(to: email, from: from_address(store), subject: subject)
     end
   end
 end

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

@@ -15,7 +15,7 @@ module Spree
     end
 
     def drop_payment_source(source)
-      ActiveSupport::Deprecation.warn("User#drop_payment_source is deprecated", caller)
+      Spree::Deprecation.warn("User#drop_payment_source is deprecated", caller)
       gateway = source.payment_method
       gateway.disable_customer_profile(source)
     end

data/app/models/spree/address.rb

@@ -1,6 +1,8 @@
+require 'twitter_cldr'
+
 module Spree
   class Address < Spree::Base
-    require 'twitter_cldr'
+    extend ActiveModel::ForbiddenAttributesProtection
 
     belongs_to :country, class_name: "Spree::Country"
     belongs_to :state, class_name: "Spree::State"
@@ -15,6 +17,7 @@ module Spree
     alias_attribute :last_name, :lastname
 
     DB_ONLY_ATTRS = %w(id updated_at created_at)
+    TAXATION_ATTRS = %w(state_id country_id zipcode)
 
     self.whitelisted_ransackable_attributes = %w[firstname lastname]
 
@@ -27,7 +30,7 @@ module Spree
     end
 
     def self.default(user = nil, kind = "bill")
-      ActiveSupport::Deprecation.warn("Address.default is deprecated. Use User.default_address or Address.build_default", caller)
+      Spree::Deprecation.warn("Address.default is deprecated. Use User.default_address or Address.build_default", caller)
       if user
         user.send(:"#{kind}_address") || build_default
       else
@@ -44,6 +47,9 @@ module Spree
     # @return [Address] address from existing address plus new_attributes as diff
     # @note, this may return existing_address if there are no changes to value equality
     def self.immutable_merge(existing_address, new_attributes)
+      # Ensure new_attributes is a sanitized hash
+      new_attributes = sanitize_for_mass_assignment(new_attributes)
+
       return factory(new_attributes) if existing_address.nil?
 
       merged_attributes = value_attributes(existing_address.attributes, new_attributes)
@@ -78,6 +84,10 @@ module Spree
       self.class.value_attributes(attributes)
     end
 
+    def taxation_attributes
+      self.class.value_attributes(attributes.slice(*TAXATION_ATTRS))
+    end
+
     # @return [String] the full name on this address
     def full_name
       "#{firstname} #{lastname}".strip
@@ -101,12 +111,12 @@ module Spree
     end
 
     def same_as?(other_address)
-      ActiveSupport::Deprecation.warn("Address.same_as? is deprecated. It's equivalent to Address.==", caller)
+      Spree::Deprecation.warn("Address.same_as? is deprecated. It's equivalent to Address.==", caller)
       self == other_address
     end
 
     def same_as(other_address)
-      ActiveSupport::Deprecation.warn("Address.same_as is deprecated. It's equivalent to Address.==", caller)
+      Spree::Deprecation.warn("Address.same_as is deprecated. It's equivalent to Address.==", caller)
       self == other_address
     end
 

data/app/models/spree/adjustment.rb

@@ -26,17 +26,14 @@ module Spree
     validates :amount, numericality: true
     validates :promotion_code, presence: true, if: :require_promotion_code?
 
-    after_create :update_adjustable_adjustment_total
-    after_destroy :update_adjustable_adjustment_total
-
     scope :not_finalized, -> { where(finalized: false) }
     scope :open, -> do
-      ActiveSupport::Deprecation.warn "Adjustment.open is deprecated. Instead use Adjustment.not_finalized", caller
+      Spree::Deprecation.warn "Adjustment.open is deprecated. Instead use Adjustment.not_finalized", caller
       where(finalized: false)
     end
     scope :finalized, -> { where(finalized: true) }
     scope :closed, -> do
-      ActiveSupport::Deprecation.warn "Adjustment.closed is deprecated. Instead use Adjustment.finalized", caller
+      Spree::Deprecation.warn "Adjustment.closed is deprecated. Instead use Adjustment.finalized", caller
       where(finalized: true)
     end
     scope :cancellation, -> { where(source_type: 'Spree::UnitCancel') }
@@ -78,12 +75,12 @@ module Spree
 
     # Deprecated methods
     def state
-      ActiveSupport::Deprecation.warn "Adjustment#state is deprecated. Instead use Adjustment#finalized?", caller
+      Spree::Deprecation.warn "Adjustment#state is deprecated. Instead use Adjustment#finalized?", caller
       finalized? ? "closed" : "open"
     end
 
     def state=(new_state)
-      ActiveSupport::Deprecation.warn "Adjustment#state= is deprecated. Instead use Adjustment#finalized=", caller
+      Spree::Deprecation.warn "Adjustment#state= is deprecated. Instead use Adjustment#finalized=", caller
       case new_state
       when "open"
         self.finalized = false
@@ -95,32 +92,32 @@ module Spree
     end
 
     def open?
-      ActiveSupport::Deprecation.warn "Adjustment#open? is deprecated. Instead use Adjustment#finalized?", caller
+      Spree::Deprecation.warn "Adjustment#open? is deprecated. Instead use Adjustment#finalized?", caller
       !closed?
     end
 
     def closed?
-      ActiveSupport::Deprecation.warn "Adjustment#closed? is deprecated. Instead use Adjustment#finalized?", caller
+      Spree::Deprecation.warn "Adjustment#closed? is deprecated. Instead use Adjustment#finalized?", caller
       finalized?
     end
 
     def open
-      ActiveSupport::Deprecation.warn "Adjustment#open is deprecated. Instead use Adjustment#unfinalize", caller
+      Spree::Deprecation.warn "Adjustment#open is deprecated. Instead use Adjustment#unfinalize", caller
       unfinalize
     end
 
     def open!
-      ActiveSupport::Deprecation.warn "Adjustment#open! is deprecated. Instead use Adjustment#unfinalize!", caller
+      Spree::Deprecation.warn "Adjustment#open! is deprecated. Instead use Adjustment#unfinalize!", caller
       unfinalize!
     end
 
     def close
-      ActiveSupport::Deprecation.warn "Adjustment#close is deprecated. Instead use Adjustment#finalize", caller
+      Spree::Deprecation.warn "Adjustment#close is deprecated. Instead use Adjustment#finalize", caller
       finalize
     end
 
     def close!
-      ActiveSupport::Deprecation.warn "Adjustment#close! is deprecated. Instead use Adjustment#finalize!", caller
+      Spree::Deprecation.warn "Adjustment#close! is deprecated. Instead use Adjustment#finalize!", caller
       finalize!
     end
     # End deprecated methods
@@ -154,7 +151,7 @@ module Spree
     # @return [BigDecimal] New amount of this adjustment
     def update!(target = nil)
       if target
-        ActiveSupport::Deprecation.warn("Passing a target to Adjustment#update! is deprecated. The adjustment will use the correct target from it's adjustable association.", caller)
+        Spree::Deprecation.warn("Passing a target to Adjustment#update! is deprecated. The adjustment will use the correct target from it's adjustable association.", caller)
       end
       return amount if finalized?
 
@@ -177,11 +174,6 @@ module Spree
 
     private
 
-    def update_adjustable_adjustment_total
-      # Cause adjustable's total to be recalculated
-      ItemAdjustments.new(adjustable).update
-    end
-
     def require_promotion_code?
       promotion? && source.promotion.codes.any?
     end

data/app/models/spree/app_configuration.rb

@@ -349,6 +349,28 @@ module Spree
       @order_merger_class ||= Spree::OrderMerger
     end
 
+    # Allows providing your own class for adding default payments to a user's
+    # order from their "wallet".
+    #
+    # @!attribute [rw] default_payment_builder_class
+    # @return [Class] a class with the same public interfaces as
+    #   Spree::Wallet::DefaultPaymentBuilder.
+    attr_writer :default_payment_builder_class
+    def default_payment_builder_class
+      @default_payment_builder_class ||= Spree::Wallet::DefaultPaymentBuilder
+    end
+
+    # Allows providing your own class for adding payment sources to a user's
+    # "wallet" after an order moves to the complete state.
+    #
+    # @!attribute [rw] add_payment_sources_to_wallet_class
+    # @return [Class] a class with the same public interfaces
+    #   as Spree::Wallet::AddPaymentSourcesToWallet.
+    attr_writer :add_payment_sources_to_wallet_class
+    def add_payment_sources_to_wallet_class
+      @add_payment_sources_to_wallet_class ||= Spree::Wallet::AddPaymentSourcesToWallet
+    end
+
     def static_model_preferences
       @static_model_preferences ||= Spree::Preferences::StaticModelPreferences.new
     end
@@ -387,7 +409,7 @@ module Spree
 
       # support all the old preference methods with a warning
       define_method "preferred_#{old_preference_name}" do
-        ActiveSupport::Deprecation.warn("#{old_preference_name} is no longer supported on Spree::Config, please access it through #{store_method} on Spree::Store", bc.clean(caller))
+        Spree::Deprecation.warn("#{old_preference_name} is no longer supported on Spree::Config, please access it through #{store_method} on Spree::Store", bc.clean(caller))
         Spree::Store.default.send(store_method)
       end
     end

data/app/models/spree/base.rb

@@ -26,4 +26,13 @@ class Spree::Base < ActiveRecord::Base
   end
 
   self.abstract_class = true
+
+  # Provides a scope that should be included any time products
+  # are fetched with the intention of displaying to the user.
+  #
+  # Allows individual stores to include any active record scopes or joins
+  # when products are displayed.
+  def self.display_includes
+    where(nil)
+  end
 end

data/app/models/spree/country.rb

@@ -7,7 +7,7 @@ module Spree
     validates :name, :iso_name, presence: true
 
     def self.states_required_by_country_id
-      ActiveSupport::Deprecation.warn "Spree::Country.states_required_by_country_id is deprecated and will be removed from future releases, Implement it yourself.", caller
+      Spree::Deprecation.warn "Spree::Country.states_required_by_country_id is deprecated and will be removed from future releases, Implement it yourself.", caller
       states_required = Hash.new(true)
       all.each { |country| states_required[country.id.to_s] = country.states_required }
       states_required
@@ -15,7 +15,7 @@ module Spree
 
     def self.default
       if Spree::Config.default_country_id
-        ActiveSupport::Deprecation.warn("Setting your default country via its ID is deprecated. Please set your default country via the `default_country_iso` setting.", caller)
+        Spree::Deprecation.warn("Setting your default country via its ID is deprecated. Please set your default country via the `default_country_iso` setting.", caller)
         find_by(id: Spree::Config.default_country_id) || find_by!(iso: Spree::Config.default_country_iso)
       else
         find_by!(iso: Spree::Config.default_country_iso)

data/app/models/spree/exchange.rb

@@ -20,7 +20,7 @@ module Spree
 
     def perform!
       begin
-        shipments = Spree::Stock::Coordinator.new(@order, @reimbursement_objects.map(&:build_exchange_inventory_unit)).shipments
+        shipments = Spree::Config.stock.coordinator_class.new(@order, @reimbursement_objects.map(&:build_exchange_inventory_unit)).shipments
       rescue Spree::Order::InsufficientStock
         raise UnableToCreateShipments.new("Could not generate shipments for all items. Out of stock?")
       end

data/app/models/spree/gateway.rb

@@ -39,7 +39,7 @@ module Spree
     end
 
     def disable_customer_profile(source)
-      ActiveSupport::Deprecation.warn("Gateway#disable_customer_profile is deprecated")
+      Spree::Deprecation.warn("Gateway#disable_customer_profile is deprecated")
       if source.is_a? CreditCard
         source.update_column :gateway_customer_profile_id, nil
       else

data/app/models/spree/item_adjustments.rb

@@ -70,6 +70,13 @@ module Spree
         updated_at: Time.current
       ) if @item.changed?
 
+      # In rails 4.2 update_columns isn't reflected in the changed_attributes hash,
+      # which means that multiple updates on the same in-memory model will
+      # behave incorrectly.
+      # In rails 5.0 changed_attributes works with update_columns and this is
+      # unnecessary.
+      item.attributes_changed_by_setter.except!(:promo_total, :included_tax_total, :additional_tax_total, :adjustment_total)
+
       @item
     end
 

data/app/models/spree/line_item.rb

@@ -26,7 +26,6 @@ module Spree
     after_create :update_tax_charge
 
     after_save :update_inventory
-    after_save :update_adjustments
 
     before_destroy :update_inventory
     before_destroy :destroy_inventory_units
@@ -151,7 +150,7 @@ module Spree
 
     def handle_copy_price_override
       copy_price
-      ActiveSupport::Deprecation.warn 'You have overridden Spree::LineItem#copy_price. ' \
+      Spree::Deprecation.warn 'You have overridden Spree::LineItem#copy_price. ' \
         'This method is now called Spree::LineItem#set_pricing_attributes. ' \
         'Please adjust your override.',
         caller
@@ -167,17 +166,6 @@ module Spree
       inventory_units.destroy_all
     end
 
-    def update_adjustments
-      if quantity_changed?
-        update_tax_charge # Called to ensure pre_tax_amount is updated.
-        recalculate_adjustments
-      end
-    end
-
-    def recalculate_adjustments
-      Spree::ItemAdjustments.new(self).update
-    end
-
     def update_tax_charge
       Spree::Tax::ItemAdjuster.new(self).adjust!
     end

data/app/models/spree/order/checkout.rb

@@ -36,7 +36,7 @@ module Spree
             # To avoid multiple occurrences of the same transition being defined
             # On first definition, state_machines will not be defined
             state_machines.clear if respond_to?(:state_machines)
-            state_machine :state, initial: :cart, use_transactions: false, action: :save_state do
+            state_machine :state, initial: :cart, use_transactions: false do
               klass.next_event_transitions.each { |t| transition(t.merge(on: :next)) }
 
               # Persist the state on the order
@@ -76,7 +76,7 @@ module Spree
                   transition to: :payment, from: :confirm
                 end
 
-                after_transition to: :complete, do: :persist_user_credit_card
+                after_transition to: :complete, do: :add_payment_sources_to_wallet
                 before_transition to: :payment, do: :set_shipments_cost
                 before_transition to: :payment, do: :create_tax_charge!
                 before_transition to: :payment, do: :assign_default_credit_card
@@ -250,7 +250,7 @@ module Spree
 
           # @deprecated Use {OrderUpdateAttributes} instead
           def update_from_params(params, permitted_params, request_env = {})
-            ActiveSupport::Deprecation.warn "update_from_params is deprecated. Use the OrderUpdateAttributes class instead", caller
+            Spree::Deprecation.warn "update_from_params is deprecated. Use the OrderUpdateAttributes class instead", caller
             success = false
             @updating_params = params
             run_callbacks :updating_from_params do
@@ -309,22 +309,25 @@ module Spree
             end
           end
 
-          def persist_user_credit_card
-            if !temporary_credit_card && user_id && valid_credit_cards.present?
-              default_cc = valid_credit_cards.first
-              # TODO: target for refactoring -- why is order checkout responsible for the user -> credit_card relationship?
-              default_cc.user_id = user_id
-              default_cc.default = true
-              default_cc.save
-            end
+          def add_payment_sources_to_wallet
+            Spree::Config.
+              add_payment_sources_to_wallet_class.new(self).
+              add_to_wallet
           end
+          alias_method :persist_user_credit_card, :add_payment_sources_to_wallet
+          deprecate :persist_user_credit_card
 
           def assign_default_credit_card
-            if payments.from_credit_card.count == 0 && user && user.default_credit_card.try(:valid?)
-              cc = user.default_credit_card
-              payments.create!(payment_method_id: cc.payment_method_id, source: cc)
-              # this is one of 2 places still using User#bill_address
-              self.bill_address ||= user.default_credit_card.address || user.bill_address
+            builder = Spree::Config.default_payment_builder_class.new(self)
+
+            if payment = builder.build
+              payments << payment
+
+              if bill_address.nil?
+                # this is one of 2 places still using User#bill_address
+                self.bill_address = payment.source.try(:address) ||
+                                    user.bill_address
+              end
             end
           end
 

data/app/models/spree/order/payments.rb

@@ -38,8 +38,6 @@ module Spree
       def process_payments_with(method)
         # Don't run if there is nothing to pay.
         return true if payment_total >= total
-        # Prevent orders from transitioning to complete without a successfully processed payment.
-        raise Core::GatewayError.new(Spree.t(:no_payment_found)) if unprocessed_payments.empty?
 
         unprocessed_payments.each do |payment|
           break if payment_total >= total

data/app/models/spree/order.rb

@@ -27,7 +27,7 @@ module Spree
     end
 
     self.whitelisted_ransackable_associations = %w[shipments user promotions bill_address ship_address line_items]
-    self.whitelisted_ransackable_attributes = %w[completed_at created_at email number state payment_state shipment_state total]
+    self.whitelisted_ransackable_attributes = %w[completed_at created_at email number state payment_state shipment_state total store_id]
 
     attr_reader :coupon_code
     attr_accessor :temporary_address, :temporary_credit_card
@@ -505,7 +505,7 @@ module Spree
       else
         adjustments.shipping.destroy_all
         shipments.destroy_all
-        self.shipments = Spree::Stock::Coordinator.new(self).shipments
+        self.shipments = Spree::Config.stock.coordinator_class.new(self).shipments
       end
     end
 
@@ -590,7 +590,7 @@ module Spree
     end
 
     def token
-      ActiveSupport::Deprecation.warn("Spree::Order#token is DEPRECATED, please use #guest_token instead.", caller)
+      Spree::Deprecation.warn("Spree::Order#token is DEPRECATED, please use #guest_token instead.", caller)
       guest_token
     end
 
@@ -618,6 +618,9 @@ module Spree
     end
 
     def add_store_credit_payments
+      return if user.nil?
+      return if payments.store_credits.checkout.empty? && user.total_available_store_credit.zero?
+
       payments.store_credits.checkout.each(&:invalidate!)
 
       # this can happen when multiple payments are present, auto_capture is
@@ -627,7 +630,7 @@ module Spree
 
       remaining_total = outstanding_balance - authorized_total
 
-      if user && user.store_credits.any?
+      if user.store_credits.any?
         payment_method = Spree::PaymentMethod::StoreCredit.first
 
         user.store_credits.order_by_priority.each do |credit|
@@ -689,23 +692,6 @@ module Spree
       Spree::Money.new(total_available_store_credit - total_applicable_store_credit, { currency: currency })
     end
 
-    def payments_attributes=(attributes)
-      validate_payments_attributes(attributes)
-      super(attributes)
-    end
-
-    def validate_payments_attributes(attributes)
-      attributes = Array.wrap(attributes)
-      # Ensure the payment methods specified are allowed for this user
-      payment_methods = Spree::PaymentMethod.where(id: available_payment_methods)
-      attributes.each do |payment_attributes|
-        payment_method_id = payment_attributes[:payment_method_id]
-
-        # raise RecordNotFound unless it is an allowed payment method
-        payment_methods.find(payment_method_id) if payment_method_id
-      end
-    end
-
     private
 
     def associate_store