spree_api 5.2.5 → 5.3.0.rc1

data/app/serializers/spree/api/v2/platform/tax_rate_serializer.rb

@@ -5,8 +5,8 @@ module Spree
         class TaxRateSerializer < BaseSerializer
           include ResourceSerializerConcern
 
-          belongs_to :zone, serializer: Spree::Api::Dependencies.platform_zone_serializer.constantize
-          belongs_to :tax_category, serializer: Spree::Api::Dependencies.platform_tax_category_serializer.constantize
+          belongs_to :zone, serializer: Spree.api.platform_zone_serializer
+          belongs_to :tax_category, serializer: Spree.api.platform_tax_category_serializer
         end
       end
     end

data/app/serializers/spree/api/v2/platform/taxon_serializer.rb

@@ -27,19 +27,19 @@ module Spree
             taxon.leaf?
           end
 
-          belongs_to :parent,   record_type: :taxon, serializer: Spree::Api::Dependencies.platform_taxon_serializer.constantize
-          belongs_to :taxonomy, record_type: :taxonomy, serializer: Spree::Api::Dependencies.platform_taxonomy_serializer.constantize
+          belongs_to :parent,   record_type: :taxon, serializer: Spree.api.platform_taxon_serializer
+          belongs_to :taxonomy, record_type: :taxonomy, serializer: Spree.api.platform_taxonomy_serializer
 
-          has_many   :children, record_type: :taxon, serializer: Spree::Api::Dependencies.platform_taxon_serializer.constantize
+          has_many   :children, record_type: :taxon, serializer: Spree.api.platform_taxon_serializer
           has_many   :products, record_type: :product,
-                                serializer: Spree::Api::Dependencies.platform_product_serializer.constantize,
+                                serializer: Spree.api.platform_product_serializer,
                                 if: proc { |_taxon, params| params && params[:include_products] == true }
 
           has_one    :image,
                      object_method_name: :icon,
                      id_method_name: :icon_id,
                      record_type: :taxon_image,
-                     serializer: Spree::Api::Dependencies.platform_taxon_image_serializer.constantize
+                     serializer: Spree.api.platform_taxon_image_serializer
         end
       end
     end

data/app/serializers/spree/api/v2/platform/taxonomy_serializer.rb

@@ -5,8 +5,8 @@ module Spree
         class TaxonomySerializer < BaseSerializer
           include ResourceSerializerConcern
 
-          has_many :taxons, serializer: Spree::Api::Dependencies.platform_taxon_serializer.constantize
-          has_one :root, serializer: Spree::Api::Dependencies.platform_taxon_serializer.constantize
+          has_many :taxons, serializer: Spree.api.platform_taxon_serializer
+          has_one :root, serializer: Spree.api.platform_taxon_serializer
         end
       end
     end

data/app/serializers/spree/api/v2/platform/user_serializer.rb

@@ -21,11 +21,11 @@ module Spree
 
           has_one :bill_address,
                   record_type: :address,
-                  serializer: Spree::Api::Dependencies.platform_address_serializer.constantize
+                  serializer: Spree.api.platform_address_serializer
 
           has_one :ship_address,
                   record_type: :address,
-                  serializer: Spree::Api::Dependencies.platform_address_serializer.constantize
+                  serializer: Spree.api.platform_address_serializer
 
           def self.price_stats(stats)
             stats.map { |value| { currency: value.currency.to_s, amount: value.money.to_s } }

data/app/serializers/spree/api/v2/platform/variant_serializer.rb

@@ -29,28 +29,36 @@ module Spree
           end
 
           attribute :price do |object, params|
-            price(object, params[:currency])
+            price(object, params[:currency], pricing_context_options(params))
           end
 
           attribute :display_price do |object, params|
-            display_price(object, params[:currency])
+            display_price(object, params[:currency], pricing_context_options(params))
           end
 
           attribute :compare_at_price do |object, params|
-            compare_at_price(object, params[:currency])
+            compare_at_price(object, params[:currency], pricing_context_options(params))
           end
 
           attribute :display_compare_at_price do |object, params|
-            display_compare_at_price(object, params[:currency])
+            display_compare_at_price(object, params[:currency], pricing_context_options(params))
           end
 
-          belongs_to :product, serializer: Spree::Api::Dependencies.platform_product_serializer.constantize
-          belongs_to :tax_category, serializer: Spree::Api::Dependencies.platform_tax_category_serializer.constantize
-          has_many :digitals, serializer: Spree::Api::Dependencies.platform_digital_serializer.constantize
-          has_many :images, serializer: Spree::Api::Dependencies.platform_image_serializer.constantize
-          has_many :option_values, serializer: Spree::Api::Dependencies.platform_option_value_serializer.constantize
-          has_many :stock_items, serializer: Spree::Api::Dependencies.platform_stock_item_serializer.constantize
-          has_many :stock_locations, serializer: Spree::Api::Dependencies.platform_stock_location_serializer.constantize
+          def self.pricing_context_options(params)
+            {
+              store: params[:store],
+              user: params[:user],
+              tax_zone: params.dig(:price_options, :tax_zone)
+            }
+          end
+
+          belongs_to :product, serializer: Spree.api.platform_product_serializer
+          belongs_to :tax_category, serializer: Spree.api.platform_tax_category_serializer
+          has_many :digitals, serializer: Spree.api.platform_digital_serializer
+          has_many :images, serializer: Spree.api.platform_image_serializer
+          has_many :option_values, serializer: Spree.api.platform_option_value_serializer
+          has_many :stock_items, serializer: Spree.api.platform_stock_item_serializer
+          has_many :stock_locations, serializer: Spree.api.platform_stock_location_serializer
         end
       end
     end

data/app/serializers/spree/api/v2/platform/wished_item_serializer.rb

@@ -21,7 +21,7 @@ module Spree
             wished_item.display_total(currency: params[:currency]).to_s
           end
 
-          belongs_to :variant, serializer: Spree::Api::Dependencies.platform_variant_serializer.constantize
+          belongs_to :variant, serializer: Spree.api.platform_variant_serializer
         end
       end
     end

data/app/serializers/spree/api/v2/platform/wishlist_serializer.rb

@@ -11,7 +11,7 @@ module Spree
             wishlist.include?(params[:is_variant_included])
           end
 
-          has_many :wished_items, serializer: Spree::Api::Dependencies.platform_wished_item_serializer.constantize
+          has_many :wished_items, serializer: Spree.api.platform_wished_item_serializer
         end
       end
     end

data/app/serializers/spree/api/v2/platform/zone_serializer.rb

@@ -5,7 +5,7 @@ module Spree
         class ZoneSerializer < BaseSerializer
           include ResourceSerializerConcern
 
-          has_many :zone_members, serializer: Spree::Api::Dependencies.platform_zone_member_serializer.constantize
+          has_many :zone_members, serializer: Spree.api.platform_zone_member_serializer
         end
       end
     end

data/app/serializers/spree/v2/storefront/cart_serializer.rb

@@ -42,25 +42,25 @@ module Spree
           cart.display_total_minus_store_credits.amount_in_cents
         end
 
-        has_many   :line_items, serializer: Spree::Api::Dependencies.storefront_line_item_serializer.constantize
-        has_many   :variants, serializer: Spree::Api::Dependencies.storefront_variant_serializer.constantize
-        has_many   :promotions, serializer: Spree::Api::Dependencies.storefront_order_promotion_serializer.constantize, object_method_name: :valid_promotions, id_method_name: :valid_promotion_ids
-        has_many   :payments, serializer: Spree::Api::Dependencies.storefront_payment_serializer.constantize do |cart|
+        has_many   :line_items, serializer: Spree.api.storefront_line_item_serializer
+        has_many   :variants, serializer: Spree.api.storefront_variant_serializer
+        has_many   :promotions, serializer: Spree.api.storefront_order_promotion_serializer, object_method_name: :valid_promotions, id_method_name: :valid_promotion_ids
+        has_many   :payments, serializer: Spree.api.storefront_payment_serializer do |cart|
           cart.payments.valid
         end
-        has_many   :shipments, serializer: Spree::Api::Dependencies.storefront_shipment_serializer.constantize
+        has_many   :shipments, serializer: Spree.api.storefront_shipment_serializer
 
-        belongs_to :user, serializer: Spree::Api::Dependencies.storefront_user_serializer.constantize
+        belongs_to :user, serializer: Spree.api.storefront_user_serializer
         belongs_to :billing_address,
                    id_method_name: :bill_address_id,
-                   serializer: Spree::Api::Dependencies.storefront_address_serializer.constantize,
+                   serializer: Spree.api.storefront_address_serializer,
                    record_type: :address
 
         belongs_to :shipping_address,
                    id_method_name: :ship_address_id,
-                   serializer: Spree::Api::Dependencies.storefront_address_serializer.constantize,
+                   serializer: Spree.api.storefront_address_serializer,
                    record_type: :address
-        belongs_to :gift_card, serializer: Spree::Api::Dependencies.storefront_gift_card_serializer.constantize
+        belongs_to :gift_card, serializer: Spree.api.storefront_gift_card_serializer
       end
     end
   end

data/app/serializers/spree/v2/storefront/credit_card_serializer.rb

@@ -8,7 +8,7 @@ module Spree
 
         attributes :cc_type, :last_digits, :month, :year, :name, :default, :gateway_payment_profile_id, :public_metadata
 
-        belongs_to :payment_method, serializer: Spree::Api::Dependencies.storefront_payment_method_serializer.constantize
+        belongs_to :payment_method, serializer: Spree.api.storefront_payment_method_serializer
       end
     end
   end

data/app/serializers/spree/v2/storefront/estimated_shipping_rate_serializer.rb

@@ -12,7 +12,7 @@ module Spree
           shipping_rate.shipping_method_id.to_s
         end
 
-        belongs_to :shipping_method, serializer: Spree::Api::Dependencies.storefront_shipping_method_serializer.constantize
+        belongs_to :shipping_method, serializer: Spree.api.storefront_shipping_method_serializer
 
         attribute :final_price do |shipping_rate|
           shipping_rate.cost

data/app/serializers/spree/v2/storefront/line_item_serializer.rb

@@ -15,8 +15,8 @@ module Spree
                    :pre_tax_amount, :display_pre_tax_amount, :compare_at_amount, :display_compare_at_amount,
                    :public_metadata
 
-        belongs_to :variant, serializer: Spree::Api::Dependencies.storefront_variant_serializer.constantize
-        has_many :digital_links, serializer: Spree::Api::Dependencies.storefront_digital_link_serializer.constantize
+        belongs_to :variant, serializer: Spree.api.storefront_variant_serializer
+        has_many :digital_links, serializer: Spree.api.storefront_digital_link_serializer
       end
     end
   end

data/app/serializers/spree/v2/storefront/option_type_serializer.rb

@@ -8,7 +8,7 @@ module Spree
 
         attributes :name, :presentation, :position, :public_metadata
 
-        has_many   :option_values, serializer: Spree::Api::Dependencies.storefront_option_value_serializer.constantize
+        has_many   :option_values, serializer: Spree.api.storefront_option_value_serializer
       end
     end
   end

data/app/serializers/spree/v2/storefront/option_value_serializer.rb

@@ -6,7 +6,7 @@ module Spree
 
         attributes :name, :presentation, :position, :public_metadata
 
-        belongs_to :option_type, serializer: Spree::Api::Dependencies.storefront_option_type_serializer.constantize
+        belongs_to :option_type, serializer: Spree.api.storefront_option_type_serializer
       end
     end
   end

data/app/serializers/spree/v2/storefront/payment_serializer.rb

@@ -7,7 +7,7 @@ module Spree
         set_type :payment
 
         has_one :source, polymorphic: true
-        has_one :payment_method, serializer: Spree::Api::Dependencies.storefront_payment_method_serializer.constantize
+        has_one :payment_method, serializer: Spree.api.storefront_payment_method_serializer
 
         attributes :amount, :response_code, :number, :cvv_response_code, :cvv_response_message, :payment_method_name, :state, :public_metadata
 

data/app/serializers/spree/v2/storefront/payment_source_serializer.rb

@@ -4,8 +4,8 @@ module Spree
       class PaymentSourceSerializer < BaseSerializer
         include Spree::Api::V2::PublicMetafieldsConcern
 
-        belongs_to :payment_method, serializer: Spree::Api::Dependencies.storefront_payment_method_serializer.constantize
-        belongs_to :user, serializer: Spree::Api::Dependencies.storefront_user_serializer.constantize
+        belongs_to :payment_method, serializer: Spree.api.storefront_payment_method_serializer
+        belongs_to :user, serializer: Spree.api.storefront_user_serializer
       end
     end
   end

data/app/serializers/spree/v2/storefront/post_category_serializer.rb

@@ -12,7 +12,7 @@ module Spree
           category.description.to_plain_text if category.description.present?
         end
 
-        has_many :posts, serializer: Spree::Api::Dependencies.storefront_post_serializer.constantize, record_type: :post, if: proc { |_record, params|
+        has_many :posts, serializer: Spree.api.storefront_post_serializer, record_type: :post, if: proc { |_record, params|
           params[:include_posts] == true
         } do |category|
           category.posts.published.by_newest

data/app/serializers/spree/v2/storefront/post_serializer.rb

@@ -44,7 +44,7 @@ module Spree
           url_helpers.cdn_image_url(post.image.attachment) if post.image.present? && post.image.attached?
         end
 
-        belongs_to :post_category, serializer: Spree::Api::Dependencies.storefront_post_category_serializer.constantize, record_type: :post_category
+        belongs_to :post_category, serializer: Spree.api.storefront_post_category_serializer, record_type: :post_category
       end
     end
   end

data/app/serializers/spree/v2/storefront/product_serializer.rb

@@ -30,19 +30,27 @@ module Spree
         end
 
         attribute :price do |product, params|
-          price(product, params[:currency])
+          price(product, params[:currency], pricing_context_options(params))
         end
 
         attribute :display_price do |product, params|
-          display_price(product, params[:currency])
+          display_price(product, params[:currency], pricing_context_options(params))
         end
 
         attribute :compare_at_price do |product, params|
-          compare_at_price(product, params[:currency])
+          compare_at_price(product, params[:currency], pricing_context_options(params))
         end
 
         attribute :display_compare_at_price do |product, params|
-          display_compare_at_price(product, params[:currency])
+          display_compare_at_price(product, params[:currency], pricing_context_options(params))
+        end
+
+        def self.pricing_context_options(params)
+          {
+            store: params[:store],
+            user: params[:user],
+            tax_zone: params.dig(:price_options, :tax_zone)
+          }
         end
 
         attribute :localized_slugs do |product, params|
@@ -52,12 +60,12 @@ module Spree
         attribute :tags, &:tag_list
         attribute :labels, &:label_list
 
-        has_many :variants, serializer: Spree::Api::Dependencies.storefront_variant_serializer.constantize
-        has_many :option_types, serializer: Spree::Api::Dependencies.storefront_option_type_serializer.constantize
-        has_many :product_properties, serializer: Spree::Api::Dependencies.storefront_product_property_serializer.constantize
+        has_many :variants, serializer: Spree.api.storefront_variant_serializer
+        has_many :option_types, serializer: Spree.api.storefront_option_type_serializer
+        has_many :product_properties, serializer: Spree.api.storefront_product_property_serializer
 
-        has_many :taxons, serializer: Spree::Api::Dependencies.storefront_taxon_serializer.constantize, record_type: :taxon do |object, params|
-          object.taxons_for_store(params[:store]).order(:id)
+        has_many :taxons, serializer: Spree.api.storefront_taxon_serializer, record_type: :taxon do |object, params|
+          object.taxons_for_store(params[:store])
         end
 
         # all images from all variants
@@ -65,19 +73,19 @@ module Spree
                  object_method_name: :variant_images,
                  id_method_name: :variant_image_ids,
                  record_type: :image,
-                 serializer: Spree::Api::Dependencies.storefront_image_serializer.constantize
+                 serializer: Spree.api.storefront_image_serializer
 
         has_one :default_variant,
                 object_method_name: :default_variant,
                 id_method_name: :default_variant_id,
                 record_type: :variant,
-                serializer: Spree::Api::Dependencies.storefront_variant_serializer.constantize
+                serializer: Spree.api.storefront_variant_serializer
 
         has_one :primary_variant,
                 object_method_name: :master,
                 id_method_name: :master_id,
                 record_type: :variant,
-                serializer: Spree::Api::Dependencies.storefront_variant_serializer.constantize
+                serializer: Spree.api.storefront_variant_serializer
       end
     end
   end

data/app/serializers/spree/v2/storefront/shipment_serializer.rb

@@ -13,11 +13,11 @@ module Spree
           shipment.free?
         end
 
-        has_many :shipping_rates, serializer: Spree::Api::Dependencies.storefront_shipping_rate_serializer.constantize
-        has_one :selected_shipping_rate, serializer: Spree::Api::Dependencies.storefront_shipping_rate_serializer.constantize
+        has_many :shipping_rates, serializer: Spree.api.storefront_shipping_rate_serializer
+        has_one :selected_shipping_rate, serializer: Spree.api.storefront_shipping_rate_serializer
 
-        belongs_to :stock_location, serializer: Spree::Api::Dependencies.storefront_stock_location_serializer.constantize
-        has_many :line_items, serializer: Spree::Api::Dependencies.storefront_line_item_serializer.constantize do |shipment|
+        belongs_to :stock_location, serializer: Spree.api.storefront_stock_location_serializer
+        has_many :line_items, serializer: Spree.api.storefront_line_item_serializer do |shipment|
           shipment.line_items
         end
       end

data/app/serializers/spree/v2/storefront/shipping_rate_serializer.rb

@@ -11,7 +11,7 @@ module Spree
           shipping_rate.shipping_method_id.to_s
         end
 
-        belongs_to :shipping_method, serializer: Spree::Api::Dependencies.storefront_shipping_method_serializer.constantize
+        belongs_to :shipping_method, serializer: Spree.api.storefront_shipping_method_serializer
 
         attribute :free do |shipping_rate|
           shipping_rate.free?

data/app/serializers/spree/v2/storefront/store_credit_serializer.rb

@@ -6,11 +6,11 @@ module Spree
 
         set_type :store_credit
 
-        belongs_to :category, serializer: Spree::Api::Dependencies.storefront_store_credit_category_serializer.constantize
-        has_many :store_credit_events, serializer: Spree::Api::Dependencies.storefront_store_credit_event_serializer.constantize
+        belongs_to :category, serializer: Spree.api.storefront_store_credit_category_serializer
+        has_many :store_credit_events, serializer: Spree.api.storefront_store_credit_event_serializer
         belongs_to :credit_type,
                    id_method_name: :type_id,
-                   serializer: Spree::Api::Dependencies.storefront_store_credit_type_serializer.constantize
+                   serializer: Spree.api.storefront_store_credit_type_serializer
 
         attributes :amount, :amount_used, :created_at, :public_metadata
       end

data/app/serializers/spree/v2/storefront/store_serializer.rb

@@ -11,7 +11,7 @@ module Spree
                    :default, :supported_currencies, :facebook, :twitter, :instagram, :default_locale,
                    :customer_support_email, :description, :address, :contact_phone, :supported_locales
 
-        has_one :default_country, serializer: Spree::Api::Dependencies.storefront_country_serializer.constantize, record_type: :country, id_method_name: :default_country_id
+        has_one :default_country, serializer: Spree.api.storefront_country_serializer, record_type: :country, id_method_name: :default_country_id
       end
     end
   end

data/app/serializers/spree/v2/storefront/taxon_serializer.rb

@@ -14,7 +14,7 @@ module Spree
         end
 
         attribute :has_products do |taxon|
-          taxon.active_products_with_descendants.exists?
+          taxon.classification_count.positive? || taxon.active_products_with_descendants.exists?
         end
 
         attribute :header_url do |taxon|
@@ -37,18 +37,18 @@ module Spree
           taxon.localized_slugs_for_store(params[:store])
         end
 
-        belongs_to :parent,   record_type: :taxon, serializer: Spree::Api::Dependencies.storefront_taxon_serializer.constantize
-        belongs_to :taxonomy, record_type: :taxonomy, serializer: Spree::Api::Dependencies.storefront_taxonomy_serializer.constantize
+        belongs_to :parent,   record_type: :taxon, serializer: Spree.api.storefront_taxon_serializer
+        belongs_to :taxonomy, record_type: :taxonomy, serializer: Spree.api.storefront_taxonomy_serializer
 
-        has_many   :children, record_type: :taxon, serializer: Spree::Api::Dependencies.storefront_taxon_serializer.constantize
-        has_many   :products, record_type: :product, serializer: Spree::Api::Dependencies.storefront_product_serializer.constantize,
+        has_many   :children, record_type: :taxon, serializer: Spree.api.storefront_taxon_serializer
+        has_many   :products, record_type: :product, serializer: Spree.api.storefront_product_serializer,
                               if: proc { |_taxon, params| params && params[:include_products] == true }
 
         has_one    :image,
                    object_method_name: :icon,
                    id_method_name: :icon_id,
                    record_type: :taxon_image,
-                   serializer: Spree::Api::Dependencies.storefront_taxon_image_serializer.constantize
+                   serializer: Spree.api.storefront_taxon_image_serializer
       end
     end
   end

data/app/serializers/spree/v2/storefront/user_serializer.rb

@@ -20,13 +20,13 @@ module Spree
                 id_method_name: :bill_address_id,
                 object_method_name: :bill_address,
                 record_type: :address,
-                serializer: Spree::Api::Dependencies.storefront_address_serializer.constantize
+                serializer: Spree.api.storefront_address_serializer
 
         has_one :default_shipping_address,
                 id_method_name: :ship_address_id,
                 object_method_name: :ship_address,
                 record_type: :address,
-                serializer: Spree::Api::Dependencies.storefront_address_serializer.constantize
+                serializer: Spree.api.storefront_address_serializer
       end
     end
   end

data/app/serializers/spree/v2/storefront/variant_serializer.rb

@@ -26,24 +26,32 @@ module Spree
         end
 
         attribute :price do |product, params|
-          price(product, params[:currency])
+          price(product, params[:currency], pricing_context_options(params))
         end
 
         attribute :display_price do |product, params|
-          display_price(product, params[:currency])
+          display_price(product, params[:currency], pricing_context_options(params))
         end
 
         attribute :compare_at_price do |product, params|
-          compare_at_price(product, params[:currency])
+          compare_at_price(product, params[:currency], pricing_context_options(params))
         end
 
         attribute :display_compare_at_price do |product, params|
-          display_compare_at_price(product, params[:currency])
+          display_compare_at_price(product, params[:currency], pricing_context_options(params))
         end
 
-        belongs_to :product, serializer: Spree::Api::Dependencies.storefront_product_serializer.constantize
-        has_many :images, serializer: Spree::Api::Dependencies.storefront_image_serializer.constantize
-        has_many :option_values, serializer: Spree::Api::Dependencies.storefront_option_value_serializer.constantize
+        def self.pricing_context_options(params)
+          {
+            store: params[:store],
+            user: params[:user],
+            tax_zone: params.dig(:price_options, :tax_zone)
+          }
+        end
+
+        belongs_to :product, serializer: Spree.api.storefront_product_serializer
+        has_many :images, serializer: Spree.api.storefront_image_serializer
+        has_many :option_values, serializer: Spree.api.storefront_option_value_serializer
       end
     end
   end

data/app/serializers/spree/v2/storefront/wished_item_serializer.rb

@@ -22,7 +22,7 @@ module Spree
           wished_item.display_total(currency: params[:currency]).to_s
         end
 
-        belongs_to :variant, serializer: Spree::Api::Dependencies.storefront_variant_serializer.constantize
+        belongs_to :variant, serializer: Spree.api.storefront_variant_serializer
       end
     end
   end

data/app/serializers/spree/v2/storefront/wishlist_serializer.rb

@@ -10,7 +10,7 @@ module Spree
           wishlist.include?(params[:is_variant_included])
         end
 
-        has_many :wished_items, serializer: Spree::Api::Dependencies.storefront_wished_item_serializer.constantize
+        has_many :wished_items, serializer: Spree.api.storefront_wished_item_serializer
       end
     end
   end

data/app/services/spree/webhooks/deliver_webhook.rb

@@ -0,0 +1,83 @@
+# frozen_string_literal: true
+
+require 'net/http'
+require 'openssl'
+
+module Spree
+  module Webhooks
+    class DeliverWebhook
+      TIMEOUT = 30
+
+      def self.call(delivery:, secret_key:)
+        new(delivery: delivery, secret_key: secret_key).call
+      end
+
+      def initialize(delivery:, secret_key:)
+        @delivery = delivery
+        @secret_key = secret_key
+      end
+
+      def call
+        start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+        response = make_request
+        execution_time = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time) * 1000).round
+
+        @delivery.complete!(
+          response_code: response.code.to_i,
+          execution_time: execution_time,
+          response_body: response.body.to_s.truncate(10_000)
+        )
+      rescue Net::OpenTimeout, Net::ReadTimeout => e
+        execution_time = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time) * 1000).round
+        Rails.error.report(e, context: { webhook_delivery_id: @delivery.id, url: @delivery.url })
+        @delivery.complete!(
+          execution_time: execution_time,
+          error_type: 'timeout',
+          request_errors: e.message
+        )
+      rescue StandardError => e
+        execution_time = ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time) * 1000).round
+        Rails.error.report(e, context: { webhook_delivery_id: @delivery.id, url: @delivery.url })
+        @delivery.complete!(
+          execution_time: execution_time,
+          error_type: 'connection_error',
+          request_errors: e.message
+        )
+      end
+
+      private
+
+      def make_request
+        uri = URI.parse(@delivery.url)
+        http = Net::HTTP.new(uri.host, uri.port)
+        http.use_ssl = uri.scheme == 'https'
+        http.verify_mode = ssl_verify_mode
+        http.open_timeout = TIMEOUT
+        http.read_timeout = TIMEOUT
+
+        request = Net::HTTP::Post.new(uri.request_uri)
+        request['Content-Type'] = 'application/json'
+        request['User-Agent'] = 'Spree-Webhooks/1.0'
+        request['X-Spree-Webhook-Signature'] = generate_signature
+        request['X-Spree-Webhook-Event'] = @delivery.event_name
+        request.body = @delivery.payload.to_json
+
+        http.request(request)
+      end
+
+      def generate_signature
+        payload_json = @delivery.payload.to_json
+        OpenSSL::HMAC.hexdigest('SHA256', @secret_key, payload_json)
+      end
+
+      def ssl_verify_mode
+        if Spree::Api::Config.webhooks_verify_ssl
+          OpenSSL::SSL::VERIFY_PEER
+        else
+          OpenSSL::SSL::VERIFY_NONE
+        end
+      end
+    end
+  end
+end