raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds minus sign as validation criteria

Browse Source 
Removes pending from passing examples
This commit is contained in:
filipefurtad0
2023-05-14 22:51:28 +01:00
parent 596b318778
commit e7ab839fb3
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spree/localized_number.rb
View File

@@ -45,7 +45,7 @@ module Spree
def self.valid_localizable_number?(number)
return true unless number.is_a?(String) || number.respond_to?(:to_d)
# Invalid if only two digits between dividers, or if any non-number characters
return false if number.to_s =~ /[.,]\d{2}[.,]/ || number.to_s =~ /[^0-9,.]+/
return false if number.to_s =~ /[.,]\d{2}[.,]/ || number.to_s =~ /[^0-9,.-]+/
true
end

12
spec/system/admin/adjustments_spec.rb
View File

@@ -63,23 +63,17 @@ describe '
context "included tax" do
context "adding negative, taxed adjustments to an order" do
it_behaves_like "when the enable_localized_number preference", "Discount", "-2", "TVA 20%", "$0.33", "$-1.67" do
before { pending("#10837") }
end
it_behaves_like "when the enable_localized_number preference", "Discount", "-2", "TVA 20%", "$0.33", "$-1.67"
end
context "adding positive, taxed adjustments to an order" do
it_behaves_like "when the enable_localized_number preference", "Late fee", "100", "TVA 20%", "$-16.67", "$83.33" do
before { pending("#10837") }
end
it_behaves_like "when the enable_localized_number preference", "Late fee", "100", "TVA 20%", "$-16.67", "$83.33"
end
end
context "added tax" do
context "adding negative, taxed adjustments to an order" do
it_behaves_like "when the enable_localized_number preference", "Discount", "-2", "GST", "$10.00", "$8.00" do
before { pending("#10837") }
end
it_behaves_like "when the enable_localized_number preference", "Discount", "-2", "GST", "$10.00", "$8.00"
end
context "adding positive, taxed adjustments to an order" do