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.

V-3256 Metafields fixes (#13170)

Damian Legawiec59ba494c981b
diff --git a/admin/app/views/spree/admin/metafields/types/_boolean.html.erb b/admin/app/views/spree/admin/metafields/types/_boolean.html.erb
index 5bf0034aa1..4d8fcbbda9 100644
--- a/admin/app/views/spree/admin/metafields/types/_boolean.html.erb
+++ b/admin/app/views/spree/admin/metafields/types/_boolean.html.erb
@@ -1,4 +1,4 @@
<div class="custom-control custom-checkbox">
- <%= f.check_box :value, class: 'custom-control-input' %>
+ <%= f.check_box :value, class: 'custom-control-input', checked: f.object.value&.to_b %>
<%= f.label :value, Spree.t(:say_yes), class: 'custom-control-label' %>
</div>
\ No newline at end of file
diff --git a/admin/spec/controllers/spree/admin/metafields_controller_spec.rb b/admin/spec/controllers/spree/admin/metafields_controller_spec.rb
index eb975d20be..bc4762c015 100644
--- a/admin/spec/controllers/spree/admin/metafields_controller_spec.rb
+++ b/admin/spec/controllers/spree/admin/metafields_controller_spec.rb
@@ -59,6 +59,7 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller do
describe 'PUT #update' do
let!(:metafield) { create(:metafield, resource: product, metafield_definition: metafield_definition) }
let!(:metafield_definition_2) { create(:metafield_definition, :rich_text_field, resource_type: 'Spree::Product') }
+ let!(:metafield_definition_3) { create(:metafield_definition, :boolean_field, resource_type: 'Spree::Product') }
let(:metafield_attributes) do
{
@@ -74,6 +75,12 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller do
type: metafield_definition_2.metafield_type,
metafield_definition_id: metafield_definition_2.id,
value: '<strong>Test Value</strong>'
+ },
+ "2" => {
+ id: nil,
+ type: metafield_definition_3.metafield_type,
+ metafield_definition_id: metafield_definition_3.id,
+ value: '0'
}
}
}
@@ -95,6 +102,9 @@ RSpec.describe Spree::Admin::MetafieldsController, type: :controller do
metafield2 = product.metafields.find_by(metafield_definition_id: metafield_definition_2.id)
expect(metafield2.value).to be_kind_of(ActionText::RichText)
expect(metafield2.value.to_s).to include('<strong>Test Value</strong>')
+
+ metafield3 = product.metafields.find_by(metafield_definition_id: metafield_definition_3.id)
+ expect(metafield3.value).to eq('false')
end
context 'when resource_type is missing' do
diff --git a/core/app/models/concerns/spree/display_on.rb b/core/app/models/concerns/spree/display_on.rb
index dafd64e473..e98845c366 100644
--- a/core/app/models/concerns/spree/display_on.rb
+++ b/core/app/models/concerns/spree/display_on.rb
@@ -10,6 +10,10 @@ module Spree
scope :available_on_back_end, -> { where(display_on: [:back_end, :both]) }
validates :display_on, presence: true, inclusion: { in: DISPLAY.map(&:to_s) }
+
+ def available_on_front_end?
+ display_on == 'front_end' || display_on == 'both'
+ end
end
end
end
diff --git a/core/app/models/spree/metafields/boolean.rb b/core/app/models/spree/metafields/boolean.rb
index c4a522d84b..2a6770f45a 100644
--- a/core/app/models/spree/metafields/boolean.rb
+++ b/core/app/models/spree/metafields/boolean.rb
@@ -1,11 +1,15 @@
module Spree
module Metafields
class Boolean < Spree::Metafield
- normalizes :value, with: lambda(&:to_b)
+ normalizes :value, with: ->(value) { value.to_b.to_s }
def csv_value
value.to_b ? Spree.t(:say_yes) : Spree.t(:say_no)
end
+
+ def serialize_value
+ value.to_b
+ end
end
end
end
diff --git a/core/app/models/spree/metafields/number.rb b/core/app/models/spree/metafields/number.rb
index 27a23484e5..9c5ba3d8db 100644
--- a/core/app/models/spree/metafields/number.rb
+++ b/core/app/models/spree/metafields/number.rb
@@ -8,7 +8,7 @@ module Spree
end
def csv_value
- value.to_s
+ value.to_d.to_s
end
end
end
diff --git a/core/spec/models/spree/metafields/boolean_spec.rb b/core/spec/models/spree/metafields/boolean_spec.rb
new file mode 100644
index 0000000000..a6aad76275
--- /dev/null
+++ b/core/spec/models/spree/metafields/boolean_spec.rb
@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe Spree::Metafields::Boolean, type: :model do
+ let(:metafield_definition) { create(:metafield_definition, :boolean_field) }
+ let(:metafield) { described_class.new(metafield_definition: metafield_definition, value: 'true') }
+
+ describe 'normalizes' do
+ it 'normalizes the boolean value' do
+ metafield.value = '0'
+ expect(metafield.value).to eq('false')
+ metafield.value = '1'
+ expect(metafield.value).to eq('true')
+ end
+ end
+
+ describe '#serialize_value' do
+ it 'returns the boolean value' do
+ expect(metafield.serialize_value).to eq(true)
+ end
+ end
+
+ describe '#csv_value' do
+ it 'returns the boolean value' do
+ expect(metafield.csv_value).to eq('Yes')
+ end
+ end
+end
diff --git a/core/spec/models/spree/metafields/number_spec.rb b/core/spec/models/spree/metafields/number_spec.rb
index d8f8837837..3f1f941e48 100644
--- a/core/spec/models/spree/metafields/number_spec.rb
+++ b/core/spec/models/spree/metafields/number_spec.rb
@@ -19,4 +19,11 @@ describe Spree::Metafields::Number, type: :model do
expect(metafield.serialize_value).to eq(123)
end
end
+
+ describe '#csv_value' do
+ it 'returns the number as a string' do
+ expect(metafield.csv_value).to be_kind_of(String)
+ expect(metafield.csv_value).to eq('123.0')
+ end
+ end
end
diff --git a/storefront/app/views/themes/default/spree/metafields/_boolean.html.erb b/storefront/app/views/themes/default/spree/metafields/_boolean.html.erb
new file mode 100644
index 0000000000..b7c5a1fc19
--- /dev/null
+++ b/storefront/app/views/themes/default/spree/metafields/_boolean.html.erb
@@ -0,0 +1,5 @@
+<% if metafield.value == 'true' %>
+ <%= Spree.t(:say_yes) %>
+<% else %>
+ <%= Spree.t(:say_no) %>
+<% end %>
\ No newline at end of file
diff --git a/storefront/app/views/themes/default/spree/metafields/_json.html.erb b/storefront/app/views/themes/default/spree/metafields/_json.html.erb
new file mode 100644
index 0000000000..572eb5b765
--- /dev/null
+++ b/storefront/app/views/themes/default/spree/metafields/_json.html.erb
@@ -0,0 +1,3 @@
+<code>
+ <%= metafield.value.as_json.as_json %>
+</code>
\ No newline at end of file
diff --git a/storefront/app/views/themes/default/spree/metafields/_number.html.erb b/storefront/app/views/themes/default/spree/metafields/_number.html.erb
new file mode 100644
index 0000000000..52172fe269
--- /dev/null
+++ b/storefront/app/views/themes/default/spree/metafields/_number.html.erb
@@ -0,0 +1 @@
+<%= metafield.value %>
\ No newline at end of file
diff --git a/storefront/app/views/themes/default/spree/products/_metafields.html.erb b/storefront/app/views/themes/default/spree/products/_metafields.html.erb
index f048a9c50b..40d82dd940 100644
--- a/storefront/app/views/themes/default/spree/products/_metafields.html.erb
+++ b/storefront/app/views/themes/default/spree/products/_metafields.html.erb
@@ -3,6 +3,7 @@
<% block.preferred_metafield_definition_ids.each do |definition_id| %>
<% metafield = metafields_by_definition[definition_id.to_s] %>
<% next unless metafield %>
+ <% next unless metafield.metafield_definition.available_on_front_end? %>
<details class="product-metafield border-b border-default group" id="metafield_<%= metafield.id %>">
<summary class="text-sm uppercase tracking-widest inline-flex w-full justify-between items-center py-4 cursor-pointer focus:outline-none">