spree_core 4.8.3 → 4.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee4d4cee87ddfaa3a840606e85a256ec3751fd79f509e481fc08557c908f0a5
-  data.tar.gz: ef15433c0b5ac981d367bf1ee209d5ff126f9930e986bc824b74a554cb56e171
+  metadata.gz: 3966d98b01b3e3ac7e23384c37933bfd0cd961d05a112b6b538e3973bf62e0df
+  data.tar.gz: d1305f1376e401557ae786799c862ab927c4aa26986cb444bdd8db4230d92cd8
 SHA512:
-  metadata.gz: 563286ea01a9de90ed7d4fa10398715511835028bf0ec274a69ea482841793bab3cb7441778b574e2a4add3c128b38b1bb65c31a0e1b1e669361244fbf756b11
-  data.tar.gz: a0fa015209ed89a6c2d69cef0bc17e01d2eb7002b869b0fccff2aab8b0ede4f443a6933d15d0832589b5eeae91b2b80364f625af36b6d3a0e50a641c5a85b1f6
+  metadata.gz: 768f2fb6195ca9528398233360ab1f4b7be974e7fa5999ba32a5aa53b89d52bcce93ef252dd45ba7bd627ea329e5ebb9e11200dea6fecdb494c45078b2a97e88
+  data.tar.gz: 1a3c031451d48a9fd021eb0529e942db6adcd732a9e558c7fdefd7574c749192982cece0854678a198489512d421e22aa466bdd958f240d8bc5af23a4de9d240

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

@@ -13,7 +13,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
@@ -70,11 +70,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 +95,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 +120,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

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

@@ -0,0 +1,15 @@
+module Spree
+  class Payment < Spree::Base
+    module Webhooks
+      extend ActiveSupport::Concern
+
+      def send_payment_voided_webhook
+        # Implement your logic here
+      end
+
+      def send_payment_completed_webhook
+        # Implement your logic here
+      end
+    end
+  end
+end

data/app/models/spree/payment.rb

@@ -6,14 +6,12 @@ module Spree
     include Spree::NumberIdentifier
     include Spree::NumberAsParam
     include Spree::Metadata
-    if defined?(Spree::Webhooks::HasWebhooks)
-      include Spree::Webhooks::HasWebhooks
-    end
     if defined?(Spree::Security::Payments)
       include Spree::Security::Payments
     end
 
     include Spree::Payment::Processing
+    include Spree::Payment::Webhooks
 
     NON_RISKY_AVS_CODES = ['B', 'D', 'H', 'J', 'M', 'Q', 'T', 'V', 'X', 'Y'].freeze
     RISKY_AVS_CODES     = ['A', 'C', 'E', 'F', 'G', 'I', 'K', 'L', 'N', 'O', 'P', 'R', 'S', 'U', 'W', 'Z'].freeze
@@ -67,6 +65,8 @@ module Spree
     scope :processing, -> { with_state('processing') }
     scope :failed, -> { with_state('failed') }
 
+    scope :incomplete, -> { where.not(state: 'completed') }
+
     scope :risky, -> { where("avs_response IN (?) OR (cvv_response_code IS NOT NULL and cvv_response_code != 'M') OR state = 'failed'", RISKY_AVS_CODES) }
     scope :valid, -> { where.not(state: INVALID_STATES) }
 
@@ -105,11 +105,11 @@ module Spree
       event :complete do
         transition from: [:processing, :pending, :checkout], to: :completed
       end
-      after_transition to: :completed, do: :after_completed
+      after_transition to: :completed, do: [:after_completed, :send_payment_completed_webhook]
       event :void do
         transition from: [:pending, :processing, :completed, :checkout], to: :void
       end
-      after_transition to: :void, do: :after_void
+      after_transition to: :void, do: [:after_void, :send_payment_voided_webhook]
       # when the card brand isn't supported
       event :invalidate do
         transition from: [:checkout], to: :invalid
@@ -209,11 +209,11 @@ module Spree
     private
 
     def after_void
-      # this method is prepended in api/ to queue Webhooks requests
+      # Implement your logic here
     end
 
     def after_completed
-      # this method is prepended in api/ to queue Webhooks requests
+      # Implement your logic here
     end
 
     def has_invalid_state?

data/app/models/spree/price.rb

@@ -12,6 +12,7 @@ module Spree
     belongs_to :variant, -> { with_deleted }, class_name: 'Spree::Variant', inverse_of: :prices, touch: true
 
     before_validation :ensure_currency
+    before_save :remove_compare_at_amount_if_equals_amount
 
     validates :amount, allow_nil: true, numericality: {
       greater_than_or_equal_to: 0,
@@ -23,6 +24,10 @@ module Spree
       less_than_or_equal_to: MAXIMUM_AMOUNT
     }
 
+    scope :with_currency, ->(currency) { where(currency: currency) }
+    scope :non_zero, -> { where.not(amount: [nil, 0]) }
+    scope :discounted, -> { where('compare_at_amount > amount') }
+
     extend DisplayMoney
     money_methods :amount, :price, :compare_at_amount
     alias display_compare_at_price display_compare_at_amount
@@ -68,10 +73,50 @@ module Spree
       Spree::Money.new(compare_at_price_including_vat_for(price_options), currency: currency)
     end
 
+    # returns the name of the price in a format of variant name and currency
+    #
+    # @return [String]
+    def name
+      "#{variant.name} - #{currency.upcase}"
+    end
+
+    # returns true if the price is discounted
+    #
+    # @return [Boolean]
+    def discounted?
+      compare_at_amount.to_i.positive? && compare_at_amount > amount
+    end
+
+    # returns true if the price was discounted
+    #
+    # @return [Boolean]
+    def was_discounted?
+      compare_at_amount_was.to_i.positive? && compare_at_amount_was > amount_was
+    end
+
+    # returns true if the price is zero
+    #
+    # @return [Boolean]
+    def zero?
+      amount.nil? || amount.zero?
+    end
+
+    # returns true if the price is not zero
+    #
+    # @return [Boolean]
+    def non_zero?
+      !zero?
+    end
+
     private
 
     def ensure_currency
       self.currency ||= Spree::Store.default.default_currency
     end
+
+    # removes the compare at amount if it is the same as the amount
+    def remove_compare_at_amount_if_equals_amount
+      self.compare_at_amount = nil if compare_at_amount == amount
+    end
   end
 end

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

@@ -0,0 +1,17 @@
+module Spree
+  class Product < Spree::Base
+    module Webhooks
+      def send_product_activated_webhook
+        # Implement your logic here
+      end
+
+      def send_product_archived_webhook
+        # Implement your logic here
+      end
+
+      def send_product_drafted_webhook
+        # Implement your logic here
+      end
+    end
+  end
+end