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 store credit amount validation with non-English locales (#13665)

Damian Legawieca1789457bcd7
diff --git a/spree/core/app/models/spree/gift_card_batch.rb b/spree/core/app/models/spree/gift_card_batch.rb
index 1bbab536f8..417554c9ba 100644
--- a/spree/core/app/models/spree/gift_card_batch.rb
+++ b/spree/core/app/models/spree/gift_card_batch.rb
@@ -32,6 +32,10 @@ module Spree
money_methods :amount
+ def amount=(amount)
+ self[:amount] = Spree::LocalizedNumber.parse(amount)
+ end
+
self.whitelisted_ransackable_attributes = %w[prefix]
def generate_gift_cards
diff --git a/spree/core/app/models/spree/refund.rb b/spree/core/app/models/spree/refund.rb
index bd472d2de0..8bad961f41 100644
--- a/spree/core/app/models/spree/refund.rb
+++ b/spree/core/app/models/spree/refund.rb
@@ -36,6 +36,10 @@ module Spree
delegate :order, :currency, to: :payment
+ def amount=(amount)
+ self[:amount] = Spree::LocalizedNumber.parse(amount)
+ end
+
def money
Spree::Money.new(amount, currency: currency)
end
diff --git a/spree/core/app/models/spree/store_credit.rb b/spree/core/app/models/spree/store_credit.rb
index 5034d42cc7..e724775c64 100644
--- a/spree/core/app/models/spree/store_credit.rb
+++ b/spree/core/app/models/spree/store_credit.rb
@@ -54,6 +54,10 @@ module Spree
extend Spree::DisplayMoney
money_methods :amount, :amount_used, :amount_remaining, :amount_authorized
+ def amount=(amount)
+ self[:amount] = Spree::LocalizedNumber.parse(amount)
+ end
+
self.whitelisted_ransackable_attributes = %w[user_id created_by_id amount currency type_id]
self.whitelisted_ransackable_associations = %w[type user created_by]
diff --git a/spree/core/spec/models/spree/gift_card_batch_spec.rb b/spree/core/spec/models/spree/gift_card_batch_spec.rb
index f4b689f431..5046f6fac2 100644
--- a/spree/core/spec/models/spree/gift_card_batch_spec.rb
+++ b/spree/core/spec/models/spree/gift_card_batch_spec.rb
@@ -35,6 +35,16 @@ RSpec.describe Spree::GiftCardBatch, type: :model do
end
end
+ describe '#amount=' do
+ let(:amount) { '1,599,99' }
+
+ it 'is expected to equal to localized number' do
+ gift_card_batch = build(:gift_card_batch, codes_count: 2, prefix: 'batch_')
+ gift_card_batch.amount = amount
+ expect(gift_card_batch.amount).to eq(Spree::LocalizedNumber.parse(amount))
+ end
+ end
+
describe '#create_gift_cards' do
subject(:gift_card_batch) { build(:gift_card_batch, codes_count: 2, prefix: 'batch_', amount: 10) }
diff --git a/spree/core/spec/models/spree/refund_spec.rb b/spree/core/spec/models/spree/refund_spec.rb
index 525bfc58c7..a632346806 100644
--- a/spree/core/spec/models/spree/refund_spec.rb
+++ b/spree/core/spec/models/spree/refund_spec.rb
@@ -10,6 +10,20 @@ describe Spree::Refund, type: :model do
it_behaves_like 'lifecycle events'
end
+ describe '#amount=' do
+ let(:refund) { build(:refund) }
+ let(:amount) { '1,599,99' }
+
+ before do
+ allow_any_instance_of(Spree::Refund).to receive(:amount_is_less_than_or_equal_to_allowed_amount)
+ refund.amount = amount
+ end
+
+ it 'is expected to equal to localized number' do
+ expect(refund.amount).to eq(Spree::LocalizedNumber.parse(amount))
+ end
+ end
+
describe 'create' do
subject { create(:refund, payment: payment, amount: amount, reason: refund_reason, transaction_id: nil) }
diff --git a/spree/core/spec/models/spree/store_credit_spec.rb b/spree/core/spec/models/spree/store_credit_spec.rb
index f6dc50437a..7d86ad810a 100644
--- a/spree/core/spec/models/spree/store_credit_spec.rb
+++ b/spree/core/spec/models/spree/store_credit_spec.rb
@@ -135,6 +135,16 @@ describe Spree::StoreCredit, type: :model do
end
end
+ describe '#amount=' do
+ let(:amount) { '1,599,99' }
+
+ before { store_credit.amount = amount }
+
+ it 'is expected to equal to localized number' do
+ expect(store_credit.amount).to eq(Spree::LocalizedNumber.parse(amount))
+ end
+ end
+
describe '#authorize' do
context 'amount is valid' do
let(:authorization_amount) { 1.0 }