spree_core 4.8.3 → 4.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee4d4cee87ddfaa3a840606e85a256ec3751fd79f509e481fc08557c908f0a5
-  data.tar.gz: ef15433c0b5ac981d367bf1ee209d5ff126f9930e986bc824b74a554cb56e171
+  metadata.gz: ef1a05dcfe29482a9f538a00cbf53f30fb26b25cc789e6935b1c502fa7d670ba
+  data.tar.gz: 0b685feeca4b4de334ef20c454edf4b83476d7275dca33617780b03df659023e
 SHA512:
-  metadata.gz: 563286ea01a9de90ed7d4fa10398715511835028bf0ec274a69ea482841793bab3cb7441778b574e2a4add3c128b38b1bb65c31a0e1b1e669361244fbf756b11
-  data.tar.gz: a0fa015209ed89a6c2d69cef0bc17e01d2eb7002b869b0fccff2aab8b0ede4f443a6933d15d0832589b5eeae91b2b80364f625af36b6d3a0e50a641c5a85b1f6
+  metadata.gz: d18e35dc1286e0053e044ae360e0b626ccab034e356a8ca6396303a8c90c18041c22ee94fdfdcb7e08ed8856f56416a81efed9e864088b351a68684d972b95c0
+  data.tar.gz: e9338463f6da5a8b40353001e24285c0cf5b0fea045a66ff536531022c7ea1ab82c9507ce456652e5afcee6d8a8166d577645b083f79371a95d3d0c30be7eeca

data/LICENSE.md

@@ -0,0 +1,57 @@
+# License
+
+Copyright © 2024-present, Vendo Connect Inc.
+
+Copyright © 2015-2024, Spark Solutions Sp. z o.o.
+
+Copyright © 2007-2015, Spree Commerce Inc.
+
+Spree Commerce is a free, open-source eCommerce framework giving you full control and customizability.
+
+For **Spree Commerce versions 4.10** and later in the [spree/spree](https://github.com/spree/spree) repository two licenses apply simultaneously and users are required to comply with the terms of these two licenses at the same time:
+
+* [AGPL-3.0](https://opensource.org/license/agpl-v3) - for all contributions from version 4.10 onwards
+
+* [BSD-3-Clause](https://opensource.org/license/bsd-3-clause) - for all other contributions predating version 4.10
+Effectively, for versions 4.10 and upwards **AGPL-3.0** license applies.
+
+**Spree Commerce versions 4.9** and earlier in the [spree/spree](https://github.com/spree/spree) repository are available under the **BSD-3-Clause** license and users are required to comply with its terms.
+
+If you’d like to use Spree Commerce without the AGPL-3.0 restrictions e.g. for a **SaaS** business, please talk to us about obtaining a [Commercial License](#commercial-license).
+
+All third party components incorporated into this software are licensed under the original license provided by the owner of the applicable component.
+
+Please refer to our [Licensing FAQ](https://spreecommerce.org/why-spree-is-changing-its-open-source-license-to-agpl-3-0-and-introducing-a-commercial-license/) in case of questions.
+
+## AGPL-3.0 License - Spree 4.10 upwards
+
+If you decide to accept the AGPL-3.0 license by using Spree Commerce version 4.10 or later, you must comply with the following terms:
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see [https://www.gnu.org/licenses/](https://www.gnu.org/licenses/).
+
+## BSD 3-Clause License
+
+If you decide to accept the BSD-3-Clause license by using Spree Commerce, you must comply with the following terms:
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of Spree Commerce Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,     THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR                CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,              PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF         LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+## Commercial License
+
+Should you decide to use Spree Commerce version 4.10 or later for commercial redistribution (eg. SaaS) - also known as Commercial Distribution - you must do so in accordance with the terms and conditions contained in a separate written agreement between you and [Vendo Connect Inc.](https://www.getvendo.com/).
+
+For more information about the Commercial License (CL) please contact [sales@getvendo.com](mailto:sales@getvendo.com).
+
+Please refer to our [Licensing FAQ](https://spreecommerce.org/why-spree-is-changing-its-open-source-license-to-agpl-3-0-and-introducing-a-commercial-license/) in case of questions.

data/app/finders/spree/line_items/find_by_variant.rb

@@ -2,11 +2,13 @@ module Spree
   module LineItems
     class FindByVariant
       def execute(order:, variant:, options: {})
-        order.line_items.detect do |line_item|
-          next unless line_item.variant_id == variant.id
+        line_item = order.line_items.loaded? ? order.line_items.detect { |li| li.variant_id == variant.id } : order.line_items.find_by(variant_id: variant.id)
 
+        if line_item
           Spree::Dependencies.cart_compare_line_items_service.constantize.call(order: order, line_item: line_item, options: options).value
         end
+
+        line_item
       end
     end
   end

data/app/finders/spree/orders/find_complete.rb

@@ -1,6 +1,8 @@
 module Spree
   module Orders
     class FindComplete
+      include Spree::Orders::FinderHelper
+
       attr_reader :user, :number, :token, :store
 
       def initialize(user: nil, number: nil, token: nil, store: nil)
@@ -22,7 +24,7 @@ module Spree
       private
 
       def scope
-        user? ? user.orders.complete.includes(scope_includes) : Spree::Order.complete.includes(scope_includes)
+        user? ? user.orders.complete.includes(order_includes) : Spree::Order.complete.includes(order_includes)
       end
 
       def user?
@@ -64,18 +66,6 @@ module Spree
 
         orders.where(store: store)
       end
-
-      def scope_includes
-        {
-          line_items: [
-            variant: [
-              :images,
-              option_values: :option_type,
-              product: :product_properties,
-            ]
-          ]
-        }
-      end
     end
   end
 end

data/app/finders/spree/orders/find_current.rb

@@ -1,6 +1,8 @@
 module Spree
   module Orders
     class FindCurrent
+      include Spree::Orders::FinderHelper
+
       def execute(user:, store:, **params)
         params = params.merge(store_id: store.id)
 
@@ -15,7 +17,7 @@ module Spree
       private
 
       def incomplete_orders
-        Spree::Order.incomplete.not_canceled
+        Spree::Order.incomplete.not_canceled.includes(order_includes)
       end
     end
   end

data/app/finders/spree/orders/finder_helper.rb

@@ -0,0 +1,17 @@
+module Spree
+  module Orders
+    module FinderHelper
+      def order_includes
+        {
+          line_items: [
+            variant: [
+              :product,
+              :images,
+              { option_values: :option_type }
+            ]
+          ]
+        }
+      end
+    end
+  end
+end

data/app/finders/spree/products/find.rb

@@ -263,7 +263,7 @@ module Spree
       def taxon_ids(taxons_ids)
         return if taxons_ids.nil? || taxons_ids.to_s.blank?
 
-        taxons = store.taxons.where(id: taxons_ids.to_s.split(','))
+        taxons = Spree::Taxon.for_store(store).where(id: taxons_ids.to_s.split(','))
         taxons.map(&:cached_self_and_descendants_ids).flatten.compact.uniq.map(&:to_s)
       end
 

data/app/finders/spree/variants/find.rb

@@ -0,0 +1,30 @@
+module Spree
+  module Variants
+    class Find
+      def initialize(scope:, params:)
+        @scope = scope
+        @options = params.dig(:filter, :options).try(:to_unsafe_hash)
+      end
+
+      def execute
+        variants = by_options(scope)
+        variants.distinct
+      end
+
+      private
+
+      attr_reader :scope, :options
+
+      def options?
+        options.present?
+      end
+
+      def by_options(variants)
+        return variants unless options?
+
+        variants_ids = options.map { |key, value| variants.with_option_value(key, value)&.ids }.compact.uniq
+        variants.where(id: variants_ids.reduce(&:intersection))
+      end
+    end
+  end
+end

data/app/models/spree/address.rb

@@ -46,7 +46,9 @@ module Spree
     before_validation :clear_invalid_state_entities, if: -> { country.present? }, on: :update
 
     with_options presence: true do
-      validates :firstname, :lastname, :address1, :city, :country
+      validates :firstname, :lastname, if: :require_name?
+      validates :address1, if: :require_street?
+      validates :city, :country
       validates :zipcode, if: :require_zipcode?
       validates :phone, if: :require_phone?
     end
@@ -137,12 +139,20 @@ module Spree
       country ? country.zipcode_required? : true
     end
 
+    def require_name?
+      true
+    end
+
+    def require_street?
+      true
+    end
+
     def editable?
       new_record? || (shipments.empty? && !Order.complete.where('bill_address_id = ? OR ship_address_id = ?', id, id).exists?)
     end
 
     def can_be_deleted?
-      shipments.empty? && !Order.where('bill_address_id = ? OR ship_address_id = ?', id, id).exists?
+      shipments.empty? && !Order.complete.where('bill_address_id = ? OR ship_address_id = ?', id, id).exists?
     end
 
     def check

data/app/models/spree/adjustment.rb

@@ -64,6 +64,7 @@ module Spree
     scope :charge, -> { where("#{quoted_table_name}.amount >= 0") }
     scope :credit, -> { where("#{quoted_table_name}.amount < 0") }
     scope :nonzero, -> { where("#{quoted_table_name}.amount != 0") }
+    scope :non_zero, -> { where.not(amount: [nil, 0]) }
     scope :promotion, -> { where(source_type: 'Spree::PromotionAction') }
     scope :return_authorization, -> { where(source_type: 'Spree::ReturnAuthorization') }
     scope :is_included, -> { where(included: true) }
@@ -87,6 +88,10 @@ module Spree
       source_type == 'Spree::PromotionAction'
     end
 
+    def tax?
+      source_type == 'Spree::TaxRate'
+    end
+
     # Passing a target here would always be recommended as it would avoid
     # hitting the database again and would ensure you're compute values over
     # the specific object amount passed here.

data/app/models/spree/asset.rb

@@ -8,5 +8,13 @@ module Spree
 
     belongs_to :viewable, polymorphic: true, touch: true
     acts_as_list scope: [:viewable_id, :viewable_type]
+
+    if Spree.public_storage_service_name
+      has_one_attached :attachment, service: Spree.public_storage_service_name
+    else
+      has_one_attached :attachment
+    end
+
+    default_scope { includes(attachment_attachment: :blob) }
   end
 end

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

@@ -4,12 +4,15 @@ module Spree
   class Calculator::FlatRate < Calculator
     preference :amount, :decimal, default: 0
     preference :currency, :string, default: -> { Spree::Store.default.default_currency }
+    preference :apply_only_on_full_priced_items, :boolean, default: false
 
     def self.description
       Spree.t(:flat_rate_per_order)
     end
 
     def compute(object = nil)
+      return 0 if preferred_apply_only_on_full_priced_items && object&.variant&.compare_at_amount_in(object.currency).present?
+
       if object && preferred_currency.casecmp(object.currency.upcase).zero?
         preferred_amount
       else

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

@@ -6,6 +6,7 @@ module Spree
     preference :additional_item, :decimal, default: 0.0
     preference :max_items,       :integer, default: 0
     preference :currency,        :string,  default: -> { Spree::Store.default.default_currency }
+    preference :apply_only_on_full_priced_items, :boolean, default: false
 
     def self.description
       Spree.t(:flexible_rate)
@@ -16,6 +17,8 @@ module Spree
     end
 
     def compute(object)
+      return 0 if preferred_apply_only_on_full_priced_items && object.variant.compare_at_amount_in(object.currency).present?
+
       compute_from_quantity(object.quantity)
     end
 

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

@@ -2,12 +2,15 @@ module Spree
   class Calculator
     class PercentOnLineItem < Calculator
       preference :percent, :decimal, default: 0
+      preference :apply_only_on_full_priced_items, :boolean, default: false
 
       def self.description
         Spree.t(:percent_per_item)
       end
 
       def compute(object)
+        return 0 if preferred_apply_only_on_full_priced_items && object.variant.compare_at_amount_in(object.currency).present?
+
         computed_amount = (object.amount * preferred_percent / 100).round(2)
 
         # We don't want to cause the promotion adjustments to push the order into a negative total.

data/app/models/spree/calculator/shipping/flat_rate.rb

@@ -6,11 +6,23 @@ module Spree
       preference :amount, :decimal, default: 0
       preference :currency, :string, default: -> { Spree::Store.default.default_currency }
 
+      preference :minimum_item_total, :decimal, default: nil, nullable: true
+      preference :maximum_item_total, :decimal, default: nil, nullable: true
+
+      preference :minimum_weight, :decimal, default: nil, nullable: true
+      preference :maximum_weight, :decimal, default: nil, nullable: true
+
       def self.description
         Spree.t(:shipping_flat_rate_per_order)
       end
 
-      def compute_package(_package)
+      def compute_package(package)
+        return nil if preferred_minimum_weight.present? && preferred_minimum_weight >= package.weight
+        return nil if preferred_maximum_weight.present? && preferred_maximum_weight < package.weight
+
+        return nil if preferred_minimum_item_total.present? && preferred_minimum_item_total >= package.item_total
+        return nil if preferred_maximum_item_total.present? && preferred_maximum_item_total < package.item_total
+
         preferred_amount
       end
     end

data/app/models/spree/cms_section_image.rb

@@ -1,11 +1,5 @@
 module Spree
   class CmsSectionImage < Asset
-    if Spree.public_storage_service_name
-      has_one_attached :attachment, service: Spree.public_storage_service_name
-    else
-      has_one_attached :attachment
-    end
-
     IMAGE_COUNT = ['one', 'two', 'three']
     IMAGE_TYPES = ['image/png', 'image/jpg', 'image/jpeg', 'image/gif'].freeze
     IMAGE_SIZE = ['sm', 'md', 'lg', 'xl']

data/app/models/spree/customer_return.rb

@@ -45,6 +45,7 @@ module Spree
     # Temporarily tie a customer_return to one order
     def order
       return nil if return_items.blank?
+      return nil if return_items.first.inventory_unit.blank?
 
       return_items.first.inventory_unit.order
     end

data/app/models/spree/fulfilment_changer.rb

@@ -109,6 +109,7 @@ module Spree
       end
 
       desired_shipment.refresh_rates
+      desired_shipment.update_amounts
 
       desired_shipment.order.reload
       desired_shipment.order.update_with_updater!

data/app/models/spree/icon.rb

@@ -1,11 +1,5 @@
 module Spree
   class Icon < Spree::Asset
-    if Spree.public_storage_service_name
-      has_one_attached :attachment, service: Spree.public_storage_service_name
-    else
-      has_one_attached :attachment
-    end
-
     ICON_TYPES = %i[png jpg jpeg gif svg]
 
     validates :attachment, attached: true, content_type: ICON_TYPES

data/app/models/spree/image/configuration/active_storage.rb

@@ -5,16 +5,8 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          if Spree.public_storage_service_name
-            has_one_attached :attachment, service: Spree.public_storage_service_name
-          else
-            has_one_attached :attachment
-          end
-
           validates :attachment, attached: true, content_type: /\Aimage\/.*\z/
 
-          default_scope { includes(attachment_attachment: :blob) }
-
           def self.styles
             @styles ||= {
               mini: '48x48>',

data/app/models/spree/image.rb

@@ -4,6 +4,8 @@ module Spree
     include Rails.application.routes.url_helpers
     include Spree::ImageMethods
 
+    after_commit :touch_product_variants, if: :should_touch_product_variants?, on: :update
+
     # In Rails 5.x class constants are being undefined/redefined during the code reloading process
     # in a rails development environment, after which the actual ruby objects stored in those class constants
     # are no longer equal (subclass == self) what causes error ActiveRecord::SubclassNotFound
@@ -51,5 +53,20 @@ module Spree
     def plp_url
       generate_url(size: self.class.styles[:plp_and_carousel])
     end
+
+    private
+
+    def touch_product_variants
+      viewable.product.variants.touch_all
+    end
+
+    def should_touch_product_variants?
+      return false unless viewable.is_a?(Spree::Variant)
+      return false unless viewable.is_master?
+      return false unless viewable.product.has_variants?
+      return false unless saved_change_to_position?
+
+      true
+    end
   end
 end

data/app/models/spree/line_item.rb

@@ -5,6 +5,8 @@ module Spree
       include Spree::Webhooks::HasWebhooks
     end
 
+    attribute :quantity, :integer, default: 1
+
     before_validation :ensure_valid_quantity
 
     with_options inverse_of: :line_items do
@@ -13,7 +15,7 @@ module Spree
     end
     belongs_to :tax_category, -> { with_deleted }, class_name: 'Spree::TaxCategory'
 
-    has_one :product, through: :variant
+    has_one :product, -> { with_deleted }, class_name: 'Spree::Product', through: :variant
 
     has_many :adjustments, as: :adjustable, dependent: :destroy
     has_many :inventory_units, inverse_of: :line_item
@@ -27,7 +29,7 @@ module Spree
     # numericality: :less_than_or_equal_to validation is due to the restriction at the database level
     #   https://github.com/spree/spree/issues/2695#issuecomment-143314161
     validates :quantity, numericality: {
-      less_than_or_equal_to: DatabaseTypeUtilities.maximum_value_for(:integer),
+      in: 0..DatabaseTypeUtilities.maximum_value_for(:integer),
       only_integer: true, message: Spree.t('validation.must_be_int')
     }
 
@@ -70,11 +72,7 @@ module Spree
     def update_price
       currency_price = variant.price_in(order.currency)
 
-      self.price = if currency_price.amount.present?
-                     currency_price.price_including_vat_for(tax_zone: tax_zone)
-                   else
-                     0
-                   end
+      self.price = currency_price.price_including_vat_for(tax_zone: tax_zone) if currency_price.present?
     end
 
     def copy_tax_category
@@ -99,6 +97,13 @@ module Spree
       amount + taxable_adjustment_total
     end
 
+    # returns the total tax amount
+    #
+    # @return [BigDecimal]
+    def tax_total
+      included_tax_total + additional_tax_total
+    end
+
     alias discounted_money display_discounted_amount
     alias discounted_amount taxable_amount
 
@@ -117,6 +122,20 @@ module Spree
       !sufficient_stock?
     end
 
+    # returns true if any of the inventory units are shipped
+    #
+    # @return [Boolean]
+    def any_shipped?
+      inventory_units.any?(&:shipped?)
+    end
+
+    # returns true if all of the inventory units are shipped
+    #
+    # @return [Boolean]
+    def fully_shipped?
+      inventory_units.all?(&:shipped?)
+    end
+
     def options=(options = {})
       return unless options.present?
 

data/app/models/spree/option_value_variant.rb

@@ -5,5 +5,9 @@ module Spree
 
     validates :option_value, :variant, presence: true
     validates :option_value_id, uniqueness: { scope: :variant_id }
+
+    scope :for_option_types, lambda { |option_types|
+      joins(:option_value).merge(Spree::OptionValue.where(option_types: option_types))
+    }
   end
 end

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

@@ -26,10 +26,10 @@ module Spree
       def update_line_item_price!(line_item)
         price = price_from_line_item(line_item)
 
-        if price
+        if price&.currency && price.amount
           line_item.update!(currency: price.currency, price: price.amount)
         else
-          raise "no #{currency} price found for #{line_item.product.name} (#{line_item.variant.sku})"
+          line_item.destroy
         end
       end
     end

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

@@ -0,0 +1,19 @@
+module Spree
+  class Order < Spree::Base
+    module Webhooks
+      extend ActiveSupport::Concern
+
+      def send_order_canceled_webhook
+        # Implement your logic of sending cancale webhooks
+      end
+
+      def send_order_placed_webhook
+        # Implement your logic of sending order placed webhooks
+      end
+
+      def send_order_resumed_webhook
+        # Implement your logic of sending after resume webhooks
+      end
+    end
+  end
+end

data/app/models/spree/order.rb

@@ -17,6 +17,7 @@ module Spree
     include Spree::Order::StoreCredit
     include Spree::Order::AddressBook
     include Spree::Order::Emails
+    include Spree::Order::Webhooks
     include Spree::Core::NumberGenerator.new(prefix: 'R')
     include Spree::Core::TokenGenerator
 
@@ -25,9 +26,6 @@ module Spree
     include Spree::SingleStoreResource
     include Spree::MemoizedData
     include Spree::Metadata
-    if defined?(Spree::Webhooks::HasWebhooks)
-      include Spree::Webhooks::HasWebhooks
-    end
     if defined?(Spree::Security::Orders)
       include Spree::Security::Orders
     end
@@ -91,9 +89,9 @@ module Spree
       belongs_to :user, optional: true
     end
     if Spree.admin_user_class
-      belongs_to :created_by, class_name: Spree.admin_user_class.to_s, optional: true
-      belongs_to :approver, class_name: Spree.admin_user_class.to_s, optional: true
-      belongs_to :canceler, class_name: Spree.admin_user_class.to_s, optional: true
+      belongs_to :created_by, class_name: "::#{Spree.admin_user_class}", optional: true
+      belongs_to :approver, class_name: "::#{Spree.admin_user_class}", optional: true
+      belongs_to :canceler, class_name: "::#{Spree.admin_user_class}", optional: true
     else
       belongs_to :created_by, optional: true
       belongs_to :approver, optional: true
@@ -401,6 +399,8 @@ module Spree
       deliver_order_confirmation_email unless confirmation_delivered?
       deliver_store_owner_order_notification_email if deliver_store_owner_order_notification_email?
 
+      send_order_placed_webhook
+
       consider_risk
     end
 
@@ -522,6 +522,14 @@ module Spree
       self.shipments = Spree::Stock::Coordinator.new(self).shipments
     end
 
+    # Returns the total weight of the inventory units in the order
+    # This is used to calculate the shipping rates for the order
+    #
+    # @return [BigDecimal] the total weight of the inventory units in the order
+    def total_weight
+      @total_weight ||= line_items.joins(:variant).includes(:variant).map { |li| li.variant.weight * li.quantity }.sum
+    end
+
     def apply_free_shipping_promotions
       Spree::PromotionHandler::FreeShipping.new(self).activate
       shipments.each { |shipment| Spree::Adjustable::AdjustmentsUpdater.update(shipment) }
@@ -566,6 +574,7 @@ module Spree
     def set_shipments_cost
       shipments.each(&:update_amounts)
       updater.update_shipment_total
+      updater.update_adjustment_total
       persist_totals
     end
 
@@ -726,11 +735,13 @@ module Spree
 
       send_cancel_email
       update_with_updater!
+      send_order_canceled_webhook
     end
 
     def after_resume
       shipments.each(&:resume!)
       consider_risk
+      send_order_resumed_webhook
     end
 
     def use_billing?

data/app/models/spree/order_merger.rb

@@ -16,6 +16,7 @@ module Spree
       end
 
       set_user(user)
+      clear_addresses(other_order)
       persist_merge
 
       # So that the destroy doesn't take out line items which may have been re-assigned
@@ -39,6 +40,11 @@ module Spree
       order.associate_user!(user) if !order.user && !user.blank?
     end
 
+    def clear_addresses(other_order)
+      other_order.ship_address = nil
+      other_order.bill_address = nil
+    end
+
     # The idea is the end developer can choose to override the merge
     # to their own choosing. Default is merge with errors.
     def handle_merge(current_line_item, other_order_line_item)

data/app/models/spree/payment/gateway_options.rb

@@ -5,6 +5,10 @@ module Spree
         @payment = payment
       end
 
+      def statement_descriptor_suffix
+        order.number
+      end
+
       def email
         order.email
       end