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
Added `LineItem#display_compare_at_amount` to remove business logic f… (#12839)
Damian Legawiec84fe6d1344d1
diff --git a/core/app/models/spree/line_item.rb b/core/app/models/spree/line_item.rbindex 92e2597407..8a9c6fcc8f 100644--- a/core/app/models/spree/line_item.rb+++ b/core/app/models/spree/line_item.rb@@ -85,7 +85,7 @@ module Spreeextend DisplayMoneymoney_methods :amount, :subtotal, :discounted_amount, :final_amount, :total, :price,:adjustment_total, :additional_tax_total, :promo_total, :included_tax_total,- :pre_tax_amount, :shipping_cost, :tax_total+ :pre_tax_amount, :shipping_cost, :tax_total, :compare_at_amountalias single_money display_pricealias single_display_amount display_price@@ -94,6 +94,10 @@ module Spreeprice * quantityend+ def compare_at_amount+ (variant.compare_at_amount_in(currency) || 0) * quantity+ end+alias subtotal amountdef taxable_amountdiff --git a/core/spec/models/spree/line_item_spec.rb b/core/spec/models/spree/line_item_spec.rbindex 6b266a7b35..89b75e56f0 100644--- a/core/spec/models/spree/line_item_spec.rb+++ b/core/spec/models/spree/line_item_spec.rb@@ -482,4 +482,58 @@ describe Spree::LineItem, type: :model doendendend++ describe '#amount' do+ let(:variant) { create(:variant, price: 10) }+ let(:line_item) { build(:line_item, variant: variant, quantity: 2) }++ it 'returns the amount for the line item' do+ expect(line_item.amount).to eq(20)+ end+ end++ describe '#display_amount' do+ let(:variant) { create(:variant, price: 10) }+ let(:line_item) { build(:line_item, variant: variant, quantity: 2) }++ it 'returns the amount for the line item' do+ expect(line_item.display_amount.to_s).to eq('$20.00')+ end+ end++ describe '#compare_at_amount' do+ let(:variant) { create(:variant, compare_at_price: 15) }+ let(:line_item) { build(:line_item, variant: variant, quantity: 2) }++ it 'returns the compare at amount for the line item' do+ expect(line_item.compare_at_amount).to eq(30)+ end++ context 'when compare_at_price is nil' do+ let(:variant) { create(:variant, compare_at_price: nil) }++ it 'returns zero' do+ expect(line_item.compare_at_amount).to eq(0)+ expect(line_item.display_compare_at_amount.to_s).to eq('$0.00')+ end+ end++ context 'when compare_at_price is zero' do+ let(:variant) { create(:variant, compare_at_price: 0) }++ it 'returns zero' do+ expect(line_item.compare_at_amount).to eq(0)+ expect(line_item.display_compare_at_amount.to_s).to eq('$0.00')+ end+ end+ end++ describe '#display_compare_at_amount' do+ let(:variant) { create(:variant, compare_at_price: 15) }+ let(:line_item) { build(:line_item, variant: variant, quantity: 2) }++ it 'returns the compare at amount for the line item' do+ expect(line_item.display_compare_at_amount.to_s).to eq('$30.00')+ end+ endenddiff --git a/storefront/app/views/spree/checkout/_line_item.html.erb b/storefront/app/views/spree/checkout/_line_item.html.erbindex 98be89289e..8ac3a49b59 100644--- a/storefront/app/views/spree/checkout/_line_item.html.erb+++ b/storefront/app/views/spree/checkout/_line_item.html.erb@@ -15,7 +15,7 @@<div class="font-semibold text-sm text-right shrink-0"><% if should_display_compare_at_price?(line_item.variant) %><span class="line-through text-red-500">- <%= Spree::Money.new(line_item.variant.compare_at_amount_in(line_item.currency) * line_item.quantity, currency: line_item.currency) %>+ <%= line_item.display_compare_at_amount %></span><br /><% end %>