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
Fix displaying the order status when order with gift card is refunded/cancelled (#13204)
Łukasz Adamczyk55676278ba42
diff --git a/admin/app/helpers/spree/admin/orders_helper.rb b/admin/app/helpers/spree/admin/orders_helper.rbindex 19bb98fa00..c325f6a6ac 100644--- a/admin/app/helpers/spree/admin/orders_helper.rb+++ b/admin/app/helpers/spree/admin/orders_helper.rb@@ -20,7 +20,15 @@ module Spreedef order_payment_state(order, options = {})return if order.payment_state.blank?- content_tag :span, class: "badge #{options[:class]} badge-#{order.partially_refunded? ? 'warning' : order.payment_state}" do+ badge_class = if order.order_refunded?+ 'badge-danger'+ elsif order.partially_refunded?+ 'badge-warning'+ else+ "badge-#{order.payment_state}"+ end++ content_tag :span, class: "badge #{options[:class]} #{badge_class}" doif order.order_refunded?icon('credit-card-refund') + Spree.t('payment_states.refunded')elsif order.partially_refunded?diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rbindex 3d8e6856ad..39077f8c6f 100644--- a/core/app/models/spree/order.rb+++ b/core/app/models/spree/order.rb@@ -269,16 +269,14 @@ module Spreeenddef order_refunded?- (payment_state == 'void' && refunds.sum(:amount).positive?) || refunds.sum(:amount) == total+ (payment_state.in?(%w[void failed]) && refunds.sum(:amount).positive?) ||+ refunds.sum(:amount) == total_minus_store_credits - additional_tax_total.absenddef partially_refunded?- return false if refunds.empty?+ return false if refunds.empty? || payment_state.in?(%w[void failed])- # we must deduct not returned amount, otherwise it can look like order has not been fully refunded- amount_not_refunded = additional_tax_total.abs + total_applied_store_credit-- refunds.sum(:amount) < total - amount_not_refunded+ refunds.sum(:amount) < total_minus_store_credits - additional_tax_total.absend# Indicates whether or not the user is allowed to proceed to checkout.diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rbindex 212339be02..8438aae4be 100644--- a/core/spec/models/spree/order_spec.rb+++ b/core/spec/models/spree/order_spec.rb@@ -2025,6 +2025,26 @@ describe Spree::Order, type: :model doexpect(subject).to be falseendend++ context 'when payment is void' do+ let(:amount) { 70 }++ before { order.update_column(:payment_state, 'void') }++ it 'returns false' do+ expect(subject).to be(false)+ end+ end++ context 'when payment is failed' do+ let(:amount) { 70 }++ before { order.update_column(:payment_state, 'failed') }++ it 'returns false' do+ expect(subject).to be(false)+ end+ endendcontext 'when order does not have refunds' do@@ -2036,6 +2056,62 @@ describe Spree::Order, type: :model doendend+ describe '#order_refunded?' do+ subject { order.order_refunded? }++ context 'when orders has refunds' do+ let!(:order) { create(:order_ready_to_ship) }+ let!(:refund) { create(:refund, amount: amount, payment: order.payments.first) }++ let!(:credit_card_payment_method) { create(:simple_credit_card_payment_method, stores: [store]) }+ let!(:store_credit) { create(:store_credit, user: order.user, amount: 15) }++ before do+ order.update_column(:total, 110)+ order.update_column(:additional_tax_total, 10)+ order.update_column(:payment_total, 95)++ order.payments.first.update_column(:amount, 95)++ create(:store_credit_payment, amount: 15, order: order)+ end++ context 'when sum of refunds is less than max amount which could be refunded' do+ let(:amount) { 50 }++ it 'returns false' do+ expect(subject).to be(false)+ end+ end++ context 'when sum of refunds is equal to max amount which could be refunded' do+ let(:amount) { 85 }++ it 'returns true' do+ expect(subject).to be(true)+ end+ end++ context 'when payment is void' do+ let(:amount) { 85 }++ before { order.update_column(:state, 'void') }++ it 'returns true' do+ expect(subject).to be(true)+ end+ end+ end++ context 'when order does not have refunds' do+ let!(:order) { create(:order_ready_to_ship) }++ it 'returns false' do+ expect(subject).to be(false)+ end+ end+ end+describe '#payment_method' dosubject { order.payment_method }