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.

Improve displaying Volume Rule when max quantity is unlimited

Damian Legawieccebe90bffe7e
diff --git a/admin/app/views/spree/admin/shared/_preferences.html.erb b/admin/app/views/spree/admin/shared/_preferences.html.erb
index 61bdafb397..31219a4c13 100644
--- a/admin/app/views/spree/admin/shared/_preferences.html.erb
+++ b/admin/app/views/spree/admin/shared/_preferences.html.erb
@@ -1,10 +1,10 @@
<% if object.preferences.present? %>
<p class="mb-0">
<% object.preferences.each do |key, value| %>
- <% next if value.blank? %>
+ <% next if value.blank? && key != :max_quantity %>
<% next if key == :eligible_values %>
<span><%= Spree.t(key) %>:</span>
- <strong><%= value %></strong>
+ <strong><%= value.blank? ? Spree.t(:unlimited) : value %></strong>
<% end %>
</p>
<% end %>
\ No newline at end of file
diff --git a/core/app/models/spree/price_rules/volume_rule.rb b/core/app/models/spree/price_rules/volume_rule.rb
index d0b49a7007..ef821aece3 100644
--- a/core/app/models/spree/price_rules/volume_rule.rb
+++ b/core/app/models/spree/price_rules/volume_rule.rb
@@ -2,7 +2,7 @@ module Spree
module PriceRules
class VolumeRule < Spree::PriceRule
preference :min_quantity, :integer, default: 1
- preference :max_quantity, :integer
+ preference :max_quantity, :integer, nullable: true
def applicable?(context)
return false unless context.quantity
diff --git a/core/spec/models/spree/price_rules/volume_rule_spec.rb b/core/spec/models/spree/price_rules/volume_rule_spec.rb
index 48b8191826..abddda4534 100644
--- a/core/spec/models/spree/price_rules/volume_rule_spec.rb
+++ b/core/spec/models/spree/price_rules/volume_rule_spec.rb
@@ -5,6 +5,26 @@ describe Spree::PriceRules::VolumeRule, type: :model do
let(:rule) { create(:volume_price_rule, price_list: price_list, min_quantity: 10) }
let(:variant) { create(:variant) }
+ describe 'max_quantity preference' do
+ it 'stores nil when set to empty string' do
+ rule.preferred_max_quantity = ''
+ rule.save!
+ expect(rule.reload.preferred_max_quantity).to be_nil
+ end
+
+ it 'preserves non-zero max_quantity' do
+ rule.preferred_max_quantity = 50
+ rule.save!
+ expect(rule.reload.preferred_max_quantity).to eq(50)
+ end
+
+ it 'preserves nil max_quantity' do
+ rule.preferred_max_quantity = nil
+ rule.save!
+ expect(rule.reload.preferred_max_quantity).to be_nil
+ end
+ end
+
describe '#applicable?' do
it 'returns true when quantity meets minimum' do
context = Spree::Pricing::Context.new(variant: variant, currency: 'USD', quantity: 10)