spree_core 4.7.1 → 4.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54eebdc1dcb6130ab56b1a4e75fb3792107be4494d17287dd369c5aabd0b2d14
-  data.tar.gz: 004df02ec384660e4961af21500eb00bdc2a5570fd18c8c7aaad9c6e977d89bc
+  metadata.gz: 96a1ab3dd325e2cd0053b0ad881b73ddb153624fd04dba62dd61d4e01ab2aca4
+  data.tar.gz: 1e947a1bba157dd1df4ba6773d869675da4bffa856f4f1c57f63a4c7b5a592aa
 SHA512:
-  metadata.gz: 59d0eaa2ad2d91e38810029df57582004177d1b996f9fccc4e024cc29c7d5af3e0dc3ec2bda1bcd48d8167d1149fb812ae032ffb6979e1663738a2e360e3d54a
-  data.tar.gz: 315166b05eec174294841dc72068a6c187a9a622d2d293aeee0e9607c18530a65a8ab123387c2ff3bf70ccc02a4fcd86e103f47e9923922b7c5b6fa56eb4e5f8
+  metadata.gz: 6307ed6baf1241414853b53c6528f08448fb465fcdd4603e96f29aaf507fa2188a7f481f4e000b5ec9370e7894c49680ad86ad61d39b1c2e36d7735988c36c95
+  data.tar.gz: 1d75cd60145ae2fe99f9d9a8e2c13cd7c3b9026847b561c31299ce1bbd0596c7f4e14499e01f658dfe0e8c87e5335ee718d6983213d8ac1d8338a3300836d1f3

data/app/models/concerns/spree/named_type.rb

@@ -6,7 +6,7 @@ module Spree
       scope :active, -> { where(active: true) }
       default_scope { order(Arel.sql("LOWER(#{table_name}.name)")) }
 
-      include UniqueName
+      include Spree::UniqueName
     end
   end
 end

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::SingleStoreResource
+    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/image.rb

@@ -1,8 +1,8 @@
 module Spree
   class Image < Asset
-    include Configuration::ActiveStorage
+    include Spree::Image::Configuration::ActiveStorage
     include Rails.application.routes.url_helpers
-    include ::Spree::ImageMethods
+    include Spree::ImageMethods
 
     # 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

data/app/models/spree/legacy_user.rb

@@ -1,9 +1,9 @@
 # Default implementation of User.  This class is intended to be modified by extensions (ex. spree_auth_devise)
 module Spree
   class LegacyUser < Spree::Base
-    include UserAddress
-    include UserPaymentSource
-    include UserMethods
+    include Spree::UserAddress
+    include Spree::UserPaymentSource
+    include Spree::UserMethods
     include Spree::Metadata
 
     self.table_name = 'spree_users'

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/menu.rb

@@ -1,6 +1,6 @@
 module Spree
   class Menu < Spree::Base
-    include SingleStoreResource
+    include Spree::SingleStoreResource
     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 SingleStoreResource
-    include MemoizedData
+    include Spree::NumberIdentifier
+    include Spree::NumberAsParam
+    include Spree::SingleStoreResource
+    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,12 @@
 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/product_property.rb

@@ -1,7 +1,7 @@
 module Spree
   class ProductProperty < Spree::Base
     include Spree::FilterParam
-    include TranslatableResource
+    include Spree::TranslatableResource
 
     TRANSLATABLE_FIELDS = %i[value filter_param].freeze
     translates(*TRANSLATABLE_FIELDS)

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/role.rb

@@ -1,6 +1,6 @@
 module Spree
   class Role < Spree::Base
-    include UniqueName
+    include Spree::UniqueName
 
     has_many :role_users, class_name: 'Spree::RoleUser', dependent: :destroy
     has_many :users, through: :role_users, class_name: "::#{Spree.user_class}"

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_category.rb

@@ -1,6 +1,6 @@
 module Spree
   class ShippingCategory < Spree::Base
-    include UniqueName
+    include Spree::UniqueName
     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_location.rb

@@ -1,6 +1,6 @@
 module Spree
   class StockLocation < Spree::Base
-    include UniqueName
+    include Spree::UniqueName
     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.rb

@@ -1,6 +1,6 @@
 module Spree
   class Store < Spree::Base
-    include TranslatableResource
+    include Spree::TranslatableResource
     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::SingleStoreResource
+    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/taxon_image.rb

@@ -1,8 +1,8 @@
 module Spree
   class TaxonImage < Asset
-    include Configuration::ActiveStorage
+    include Spree::TaxonImage::Configuration::ActiveStorage
     include Rails.application.routes.url_helpers
-    include ::Spree::ImageMethods
+    include Spree::ImageMethods
 
     def styles
       self.class.styles.map do |_, size|

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/app/models/spree/wishlist.rb

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

data/app/models/spree/zone.rb

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

data/lib/spree/core/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.7.1
+  version: 4.7.3
 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
@@ -664,6 +664,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
@@ -1121,9 +1122,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.7.1
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.7.3
   documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.7.1
+  source_code_uri: https://github.com/spree/spree/tree/v4.7.3
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -1139,7 +1140,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