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.

fix[v-3325]: order_refunded? fix (#13702)

Szymon Chorobski94ac0f755c27
diff --git a/spree/core/app/models/spree/order.rb b/spree/core/app/models/spree/order.rb
index a1c311eb50..0ed95cc87d 100644
--- a/spree/core/app/models/spree/order.rb
+++ b/spree/core/app/models/spree/order.rb
@@ -309,9 +309,9 @@ module Spree
# @return [Boolean]
def order_refunded?
return false if item_count.zero?
+ return false if refunds_total.zero?
- (payment_state.in?(%w[void failed]) && refunds_total.positive?) ||
- refunds_total == total_minus_store_credits - additional_tax_total.abs
+ payment_state.in?(%w[void failed]) || refunds_total == total_minus_store_credits - additional_tax_total.abs
end
def refunds_total
diff --git a/spree/core/spec/models/spree/order_spec.rb b/spree/core/spec/models/spree/order_spec.rb
index 36497ecb70..baed27fdf8 100644
--- a/spree/core/spec/models/spree/order_spec.rb
+++ b/spree/core/spec/models/spree/order_spec.rb
@@ -2418,7 +2418,18 @@ describe Spree::Order, type: :model do
end
context 'when order does not have refunds' do
- let!(:order) { create(:order_ready_to_ship) }
+ let(:order) { create(:order_with_line_items, total: 100, store: store) }
+
+ context 'when order is fully paid by store credit' do
+ before do
+ create(:store_credit_payment_method, stores: [order.store])
+ create(:store_credit_payment, amount: order.total, order: order)
+ end
+
+ it 'returns false' do
+ expect(subject).to be(false)
+ end
+ end
it 'returns false' do
expect(subject).to be(false)