Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Removed deprecation warnings raised by Spree's own code (#14834)

Damian Legawiec1fd4b3f8e6f7
diff --git a/spree/api/app/controllers/spree/api/v3/admin/orders_controller.rb b/spree/api/app/controllers/spree/api/v3/admin/orders_controller.rb
index ef5a371cb7..661faaa5b8 100644
--- a/spree/api/app/controllers/spree/api/v3/admin/orders_controller.rb
+++ b/spree/api/app/controllers/spree/api/v3/admin/orders_controller.rb
@@ -58,7 +58,7 @@ module Spree
# are nested inside it.
def complete
with_order_lock do
- result = Spree.order_complete_service.call(
+ result = Spree.order_complete_workflow.call(
order: @resource,
payment_pending: params[:payment_pending].to_b,
notify_customer: ActiveModel::Type::Boolean.new.cast(params[:notify_customer])
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/categories_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/categories_controller_spec.rb
index ae095446d5..b5fc9ce602 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/categories_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/categories_controller_spec.rb
@@ -40,8 +40,8 @@ RSpec.describe Spree::Api::V3::Admin::CategoriesController, type: :controller do
it 'rolls subcategory products up into the product count' do
child = create(:category, name: 'Shirts', parent: category)
- create(:product).taxons << category
- create(:product).taxons << child
+ create(:product).categories << category
+ create(:product).categories << child
get :show, params: { id: category.prefixed_id }, as: :json
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/customers_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/customers_controller_spec.rb
index 861059fd06..51dc0f20d1 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/customers_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/customers_controller_spec.rb
@@ -94,7 +94,7 @@ RSpec.describe Spree::Api::V3::Admin::CustomersController, type: :controller do
let(:headers) { { 'x-spree-api-key' => customers_key.plaintext_token } }
it 'drops expansions into orders and store credits' do
- create(:completed_order_with_totals, store: store, user: customer)
+ create(:completed_order_with_totals, store: store, customer: customer)
get :show, params: { id: customer.prefixed_id, expand: 'orders.payments,store_credits' }, as: :json
@@ -105,7 +105,7 @@ RSpec.describe Spree::Api::V3::Admin::CustomersController, type: :controller do
end
it 'expands orders for a caller who can read them' do
- create(:completed_order_with_totals, store: store, user: customer)
+ create(:completed_order_with_totals, store: store, customer: customer)
get :show, params: { id: customer.prefixed_id, expand: 'orders' }, as: :json
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb
index 86f2497745..d1a516d8aa 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/orders_controller_spec.rb
@@ -450,8 +450,8 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
expect(created.shipments).not_to be_empty
expect(created.shipments.first.shipping_rates).not_to be_empty
expect(created.shipments.first.selected_shipping_rate).to be_present
- expect(created.shipment_total).to eq(5)
- expect(created.total).to eq(created.item_total + created.shipment_total + created.adjustment_total)
+ expect(created.delivery_total).to eq(5)
+ expect(created.total).to eq(created.item_total + created.delivery_total + created.adjustment_total)
expect(json_response['delivery_total']).to eq('5.0')
expect(json_response['total']).to eq(created.total.to_s)
@@ -850,7 +850,7 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
expect(order.shipments).not_to be_empty
expect(order.fulfillments.first.shipping_rates).not_to be_empty
expect(order.fulfillments.first.selected_shipping_rate).to be_present
- expect(order.shipment_total).to eq(5)
+ expect(order.delivery_total).to eq(5)
expect(json_response['delivery_total']).to eq('5.0')
expect(json_response['total']).to eq(order.total.to_s)
@@ -933,7 +933,7 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
it 'passes notify_customer flag to the service' do
service_double = instance_double(Spree::Orders::Complete)
- allow(Spree).to receive(:order_complete_service).and_return(service_double)
+ allow(Spree).to receive(:order_complete_workflow).and_return(service_double)
expect(service_double).to receive(:call).with(
hash_including(order: order, notify_customer: true)
).and_return(Spree::ServiceModule::Result.new(true, order, nil))
@@ -945,7 +945,7 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
it 'omits notify_customer when not given (service defaults to false)' do
service_double = instance_double(Spree::Orders::Complete)
- allow(Spree).to receive(:order_complete_service).and_return(service_double)
+ allow(Spree).to receive(:order_complete_workflow).and_return(service_double)
expect(service_double).to receive(:call) do |args|
expect(args[:notify_customer]).to be_nil # service default kicks in (false)
expect(args[:order]).to eq(order)
@@ -971,7 +971,7 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
it 'surfaces validation errors from the order' do
service_double = instance_double(Spree::Orders::Complete)
- allow(Spree).to receive(:order_complete_service).and_return(service_double)
+ allow(Spree).to receive(:order_complete_workflow).and_return(service_double)
allow(service_double).to receive(:call) do |args|
args[:order].errors.add(:base, 'Custom failure reason')
Spree::ServiceModule::Result.new(false, args[:order], 'service error')
@@ -987,7 +987,7 @@ RSpec.describe Spree::Api::V3::Admin::OrdersController, type: :controller do
it 'falls back to the service error when the order has no errors' do
service_double = instance_double(Spree::Orders::Complete)
- allow(Spree).to receive(:order_complete_service).and_return(service_double)
+ allow(Spree).to receive(:order_complete_workflow).and_return(service_double)
allow(service_double).to receive(:call).and_return(
Spree::ServiceModule::Result.new(false, order, 'Order is canceled')
)
diff --git a/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb b/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb
index 1dca98d67a..6eb3362594 100644
--- a/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb
+++ b/spree/api/spec/controllers/spree/api/v3/admin/products_controller_spec.rb
@@ -447,7 +447,7 @@ RSpec.describe Spree::Api::V3::Admin::ProductsController, type: :controller do
expect(created.meta_title).to eq('Premium T-Shirt')
expect(created.tax_category).to eq(tax_category)
expect(created.tag_list).to match_array(['premium', 'cotton', 'summer'])
- expect(created.taxons).to match_array([category1, category2])
+ expect(created.categories).to match_array([category1, category2])
# Cost price now lives on the variant, not delegated from the product.
small_variant = created.variants.find_by(sku: 'PREM-TEE-S')
@@ -910,7 +910,7 @@ RSpec.describe Spree::Api::V3::Admin::ProductsController, type: :controller do
expect(updated.meta_title).to eq('Updated Premium Shirt | Shop')
expect(updated.tax_category).to eq(tax_category)
expect(updated.tag_list).to match_array(['updated', 'premium', 'new-arrival'])
- expect(updated.taxons).to match_array([category1, category2])
+ expect(updated.categories).to match_array([category1, category2])
# Variants created
small = updated.variants.find_by(sku: 'UPD-SHIRT-S')
@@ -1848,8 +1848,8 @@ RSpec.describe Spree::Api::V3::Admin::ProductsController, type: :controller do
}, as: :json
positions = [
- product.reload.classifications.find_by(category: category).position,
- second_product.reload.classifications.find_by(category: category).position
+ product.reload.product_categories.find_by(category: category).position,
+ second_product.reload.product_categories.find_by(category: category).position
]
expect(positions).to contain_exactly(1, 2)
end
@@ -1963,8 +1963,8 @@ RSpec.describe Spree::Api::V3::Admin::ProductsController, type: :controller do
}, as: :json
positions = [
- survivor.reload.classifications.find_by(category: category)&.position,
- latecomer.reload.classifications.find_by(category: category)&.position
+ survivor.reload.product_categories.find_by(category: category)&.position,
+ latecomer.reload.product_categories.find_by(category: category)&.position
].compact.sort
expect(positions).to eq([1, 2])
diff --git a/spree/api/spec/services/spree/api/v3/filters_aggregator_spec.rb b/spree/api/spec/services/spree/api/v3/filters_aggregator_spec.rb
index e3887b372c..5028a0ec41 100644
--- a/spree/api/spec/services/spree/api/v3/filters_aggregator_spec.rb
+++ b/spree/api/spec/services/spree/api/v3/filters_aggregator_spec.rb
@@ -85,8 +85,8 @@ RSpec.describe Spree::Api::V3::FiltersAggregator do
# The range is public; a price list's rows belong to its own audience.
it 'leaves price-list prices out of the range' do
price_list = create(:price_list, store: store)
- create(:price, variant: product1.master, price_list: price_list, amount: 0.5, currency: currency)
- create(:price, variant: product2.master, price_list: price_list, amount: 9_999, currency: currency)
+ create(:price, variant: product1.default_variant, price_list: price_list, amount: 0.5, currency: currency)
+ create(:price, variant: product2.default_variant, price_list: price_list, amount: 9_999, currency: currency)
price_filter = result[:filters].find { |f| f[:type] == 'price_range' }
diff --git a/spree/core/app/models/spree/product.rb b/spree/core/app/models/spree/product.rb
index a4e7c314f7..25dda88740 100644
--- a/spree/core/app/models/spree/product.rb
+++ b/spree/core/app/models/spree/product.rb
@@ -691,7 +691,7 @@ module Spree
# variant), reading preloaded associations to avoid an N+1.
# @return [ActiveSupport::TimeWithZone, nil]
def preorder_ships_at
- candidates = has_variants? ? variants : [master]
+ candidates = has_variants? ? variants : [default_variant]
candidates.select(&:preorder?).filter_map(&:preorder_ships_at).max
end
diff --git a/spree/core/app/services/spree/carts/split_by_seller.rb b/spree/core/app/services/spree/carts/split_by_seller.rb
index 61fc58f1be..8cad7441c6 100644
--- a/spree/core/app/services/spree/carts/split_by_seller.rb
+++ b/spree/core/app/services/spree/carts/split_by_seller.rb
@@ -242,7 +242,7 @@ module Spree
end
def clone_fulfillment(fulfillment, sibling)
- attributes = fulfillment.attributes.except('id', 'cart_id', 'number', 'created_at', 'updated_at')
+ attributes = fulfillment.attributes.except('id', 'cart_id', 'number', 'tracking', 'created_at', 'updated_at')
replacement = sibling.fulfillments.create!(
attributes.merge('order_id' => sibling.id, 'address_id' => sibling.ship_address_id)
)
diff --git a/spree/core/app/services/spree/orders/remove_line_item.rb b/spree/core/app/services/spree/orders/remove_line_item.rb
index 4e841c378d..20ef122b8a 100644
--- a/spree/core/app/services/spree/orders/remove_line_item.rb
+++ b/spree/core/app/services/spree/orders/remove_line_item.rb
@@ -1,12 +1,22 @@
module Spree
module Orders
- # Draft-order twin of the cart service — order: is the canonical keyword
- # on this side, delegating onto the shared implementation.
+ # Draft-order twin of the cart service. Removing an item is an upsert with
+ # quantity zero, so the removal passes the same 'orders.upsert_items.validate'
+ # hook every other draft-order item edit does.
class RemoveLineItem
prepend Spree::ServiceModule::Base
+ # @param order [Spree::Order]
+ # @param line_item [Spree::LineItem]
+ # @param options [Hash] accepted for signature compatibility and ignored
+ # @return [Spree::ServiceModule::Result] value is the removed line item
def call(order:, line_item:, options: {})
- Spree::Carts::RemoveLineItem.call(cart: order, line_item: line_item, options: options)
+ result = Spree.order_upsert_items_workflow.call(
+ order: order,
+ items: [{ variant_id: line_item.variant_id, quantity: 0 }]
+ )
+
+ result.success? ? success(line_item) : failure(line_item, result.error)
end
end
end
diff --git a/spree/core/app/workflows/spree/carts/complete.rb b/spree/core/app/workflows/spree/carts/complete.rb
index 888dd32a32..6c3071aa3c 100644
--- a/spree/core/app/workflows/spree/carts/complete.rb
+++ b/spree/core/app/workflows/spree/carts/complete.rb
@@ -338,7 +338,7 @@ module Spree
line_item_id_map = line_item_map.transform_keys(&:id).transform_values(&:id)
cart.fulfillments.reload.each_with_object({}) do |cart_fulfillment, map|
- attributes = cart_fulfillment.attributes.except('id', 'cart_id', 'number', 'created_at', 'updated_at')
+ attributes = cart_fulfillment.attributes.except('id', 'cart_id', 'number', 'tracking', 'created_at', 'updated_at')
fulfillment = order.fulfillments.create!(attributes.merge('order_id' => order.id, 'address_id' => order.ship_address_id))
if (selected = cart_fulfillment.selected_delivery_rate)
diff --git a/spree/core/lib/spree/testing_support/factories/refund_factory.rb b/spree/core/lib/spree/testing_support/factories/refund_factory.rb
index 30c985fbaa..a26ab1fe59 100644
--- a/spree/core/lib/spree/testing_support/factories/refund_factory.rb
+++ b/spree/core/lib/spree/testing_support/factories/refund_factory.rb
@@ -4,7 +4,7 @@ FactoryBot.define do
factory :refund, class: Spree::Refund do
amount { 100.00 }
transaction_id { generate(:refund_transaction_id) }
- association(:payment, state: 'completed')
+ association(:payment, status: 'completed')
association(:reason, factory: :refund_reason)
end