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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Remove Order model dead methods (#13679)
Damian Legawiec4c724e2355e6
diff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rbindex c6dd41c8d3..95849f35fe 100644--- a/spree/core/app/models/spree/order.rb+++ b/spree/core/app/models/spree/order.rb@@ -92,7 +92,7 @@ module Spreeself.whitelisted_ransackable_scopes = %w[refunded partially_refunded multi_search]attr_reader :coupon_code- attr_accessor :temporary_address, :temporary_credit_card+ attr_accessor :temporary_addressattribute :state_machine_resumed, :boolean@@ -532,16 +532,6 @@ module Spreecomplete? || canceled? || returned?end- def credit_cards- credit_card_ids = payments.from_credit_card.pluck(:source_id).uniq- CreditCard.where(id: credit_card_ids)- end-- def valid_credit_cards- credit_card_ids = payments.from_credit_card.valid.pluck(:source_id).uniq- CreditCard.where(id: credit_card_ids)- end-# Finalizes an in progress order after checkout is complete.# Called after transition to complete state when payments will have been processeddef finalize!diff --git a/spree/core/app/models/spree/order/checkout.rb b/spree/core/app/models/spree/order/checkout.rbindex 0baf28c504..509ad634fd 100644--- a/spree/core/app/models/spree/order/checkout.rb+++ b/spree/core/app/models/spree/order/checkout.rb@@ -89,7 +89,6 @@ module Spreeendafter_transition to: :complete, do: :create_user_record- after_transition to: :complete, do: :persist_user_credit_cardbefore_transition to: :payment, do: :set_shipments_costbefore_transition to: :payment, do: :create_tax_charge!before_transition to: :payment, do: :recalculate_store_credit_payment@@ -293,23 +292,6 @@ module SpreeSpree::Orders::CreateUserAccount.call(order: self, accepts_email_marketing: accept_marketing?)end- def persist_user_credit_card- return unless !temporary_credit_card && user_id && valid_credit_cards.present?-- valid_credit_cards.first.update(user_id: user_id, default: true)- end-- def assign_default_credit_card- return unless payments.from_credit_card.size.empty? && user_has_valid_default_card? && payment_required?-- cc = user.default_credit_card- payments.create!(payment_method_id: cc.payment_method_id, source: cc, amount: total)- end-- def user_has_valid_default_card?- user && user.default_credit_card.try(:valid?)- end-def move_to_next_step_if_address_not_requiredreturn if requires_ship_address?diff --git a/spree/core/lib/spree/core/engine.rb b/spree/core/lib/spree/core/engine.rbindex a2bd4b2670..ff8cdd52dd 100644--- a/spree/core/lib/spree/core/engine.rb+++ b/spree/core/lib/spree/core/engine.rb@@ -43,10 +43,6 @@ module Spree# Add app/subscribers to autoload pathsconfig.paths.add 'app/subscribers', eager_load: true- rake_tasks do- load File.join(root, 'lib', 'tasks', 'exchanges.rake')- end-initializer 'spree.environment', before: :load_config_initializers do |app|app.config.spree = Environment.new(SpreeCalculators.new, SpreeValidators.new, Spree::Core::Configuration.new, Spree::Core::Dependencies.new)diff --git a/spree/core/lib/tasks/exchanges.rake b/spree/core/lib/tasks/exchanges.rakedeleted file mode 100644index 19f0b1955e..0000000000--- a/spree/core/lib/tasks/exchanges.rake+++ /dev/null@@ -1,66 +0,0 @@-namespace :exchanges do- desc %q{Takes unreturned exchanged items and creates a new order to charge- the customer for not returning them}- task charge_unreturned_items: :environment do- unreturned_return_items_scope = Spree::ReturnItem.awaiting_return.exchange_processed- unreturned_return_items = unreturned_return_items_scope.joins(:exchange_inventory_units).where([- 'spree_inventory_units.created_at < :days_ago AND spree_inventory_units.state = :iu_state',- days_ago: Spree::Config[:expedited_exchanges_days_window].days.ago, iu_state: 'shipped'- ]).distinct.to_a-- # Determine that a return item has already been deemed unreturned and therefore charged- # by the fact that its exchange inventory unit has popped off to a different order- unreturned_return_items.select! { |ri| ri.exchange_inventory_units.exists?(order_id: ri.inventory_unit.order_id) }-- failed_orders = []-- unreturned_return_items.group_by(&:exchange_shipments).each do |shipments, return_items|- original_order = shipments.first.order- order_attributes = {- bill_address: original_order.bill_address,- ship_address: original_order.ship_address,- email: original_order.email- }- order_attributes[:store_id] = original_order.store_id- order = Spree::Order.create!(order_attributes)-- order.associate_user!(original_order.user) if original_order.user-- return_items.group_by(&:exchange_variant).map do |variant, variant_return_items|- variant_inventory_units = variant_return_items.map(&:exchange_inventory_units).flatten- line_item = Spree::LineItem.create!(variant: variant, quantity: variant_return_items.count, order: order)- variant_inventory_units.each { |i| i.update!(line_item_id: line_item.id, order_id: order.id) }- end-- order.reload.update_with_updater!- while order.state != order.checkout_steps[-2] && order.next; end-- unless order.payments.present?- card_to_reuse = original_order.valid_credit_cards.first- card_to_reuse = original_order.user.credit_cards.default.first if !card_to_reuse && original_order.user- Spree::Payment.create!(order: order,- payment_method_id: card_to_reuse.try(:payment_method_id),- source: card_to_reuse,- amount: order.total)- end-- # the order builds a shipment on its own on transition to delivery, but we want- # the original exchange shipment, not the built one- order.shipments.destroy_all- shipments.each { |shipment| shipment.update(order_id: order.id) }- order.update!(state: 'confirm')-- order.reload.next!- order.update_with_updater!- order.finalize!-- failed_orders << order unless order.completed? && order.valid?- rescue StandardError- failed_orders << order- end- failure_message = failed_orders.map { |o| "#{o.number} - #{o.errors.full_messages}" }.join(', ')- raise UnableToChargeForUnreturnedItems, failure_message if failed_orders.present?- end-end--class UnableToChargeForUnreturnedItems < StandardError; enddiff --git a/spree/core/spec/lib/tasks/exchanges_spec.rb b/spree/core/spec/lib/tasks/exchanges_spec.rbdeleted file mode 100644index b8fce039d1..0000000000--- a/spree/core/spec/lib/tasks/exchanges_spec.rb+++ /dev/null@@ -1,140 +0,0 @@-require 'spec_helper'--describe 'exchanges:charge_unreturned_items' do- include_context 'rake'-- describe '#prerequisites' do- it { expect(subject.prerequisites).to include('environment') }- end-- context 'there are no unreturned items' do- it { expect { subject.invoke }.not_to change { Spree::Order.count } }- end-- context 'there are unreturned items' do- let!(:order) { create(:shipped_order, line_items_count: 2) }- let(:return_item_1) { create(:exchange_return_item, inventory_unit: order.inventory_units.first) }- let(:return_item_2) { create(:exchange_return_item, inventory_unit: order.inventory_units.last) }- let!(:rma) { create(:return_authorization, order: order, return_items: [return_item_1, return_item_2]) }- let!(:tax_rate) { create(:tax_rate, zone: order.tax_zone, tax_category: return_item_2.exchange_variant.tax_category) }-- before do- @original_expedited_exchanges_pref = Spree::Config[:expedited_exchanges]- Spree::Config[:expedited_exchanges] = true- Spree::StockItem.update_all(count_on_hand: 10)- rma.save!- Spree::Shipment.last.ship!- return_item_1.receive!- Timecop.travel travel_time- Spree::Config[:auto_capture] = false- end-- after do- Timecop.return- Spree::Config[:expedited_exchanges] = @original_expedited_exchanges_pref- Spree::Config[:auto_capture] = true- end-- context 'fewer than the config allowed days have passed' do- let(:travel_time) { (Spree::Config[:expedited_exchanges_days_window] - 1).days }-- it 'does not create a new order' do- expect { subject.invoke }.not_to change { Spree::Order.count }- end- end-- context 'more than the config allowed days have passed' do- let(:travel_time) { (Spree::Config[:expedited_exchanges_days_window] + 1).days }-- it 'creates a new completed order' do- expect { subject.invoke }.to change { Spree::Order.count }- expect(Spree::Order.last).to be_completed- end-- it 'moves the shipment for the unreturned items to the new order' do- subject.invoke- new_order = Spree::Order.last- expect(new_order.shipments.count).to eq 1- expect(return_item_2.reload.exchange_shipments.first.order).to eq Spree::Order.last- end-- it 'creates line items on the order for the unreturned items' do- subject.invoke- expect(Spree::Order.last.line_items.map(&:variant)).to eq [return_item_2.exchange_variant]- end-- it 'associates the exchanges inventory units with the new line items' do- subject.invoke- expect(return_item_2.reload.exchange_inventory_units.last.try(:line_item).try(:order)).to eq Spree::Order.last- end-- it 'uses the credit card from the previous order' do- subject.invoke- new_order = Spree::Order.last- expect(new_order.credit_cards).to be_present- expect(new_order.credit_cards.first).to eq order.valid_credit_cards.first- end-- it 'authorizes the order for the full amount of the unreturned items including taxes' do- expect { subject.invoke }.to change { Spree::Payment.count }.by(1)- new_order = Spree::Order.last- expected_amount = return_item_2.reload.exchange_variant.price + new_order.additional_tax_total + new_order.included_tax_total + new_order.ship_total- expect(new_order.total).to eq expected_amount- payment = new_order.payments.first- expect(payment.amount).to eq expected_amount- expect(payment).to be_pending- expect(new_order.item_total).to eq return_item_2.reload.exchange_variant.price- end-- it 'does not attempt to create a new order for the item more than once' do- subject.invoke- subject.reenable- expect { subject.invoke }.not_to change { Spree::Order.count }- end-- it 'associates the store of the original order with the exchange order' do- allow_any_instance_of(Spree::Order).to receive(:store_id).and_return(123)-- expect(Spree::Order).to receive(:create!).once.with(hash_including(store_id: 123)) { |attrs| Spree::Order.new(attrs.except(:store_id)).tap(&:save!) }- subject.invoke- end-- context 'there is no card from the previous order' do- let!(:credit_card) { create(:credit_card, user: order.user, default: true, gateway_customer_profile_id: 'BGS-123') }-- before { allow_any_instance_of(Spree::Order).to receive(:valid_credit_cards).and_return([]) }-- it "attempts to use the user's default card" do- expect { subject.invoke }.to change { Spree::Payment.count }.by(1)- new_order = Spree::Order.last- expect(new_order.credit_cards).to be_present- expect(new_order.credit_cards.first).to eq credit_card- end- end-- context 'it is unable to authorize the credit card' do- before { allow_any_instance_of(Spree::Payment).to receive(:authorize!).and_raise(RuntimeError) }-- it 'raises an error with the order' do- expect { subject.invoke }.to raise_error(UnableToChargeForUnreturnedItems)- end- end-- context 'the exchange inventory unit is not shipped' do- before { return_item_2.reload.exchange_inventory_units.update_all(state: 'on hand') }-- it 'does not create a new order' do- expect { subject.invoke }.not_to change { Spree::Order.count }- end- end-- context 'the exchange inventory unit has been returned' do- before { return_item_2.reload.exchange_inventory_units.update_all(state: 'returned') }-- it 'does not create a new order' do- expect { subject.invoke }.not_to change { Spree::Order.count }- end- end- end- end-enddiff --git a/spree/core/spec/models/spree/order/checkout_spec.rb b/spree/core/spec/models/spree/order/checkout_spec.rbindex 9fd376032b..6a006cec56 100644--- a/spree/core/spec/models/spree/order/checkout_spec.rb+++ b/spree/core/spec/models/spree/order/checkout_spec.rb@@ -492,12 +492,6 @@ describe Spree::Order, type: :model doendend- it "makes the current credit card a user's default credit card" do- order.next!- expect(order.state).to eq 'complete'- expect(order.user.reload.default_credit_card.try(:id)).to eq(order.credit_cards.first.id)- end-it 'creates a digital_link for the digital line_item' doorder.next!expect(order.state).to eq 'complete'@@ -510,12 +504,6 @@ describe Spree::Order, type: :model doexpect(order.line_items.find_by(variant: variant_physical_with_digital_asset).digital_links).not_to be_emptyend- it 'does not assign a default credit card if temporary_credit_card is set' do- order.temporary_credit_card = true- order.next!- expect(order.user.reload.default_credit_card).to be_nil- end-context 'when gift card is present' dolet(:gift_card) { create(:gift_card, amount: order.total, store: store) }let(:order) { create(:order_with_line_items, store: store, state: 'payment') }