spree_core 5.2.6 → 5.3.0.rc1

data/app/serializers/spree/events/refund_serializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class RefundSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          amount: money(resource.amount),
+          transaction_id: resource.transaction_id,
+          payment_id: resource.payment_id,
+          refund_reason_id: resource.refund_reason_id,
+          reimbursement_id: resource.reimbursement_id,
+          refunder_id: resource.refunder_id,
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/serializers/spree/events/reimbursement_serializer.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class ReimbursementSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          number: resource.number,
+          reimbursement_status: resource.reimbursement_status,
+          total: money(resource.total),
+          order_id: resource.order_id,
+          customer_return_id: resource.customer_return_id,
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/serializers/spree/events/report_serializer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class ReportSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          type: resource.type,
+          store_id: resource.store_id,
+          user_id: resource.user_id,
+          currency: resource.currency,
+          date_from: timestamp(resource.date_from),
+          date_to: timestamp(resource.date_to),
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/serializers/spree/events/return_authorization_serializer.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class ReturnAuthorizationSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          number: resource.number,
+          state: resource.state.to_s,
+          order_id: resource.order_id,
+          stock_location_id: resource.stock_location_id,
+          return_authorization_reason_id: resource.return_authorization_reason_id,
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/serializers/spree/events/return_item_serializer.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class ReturnItemSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          reception_status: resource.reception_status,
+          acceptance_status: resource.acceptance_status,
+          pre_tax_amount: money(resource.pre_tax_amount),
+          included_tax_total: money(resource.included_tax_total),
+          additional_tax_total: money(resource.additional_tax_total),
+          inventory_unit_id: resource.inventory_unit_id,
+          return_authorization_id: resource.return_authorization_id,
+          customer_return_id: resource.customer_return_id,
+          reimbursement_id: resource.reimbursement_id,
+          exchange_variant_id: resource.exchange_variant_id,
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/serializers/spree/events/shipment_serializer.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class ShipmentSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          number: resource.number,
+          state: resource.state.to_s,
+          tracking: resource.tracking,
+          cost: money(resource.cost),
+          order_id: resource.order_id,
+          stock_location_id: resource.stock_location_id,
+          shipped_at: timestamp(resource.shipped_at),
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/serializers/spree/events/stock_item_serializer.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class StockItemSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          count_on_hand: resource.count_on_hand,
+          backorderable: resource.backorderable,
+          stock_location_id: resource.stock_location_id,
+          variant_id: resource.variant_id,
+          deleted_at: timestamp(resource.deleted_at),
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/serializers/spree/events/stock_movement_serializer.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class StockMovementSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          quantity: resource.quantity,
+          action: resource.action,
+          originator_type: resource.originator_type,
+          originator_id: resource.originator_id,
+          stock_item_id: resource.stock_item_id,
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/serializers/spree/events/stock_transfer_serializer.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class StockTransferSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          number: resource.number,
+          type: resource.type,
+          reference: resource.reference,
+          source_location_id: resource.source_location_id,
+          destination_location_id: resource.destination_location_id,
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/serializers/spree/events/store_credit_serializer.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class StoreCreditSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          amount: money(resource.amount),
+          amount_used: money(resource.amount_used),
+          amount_authorized: money(resource.amount_authorized),
+          currency: resource.currency,
+          memo: resource.memo,
+          user_id: resource.user_id,
+          category_id: resource.category_id,
+          type_id: resource.type_id,
+          store_id: resource.store_id,
+          created_by_id: resource.created_by_id,
+          originator_type: resource.originator_type,
+          originator_id: resource.originator_id,
+          deleted_at: timestamp(resource.deleted_at),
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/serializers/spree/events/user_serializer.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class UserSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          email: resource.email,
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/serializers/spree/events/variant_serializer.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class VariantSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          sku: resource.sku,
+          barcode: resource.barcode,
+          is_master: resource.is_master,
+          position: resource.position,
+          weight: money(resource.weight),
+          height: money(resource.height),
+          width: money(resource.width),
+          depth: money(resource.depth),
+          weight_unit: resource.weight_unit,
+          dimensions_unit: resource.dimensions_unit,
+          cost_price: money(resource.cost_price),
+          cost_currency: resource.cost_currency,
+          track_inventory: resource.track_inventory,
+          product_id: resource.product_id,
+          tax_category_id: resource.tax_category_id,
+          discontinue_on: timestamp(resource.discontinue_on),
+          deleted_at: timestamp(resource.deleted_at),
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/serializers/spree/events/wished_item_serializer.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class WishedItemSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          quantity: resource.quantity,
+          variant_id: resource.variant_id,
+          wishlist_id: resource.wishlist_id,
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/serializers/spree/events/wishlist_serializer.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Spree
+  module Events
+    class WishlistSerializer < BaseSerializer
+      protected
+
+      def attributes
+        {
+          id: resource.id,
+          name: resource.name,
+          is_private: resource.is_private,
+          is_default: resource.is_default,
+          user_id: resource.user_id,
+          store_id: resource.store_id,
+          created_at: timestamp(resource.created_at),
+          updated_at: timestamp(resource.updated_at)
+        }
+      end
+    end
+  end
+end

data/app/services/spree/addresses/update.rb

@@ -12,7 +12,7 @@ module Spree
         default_shipping = opts.fetch(:default_shipping, false)
         address_changes_except = opts.fetch(:address_changes_except, [])
         create_new_address_on_update = opts.fetch(:create_new_address_on_update, false)
-        Spree::Deprecation.warn('Spree::Addresses::Update create_new_address_on_update parameter is deprecated and will be removed in Spree 6.') if create_new_address_on_update
+        Spree::Deprecation.warn('Spree::Addresses::Update create_new_address_on_update parameter is deprecated and will be removed in Spree 5.5.') if create_new_address_on_update
 
         prepare_address_params!(address, address_params)
         address.assign_attributes(address_params)

data/app/services/spree/cart/add_item.rb

@@ -39,7 +39,7 @@ module Spree
 
         return failure(line_item) unless line_item.save
 
-        line_item.reload.update_price
+        line_item.reload.recalculate_price
 
         ::Spree::TaxRate.adjust(order, [line_item]) if line_item_created
         success(order: order, line_item: line_item, line_item_created: line_item_created, options: options)

data/app/services/spree/coupon_codes/coupon_codes_handler.rb

@@ -19,7 +19,8 @@ module Spree
       private
 
       def find_current_promotions_ids
-        order.all_adjustments.promotion.eligible.map { |a| a.source.try(:promotion_id) }.compact
+        order.all_adjustments.promotion.eligible.joins("INNER JOIN #{Spree::PromotionAction.table_name} ON #{Spree::PromotionAction.table_name}.id = #{Spree::Adjustment.table_name}.source_id").
+          pluck("#{Spree::PromotionAction.table_name}.promotion_id").compact.uniq
       end
 
       def use_all_current(promotion_ids)

data/app/services/spree/data_feeds/google/required_attributes.rb

@@ -12,7 +12,7 @@ module Spree
           information['id'] = input[:variant].id
           information['title'] = format_title(input[:product], input[:variant])
           information['description'] = get_description(input[:product], input[:variant])
-          information['link'] = "#{input[:store].url}/#{input[:product].slug}"
+          information['link'] = "#{input[:store].url}/products/#{input[:product].slug}"
           information['image_link'] = get_image_link(input[:variant], input[:product])
           information['price'] = format_price(input[:variant])
           information['availability'] = get_availability(input[:product])
@@ -26,11 +26,11 @@ module Spree
         def format_title(product, variant)
           # Title of a variant is created by joining title of a product and variant's option_values, as they are
           # what differentiates it from other variants.
-          title = product.name
+          parts = [product.name]
           variant.option_values.find_each do |option_value|
-            title << " - #{option_value.name}"
+            parts << option_value.name
           end
-          title
+          parts.join(' - ')
         end
 
         def get_description(product, variant)

data/app/services/spree/newsletter/verify.rb

@@ -8,6 +8,7 @@ module Spree
       def call
         verify_subscriber
         set_user_email_marketing_to_true
+        publish_event
 
         subscriber
       end
@@ -25,6 +26,10 @@ module Spree
 
         subscriber.user.update!(accepts_email_marketing: true)
       end
+
+      def publish_event
+        subscriber.publish_event('newsletter_subscriber.verified')
+      end
     end
   end
 end

data/app/services/spree/products/auto_match_taxons.rb

@@ -40,7 +40,7 @@ module Spree
 
         all_affected_taxons = (taxons_to_remove + taxons_to_add).uniq
 
-        if all_affected_taxons.any?
+        if all_affected_taxons.any? && defined?(Spree::Taxons::TouchFeaturedSections)
           Spree::Taxons::TouchFeaturedSections.call(taxon_ids: all_affected_taxons.pluck(:id))
           product.touch
         end

data/app/services/spree/seeds/all.rb

@@ -4,7 +4,7 @@ module Spree
       prepend Spree::ServiceModule::Base
 
       def call
-        Spree::Webhooks.disable_webhooks do
+        Spree::Events.disable do
           # GEO
           Countries.call
           States.call

data/app/services/spree/taxons/add_products.rb

@@ -28,12 +28,16 @@ module Spree
         # doing a quick insert_all here to avoid the overhead of instantiating
         Spree::Classification.insert_all(classifications_params)
 
-        # clearing cache
-        Spree::Product.where(id: products.pluck(:id)).touch_all
-
+        # update counter caches
         taxon_ids = taxons.pluck(:id)
+        product_ids = products.pluck(:id)
+        taxon_ids.each { |id| Spree::Taxon.reset_counters(id, :classifications) }
+        product_ids.each { |id| Spree::Product.reset_counters(id, :classifications) }
+
+        # clearing cache
+        Spree::Product.where(id: product_ids).touch_all
         Spree::Taxon.where(id: taxon_ids).touch_all
-        Spree::Taxons::TouchFeaturedSections.call(taxon_ids: taxon_ids)
+        Spree::Taxons::TouchFeaturedSections.call(taxon_ids: taxon_ids) if defined?(Spree::Taxons::TouchFeaturedSections)
 
         success(true)
       end

data/app/services/spree/taxons/regenerate_products.rb

@@ -5,6 +5,7 @@ module Spree
 
       def call(taxon:)
         return if taxon.nil?
+        return if taxon.destroyed?
         return if taxon.manual?
 
         previous_products_ids = taxon.classifications.order(position: :asc).pluck(:product_id)
@@ -34,6 +35,13 @@ module Spree
           Spree::Product.where(id: (previous_products_ids + product_ids_to_insert).uniq).touch_all
         end
 
+        # update counter caches
+        # Check if taxon still exists (may have been destroyed)
+        Spree::Taxon.reset_counters(taxon.id, :classifications)
+        all_product_ids = (previous_products_ids + product_ids_to_insert).uniq
+        existing_product_ids = Spree::Product.where(id: all_product_ids).pluck(:id)
+        existing_product_ids.each { |id| Spree::Product.reset_counters(id, :classifications) }
+
         success(taxon)
       end
 

data/app/services/spree/taxons/remove_products.rb

@@ -11,12 +11,15 @@ module Spree
       def call(taxons:, products:)
         return if taxons.blank? || products.blank?
 
+        taxon_ids = taxons.pluck(:id)
+        product_ids = products.pluck(:id)
+
         ApplicationRecord.transaction do
-          taxons.pluck(:id).each do |taxon_id|
-            Spree::Classification.where(taxon_id: taxon_id, product_id: products.pluck(:id)).delete_all
+          taxon_ids.each do |taxon_id|
+            Spree::Classification.where(taxon_id: taxon_id, product_id: product_ids).delete_all
           end
 
-          classifications_params = taxons.pluck(:id).flat_map do |taxon_id|
+          classifications_params = taxon_ids.flat_map do |taxon_id|
             position = 0
             existing_product_ids = Spree::Classification.where(taxon_id: taxon_id).pluck(:product_id)
 
@@ -42,12 +45,14 @@ module Spree
           end
         end
 
-        # clear cache
-        Spree::Product.where(id: products.pluck(:id)).touch_all
+        # update counter caches
+        taxon_ids.each { |id| Spree::Taxon.reset_counters(id, :classifications) }
+        product_ids.each { |id| Spree::Product.reset_counters(id, :classifications) }
 
-        taxon_ids = taxons.pluck(:id)
+        # clear cache
+        Spree::Product.where(id: product_ids).touch_all
         Spree::Taxon.where(id: taxon_ids).touch_all
-        Spree::Taxons::TouchFeaturedSections.call(taxon_ids: taxon_ids)
+        Spree::Taxons::TouchFeaturedSections.call(taxon_ids: taxon_ids) if defined?(Spree::Taxons::TouchFeaturedSections)
 
         success(true)
       end

data/app/subscribers/spree/event_log_subscriber.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Spree
+  # Logs all Spree events to Rails logger.
+  #
+  # Enabled by default. To disable, set Spree::Config.events_log_enabled = false
+  #
+  # Events are logged at info level. Sensitive parameters are filtered using
+  # Rails.application.config.filter_parameters.
+  #
+  # @example Output
+  #   [Spree Event] order.complete | payload: {"id"=>1} | 0.5ms
+  #
+  class EventLogSubscriber
+    NAMESPACE = 'spree'
+
+    class << self
+      def attach_to_notifications
+        # Always detach first to ensure clean state after code reload
+        detach_from_notifications
+
+        @subscription = ActiveSupport::Notifications.subscribe(/\.#{NAMESPACE}$/) do |name, start, finish, _id, payload|
+          log_event(name, start, finish, payload)
+        end
+
+        @attached = true
+        Rails.logger.info "[Spree Events] Event logging enabled"
+      end
+
+      def detach_from_notifications
+        ActiveSupport::Notifications.unsubscribe(@subscription) if @subscription
+        @subscription = nil
+        @attached = false
+      end
+
+      def attached?
+        @attached || false
+      end
+
+      private
+
+      def log_event(name, start, finish, payload)
+        spree_event = payload[:event]
+        return unless spree_event
+
+        event_name = spree_event.name
+        event_payload = filter_sensitive_params(spree_event.payload)
+        duration = ((finish - start) * 1000).round(2)
+
+        Rails.logger.info "  \e[36m[Spree Event]\e[0m \e[1m#{event_name}\e[0m | payload: #{event_payload.inspect} | #{duration}ms"
+      end
+
+      def filter_sensitive_params(payload)
+        parameter_filter.filter(payload)
+      end
+
+      def parameter_filter
+        @parameter_filter ||= ActiveSupport::ParameterFilter.new(
+          Rails.application.config.filter_parameters
+        )
+      end
+    end
+  end
+end

data/app/subscribers/spree/export_subscriber.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Spree
+  # Handles Export lifecycle events.
+  #
+  # This subscriber replaces the following callbacks in Spree::Export:
+  # - after_commit :generate_async, on: :create
+  #
+  # When an export is created, this subscriber triggers the async generation job.
+  #
+  # We use async: false because this subscriber just queues a background job,
+  # so there's no benefit to running the subscriber itself asynchronously.
+  #
+  class ExportSubscriber < Spree::Subscriber
+    subscribes_to 'export.created', async: false
+
+    on 'export.created', :generate_export_async
+
+    def generate_export_async(event)
+      export_id = event.payload['id']
+      return unless export_id
+
+      Spree::Exports::GenerateJob.perform_later(export_id)
+    end
+  end
+end

data/app/subscribers/spree/invitation_email_subscriber.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Spree
+  class InvitationEmailSubscriber < Spree::Subscriber
+    subscribes_to 'invitation.created', 'invitation.accepted', 'invitation.resent'
+
+    on 'invitation.created', :send_invitation_email
+    on 'invitation.accepted', :send_acceptance_notification
+    on 'invitation.resent', :resend_invitation_email
+
+    private
+
+    def send_invitation_email(event)
+      invitation = find_invitation(event)
+      return unless invitation
+
+      InvitationMailer.invitation_email(invitation).deliver_later
+    end
+
+    def send_acceptance_notification(event)
+      invitation = find_invitation(event)
+      return unless invitation
+
+      InvitationMailer.invitation_accepted(invitation).deliver_later
+    end
+
+    def resend_invitation_email(event)
+      invitation = find_invitation(event)
+      return unless invitation
+      return if invitation.expired? || invitation.deleted? || invitation.accepted?
+
+      InvitationMailer.invitation_email(invitation).deliver_later
+    end
+
+    def find_invitation(event)
+      invitation_id = event.payload['id']
+      Spree::Invitation.find_by(id: invitation_id)
+    end
+  end
+end