solidus_core 2.9.6 → 2.10.0.beta1

data/app/models/spree/reimbursement.rb

@@ -4,8 +4,8 @@ module Spree
   class Reimbursement < Spree::Base
     class IncompleteReimbursementError < StandardError; end
 
-    belongs_to :order, inverse_of: :reimbursements
-    belongs_to :customer_return, inverse_of: :reimbursements, touch: true
+    belongs_to :order, inverse_of: :reimbursements, optional: true
+    belongs_to :customer_return, inverse_of: :reimbursements, touch: true, optional: true
 
     has_many :refunds, inverse_of: :reimbursement
     has_many :credits, inverse_of: :reimbursement, class_name: 'Spree::Reimbursement::Credit'

data/app/models/spree/reimbursement_tax_calculator.rb

@@ -25,7 +25,7 @@ module Spree
         additional_tax_total = percent_of_tax * return_item.inventory_unit.additional_tax_total
         included_tax_total   = percent_of_tax * return_item.inventory_unit.included_tax_total
 
-        return_item.update_attributes!({
+        return_item.update!({
           additional_tax_total: additional_tax_total,
           included_tax_total:   included_tax_total
         })

data/app/models/spree/return_authorization.rb

@@ -4,14 +4,14 @@ module Spree
   # Models the return of Inventory Units to a Stock Location for an Order.
   #
   class ReturnAuthorization < Spree::Base
-    belongs_to :order, class_name: 'Spree::Order', inverse_of: :return_authorizations
+    belongs_to :order, class_name: 'Spree::Order', inverse_of: :return_authorizations, optional: true
 
     has_many :return_items, inverse_of: :return_authorization, dependent: :destroy
     has_many :inventory_units, through: :return_items, dependent: :nullify
     has_many :customer_returns, through: :return_items
 
-    belongs_to :stock_location
-    belongs_to :reason, class_name: 'Spree::ReturnReason', foreign_key: :return_reason_id
+    belongs_to :stock_location, optional: true
+    belongs_to :reason, class_name: 'Spree::ReturnReason', foreign_key: :return_reason_id, optional: true
 
     before_create :generate_number
 

data/app/models/spree/return_item.rb

@@ -29,15 +29,15 @@ module Spree
     class_attribute :refund_amount_calculator
     self.refund_amount_calculator = Calculator::Returns::DefaultRefundAmount
 
-    belongs_to :return_authorization, inverse_of: :return_items
-    belongs_to :inventory_unit, inverse_of: :return_items
-    belongs_to :exchange_variant, class_name: 'Spree::Variant'
-    belongs_to :exchange_inventory_unit, class_name: 'Spree::InventoryUnit', inverse_of: :original_return_item
-    belongs_to :customer_return, inverse_of: :return_items
-    belongs_to :reimbursement, inverse_of: :return_items
-    belongs_to :preferred_reimbursement_type, class_name: 'Spree::ReimbursementType'
-    belongs_to :override_reimbursement_type, class_name: 'Spree::ReimbursementType'
-    belongs_to :return_reason, class_name: 'Spree::ReturnReason', foreign_key: :return_reason_id
+    belongs_to :return_authorization, inverse_of: :return_items, optional: true
+    belongs_to :inventory_unit, inverse_of: :return_items, optional: true
+    belongs_to :exchange_variant, class_name: 'Spree::Variant', optional: true
+    belongs_to :exchange_inventory_unit, class_name: 'Spree::InventoryUnit', inverse_of: :original_return_item, optional: true
+    belongs_to :customer_return, inverse_of: :return_items, optional: true
+    belongs_to :reimbursement, inverse_of: :return_items, optional: true
+    belongs_to :preferred_reimbursement_type, class_name: 'Spree::ReimbursementType', optional: true
+    belongs_to :override_reimbursement_type, class_name: 'Spree::ReimbursementType', optional: true
+    belongs_to :return_reason, class_name: 'Spree::ReturnReason', foreign_key: :return_reason_id, optional: true
 
     validate :eligible_exchange_variant
     validate :belongs_to_same_customer_order
@@ -226,7 +226,7 @@ module Spree
     private
 
     def persist_acceptance_status_errors
-      update_attributes(acceptance_status_errors: validator.errors)
+      update(acceptance_status_errors: validator.errors)
     end
 
     def currency

data/app/models/spree/role_user.rb

@@ -3,8 +3,8 @@
 module Spree
   class RoleUser < Spree::Base
     self.table_name = "spree_roles_users"
-    belongs_to :role, class_name: "Spree::Role"
-    belongs_to :user, class_name: Spree::UserClassHandle.new
+    belongs_to :role, class_name: "Spree::Role", optional: true
+    belongs_to :user, class_name: Spree::UserClassHandle.new, optional: true
 
     after_create :auto_generate_spree_api_key
 

data/app/models/spree/shipment.rb

@@ -4,8 +4,8 @@ module Spree
   # An order's planned shipments including tracking and cost.
   #
   class Shipment < Spree::Base
-    belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :shipments
-    belongs_to :stock_location, class_name: 'Spree::StockLocation'
+    belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :shipments, optional: true
+    belongs_to :stock_location, class_name: 'Spree::StockLocation', optional: true
 
     has_many :adjustments, as: :adjustable, inverse_of: :adjustable, dependent: :delete_all
     has_many :inventory_units, dependent: :destroy, inverse_of: :shipment
@@ -326,7 +326,7 @@ module Spree
 
     # Update Shipment and make sure Order states follow the shipment changes
     def update_attributes_and_order(params = {})
-      if update_attributes params
+      if update(params)
         if params.key? :selected_shipping_rate_id
           # Changing the selected Shipping Rate won't update the cost (for now)
           # so we persist the Shipment#cost before running `order.recalculate`

data/app/models/spree/shipping_manifest.rb

@@ -21,9 +21,9 @@ class Spree::ShippingManifest
         states = {}
         units.group_by(&:state).each { |state, iu| states[state] = iu.count }
 
-        line_item = units.first.line_item
-        variant = units.first.variant
-        ManifestItem.new(line_item, variant, units.length, states)
+        first_unit = units.first
+
+        ManifestItem.new(first_unit.line_item, first_unit.variant, units.length, states)
       end
     end.flatten
   end

data/app/models/spree/shipping_method.rb

@@ -28,7 +28,7 @@ module Spree
     has_many :shipping_method_zones, dependent: :destroy
     has_many :zones, through: :shipping_method_zones
 
-    belongs_to :tax_category, -> { with_deleted }, class_name: 'Spree::TaxCategory'
+    belongs_to :tax_category, -> { with_deleted }, class_name: 'Spree::TaxCategory', optional: true
     has_many :shipping_method_stock_locations, dependent: :destroy, class_name: "Spree::ShippingMethodStockLocation"
     has_many :stock_locations, through: :shipping_method_stock_locations
 

data/app/models/spree/shipping_method_category.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class ShippingMethodCategory < Spree::Base
-    belongs_to :shipping_method, class_name: 'Spree::ShippingMethod'
-    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :shipping_method_categories
+    belongs_to :shipping_method, class_name: 'Spree::ShippingMethod', optional: true
+    belongs_to :shipping_category, class_name: 'Spree::ShippingCategory', inverse_of: :shipping_method_categories, optional: true
   end
 end

data/app/models/spree/shipping_method_stock_location.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 class Spree::ShippingMethodStockLocation < Spree::Base
-  belongs_to :shipping_method
-  belongs_to :stock_location
+  belongs_to :shipping_method, optional: true
+  belongs_to :stock_location, optional: true
 end

data/app/models/spree/shipping_method_zone.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class ShippingMethodZone < Spree::Base
-    belongs_to :zone
-    belongs_to :shipping_method
+    belongs_to :zone, optional: true
+    belongs_to :shipping_method, optional: true
   end
 end

data/app/models/spree/shipping_rate.rb

@@ -5,8 +5,8 @@ module Spree
   # method has been selected to deliver the shipment.
   #
   class ShippingRate < Spree::Base
-    belongs_to :shipment, class_name: 'Spree::Shipment', touch: true
-    belongs_to :shipping_method, -> { with_deleted }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates
+    belongs_to :shipment, class_name: 'Spree::Shipment', touch: true, optional: true
+    belongs_to :shipping_method, -> { with_deleted }, class_name: 'Spree::ShippingMethod', inverse_of: :shipping_rates, optional: true
 
     has_many :taxes,
              class_name: "Spree::ShippingRateTax",

data/app/models/spree/shipping_rate_tax.rb

@@ -7,8 +7,8 @@ module Spree
   # @since 1.3.0
   # @see Spree::Tax::ShippingRateTaxer
   class ShippingRateTax < ActiveRecord::Base
-    belongs_to :shipping_rate, class_name: "Spree::ShippingRate"
-    belongs_to :tax_rate, class_name: "Spree::TaxRate"
+    belongs_to :shipping_rate, class_name: "Spree::ShippingRate", optional: true
+    belongs_to :tax_rate, class_name: "Spree::TaxRate", optional: true
 
     extend DisplayMoney
     money_methods :absolute_amount

data/app/models/spree/state.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class State < Spree::Base
-    belongs_to :country, class_name: 'Spree::Country'
+    belongs_to :country, class_name: 'Spree::Country', optional: true
     has_many :addresses, dependent: :nullify
 
     validates :country, :name, presence: true

data/app/models/spree/state_change.rb

@@ -2,8 +2,8 @@
 
 module Spree
   class StateChange < Spree::Base
-    belongs_to :user
-    belongs_to :stateful, polymorphic: true
+    belongs_to :user, optional: true
+    belongs_to :stateful, polymorphic: true, optional: true
     before_create :assign_user
 
     def <=>(other)

data/app/models/spree/stock_item.rb

@@ -10,8 +10,8 @@ module Spree
     include Discard::Model
     self.discard_column = :deleted_at
 
-    belongs_to :stock_location, class_name: 'Spree::StockLocation', inverse_of: :stock_items
-    belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant', inverse_of: :stock_items
+    belongs_to :stock_location, class_name: 'Spree::StockLocation', inverse_of: :stock_items, optional: true
+    belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant', inverse_of: :stock_items, optional: true
     has_many :stock_movements, inverse_of: :stock_item
 
     validates :stock_location, :variant, presence: true

data/app/models/spree/stock_location.rb

@@ -16,8 +16,8 @@ module Spree
     has_many :user_stock_locations, dependent: :delete_all
     has_many :users, through: :user_stock_locations
 
-    belongs_to :state, class_name: 'Spree::State'
-    belongs_to :country, class_name: 'Spree::Country'
+    belongs_to :state, class_name: 'Spree::State', optional: true
+    belongs_to :country, class_name: 'Spree::Country', optional: true
 
     has_many :shipping_method_stock_locations, dependent: :destroy
     has_many :shipping_methods, through: :shipping_method_stock_locations

data/app/models/spree/stock_movement.rb

@@ -2,8 +2,8 @@
 
 module Spree
   class StockMovement < Spree::Base
-    belongs_to :stock_item, class_name: 'Spree::StockItem', inverse_of: :stock_movements
-    belongs_to :originator, polymorphic: true
+    belongs_to :stock_item, class_name: 'Spree::StockItem', inverse_of: :stock_movements, optional: true
+    belongs_to :originator, polymorphic: true, optional: true
 
     after_create :update_stock_item_quantity
 

data/app/models/spree/store_credit.rb

@@ -18,10 +18,10 @@ class Spree::StoreCredit < Spree::PaymentSource
   ADJUSTMENT_ACTION = 'adjustment'
   INVALIDATE_ACTION = 'invalidate'
 
-  belongs_to :user, class_name: Spree::UserClassHandle.new
-  belongs_to :created_by, class_name: Spree::UserClassHandle.new
-  belongs_to :category, class_name: "Spree::StoreCreditCategory"
-  belongs_to :credit_type, class_name: 'Spree::StoreCreditType', foreign_key: 'type_id'
+  belongs_to :user, class_name: Spree::UserClassHandle.new, optional: true
+  belongs_to :created_by, class_name: Spree::UserClassHandle.new, optional: true
+  belongs_to :category, class_name: "Spree::StoreCreditCategory", optional: true
+  belongs_to :credit_type, class_name: 'Spree::StoreCreditType', foreign_key: 'type_id', optional: true
   has_many :store_credit_events
 
   validates_presence_of :user_id, :category_id, :type_id, :created_by_id, :currency
@@ -63,7 +63,7 @@ class Spree::StoreCredit < Spree::PaymentSource
     end
 
     if validate_authorization(amount, order_currency)
-      update_attributes!({
+      update!({
         action: AUTHORIZE_ACTION,
         action_amount: amount,
         action_originator: options[:action_originator],
@@ -95,7 +95,7 @@ class Spree::StoreCredit < Spree::PaymentSource
         errors.add(:base, I18n.t('spree.store_credit.currency_mismatch'))
         false
       else
-        update_attributes!({
+        update!({
           action: CAPTURE_ACTION,
           action_amount: amount,
           action_originator: options[:action_originator],
@@ -114,7 +114,7 @@ class Spree::StoreCredit < Spree::PaymentSource
 
   def void(authorization_code, options = {})
     if auth_event = store_credit_events.find_by(action: AUTHORIZE_ACTION, authorization_code: authorization_code)
-      update_attributes!({
+      update!({
         action: VOID_ACTION,
         action_amount: auth_event.amount,
         action_authorization_code: authorization_code,
@@ -235,7 +235,7 @@ class Spree::StoreCredit < Spree::PaymentSource
       store_credit_events.where(action: ALLOCATION_ACTION).first_or_initialize
     end
 
-    event.update_attributes!({
+    event.update!({
       amount: action_amount || amount,
       authorization_code: action_authorization_code || event.authorization_code || generate_authorization_code,
       amount_remaining: amount_remaining,

data/app/models/spree/store_credit_event.rb

@@ -10,9 +10,9 @@ module Spree
     include Discard::Model
     self.discard_column = :deleted_at
 
-    belongs_to :store_credit
-    belongs_to :originator, polymorphic: true
-    belongs_to :store_credit_reason, class_name: 'Spree::StoreCreditReason', inverse_of: :store_credit_events
+    belongs_to :store_credit, optional: true
+    belongs_to :originator, polymorphic: true, optional: true
+    belongs_to :store_credit_reason, class_name: 'Spree::StoreCreditReason', inverse_of: :store_credit_events, optional: true
 
     validates_presence_of :store_credit_reason, if: :action_requires_reason?
 

data/app/models/spree/store_payment_method.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class StorePaymentMethod < Spree::Base
-    belongs_to :store, inverse_of: :store_payment_methods
-    belongs_to :payment_method, inverse_of: :store_payment_methods
+    belongs_to :store, inverse_of: :store_payment_methods, optional: true
+    belongs_to :payment_method, inverse_of: :store_payment_methods, optional: true
   end
 end

data/app/models/spree/store_shipping_method.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class StoreShippingMethod < Spree::Base
-    belongs_to :store, inverse_of: :store_shipping_methods
-    belongs_to :shipping_method, inverse_of: :store_shipping_methods
+    belongs_to :store, inverse_of: :store_shipping_methods, optional: true
+    belongs_to :shipping_method, inverse_of: :store_shipping_methods, optional: true
   end
 end

data/app/models/spree/tax_rate.rb

@@ -17,7 +17,7 @@ module Spree
     include Spree::CalculatedAdjustments
     include Spree::AdjustmentSource
 
-    belongs_to :zone, class_name: "Spree::Zone", inverse_of: :tax_rates
+    belongs_to :zone, class_name: "Spree::Zone", inverse_of: :tax_rates, optional: true
 
     has_many :tax_rate_tax_categories,
       class_name: 'Spree::TaxRateTaxCategory',

data/app/models/spree/tax_rate_tax_category.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class TaxRateTaxCategory < Spree::Base
-    belongs_to :tax_rate, class_name: 'Spree::TaxRate', inverse_of: :tax_rate_tax_categories
-    belongs_to :tax_category, class_name: 'Spree::TaxCategory', inverse_of: :tax_rate_tax_categories
+    belongs_to :tax_rate, class_name: 'Spree::TaxRate', inverse_of: :tax_rate_tax_categories, optional: true
+    belongs_to :tax_category, class_name: 'Spree::TaxCategory', inverse_of: :tax_rate_tax_categories, optional: true
   end
 end

data/app/models/spree/unit_cancel.rb

@@ -7,7 +7,7 @@ class Spree::UnitCancel < Spree::Base
   SHORT_SHIP = 'Short Ship'
   DEFAULT_REASON = 'Cancel'
 
-  belongs_to :inventory_unit
+  belongs_to :inventory_unit, optional: true
   has_one :adjustment, as: :source, dependent: :destroy
 
   validates :inventory_unit, presence: true
@@ -41,7 +41,10 @@ class Spree::UnitCancel < Spree::Base
   private
 
   def weighted_line_item_amount(line_item)
-    line_item.total_before_tax / quantity_of_line_item(line_item)
+    quantity_of_line_item = quantity_of_line_item(line_item)
+    raise ZeroDivisionError, "Line Item does not have any inventory units available to cancel" if quantity_of_line_item.zero?
+
+    line_item.total_before_tax / quantity_of_line_item
   end
 
   def quantity_of_line_item(line_item)

data/app/models/spree/user_address.rb

@@ -2,8 +2,8 @@
 
 module Spree
   class UserAddress < Spree::Base
-    belongs_to :user, class_name: UserClassHandle.new, foreign_key: "user_id"
-    belongs_to :address, class_name: "Spree::Address"
+    belongs_to :user, class_name: UserClassHandle.new, foreign_key: "user_id", optional: true
+    belongs_to :address, class_name: "Spree::Address", optional: true
 
     validates_uniqueness_of :address_id, scope: :user_id
     validates_uniqueness_of :user_id, conditions: -> { active.default }, message: :default_address_exists, if: :default?

data/app/models/spree/user_stock_location.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class UserStockLocation < Spree::Base
-    belongs_to :user, class_name: Spree::UserClassHandle.new, inverse_of: :user_stock_locations
-    belongs_to :stock_location, class_name: "Spree::StockLocation", inverse_of: :user_stock_locations
+    belongs_to :user, class_name: Spree::UserClassHandle.new, inverse_of: :user_stock_locations, optional: true
+    belongs_to :stock_location, class_name: "Spree::StockLocation", inverse_of: :user_stock_locations, optional: true
   end
 end

data/app/models/spree/variant/scopes.rb

@@ -2,41 +2,49 @@
 
 module Spree
   class Variant < Spree::Base
-    # FIXME: WARNING tested only under sqlite and postgresql
-    scope :descend_by_popularity, -> {
-      order(Arel.sql("COALESCE((SELECT COUNT(*) FROM  #{Spree::LineItem.quoted_table_name} GROUP BY #{Spree::LineItem.quoted_table_name}.variant_id HAVING #{Spree::LineItem.quoted_table_name}.variant_id = #{Spree::Variant.quoted_table_name}.id), 0) DESC"))
-    }
-
-    class << self
-      # Returns variants that match a given option value
-      #
-      # Example:
-      #
-      # product.variants_including_master.has_option(OptionType.find_by(name: 'shoe-size'), OptionValue.find_by(name: '8'))
-      def has_option(option_type, *option_values)
-        option_types = Spree::OptionType.table_name
-
-        option_type_conditions = case option_type
-                                 when OptionType then { "#{option_types}.name" => option_type.name }
-                                 when String     then { "#{option_types}.name" => option_type }
-        else { "#{option_types}.id" => option_type }
-        end
+    module Scopes
+      def self.prepended(base)
+        base.class_eval do
+          # FIXME: WARNING tested only under sqlite and postgresql
+          scope :descend_by_popularity, -> {
+            order(Arel.sql("COALESCE((SELECT COUNT(*) FROM  #{Spree::LineItem.quoted_table_name} GROUP BY #{Spree::LineItem.quoted_table_name}.variant_id HAVING #{Spree::LineItem.quoted_table_name}.variant_id = #{Spree::Variant.quoted_table_name}.id), 0) DESC"))
+          }
+
+          class << self
+            # Returns variants that match a given option value
+            #
+            # Example:
+            #
+            # product.variants_including_master.has_option(OptionType.find_by(name: 'shoe-size'), OptionValue.find_by(name: '8'))
+            def has_option(option_type, *option_values)
+              option_types = Spree::OptionType.table_name
+
+              option_type_conditions = case option_type
+                                       when OptionType then { "#{option_types}.name" => option_type.name }
+                                       when String     then { "#{option_types}.name" => option_type }
+                                       else { "#{option_types}.id" => option_type }
+                                       end
 
-        relation = joins(option_values: :option_type).where(option_type_conditions)
+              relation = joins(option_values: :option_type).where(option_type_conditions)
 
-        option_values.each do |option_value|
-          option_value_conditions = case option_value
-                                    when OptionValue then { "#{Spree::OptionValue.table_name}.name" => option_value.name }
-                                    when String      then { "#{Spree::OptionValue.table_name}.name" => option_value }
-          else { "#{Spree::OptionValue.table_name}.id" => option_value }
+              option_values.each do |option_value|
+                option_value_conditions = case option_value
+                                          when OptionValue then { "#{Spree::OptionValue.table_name}.name" => option_value.name }
+                                          when String      then { "#{Spree::OptionValue.table_name}.name" => option_value }
+                                          else { "#{Spree::OptionValue.table_name}.id" => option_value }
+                                          end
+                relation = relation.where(option_value_conditions)
+              end
+
+              relation
+            end
+
+            alias_method :has_options, :has_option
           end
-          relation = relation.where(option_value_conditions)
         end
-
-        relation
       end
 
-      alias_method :has_options, :has_option
+      ::Spree::Variant.prepend self
     end
   end
 end

data/app/models/spree/variant.rb

@@ -37,7 +37,7 @@ module Spree
     include Spree::DefaultPrice
 
     belongs_to :product, -> { with_deleted }, touch: true, class_name: 'Spree::Product', inverse_of: :variants, optional: false
-    belongs_to :tax_category, class_name: 'Spree::TaxCategory'
+    belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
 
     delegate :name, :description, :slug, :available_on, :shipping_category_id,
              :meta_description, :meta_keywords, :shipping_category,

data/app/models/spree/variant_property_rule.rb

@@ -13,7 +13,7 @@
 # targeted by the rule, the properties will automatically apply to the variant.
 module Spree
   class VariantPropertyRule < Spree::Base
-    belongs_to :product, touch: true
+    belongs_to :product, touch: true, optional: true
 
     has_many :values, class_name: 'Spree::VariantPropertyRuleValue', dependent: :destroy
     has_many :properties, through: :values

data/app/models/spree/variant_property_rule_condition.rb

@@ -2,8 +2,8 @@
 
 module Spree
   class VariantPropertyRuleCondition < Spree::Base
-    belongs_to :option_value
-    belongs_to :variant_property_rule, touch: true
+    belongs_to :option_value, optional: true
+    belongs_to :variant_property_rule, touch: true, optional: true
 
     validates_uniqueness_of :option_value_id, scope: :variant_property_rule_id
   end

data/app/models/spree/variant_property_rule_value.rb

@@ -6,7 +6,7 @@ module Spree
 
     acts_as_list scope: :variant_property_rule
 
-    belongs_to :property
-    belongs_to :variant_property_rule, touch: true
+    belongs_to :property, optional: true
+    belongs_to :variant_property_rule, touch: true, optional: true
   end
 end

data/app/models/spree/wallet_payment_source.rb

@@ -2,8 +2,8 @@
 
 module Spree
   class WalletPaymentSource < Spree::Base
-    belongs_to :user, class_name: Spree::UserClassHandle.new, foreign_key: 'user_id', inverse_of: :wallet_payment_sources
-    belongs_to :payment_source, polymorphic: true, inverse_of: :wallet_payment_sources
+    belongs_to :user, class_name: Spree::UserClassHandle.new, foreign_key: 'user_id', inverse_of: :wallet_payment_sources, optional: true
+    belongs_to :payment_source, polymorphic: true, inverse_of: :wallet_payment_sources, optional: true
 
     validates_presence_of :user
     validates_presence_of :payment_source

data/app/models/spree/zone_member.rb

@@ -2,8 +2,8 @@
 
 module Spree
   class ZoneMember < Spree::Base
-    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true, inverse_of: :zone_members
-    belongs_to :zoneable, polymorphic: true
+    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true, inverse_of: :zone_members, optional: true
+    belongs_to :zoneable, polymorphic: true, optional: true
 
     delegate :name, to: :zoneable, allow_nil: true
   end

data/config/initializers/inflections.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  inflect.acronym 'RMA'
+end