Merge pull request #1691 from jhawthorn/remove_expedited_exchanges

Extract expedited exchanges to an extension

backend/app/assets/javascripts/spree/backend.js

@@ -42,7 +42,6 @@
 //= require spree/backend/product_picker
 //= require spree/backend/progress
 //= require spree/backend/promotions
-//= require spree/backend/returns/expedited_exchanges_warning
 //= require spree/backend/returns/return_item_selection
 //= require spree/backend/routes
 //= require spree/backend/select_payments

backend/app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss

@@ -14,13 +14,3 @@
     max-width: 150px;
   }
 }
-.expedited-exchanges-warning {
-  display: none;
-  color: black;
-  padding: 15px;
-  margin: 10px 0;
-  font-weight: bold;
-  background-color: $color-6;
-  border-radius: 4px;
-  opacity: 0.6;
-}

backend/app/views/spree/admin/return_authorizations/_form.html.erb

@@ -87,7 +87,3 @@
     <%= f.error_message_on :memo %>
   <% end %>
 </div>
-
-<% if Spree::Config[:expedited_exchanges] %>
-  <div class="expedited-exchanges-warning"><%= Spree.t(:expedited_exchanges_warning, days_window: Spree::Config[:expedited_exchanges_days_window]) %></div>
-<% end %>

core/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
 

core/app/models/spree/app_configuration.rb

@@ -107,10 +107,6 @@ class AppConfiguration < Preferences::Configuration
     #   @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 @@ class AppConfiguration < Preferences::Configuration
     #      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+)

core/app/models/spree/order.rb

@@ -134,7 +134,6 @@ def states
 
     # shows completed orders first, by their completed_at date, then uncompleted orders by their created_at
     scope :reverse_chronological, -> { order('spree_orders.completed_at IS NULL', completed_at: :desc, created_at: :desc) }
-    scope :unreturned_exchange, -> { joins(:shipments).where('spree_orders.created_at > spree_shipments.created_at') }
 
     def self.by_customer(customer)
       joins(:user).where("#{Spree.user_class.table_name}.email" => customer)
@@ -507,8 +506,6 @@ def ensure_shipping_address
     end
 
     def create_proposed_shipments
-      return shipments if unreturned_exchange?
-
       if completed?
         raise CannotRebuildShipments.new(Spree.t(:cannot_rebuild_shipments_order_completed))
       elsif shipments.any? { |s| !s.pending? }
@@ -597,18 +594,6 @@ def token
       guest_token
     end
 
-    def unreturned_exchange?
-      # created_at - 1 is a hack to ensure that this doesn't blow up on MySQL,
-      # records loaded from the DB on MySQL will have a precision of 1 second,
-      # but records in memory may still have miliseconds on them, causing this
-      # to be true where it shouldn't be.
-      #
-      # FIXME: find a better way to determine if an order is an unreturned
-      # exchange
-      shipment = shipments.first
-      shipment.present? ? (shipment.created_at < created_at - 1) : false
-    end
-
     def tax_total
       additional_tax_total + included_tax_total
     end

core/app/models/spree/return_authorization.rb

@@ -13,20 +13,13 @@ class ReturnAuthorization < Spree::Base
 
     before_create :generate_number
 
-    after_save :generate_expedited_exchange_reimbursements
-
     accepts_nested_attributes_for :return_items, allow_destroy: true
 
     validates :order, presence: true
     validates :stock_location, presence: true
     validate :must_have_shipped_units, on: :create
     validate :no_previously_exchanged_inventory_units, on: :create
 
-    # These are called prior to generating expedited exchanges shipments.
-    # Should respond to a "call" method that takes the list of return items
-    class_attribute :pre_expedited_exchange_hooks
-    self.pre_expedited_exchange_hooks = []
-
     state_machine initial: :authorized do
       before_transition to: :canceled, do: :cancel_return_items
 
@@ -88,26 +81,5 @@ def no_previously_exchanged_inventory_units
     def cancel_return_items
       return_items.each { |item| item.cancel! if item.can_cancel? }
     end
-
-    def generate_expedited_exchange_reimbursements
-      return unless Spree::Config[:expedited_exchanges]
-
-      items_to_exchange = return_items.select(&:exchange_required?)
-      items_to_exchange.each(&:attempt_accept)
-      items_to_exchange.select!(&:accepted?)
-
-      return if items_to_exchange.blank?
-
-      pre_expedited_exchange_hooks.each { |h| h.call items_to_exchange }
-
-      reimbursement = Spree::Reimbursement.new(return_items: items_to_exchange, order: order)
-
-      if reimbursement.save
-        reimbursement.perform!
-      else
-        errors.add(:base, reimbursement.errors.full_messages)
-        raise ActiveRecord::RecordInvalid.new(self)
-      end
-    end
   end
 end

core/app/views/spree/reimbursement_mailer/reimbursement_email.html.erb

@@ -31,13 +31,6 @@
               </td>
             </tr>
           <% end %>
-          <% if @reimbursement.return_items.awaiting_return.present? && Spree::Config[:expedited_exchanges] %>
-            <tr>
-              <td colspan="3">
-                <%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %>
-              </td>
-            </tr>
-          <% end %>
         </table>
       <% end %>
     </td>

core/app/views/spree/reimbursement_mailer/reimbursement_email.text.erb

@@ -14,9 +14,4 @@
 <% @reimbursement.return_items.exchange_requested.each do |return_item| %>
 <%= return_item.variant.sku %> <%= raw(return_item.variant.name) %> <%= "(#{raw(return_item.variant.options_text)})" if return_item.variant.options_text.present? %> -> <%= return_item.exchange_variant.sku %> <%= raw(return_item.exchange_variant.name) %> <%= "(#{raw(return_item.exchange_variant.options_text)})" if return_item.exchange_variant.options_text.present? %>
 <% end %>
-
-
-<% if @reimbursement.return_items.awaiting_return.present? && Spree::Config[:expedited_exchanges] %>
-<%= Spree.t('reimbursement_mailer.reimbursement_email.days_to_send', days: Spree::Config[:expedited_exchanges_days_window]) %>
-<% end %>
 <% end %>

core/config/locales/en.yml

@@ -1170,7 +1170,6 @@ en:
     exceptions:
       count_on_hand_setter: Cannot set count_on_hand manually, as it is set automatically by the recalculate_count_on_hand callback. Please use `update_column(:count_on_hand, value)` instead.
     exchange_for: Exchange for
-    expedited_exchanges_warning: "Any specified exchanges will ship to the customer immediately upon saving. The customer will be charged the full amount of the item if they do not return the original item within %{days_window} days."
     excl: excl.
     expected: Expected
     expected_items: Expected Items

core/lib/spree/core.rb

@@ -80,7 +80,6 @@ class DestroyWithOrdersError < StandardError; end
 require 'spree/core/controller_helpers/search'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
-require 'spree/core/unreturned_item_charger'
 require 'spree/core/role_configuration'
 require 'spree/core/stock_configuration'
 require 'spree/permission_sets'

core/lib/spree/core/engine.rb

@@ -4,10 +4,6 @@ class Engine < ::Rails::Engine
       isolate_namespace Spree
       engine_name 'spree'
 
-      rake_tasks do
-        load File.join(root, "lib", "tasks", "exchanges.rake")
-      end
-
       config.generators do |g|
         g.test_framework :rspec
       end