solidus_core 2.11.7 → 3.0.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 2.11.7
+  version: 3.0.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2021-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -331,33 +331,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: paperclip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.2'
-- !ruby/object:Gem::Dependency
-  name: paranoia
+  name: kt-paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '6.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '6.3'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -415,7 +401,6 @@ files:
 - app/mailers/spree/order_mailer.rb
 - app/mailers/spree/promotion_code_batch_mailer.rb
 - app/mailers/spree/reimbursement_mailer.rb
-- app/mailers/spree/test_mailer.rb
 - app/models/concerns/spree/active_storage_adapter.rb
 - app/models/concerns/spree/active_storage_adapter/attachment.rb
 - app/models/concerns/spree/active_storage_adapter/normalization.rb
@@ -430,7 +415,6 @@ files:
 - app/models/concerns/spree/user_address_book.rb
 - app/models/concerns/spree/user_api_authentication.rb
 - app/models/concerns/spree/user_methods.rb
-- app/models/concerns/spree/user_payment_source.rb
 - app/models/concerns/spree/user_reporting.rb
 - app/models/spree/ability.rb
 - app/models/spree/address.rb
@@ -447,10 +431,7 @@ files:
 - app/models/spree/calculator/flat_percent_item_total.rb
 - app/models/spree/calculator/flat_rate.rb
 - app/models/spree/calculator/flexi_rate.rb
-- app/models/spree/calculator/free_shipping.rb
 - app/models/spree/calculator/percent_on_line_item.rb
-- app/models/spree/calculator/percent_per_item.rb
-- app/models/spree/calculator/price_sack.rb
 - app/models/spree/calculator/returns/default_refund_amount.rb
 - app/models/spree/calculator/shipping/flat_percent_item_total.rb
 - app/models/spree/calculator/shipping/flat_rate.rb
@@ -469,9 +450,6 @@ files:
 - app/models/spree/fulfilment_changer.rb
 - app/models/spree/gallery/product_gallery.rb
 - app/models/spree/gallery/variant_gallery.rb
-- app/models/spree/gateway.rb
-- app/models/spree/gateway/bogus.rb
-- app/models/spree/gateway/bogus_simple.rb
 - app/models/spree/image.rb
 - app/models/spree/image/active_storage_attachment.rb
 - app/models/spree/image/paperclip_attachment.rb
@@ -484,11 +462,9 @@ files:
 - app/models/spree/option_value.rb
 - app/models/spree/option_values_variant.rb
 - app/models/spree/order.rb
-- app/models/spree/order/checkout.rb
 - app/models/spree/order/number_generator.rb
 - app/models/spree/order/payments.rb
 - app/models/spree/order_cancellations.rb
-- app/models/spree/order_capturing.rb
 - app/models/spree/order_contents.rb
 - app/models/spree/order_inventory.rb
 - app/models/spree/order_merger.rb
@@ -542,7 +518,6 @@ files:
 - app/models/spree/promotion_code_batch.rb
 - app/models/spree/promotion_handler/cart.rb
 - app/models/spree/promotion_handler/coupon.rb
-- app/models/spree/promotion_handler/free_shipping.rb
 - app/models/spree/promotion_handler/page.rb
 - app/models/spree/promotion_handler/shipping.rb
 - app/models/spree/promotion_rule.rb
@@ -746,10 +721,9 @@ files:
 - lib/generators/spree/dummy/templates/rails/database.yml
 - lib/generators/spree/dummy/templates/rails/routes.rb
 - lib/generators/spree/dummy/templates/rails/script/rails
+- lib/generators/spree/dummy/templates/rails/storage.yml
 - lib/generators/spree/dummy/templates/rails/test.rb
-- lib/generators/spree/install/install_generator.rb
 - lib/solidus/migrations/promotions_with_code_handlers.rb
-- lib/solidus/migrations/rename_gateways.rb
 - lib/solidus_core.rb
 - lib/spree/app_configuration.rb
 - lib/spree/config.rb
@@ -765,7 +739,6 @@ 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/engine.rb
 - lib/spree/core/environment.rb
 - lib/spree/core/environment/calculators.rb
@@ -807,7 +780,6 @@ files:
 - lib/spree/migration_helpers.rb
 - lib/spree/migrations.rb
 - lib/spree/money.rb
-- lib/spree/paranoia_deprecations.rb
 - lib/spree/permission_sets.rb
 - lib/spree/permission_sets/base.rb
 - lib/spree/permission_sets/configuration_display.rb
@@ -829,17 +801,16 @@ files:
 - lib/spree/permission_sets/user_management.rb
 - lib/spree/permitted_attributes.rb
 - lib/spree/preferences/configuration.rb
+- lib/spree/preferences/persistable.rb
 - lib/spree/preferences/preferable.rb
 - lib/spree/preferences/preferable_class_methods.rb
 - lib/spree/preferences/scoped_store.rb
 - lib/spree/preferences/static_model_preferences.rb
 - lib/spree/preferences/statically_configurable.rb
 - lib/spree/preferences/store.rb
-- lib/spree/promo/environment.rb
 - lib/spree/testing_support.rb
 - lib/spree/testing_support/ability_helpers.rb
 - lib/spree/testing_support/authorization_helpers.rb
-- lib/spree/testing_support/bar_ability.rb
 - lib/spree/testing_support/blacklist_urls.rb
 - lib/spree/testing_support/caching.rb
 - lib/spree/testing_support/capybara_ext.rb
@@ -918,6 +889,7 @@ files:
 - lib/spree/testing_support/factories/zone_factory.rb
 - lib/spree/testing_support/factory_bot.rb
 - lib/spree/testing_support/fixtures/blank.jpg
+- lib/spree/testing_support/fixtures/file.txt
 - lib/spree/testing_support/flash.rb
 - lib/spree/testing_support/job_helpers.rb
 - lib/spree/testing_support/order_walkthrough.rb
@@ -931,15 +903,6 @@ files:
 - lib/spree/testing_support/url_helpers.rb
 - lib/spree/user_class_handle.rb
 - lib/spree_core.rb
-- lib/tasks/core.rake
-- lib/tasks/email.rake
-- lib/tasks/migrations/copy_order_bill_address_to_credit_card.rake
-- lib/tasks/migrations/migrate_address_names.rake
-- lib/tasks/migrations/migrate_default_billing_addresses_to_address_book.rake
-- lib/tasks/migrations/migrate_shipping_rate_taxes.rake
-- lib/tasks/migrations/migrate_user_addresses.rake
-- lib/tasks/migrations/rename_gateways.rake
-- lib/tasks/order_capturing.rake
 - lib/tasks/upgrade.rake
 - solidus_core.gemspec
 - vendor/assets/javascripts/jquery.payment.js
@@ -961,9 +924,7 @@ post_install_message: |
   If you are updating Solidus from an older version, please run
   the following commands to complete the update:
 
-  $ bin/rails railties:install:migrations
-  $ bin/rails db:migrate
-  $ bin/rails solidus:upgrade:two_point_eleven
+  $ bin/rails solidus:upgrade
 
   Please report any issues at:
   - https://github.com/solidusio/solidus/issues

data/app/mailers/spree/test_mailer.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  class TestMailer < BaseMailer
-    def test_email(email)
-      Spree::Deprecation.warn("Spree::TestMailer has been deprecated and will be removed with Solidus 3.0")
-
-      store = Spree::Store.default
-      subject = "#{store.name} #{t('.subject')}"
-      mail(to: email, from: from_address(store), subject: subject)
-    end
-  end
-end

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

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  module UserPaymentSource
-    extend ActiveSupport::Concern
-
-    def default_credit_card
-      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
-end

data/app/models/spree/calculator/free_shipping.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency 'spree/calculator'
-
-module Spree
-  # @deprecated This calculator will be removed in future versions of Spree.
-  #   The only case where it was used was for Free Shipping Promotions.  There is
-  #   now a Promotion Action which deals with these types of promotions instead.
-  class Calculator::FreeShipping < Calculator
-    def compute(object)
-      Spree::Deprecation.warn('This method is deprecated, because it is no longer used')
-      if object.is_a?(Array)
-        return if object.empty?
-        order = object.first.order
-      else
-        order = object
-      end
-
-      order.ship_total
-    end
-  end
-end

data/app/models/spree/calculator/percent_per_item.rb

@@ -1,51 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency 'spree/calculator'
-
-module Spree
-  # A calculator for promotions that calculates a percent-off discount
-  # for all matching products in an order. This should not be used as a
-  # shipping calculator since it would be the same thing as a flat percent
-  # off the entire order.
-  #
-  #
-  # TODO Should be deprecated now that we have adjustments at the line item level in spree core
-
-  class Calculator::PercentPerItem < Calculator
-    preference :percent, :decimal, default: 0
-
-    def compute(object = nil)
-      Spree::Deprecation.warn('This method is deprecated, please use adjustments at line item level')
-
-      return 0 if object.nil?
-      object.line_items.sum { |line_item|
-        value_for_line_item(line_item)
-      }
-    end
-
-    private
-
-    # Returns all products that match this calculator, but only if the calculator
-    # is attached to a promotion. If attached to a ShippingMethod, nil is returned.
-    # Copied from per_item.rb
-    def matching_products
-      if compute_on_promotion?
-        calculable.promotion.rules.flat_map do |rule|
-          rule.respond_to?(:products) ? rule.products : []
-        end
-      end
-    end
-
-    def value_for_line_item(line_item)
-      if compute_on_promotion?
-        return 0 unless matching_products.blank? || matching_products.include?(line_item.product)
-      end
-      ((line_item.price * line_item.quantity) * preferred_percent) / 100
-    end
-
-    # Determines wether or not the calculable object is a promotion
-    def compute_on_promotion?
-      @compute_on_promotion ||= calculable.respond_to?(:promotion)
-    end
-  end
-end

data/app/models/spree/calculator/price_sack.rb

@@ -1,28 +0,0 @@
-# frozen_string_literal: true
-
-require_dependency 'spree/calculator'
-
-module Spree
-  class Calculator::PriceSack < Calculator
-    preference :minimal_amount, :decimal, default: 0
-    preference :normal_amount, :decimal, default: 0
-    preference :discount_amount, :decimal, default: 0
-    preference :currency, :string, default: ->{ Spree::Config[:currency] }
-
-    # as object we always get line items, as calculable we have Coupon, ShippingMethod
-    def compute(object)
-      Spree::Deprecation.warn('This method is deprecated, please use adjustments at line item level')
-      if object.is_a?(Array)
-        base = object.sum { |element| element.respond_to?(:amount) ? element.amount : BigDecimal(element.to_s) }
-      else
-        base = object.respond_to?(:amount) ? object.amount : BigDecimal(object.to_s)
-      end
-
-      if base < preferred_minimal_amount
-        preferred_normal_amount
-      else
-        preferred_discount_amount
-      end
-    end
-  end
-end

data/app/models/spree/gateway.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  # @deprecated Use Spree::PaymentMethod::CreditCard or Spree::PaymentMethod instead
-  class Gateway < PaymentMethod::CreditCard
-    def initialize(*args)
-      Spree::Deprecation.warn \
-        "Using Spree::Gateway as parent class of payment methods is deprecated. " \
-        "Please use Spree::PaymentMethod::CreditCard for credit card based payment methods " \
-        "or Spree::PaymentMethod for non credit card payment methods instead."
-      super
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  # @deprecated Use Spree::PaymentMethod::BogusCreditCard instead
-  class Gateway::Bogus < PaymentMethod::BogusCreditCard
-    def initialize(*args)
-      Spree::Deprecation.warn \
-        'Spree::Gateway::Bogus is deprecated. ' \
-        'Please use Spree::PaymentMethod::BogusCreditCard instead'
-      super
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  # @deprecated Use Spree::PaymentMethod::SimpleBogusCreditCard instead
-  class Gateway::BogusSimple < Spree::PaymentMethod::SimpleBogusCreditCard
-    def initialize(*args)
-      Spree::Deprecation.warn \
-        'Spree::Gateway::BogusSimple is deprecated. ' \
-        'Please use Spree::PaymentMethod::SimpleBogusCreditCard instead'
-      super
-    end
-  end
-end

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

@@ -1,244 +0,0 @@
-# frozen_string_literal: true
-
-module Spree
-  class Order < Spree::Base
-    module Checkout
-      def self.included(klass)
-        klass.extend ClassMethods
-      end
-
-      module ClassMethods
-        attr_accessor :previous_states
-        attr_writer :next_event_transitions
-        attr_writer :checkout_steps
-        attr_writer :removed_transitions
-
-        def checkout_flow(&block)
-          if block_given?
-            @checkout_flow = block
-            define_state_machine!
-          else
-            @checkout_flow
-          end
-        end
-
-        def define_state_machine!
-          self.checkout_steps = {}
-          self.next_event_transitions = []
-          self.previous_states = [:cart]
-          self.removed_transitions = []
-
-          # Build the checkout flow using the checkout_flow defined either
-          # within the Order class, or a decorator for that class.
-          #
-          # This method may be called multiple times depending on if the
-          # checkout_flow is re-defined in a decorator or not.
-          instance_eval(&checkout_flow)
-
-          klass = self
-
-          # 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 do
-            klass.next_event_transitions.each { |state| transition(state.merge(on: :next)) }
-
-            # Persist the state on the order
-            after_transition do |order, transition|
-              order.state = order.state
-              order.state_changes.create(
-                previous_state: transition.from,
-                next_state:     transition.to,
-                name:           'order',
-                user_id:        order.user_id
-              )
-              order.save
-            end
-
-            event :cancel do
-              transition to: :canceled, if: :allow_cancel?
-            end
-
-            event :return do
-              transition to: :returned, from: [:returned, :complete, :awaiting_return, :canceled], if: :all_inventory_units_returned?
-            end
-
-            event :resume do
-              transition to: :resumed, from: :canceled, if: :canceled?
-            end
-
-            event :authorize_return do
-              transition to: :awaiting_return
-            end
-
-            event :complete do
-              transition to: :complete, from: :confirm
-            end
-
-            if states[:payment]
-              event :payment_failed do
-                transition to: :payment, from: :confirm
-              end
-
-              after_transition to: :complete, do: :add_payment_sources_to_wallet
-              before_transition to: :payment, do: :add_default_payment_from_wallet
-              before_transition to: :payment, do: :ensure_billing_address
-
-              before_transition to: :confirm, do: :add_store_credit_payments
-
-              # see also process_payments_before_complete below which needs to
-              # be added in the correct sequence.
-            end
-
-            before_transition from: :cart, do: :ensure_line_items_present
-
-            if states[:address]
-              before_transition to: :address, do: :assign_default_user_addresses
-              before_transition from: :address, do: :persist_user_address!
-            end
-
-            if states[:delivery]
-              before_transition to: :delivery, do: :ensure_shipping_address
-              before_transition to: :delivery, do: :create_proposed_shipments
-              before_transition to: :delivery, do: :ensure_available_shipping_rates
-              before_transition from: :delivery, do: :apply_shipping_promotions
-            end
-
-            before_transition to: :resumed, do: :ensure_line_item_variants_are_not_deleted
-            before_transition to: :resumed, do: :validate_line_item_availability
-
-            # Sequence of before_transition to: :complete
-            # calls matter so that we do not process payments
-            # until validations have passed
-            before_transition to: :complete, do: :validate_line_item_availability
-            before_transition to: :complete, do: :ensure_promotions_eligible
-            before_transition to: :complete, do: :ensure_line_item_variants_are_not_deleted
-            before_transition to: :complete, do: :ensure_inventory_units
-            if states[:payment]
-              before_transition to: :complete, do: :process_payments_before_complete
-            end
-
-            after_transition to: :complete, do: :finalize!
-            after_transition to: :resumed,  do: :after_resume
-            after_transition to: :canceled, do: :after_cancel
-
-            after_transition from: any - :cart, to: any - [:confirm, :complete] do |order|
-              order.recalculate
-            end
-
-            after_transition do |order, transition|
-              order.logger.debug "Order #{order.number} transitioned from #{transition.from} to #{transition.to} via #{transition.event}"
-            end
-
-            after_failure do |order, transition|
-              order.logger.debug "Order #{order.number} halted transition on event #{transition.event} state #{transition.from}: #{order.errors.full_messages.join}"
-            end
-          end
-        end
-
-        def go_to_state(name, options = {})
-          checkout_steps[name] = options
-          previous_states.each do |state|
-            add_transition({ from: state, to: name }.merge(options))
-          end
-          if options[:if]
-            previous_states << name
-          else
-            self.previous_states = [name]
-          end
-        end
-
-        def insert_checkout_step(name, options = {})
-          before = options.delete(:before)
-          after = options.delete(:after) unless before
-          after = checkout_steps.keys.last unless before || after
-
-          cloned_steps = checkout_steps.clone
-          cloned_removed_transitions = removed_transitions.clone
-          checkout_flow do
-            cloned_steps.each_pair do |key, value|
-              go_to_state(name, options) if key == before
-              go_to_state(key, value)
-              go_to_state(name, options) if key == after
-            end
-            cloned_removed_transitions.each do |transition|
-              remove_transition(transition)
-            end
-          end
-        end
-
-        def remove_checkout_step(name)
-          cloned_steps = checkout_steps.clone
-          cloned_removed_transitions = removed_transitions.clone
-          checkout_flow do
-            cloned_steps.each_pair do |key, value|
-              go_to_state(key, value) unless key == name
-            end
-            cloned_removed_transitions.each do |transition|
-              remove_transition(transition)
-            end
-          end
-        end
-
-        def remove_transition(options = {})
-          removed_transitions << options
-          next_event_transitions.delete(find_transition(options))
-        end
-
-        def find_transition(options = {})
-          return nil if options.nil? || !options.include?(:from) || !options.include?(:to)
-          next_event_transitions.detect do |transition|
-            transition[options[:from].to_sym] == options[:to].to_sym
-          end
-        end
-
-        def next_event_transitions
-          @next_event_transitions ||= []
-        end
-
-        def checkout_steps
-          @checkout_steps ||= {}
-        end
-
-        def checkout_step_names
-          checkout_steps.keys
-        end
-
-        def add_transition(options)
-          next_event_transitions << { options.delete(:from) => options.delete(:to) }.merge(options)
-        end
-
-        def removed_transitions
-          @removed_transitions ||= []
-        end
-      end
-
-      def checkout_steps
-        steps = self.class.checkout_steps.each_with_object([]) { |(step, options), checkout_steps|
-          next if options.include?(:if) && !options[:if].call(self)
-          checkout_steps << step
-        }.map(&:to_s)
-        # Ensure there is always a complete step
-        steps << "complete" unless steps.include?("complete")
-        steps
-      end
-
-      def has_checkout_step?(step)
-        step.present? && checkout_steps.include?(step)
-      end
-
-      def passed_checkout_step?(step)
-        has_checkout_step?(step) && checkout_step_index(step) < checkout_step_index(state)
-      end
-
-      def checkout_step_index(step)
-        checkout_steps.index(step).to_i
-      end
-
-      def can_go_to_state?(state)
-        return false unless has_checkout_step?(self.state) && has_checkout_step?(state)
-        checkout_step_index(state) > checkout_step_index(self.state)
-      end
-    end
-  end
-end