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.

Ensure that the Order number is uppercase

Damian Legawiec5aa0abe93830
diff --git a/core/app/models/spree/order.rb b/core/app/models/spree/order.rb
index b802db7231..c81cfe1457 100644
--- a/core/app/models/spree/order.rb
+++ b/core/app/models/spree/order.rb
@@ -121,6 +121,8 @@ module Spree
# Needs to happen before save_permalink is called
before_validation :ensure_store_presence
before_validation :ensure_currency_presence
+ before_validation :uppercase_number
+
before_validation :clone_billing_address, if: :use_billing?
attr_accessor :use_billing
@@ -129,6 +131,8 @@ module Spree
before_update :homogenize_line_item_currencies, if: :currency_changed?
with_options presence: true do
+ # we want to have this case_sentive: true as changing it to false causes all SQL to use LOWER(slug)
+ # which is very costly and slow on large set of records
validates :number, length: { maximum: 32, allow_blank: true }, uniqueness: { allow_blank: true, case_sensitive: true }
validates :email, length: { maximum: 254, allow_blank: true }, email: { allow_blank: true }, if: :require_email
validates :item_count, numericality: { greater_than_or_equal_to: 0, less_than: 2**31, only_integer: true, allow_blank: true }
@@ -739,5 +743,9 @@ module Spree
OrderMailer.store_owner_notification_email(id).deliver_later
update_column(:store_owner_notification_delivered, true)
end
+
+ def uppercase_number
+ number&.upcase!
+ end
end
end
diff --git a/core/spec/models/spree/order_spec.rb b/core/spec/models/spree/order_spec.rb
index f7fe8d30b0..062a1febb5 100644
--- a/core/spec/models/spree/order_spec.rb
+++ b/core/spec/models/spree/order_spec.rb
@@ -1415,4 +1415,10 @@ describe Spree::Order, type: :model do
it { is_expected.to be false }
end
end
+
+ describe '#uppercase_number' do
+ let(:order) { build(:order, number: 'r1234') }
+
+ it { expect { order.valid? }.to change(order, :number).to('R1234') }
+ end
end