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 error when creating promo coupon code with blank expiration date (#13925)

Kacper Mękarski39b3b446cb70
diff --git a/spree/core/lib/generators/spree/dummy/dummy_generator.rb b/spree/core/lib/generators/spree/dummy/dummy_generator.rb
index 6244c5d947..aa1580280c 100644
--- a/spree/core/lib/generators/spree/dummy/dummy_generator.rb
+++ b/spree/core/lib/generators/spree/dummy/dummy_generator.rb
@@ -106,7 +106,7 @@ module Spree
def inject_yaml_permitted_classes
inside dummy_path do
inject_into_file 'config/application.rb', %Q[
- config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess, ActiveSupport::TimeWithZone]
+ config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone, Time]
], after: /config\.load_defaults.*$/, verbose: true
end
end
diff --git a/spree/core/lib/spree/core/engine.rb b/spree/core/lib/spree/core/engine.rb
index 6ea35d72fd..50525320ed 100644
--- a/spree/core/lib/spree/core/engine.rb
+++ b/spree/core/lib/spree/core/engine.rb
@@ -47,7 +47,7 @@ module Spree
app.config.spree = Environment.new(SpreeCalculators.new, SpreeValidators.new, Spree::Core::Configuration.new, Spree::Core::Dependencies.new)
app.config.active_record.yaml_column_permitted_classes ||= []
- app.config.active_record.yaml_column_permitted_classes.concat([Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess, ActiveSupport::TimeWithZone])
+ app.config.active_record.yaml_column_permitted_classes.concat([Symbol, BigDecimal, ActiveSupport::HashWithIndifferentAccess, ActiveSupport::TimeWithZone, ActiveSupport::TimeZone, Time])
Spree::Config = app.config.spree.preferences
Spree::RuntimeConfig = app.config.spree.preferences # for compatibility
Spree::Dependencies = app.config.spree.dependencies