solidus_core 2.1.1 → 2.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c934b38bc5fe5c396b4c0eff48366ee4d0191b7
-  data.tar.gz: 909b4d8df7e9fae8bc877f2ea3ba94e9e4678cc1
+  metadata.gz: d5635c0bec12576a350d683b4140c8daa51e160a
+  data.tar.gz: 1163f3a0a622892863ba88006da9c321de52222f
 SHA512:
-  metadata.gz: 663ef73baabdcb94f31638b3a84913f10b853748de77376c1018b9f026f703fdf8f3d2c78cc69bd6edb4997e3c506f2aff348fbbd7d7a03442863147c054a056
-  data.tar.gz: dcfa1557ad792104c88a4f9eea1648711888417f8169594da523534d64e230caefbc86a759161ab5525e0b55c45fa123da14a6910a88b8bd6300593d7bacb934
+  metadata.gz: c7d0c449fce5ebc575ea2c176f0e7577158e3ee09184ff95828abe5a03704bf8f3821b98077c83bba86c9690ceac16bc7e256f1eae96ae76ecf3de78bcf7f162
+  data.tar.gz: 6ffdb536d3e89da7f98e03a662a681742f053db49b4ec6b24dc023524763da40d5648b71bc6cd9564170f367ee1a6d067330ab633a7f1f3c689b95f017b07dbb

data/Rakefile

@@ -3,7 +3,6 @@ require 'rake'
 require 'rake/testtask'
 require 'rspec/core/rake_task'
 require 'spree/testing_support/common_rake'
-load 'lib/tasks/exchanges.rake'
 
 RSpec::Core::RakeTask.new
 

data/app/assets/config/solidus_core_manifest.js

@@ -0,0 +1 @@
+//= link_tree ../images

data/app/assets/javascripts/spree.js.erb

@@ -0,0 +1,72 @@
+//= require jsuri
+
+window.Spree = {};
+
+Spree.ready = function(callback) {
+  if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
+    jQuery(document).on('turbolinks:load', function() {
+      callback(jQuery);
+    });
+  } else {
+    jQuery(document).ready(callback);
+  }
+};
+
+Spree.mountedAt = function() {
+  return "<%= Rails.application.routes.url_helpers.spree_path(trailing_slash: true) %>";
+};
+
+Spree.pathFor = function(path) {
+  var locationOrigin;
+  locationOrigin = (window.location.protocol + "//" + window.location.hostname) + (window.location.port ? ":" + window.location.port : "");
+  return locationOrigin + Spree.mountedAt() + path;
+};
+
+Spree.url = function(uri, query) {
+  if (Spree.env === 'development' || Spree.env === 'test') {
+    console.warn('Spree.url is deprecated, please use Spree.ajax for your request instead.');
+  }
+  if (uri.path === undefined) {
+    uri = new Uri(uri);
+  }
+  if (query) {
+    $.each(query, function(key, value) {
+      return uri.addQueryParam(key, value);
+    });
+  }
+  return uri;
+};
+
+Spree.ajax = function(url, options) {
+  if (typeof url === "object") {
+    options = url;
+    url = undefined;
+  }
+  options = options || {};
+  options = $.extend(options, {
+    headers: {
+      "X-Spree-Token": Spree.api_key
+    }
+  });
+  return $.ajax(url, options);
+};
+
+Spree.routes = {
+  states_search: Spree.pathFor('api/states'),
+  apply_coupon_code: function(order_id) {
+    return Spree.pathFor("api/orders/" + order_id + "/apply_coupon_code");
+  }
+};
+
+Spree.getJSON = function(url, data, success) {
+  if (typeof data === 'function') {
+    success = data;
+    data = undefined;
+  }
+  return Spree.ajax({
+    dataType: "json",
+    url: url,
+    data: data,
+    success: success
+  });
+};

data/app/helpers/spree/store_helper.rb

@@ -8,6 +8,11 @@ module Spree
     end
 
     def cache_key_for_taxons
+      Spree::Deprecation.warn <<-WARN.strip_heredoc
+        cache_key_for_taxons is deprecated. Rails >= 5 has built-in support for collection cache keys.
+        Instead in your view use:
+        cache [I18n.locale, @taxons] do
+      WARN
       max_updated_at = @taxons.maximum(:updated_at).to_i
       parts = [@taxon.try(:id), max_updated_at].compact.join("-")
       "#{I18n.locale}/taxons/#{parts}"

data/app/jobs/spree/promotion_code_batch_job.rb

@@ -0,0 +1,24 @@
+module Spree
+  class PromotionCodeBatchJob < ActiveJob::Base
+    queue_as :default
+
+    def perform(promotion_code_batch)
+      PromotionCode::BatchBuilder.new(
+        promotion_code_batch
+      ).build_promotion_codes
+
+      if promotion_code_batch.email?
+        Spree::PromotionCodeBatchMailer
+          .promotion_code_batch_finished(promotion_code_batch)
+          .deliver_now
+      end
+    rescue => e
+      if promotion_code_batch.email?
+        Spree::PromotionCodeBatchMailer
+          .promotion_code_batch_errored(promotion_code_batch)
+          .deliver_now
+      end
+      raise e
+    end
+  end
+end

data/app/mailers/spree/promotion_code_batch_mailer.rb

@@ -0,0 +1,13 @@
+module Spree
+  class PromotionCodeBatchMailer < ApplicationMailer
+    def promotion_code_batch_finished(promotion_code_batch)
+      @promotion_code_batch = promotion_code_batch
+      mail(to: promotion_code_batch.email)
+    end
+
+    def promotion_code_batch_errored(promotion_code_batch)
+      @promotion_code_batch = promotion_code_batch
+      mail(to: promotion_code_batch.email)
+    end
+  end
+end

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

@@ -4,7 +4,7 @@ module Spree
 
     included do
       has_one :calculator, class_name: "Spree::Calculator", as: :calculable, inverse_of: :calculable, dependent: :destroy, autosave: true
-      accepts_nested_attributes_for :calculator
+      accepts_nested_attributes_for :calculator, update_only: true
       validates :calculator, presence: true
     end
 

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

@@ -16,8 +16,8 @@ module Spree
 
     def property_name=(name)
       unless name.blank?
-        unless property = Property.find_by(name: name)
-          property = Property.create(name: name, presentation: name)
+        unless property = Spree::Property.find_by(name: name)
+          property = Spree::Property.create(name: name, presentation: name)
         end
         self.property = property
       end

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

@@ -5,7 +5,7 @@ module Spree
     included do
       has_many :user_addresses, -> { active }, { foreign_key: "user_id", class_name: "Spree::UserAddress" } do
         def find_first_by_address_values(address_attrs)
-          detect { |ua| ua.address == Address.new(address_attrs) }
+          detect { |ua| ua.address == Spree::Address.new(address_attrs) }
         end
 
         # @note this method enforces only one default address per user
@@ -37,7 +37,7 @@ module Spree
     end
 
     def bill_address_attributes=(attributes)
-      self.bill_address = Address.immutable_merge(bill_address, attributes)
+      self.bill_address = Spree::Address.immutable_merge(bill_address, attributes)
     end
 
     def default_address=(address)
@@ -48,7 +48,7 @@ module Spree
       # see "Nested Attributes Examples" section of http://apidock.com/rails/ActionView/Helpers/FormHelper/fields_for
       # this #{fieldname}_attributes= method works with fields_for in the views
       # even without declaring accepts_nested_attributes_for
-      self.default_address = Address.immutable_merge(default_address, attributes)
+      self.default_address = Spree::Address.immutable_merge(default_address, attributes)
     end
 
     alias_method :ship_address_attributes=, :default_address_attributes=
@@ -94,7 +94,7 @@ module Spree
       return nil unless address_attributes.present?
       address_attributes = address_attributes.to_h.with_indifferent_access
 
-      new_address = Address.factory(address_attributes)
+      new_address = Spree::Address.factory(address_attributes)
       return new_address unless new_address.valid?
 
       first_one = user_addresses.empty?

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

@@ -23,6 +23,9 @@ module Spree
       has_many :store_credit_events, through: :store_credits
       money_methods :total_available_store_credit
 
+      has_many :credit_cards, class_name: "Spree::CreditCard", foreign_key: :user_id
+      has_many :wallet_payment_sources, foreign_key: 'user_id', class_name: 'Spree::WalletPaymentSource', inverse_of: :user
+
       after_create :auto_generate_spree_api_key
 
       include Spree::RansackableAttributes unless included_modules.include?(Spree::RansackableAttributes)
@@ -31,6 +34,10 @@ module Spree
       self.whitelisted_ransackable_attributes = %w[id email]
     end
 
+    def wallet
+      Spree::Wallet.new(self)
+    end
+
     # has_spree_role? simply needs to return true or false whether a user has a role or not.
     def has_spree_role?(role_in_question)
       spree_roles.any? { |role| role.name == role_in_question.to_s }

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

@@ -2,15 +2,22 @@ module Spree
   module UserPaymentSource
     extend ActiveSupport::Concern
 
-    included do
-      has_many :credit_cards, class_name: "Spree::CreditCard", foreign_key: :user_id
-    end
-
     def default_credit_card
-      credit_cards.default.first
+      Spree::Deprecation.warn(
+        "user.default_credit_card is deprecated. Please use user.wallet.default_wallet_payment_source instead.",
+        caller
+      )
+      default = wallet.default_wallet_payment_source
+      if default && default.payment_source.is_a?(Spree::CreditCard)
+        default.payment_source
+      end
     end
 
     def payment_sources
+      Spree::Deprecation.warn(
+        "user.payment_sources is deprecated. Please use user.wallet.wallet_payment_sources instead.",
+        caller
+      )
       credit_cards.with_payment_profile
     end
   end

data/app/models/spree/address.rb

@@ -105,20 +105,31 @@ module Spree
       value_attributes == other_address.value_attributes
     end
 
+    # @deprecated Do not use this. Use Address.== instead.
     def same_as?(other_address)
-      Spree::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
 
+    # @deprecated Do not use this. Use Address.== instead.
     def same_as(other_address)
-      Spree::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
 
+    # @deprecated Do not use this
     def empty?
+      Spree::Deprecation.warn("Address#empty? is deprecated.", caller)
       attributes.except('id', 'created_at', 'updated_at', 'country_id').all? { |_, v| v.nil? }
     end
 
+    # This exists because the default Object#blank?, checks empty? if it is
+    # defined, and we have defined empty.
+    # This should be removed once empty? is removed
+    def blank?
+      false
+    end
+
     # @return [Hash] an ActiveMerchant compatible address hash
     def active_merchant_hash
       {
@@ -157,7 +168,7 @@ module Spree
     # @return [Country] setter that sets self.country to the Country with a matching 2 letter iso
     # @raise [ActiveRecord::RecordNotFound] if country with the iso doesn't exist
     def country_iso=(iso)
-      self.country = Country.find_by!(iso: iso)
+      self.country = Spree::Country.find_by!(iso: iso)
     end
 
     private

data/app/models/spree/adjustment.rb

@@ -105,7 +105,7 @@ module Spree
         self.amount = source.compute_amount(adjustable)
 
         if promotion?
-          self.eligible = source.promotion.eligible?(adjustable, promotion_code: promotion_code)
+          self.eligible = calculate_eligibility
         end
 
         # Persist only if changed
@@ -116,6 +116,18 @@ module Spree
       amount
     end
 
+    # Calculates based on attached promotion (if this is a promotion
+    # adjustment) whether this promotion is still eligible.
+    # @api private
+    # @return [true,false] Whether this adjustment is eligible
+    def calculate_eligibility
+      if !finalized? && source && promotion?
+        source.promotion.eligible?(adjustable, promotion_code: promotion_code)
+      else
+        eligible?
+      end
+    end
+
     private
 
     def require_promotion_code?

data/app/models/spree/app_configuration.rb

@@ -107,10 +107,6 @@ module Spree
     #   @return [Boolean] Request company field for billing and shipping addresses. (default: +false+)
     preference :company, :boolean, default: false
 
-    # @!attribute [rw] create_rma_for_unreturned_exchange
-    #   @return [Boolean] allows rma to be created for items after unreturned exchange charge has been made (default: +false+)
-    preference :create_rma_for_unreturned_exchange, :boolean, default: false
-
     # @!attribute [rw] currency
     #   Currency to use by default when not defined on the site (default: +"USD"+)
     #   @return [String] ISO 4217 Three letter currency code
@@ -132,21 +128,6 @@ module Spree
     #      prices are entered in the backend (default: nil)
     preference :admin_vat_country_iso, :string, default: nil
 
-    # @!attribute [rw] expedited_exchanges
-    #   Kicks off an exchange shipment upon return authorization save.
-    #   charge customer if they do not return items within timely manner.
-    #   @note this requires payment profiles to be supported on your gateway of
-    #     choice as well as a delayed job handler to be configured with
-    #     activejob.
-    #   @return [Boolean] Use expidited exchanges (default: +false+)
-    preference :expedited_exchanges, :boolean, default: false
-
-    # @!attribute [rw] expedited_exchanges_days_window
-    #   @return [Integer] Number of days the customer has to return their item
-    #     after the expedited exchange is shipped in order to avoid being
-    #     charged (default: +14+)
-    preference :expedited_exchanges_days_window, :integer, default: 14
-
     # @!attribute [rw] generate_api_key_for_all_roles
     #   @return [Boolean] Allow generating api key automatically for user
     #   at role_user creation for all roles. (default: +false+)

data/app/models/spree/base.rb

@@ -4,6 +4,8 @@ class Spree::Base < ActiveRecord::Base
 
   include Spree::RansackableAttributes
 
+  self.belongs_to_required_by_default = false
+
   def initialize_preference_defaults
     if has_attribute?(:preferences)
       self.preferences = default_preferences.merge(preferences)

data/app/models/spree/credit_card.rb

@@ -1,20 +1,16 @@
 module Spree
   # The default `source` of a `Spree::Payment`.
   #
-  class CreditCard < Spree::Base
-    belongs_to :payment_method
-    belongs_to :user, class_name: Spree.user_class, foreign_key: 'user_id'
+  class CreditCard < Spree::PaymentSource
+    belongs_to :user, class_name: Spree::UserClassHandle.new, foreign_key: 'user_id'
     belongs_to :address
-    has_many :payments, as: :source
 
     before_save :set_last_digits
 
-    after_save :ensure_one_default
-
     accepts_nested_attributes_for :address
 
-    attr_reader :number, :verification_value
-    attr_accessor :encrypted_data, :imported
+    attr_reader :number
+    attr_accessor :encrypted_data, :verification_value
 
     validates :month, :year, numericality: { only_integer: true }, if: :require_card_numbers?, on: :create
     validates :number, presence: true, if: :require_card_numbers?, on: :create, unless: :imported
@@ -22,7 +18,11 @@ module Spree
     validates :verification_value, presence: true, if: :require_card_numbers?, on: :create, unless: :imported
 
     scope :with_payment_profile, -> { where('gateway_customer_profile_id IS NOT NULL') }
-    scope :default, -> { where(default: true) }
+
+    def self.default
+      Spree::Deprecation.warn("CreditCard.default is deprecated. Please use Spree::Wallet instead.")
+      joins(:wallet_payment_sources).where(spree_wallet_payment_sources: { default: true })
+    end
 
     # needed for some of the ActiveMerchant gateways (eg. SagePay)
     alias_attribute :brand, :cc_type
@@ -44,8 +44,30 @@ module Spree
       'laser'              => /^(6304|6706|6709|6771(?!89))\d{8}(\d{4}|\d{6,7})?$/
     }.freeze
 
+    def default
+      Spree::Deprecation.warn("CreditCard.default is deprecated. Please use user.wallet.default_wallet_payment_source instead.", caller)
+      return false if user.nil?
+      user.wallet.default_wallet_payment_source.try!(:payment_source) == self
+    end
+
+    def default=(set_as_default)
+      Spree::Deprecation.warn("CreditCard.default= is deprecated. Please use user.wallet.default_wallet_payment_source= instead.", caller)
+      if user.nil?
+        raise "Cannot set 'default' on a credit card without a user"
+      elsif set_as_default # setting this card as default
+        wallet_payment_source = user.wallet.add(self)
+        user.wallet.default_wallet_payment_source = wallet_payment_source
+        true
+      else # removing this card as default
+        if user.wallet.default_wallet_payment_source.try!(:payment_source) == self
+          user.wallet.default_wallet_payment_source = nil
+        end
+        false
+      end
+    end
+
     def address_attributes=(attributes)
-      self.address = Address.immutable_merge(address, attributes)
+      self.address = Spree::Address.immutable_merge(address, attributes)
     end
 
     # Sets the expiry date on this credit card.
@@ -123,31 +145,8 @@ module Spree
       "XXXX-XXXX-XXXX-#{last_digits}"
     end
 
-    # @return [Array<String>] the actions available on this credit card
-    def actions
-      %w{capture void credit}
-    end
-
-    # @param payment [Spree::Payment] the payment we want to know if can be captured
-    # @return [Boolean] true when the payment is in the pending or checkout states
-    def can_capture?(payment)
-      payment.pending? || payment.checkout?
-    end
-
-    # @param payment [Spree::Payment] the payment we want to know if can be voided
-    # @return [Boolean] true when the payment is not failed or voided
-    def can_void?(payment)
-      !payment.failed? && !payment.void?
-    end
-
-    # Indicates whether its possible to credit the payment.  Note that most
-    # gateways require that the payment be settled first which generally
-    # happens within 12-24 hours of the transaction.
-    #
-    # @param payment [Spree::Payment] the payment we want to know if can be credited
-    # @return [Boolean] true when the payment is completed and can be credited
-    def can_credit?(payment)
-      payment.completed? && payment.credit_allowed > 0
+    def reusable?
+      has_payment_profile?
     end
 
     # @return [Boolean] true when there is a gateway customer or payment
@@ -192,13 +191,5 @@ module Spree
     def require_card_numbers?
       !encrypted_data.present? && !has_payment_profile?
     end
-
-    def ensure_one_default
-      if user_id && default
-        CreditCard.where(default: true).where.not(id: id).where(user_id: user_id).each do |ucc|
-          ucc.update_columns(default: false, updated_at: Time.current)
-        end
-      end
-    end
   end
 end

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

@@ -79,7 +79,7 @@ module Spree
       prefix = success ? 'BGS' : 'FAIL'
       while record
         random = "#{prefix}-#{Array.new(6){ rand(6) }.join}"
-        record = CreditCard.where(gateway_customer_profile_id: random).first
+        record = Spree::CreditCard.where(gateway_customer_profile_id: random).first
       end
       random
     end

data/app/models/spree/gateway.rb

@@ -42,16 +42,18 @@ module Spree
       source.has_payment_profile?
     end
 
-    def sources_by_order(order)
+    def reusable_sources_by_order(order)
       source_ids = order.payments.where(payment_method_id: id).pluck(:source_id).uniq
-      payment_source_class.where(id: source_ids).with_payment_profile
+      payment_source_class.where(id: source_ids).select(&:reusable?)
     end
+    alias_method :sources_by_order, :reusable_sources_by_order
+    deprecate sources_by_order: :reusable_sources_by_order, deprecator: Spree::Deprecation
 
     def reusable_sources(order)
       if order.completed?
-        sources_by_order(order)
+        reusable_sources_by_order(order)
       elsif order.user_id
-        credit_cards.where(user_id: order.user_id).with_payment_profile
+        order.user.wallet.wallet_payment_sources.map(&:payment_source).select(&:reusable?)
       else
         []
       end

data/app/models/spree/inventory_unit.rb

@@ -21,6 +21,7 @@ module Spree
 
     before_destroy :ensure_can_destroy
 
+    scope :pending, -> { where pending: true }
     scope :backordered, -> { where state: 'backordered' }
     scope :on_hand, -> { where state: 'on_hand' }
     scope :pre_shipment, -> { where(state: PRE_SHIPMENT_STATES) }
@@ -29,7 +30,7 @@ module Spree
     scope :returned, -> { where state: 'returned' }
     scope :canceled, -> { where(state: 'canceled') }
     scope :not_canceled, -> { where.not(state: 'canceled') }
-    scope :cancelable, -> { where(state: Spree::InventoryUnit::CANCELABLE_STATES) }
+    scope :cancelable, -> { where(state: Spree::InventoryUnit::CANCELABLE_STATES, pending: false) }
     scope :backordered_per_variant, ->(stock_item) do
       includes(:shipment, :order)
         .where("spree_shipments.state != 'canceled'").references(:shipment)
@@ -140,7 +141,7 @@ module Spree
         throw :abort
       end
 
-      unless shipment.pending?
+      if shipment.shipped? || shipment.canceled?
         errors.add(:base, :cannot_destroy_shipment_state, state: shipment.state)
         throw :abort
       end