spree_core 4.6.4 → 4.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1eaae4db080d34b28d92a5fe2d41eceb0bc99114a4be047b3320c7305c176306
-  data.tar.gz: 9a8948040fda3a08c5f0fb5fd2d6519c4ea9b4fece7cc91131d2a2072f25c982
+  metadata.gz: fae2e48673736c835ed7a9d9b5fdf18a35df19ce09eb27a92c6b13376e62a46e
+  data.tar.gz: e48f60fe8dcbeaa67028bb4ce9e23baba71f33afb32ff04be86636c60c9ed378
 SHA512:
-  metadata.gz: 2654308ff6eb25c99a661e2dfa6f4815d9b73bc0ef01c134a59aa2d1eaebcec16ee9f5c1e3fddbf207771e50a6b3a10f28ddf84b424adb5cdd2343360da8e63e
-  data.tar.gz: 3bfce5acc6964b4a9b0f7dcf12e07918f61d27f57e4fcf69783bbab32c95747d81bc2a764ec1557e86d4238593ddcb0145500c801176c4a7f3bf7582b8f14ac6
+  metadata.gz: 706d673aa098f26442eafe06fd1b7eab7dd7267bb9514b3c6f2f1124eff2ea950c5d1dfdde5f8d1c7258c41c9fb5456e0655a2249fa91331267ebef397bf97c8
+  data.tar.gz: 2bb5c0f817b50bdafd1a83708bf6f85cf0b9d69ca605bb48c936d7225fdf3fcf036a0f44e5e901ed9365bf17fc6b826f5190af5841d0e5eb6c1b5ce02e1e49c2

data/app/models/spree/address.rb

@@ -2,7 +2,7 @@ module Spree
   class Address < Spree::Base
     require 'validates_zipcode'
 
-    include Metadata
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/asset.rb

@@ -1,7 +1,7 @@
 module Spree
   class Asset < Spree::Base
     include Support::ActiveStorage
-    include Metadata
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/calculator/default_tax.rb

@@ -2,7 +2,7 @@ require_dependency 'spree/calculator'
 
 module Spree
   class Calculator::DefaultTax < Calculator
-    include VatPriceCalculation
+    include Spree::VatPriceCalculation
     def self.description
       Spree.t(:default_tax)
     end

data/app/models/spree/cms_page.rb

@@ -1,7 +1,7 @@
 module Spree
   class CmsPage < Base
     include SingleStoreResource
-    include DisplayLink
+    include Spree::DisplayLink
 
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks

data/app/models/spree/cms_section.rb

@@ -1,6 +1,6 @@
 module Spree
   class CmsSection < Base
-    include DisplayLink
+    include Spree::DisplayLink
 
     acts_as_list scope: :cms_page
     belongs_to :cms_page, touch: true

data/app/models/spree/credit_card.rb

@@ -1,7 +1,7 @@
 module Spree
   class CreditCard < Spree::Base
     include ActiveMerchant::Billing::CreditCardMethods
-    include Metadata
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/customer_return.rb

@@ -1,8 +1,8 @@
 module Spree
   class CustomerReturn < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'CR', length: 9)
-    include NumberIdentifier
-    include Metadata
+    include Spree::NumberIdentifier
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/line_item.rb

@@ -1,6 +1,6 @@
 module Spree
   class LineItem < Spree::Base
-    include Metadata
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/option_type.rb

@@ -1,8 +1,8 @@
 module Spree
   class OptionType < Spree::Base
-    include UniqueName
-    include Metadata
-    include TranslatableResource
+    include Spree::UniqueName
+    include Spree::Metadata
+    include Spree::TranslatableResource
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/option_value.rb

@@ -1,7 +1,7 @@
 module Spree
   class OptionValue < Spree::Base
-    include Metadata
-    include TranslatableResource
+    include Spree::Metadata
+    include Spree::TranslatableResource
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

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

@@ -1,6 +1,14 @@
 module Spree
   class Order < Spree::Base
     module StoreCredit
+      def add_store_credit_payments(amount = nil)
+        Spree::Dependencies.checkout_add_store_credit_service.constantize.call(order: self, amount: amount)
+      end
+
+      def remove_store_credit_payments
+        Spree::Dependencies.checkout_remove_store_credit_service.constantize.call(order: self)
+      end
+
       def covered_by_store_credit?
         return false unless user
 

data/app/models/spree/order.rb

@@ -20,10 +20,10 @@ module Spree
     include Spree::Core::NumberGenerator.new(prefix: 'R')
     include Spree::Core::TokenGenerator
 
-    include NumberIdentifier
-    include NumberAsParam
+    include Spree::NumberIdentifier
+    include Spree::NumberAsParam
     include SingleStoreResource
-    include MemoizedData
+    include Spree::MemoizedData
     include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks

data/app/models/spree/order_contents.rb

@@ -0,0 +1,31 @@
+module Spree
+  class OrderContents
+    attr_accessor :order, :currency
+
+    def initialize(order)
+      @order = order
+    end
+
+    def add(variant, quantity = 1, options = {})
+      Spree::Dependencies.cart_add_item_service.constantize.call(order: order,
+                                                                 variant: variant,
+                                                                 quantity: quantity,
+                                                                 options: options).value
+    end
+
+    def remove(variant, quantity = 1, options = {})
+      Spree::Dependencies.cart_remove_item_service.constantize.call(order: order,
+                                                                    variant: variant,
+                                                                    quantity: quantity,
+                                                                    options: options).value
+    end
+
+    def remove_line_item(line_item, options = {})
+      Spree::Cart::RemoveLineItem.call(order: @order, line_item: line_item, options: options).value
+    end
+
+    def update_cart(params)
+      Spree::Dependencies.cart_update_service.constantize.call(order: order, params: params).value
+    end
+  end
+end

data/app/models/spree/payment.rb

@@ -3,9 +3,9 @@ require_dependency 'spree/payment/processing'
 module Spree
   class Payment < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'P', letters: true, length: 7)
-    include NumberIdentifier
-    include NumberAsParam
-    include Metadata
+    include Spree::NumberIdentifier
+    include Spree::NumberAsParam
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/payment_method.rb

@@ -3,7 +3,7 @@ module Spree
     acts_as_paranoid
     acts_as_list
 
-    include MultiStoreResource
+    include Spree::MultiStoreResource
     include Spree::Metadata
     if defined?(Spree::Security::PaymentMethods)
       include Spree::Security::PaymentMethods

data/app/models/spree/payment_source.rb

@@ -1,6 +1,6 @@
 module Spree
   class PaymentSource < Spree::Base
-    include Metadata
+    include Spree::Metadata
 
     belongs_to :payment_method, class_name: 'Spree::PaymentMethod'
     belongs_to :user, class_name: 'Spree::User', optional: true

data/app/models/spree/price.rb

@@ -1,6 +1,6 @@
 module Spree
   class Price < Spree::Base
-    include VatPriceCalculation
+    include Spree::VatPriceCalculation
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/product.rb

@@ -21,12 +21,13 @@
 module Spree
   class Product < Spree::Base
     extend FriendlyId
-    include ProductScopes
-    include MultiStoreResource
-    include TranslatableResource
-    include TranslatableResourceSlug
-    include MemoizedData
-    include Metadata
+    include Spree::ProductScopes
+    include Spree::MultiStoreResource
+    include Spree::TranslatableResource
+    include Spree::TranslatableResourceSlug
+    include Spree::MemoizedData
+    include Spree::Metadata
+
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/promotion.rb

@@ -1,7 +1,7 @@
 module Spree
   class Promotion < Spree::Base
-    include MultiStoreResource
-    include Metadata
+    include Spree::MultiStoreResource
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/property.rb

@@ -1,8 +1,8 @@
 module Spree
   class Property < Spree::Base
     include Spree::FilterParam
-    include Metadata
-    include TranslatableResource
+    include Spree::Metadata
+    include Spree::TranslatableResource
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/prototype.rb

@@ -1,6 +1,6 @@
 module Spree
   class Prototype < Spree::Base
-    include Metadata
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/refund.rb

@@ -1,6 +1,6 @@
 module Spree
   class Refund < Spree::Base
-    include Metadata
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/reimbursement.rb

@@ -1,7 +1,7 @@
 module Spree
   class Reimbursement < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'RI', length: 9)
-    include NumberIdentifier
+    include Spree::NumberIdentifier
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/return_authorization.rb

@@ -1,7 +1,7 @@
 module Spree
   class ReturnAuthorization < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'RA', length: 9)
-    include NumberIdentifier
+    include Spree::NumberIdentifier
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/shipment.rb

@@ -3,9 +3,9 @@ require 'ostruct'
 module Spree
   class Shipment < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'H', length: 11)
-    include NumberIdentifier
-    include NumberAsParam
-    include Metadata
+    include Spree::NumberIdentifier
+    include Spree::NumberAsParam
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/shipping_method.rb

@@ -2,7 +2,7 @@ module Spree
   class ShippingMethod < Spree::Base
     acts_as_paranoid
     include Spree::CalculatedAdjustments
-    include Metadata
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/stock/estimator.rb

@@ -1,7 +1,7 @@
 module Spree
   module Stock
     class Estimator
-      include VatPriceCalculation
+      include Spree::VatPriceCalculation
 
       attr_reader :order, :currency
 

data/app/models/spree/stock_item.rb

@@ -2,7 +2,7 @@ module Spree
   class StockItem < Spree::Base
     acts_as_paranoid
 
-    include Metadata
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/stock_transfer.rb

@@ -1,9 +1,9 @@
 module Spree
   class StockTransfer < Spree::Base
     include Spree::Core::NumberGenerator.new(prefix: 'T')
-    include NumberIdentifier
-    include NumberAsParam
-    include Metadata
+    include Spree::NumberIdentifier
+    include Spree::NumberAsParam
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/store_credit.rb

@@ -1,7 +1,7 @@
 module Spree
   class StoreCredit < Spree::Base
     include SingleStoreResource
-    include Metadata
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/taxon.rb

@@ -3,9 +3,9 @@ require 'stringex'
 
 module Spree
   class Taxon < Spree::Base
-    include TranslatableResource
-    include TranslatableResourceSlug
-    include Metadata
+    include Spree::TranslatableResource
+    include Spree::TranslatableResourceSlug
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/taxonomy.rb

@@ -1,7 +1,7 @@
 module Spree
   class Taxonomy < Spree::Base
-    include TranslatableResource
-    include Metadata
+    include Spree::TranslatableResource
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/app/models/spree/variant.rb

@@ -3,8 +3,8 @@ module Spree
     acts_as_paranoid
     acts_as_list scope: :product
 
-    include MemoizedData
-    include Metadata
+    include Spree::MemoizedData
+    include Spree::Metadata
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks
     end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.6.4'.freeze
+  VERSION = '4.6.6'.freeze
 
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.6.4
+  version: 4.6.6
 platform: ruby
 authors:
 - Sean Schofield
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -670,6 +670,7 @@ files:
 - app/models/spree/order/emails.rb
 - app/models/spree/order/payments.rb
 - app/models/spree/order/store_credit.rb
+- app/models/spree/order_contents.rb
 - app/models/spree/order_inventory.rb
 - app/models/spree/order_merger.rb
 - app/models/spree/order_promotion.rb
@@ -1127,9 +1128,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.6.4
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.6.6
   documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.6.4
+  source_code_uri: https://github.com/spree/spree/tree/v4.6.6
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -1145,7 +1146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: The bare bones necessary for Spree