spree_core 3.7.14.1 → 4.0.0.beta

data/app/models/spree/adjustment.rb

@@ -48,16 +48,6 @@ module Spree
 
     self.competing_promos_source_types = ['Spree::PromotionAction']
 
-    scope :open, -> {
-      ActiveSupport::Deprecation.warn 'Adjustment.open is deprecated. Please use Adjustment.not_finalized instead', caller
-      not_finalized
-    }
-
-    scope :closed, -> {
-      ActiveSupport::Deprecation.warn 'Adjustment.closed is deprecated. Please use Adjustment.finalized instead', caller
-      finalized
-    }
-
     scope :not_finalized, -> { where(state: 'open') }
     scope :finalized, -> { where(state: 'closed') }
     scope :tax, -> { where(source_type: 'Spree::TaxRate') }

data/app/models/spree/app_dependencies.rb

@@ -17,14 +17,14 @@ module Spree
     attr_accessor *INJECTION_POINTS
 
     def initialize
-      set_default_abitily
+      set_default_ability
       set_default_services
       set_default_finders
     end
 
     private
 
-    def set_default_abitily
+    def set_default_ability
       @ability_class = 'Spree::Ability'
     end
 

data/app/models/spree/asset.rb

@@ -1,17 +1,6 @@
 module Spree
-  if Rails.application.config.use_paperclip
-    ActiveSupport::Deprecation.warn(<<-EOS, caller)
-     Paperclip support is deprecated, and will be removed in Spree 4.0.
-     Please migrate to ActiveStorage, to avoid problems after update
-     https://github.com/thoughtbot/paperclip/blob/master/MIGRATING.md
-    EOS
-    Paperclip.interpolates :viewable_id do |attachment, _style|
-      attachment.instance.viewable_id
-    end
-  end
-
   class Asset < Spree::Base
-    include Support::ActiveStorage unless Rails.application.config.use_paperclip
+    include Support::ActiveStorage
 
     belongs_to :viewable, polymorphic: true, touch: true
     acts_as_list scope: [:viewable_id, :viewable_type]

data/app/models/spree/country.rb

@@ -4,8 +4,8 @@ module Spree
     # https://github.com/rails/rails/issues/3458
     before_destroy :ensure_not_default
 
-    has_many :states, dependent: :destroy
     has_many :addresses, dependent: :restrict_with_error
+    has_many :states, dependent: :destroy
     has_many :zone_members,
              -> { where(zoneable_type: 'Spree::Country') },
              class_name: 'Spree::ZoneMember',
@@ -14,7 +14,7 @@ module Spree
 
     has_many :zones, through: :zone_members, class_name: 'Spree::Zone'
 
-    validates :name, :iso_name, presence: true, uniqueness: { case_sensitive: false }
+    validates :name, :iso_name, :iso, :iso3, presence: true, uniqueness: { case_sensitive: false }
 
     def self.default
       country_id = Spree::Config[:default_country_id]

data/app/models/spree/credit_card.rb

@@ -24,9 +24,10 @@ module Spree
     attribute :month, ActiveRecord::Type::Integer.new
     attribute :year,  ActiveRecord::Type::Integer.new
 
-    attr_reader :number, :verification_value
+    attr_reader :number
     attr_accessor :encrypted_data,
                   :imported,
+                  :verification_value,
                   :manual_entry
 
     with_options if: :require_card_numbers?, on: :create do
@@ -100,11 +101,9 @@ module Spree
                        end
     end
 
-    def verification_value=(value)
-      @verification_value = value.to_s.gsub(/\s/, '')
-    end
-
     def set_last_digits
+      number.to_s.gsub!(/\s/, '')
+      verification_value.to_s.gsub!(/\s/, '')
       self.last_digits ||= number.to_s.length <= 4 ? number : number.to_s.slice(-4..-1)
     end
 

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

@@ -22,7 +22,7 @@ module Spree
 
       # simulate the storage of credit card profile using remote service
       if success = VALID_CCS.include?(payment.source.number)
-        payment.source.update_attributes(gateway_customer_profile_id: generate_profile_id(success))
+        payment.source.update(gateway_customer_profile_id: generate_profile_id(success))
       end
     end
 

data/app/models/spree/image.rb

@@ -1,7 +1,14 @@
 module Spree
   class Image < Asset
-    include Rails.application.config.use_paperclip ? Configuration::Paperclip : Configuration::ActiveStorage
+    include Configuration::ActiveStorage
     include Rails.application.routes.url_helpers
+  
+    # 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
+    # Invalid single-table inheritance type: Spree::Image is not a subclass of Spree::Image.
+    # The line below prevents the error.
+    self.inheritance_column = nil
 
     def styles
       self.class.styles.map do |_, size|

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

@@ -29,14 +29,12 @@ module Spree
 
           def check_attachment_presence
             unless attachment.attached?
-              attachment.purge
               errors.add(:attachment, :attachment_must_be_present)
             end
           end
 
           def check_attachment_content_type
             if attachment.attached? && !attachment.content_type.in?(accepted_image_types)
-              attachment.purge
               errors.add(:attachment, :not_allowed_content_type)
             end
           end

data/app/models/spree/order.rb

@@ -1,4 +1,7 @@
 require_dependency 'spree/order/checkout'
+require_dependency 'spree/order/currency_updater'
+require_dependency 'spree/order/payments'
+require_dependency 'spree/order/store_credit'
 
 module Spree
   class Order < Spree::Base
@@ -9,6 +12,7 @@ module Spree
     include Spree::Order::CurrencyUpdater
     include Spree::Order::Payments
     include Spree::Order::StoreCredit
+    include Spree::Order::AddressBook
     include Spree::Core::NumberGenerator.new(prefix: 'R')
     include Spree::Core::TokenGenerator
 
@@ -22,30 +26,6 @@ module Spree
     alias display_ship_total display_shipment_total
     alias_attribute :ship_total, :shipment_total
 
-    def guest_token
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-        Order#guest_token is deprecated and will be removed in Spree 4.0. Please use Order#token instead
-      DEPRECATION
-
-      token
-    end
-
-    def guest_token?
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-        Order#guest_token? is deprecated and will be removed in Spree 4.0. Please use Order#token? instead
-      DEPRECATION
-
-      token?
-    end
-
-    def guest_token=(value)
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-        Order#guest_token= is deprecated and will be removed in Spree 4.0. Please use Order#token= instead
-      DEPRECATION
-
-      self.token = value
-    end
-
     MONEY_THRESHOLD  = 100_000_000
     MONEY_VALIDATION = {
       presence: true,
@@ -93,11 +73,11 @@ module Spree
     end
 
     belongs_to :bill_address, foreign_key: :bill_address_id, class_name: 'Spree::Address',
-                              optional: true
+                              optional: true, dependent: :destroy
     alias_attribute :billing_address, :bill_address
 
     belongs_to :ship_address, foreign_key: :ship_address_id, class_name: 'Spree::Address',
-                              optional: true
+                              optional: true, dependent: :destroy
     alias_attribute :shipping_address, :ship_address
 
     belongs_to :store, class_name: 'Spree::Store'
@@ -186,17 +166,6 @@ module Spree
       update_hooks.add(hook)
     end
 
-    # Use this method in other gems that wish to register their own custom logic
-    # that should be called when determining if two line items are equal.
-    def self.register_line_item_comparison_hook(hook)
-      ActiveSupport::Deprecation.warn(<<-EOS, caller)
-        Order.register_line_item_comparison_hook is deprecated and will be removed in Spree 4.0. Please use
-        `Rails.application.config.spree.line_item_comparison_hooks << hook` instead.
-      EOS
-
-      Rails.application.config.spree.line_item_comparison_hooks << hook
-    end
-
     # For compatiblity with Calculator::PriceSack
     def amount
       line_items.inject(0.0) { |sum, li| sum + li.amount }
@@ -265,15 +234,6 @@ module Spree
       @merger ||= Spree::OrderMerger.new(self)
     end
 
-    def clone_billing_address
-      if bill_address && ship_address.nil?
-        self.ship_address = bill_address.clone
-      else
-        ship_address.attributes = bill_address.attributes.except('id', 'updated_at', 'created_at')
-      end
-      true
-    end
-
     def ensure_store_presence
       self.store ||= Spree::Store.default
     end
@@ -288,10 +248,6 @@ module Spree
       inventory_units.all?(&:returned?)
     end
 
-    def contents
-      @contents ||= Spree::OrderContents.new(self)
-    end
-
     # Associates the specified user with the order.
     def associate_user!(user, override_email = true)
       self.user           = user
@@ -315,29 +271,10 @@ module Spree
     def find_line_item_by_variant(variant, options = {})
       line_items.detect do |line_item|
         line_item.variant_id == variant.id &&
-          line_item_options_match(line_item, options)
+          Spree::Dependencies.cart_compare_line_items_service.constantize.new.call(order: self, line_item: line_item, options: options).value
       end
     end
 
-    # This method enables extensions to participate in the
-    # "Are these line items equal" decision.
-    #
-    # When adding to cart, an extension would send something like:
-    # params[:product_customizations]={...}
-    #
-    # and would provide:
-    #
-    # def product_customizations_match
-    def line_item_options_match(line_item, options)
-      ActiveSupport::Deprecation.warn(<<-EOS, caller)
-        Order#add is deprecated and will be removed in Spree 4.0. Please use
-        Spree::CompareLineItems service instead.
-      EOS
-      return true unless options
-
-      Spree::Dependencies.cart_compare_line_items_service.constantize.new.call(order: self, line_item: line_item, options: options).value
-    end
-
     # Creates new tax charges if there are any applicable rates. If prices already
     # include taxes then price adjustments are created instead.
     def create_tax_charge!
@@ -540,9 +477,15 @@ module Spree
     def apply_free_shipping_promotions
       Spree::PromotionHandler::FreeShipping.new(self).activate
       shipments.each { |shipment| Spree::Adjustable::AdjustmentsUpdater.update(shipment) }
+      create_shipment_tax_charge!
       update_with_updater!
     end
 
+    # Applies user promotions when login after filling the cart
+    def apply_unassigned_promotions
+      ::Spree::PromotionHandler::Cart.new(self).activate
+    end
+
     # Clean shipments and make order back to address state
     #
     # At some point the might need to force the order to transition from address
@@ -728,14 +671,6 @@ module Spree
       self.currency ||= store.default_currency || Spree::Config[:currency]
     end
 
-    def set_currency
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
-         Spree::Order#set_currency was renamed to Spree::Order#ensure_currency_presence
-         and will be removed in Spree 4.0. Please update your code to avoid problems after update
-      DEPRECATION
-      ensure_currency_presence
-    end
-
     def create_token
       self.token ||= generate_token
     end

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

@@ -0,0 +1,86 @@
+# https://github.com/spree-contrib/spree_address_book/blob/master/app/models/spree/order_decorator.rb
+module Spree
+  class Order < Spree::Base
+    module AddressBook
+      extend ActiveSupport::Concern
+
+      def clone_shipping_address
+        if ship_address
+          self.bill_address = ship_address
+        end
+        true
+      end
+
+      def clone_billing_address
+        if bill_address
+          self.ship_address = bill_address
+        end
+        true
+      end
+
+      def bill_address_id=(id)
+        address = Spree::Address.find_by(id: id)
+        if address && address.user_id == user_id
+          self['bill_address_id'] = address.id
+          user.update_attribute(:bill_address_id, address.id)
+          bill_address.reload
+        else
+          self['bill_address_id'] = nil
+        end
+      end
+
+      def bill_address_attributes=(attributes)
+        self.bill_address = update_or_create_address(attributes)
+        user.bill_address = bill_address if user
+      end
+
+      def ship_address_id=(id)
+        address = Spree::Address.find_by(id: id)
+        if address && address.user_id == user_id
+          self['ship_address_id'] = address.id
+          user.update_attribute(:ship_address_id, address.id)
+          ship_address.reload
+        else
+          self['ship_address_id'] = nil
+        end
+      end
+
+      def ship_address_attributes=(attributes)
+        self.ship_address = update_or_create_address(attributes)
+        user.ship_address = ship_address if user
+      end
+
+      private
+
+      def update_or_create_address(attributes = {})
+        return if attributes.blank?
+
+        attributes = attributes.select { |_k, v| v.present? }
+
+        if user
+          address = user.addresses.build(attributes.except(:id)).check
+          return address if address.id
+        end
+
+        if attributes[:id]
+          address = Spree::Address.find(attributes[:id])
+          attributes.delete(:id)
+
+          if address&.editable?
+            address.update_attributes(attributes)
+            return address
+          else
+            attributes.delete(:id)
+          end
+        end
+
+        unless attributes[:id]
+          address = Spree::Address.new(attributes)
+          address.save
+        end
+
+        address
+      end
+    end
+  end
+end

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

@@ -94,7 +94,6 @@ module Spree
                 before_transition from: :address, do: :update_line_item_prices!
                 before_transition from: :address, do: :create_tax_charge!
                 before_transition to: :address, do: :assign_default_addresses!
-                before_transition from: :address, do: :persist_user_address!
               end
 
               if states[:delivery]
@@ -103,6 +102,7 @@ module Spree
                 before_transition to: :delivery, do: :set_shipments_cost
                 before_transition to: :delivery, do: :create_shipment_tax_charge!
                 before_transition from: :delivery, do: :apply_free_shipping_promotions
+                before_transition to: :delivery, do: :apply_unassigned_promotions
               end
 
               before_transition to: :resumed, do: :ensure_line_item_variants_are_not_discontinued
@@ -246,7 +246,7 @@ module Spree
                 attributes[:payments_attributes].first[:request_env] = request_env
               end
 
-              success = update_attributes(attributes)
+              success = update(attributes)
               set_shipments_cost if shipments.any?
             end
 
@@ -256,31 +256,13 @@ module Spree
 
           def assign_default_addresses!
             if user
-              clone_billing
+              self.bill_address = user.bill_address if !bill_address_id && user.bill_address&.valid?
               # Skip setting ship address if order doesn't have a delivery checkout step
               # to avoid triggering validations on shipping address
-              clone_shipping if checkout_steps.include?('delivery')
+              self.ship_address = user.ship_address if !ship_address_id && user.ship_address&.valid? && checkout_steps.include?('delivery')
             end
           end
 
-          def clone_billing
-            return unless !bill_address_id && user.bill_address.try(:valid?)
-
-            self.bill_address = user.bill_address.try(:clone)
-          end
-
-          def clone_shipping
-            return unless !ship_address_id && user.ship_address.try(:valid?)
-
-            self.ship_address = user.ship_address.try(:clone)
-          end
-
-          def persist_user_address!
-            return unless !temporary_address && user && user.respond_to?(:persist_order_address) && bill_address_id
-
-            user.persist_order_address(self)
-          end
-
           def persist_user_credit_card
             return unless !temporary_credit_card && user_id && valid_credit_cards.present?