From dae2d9db9eba1754f900b444de7fd9f1e854b3bd Mon Sep 17 00:00:00 2001 From: Rob H Date: Thu, 27 Mar 2014 15:38:44 +1100 Subject: [PATCH] BPE: Set defaults for price and on_hand to prevent 'I'm a teapot' error (418) on update --- app/views/spree/api/products/bulk_show.v1.rabl | 5 +++-- app/views/spree/api/variants/bulk_show.v1.rabl | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/spree/api/products/bulk_show.v1.rabl b/app/views/spree/api/products/bulk_show.v1.rabl index a220737007..37a4680e2f 100644 --- a/app/views/spree/api/products/bulk_show.v1.rabl +++ b/app/views/spree/api/products/bulk_show.v1.rabl @@ -1,8 +1,9 @@ object @product -attributes :id, :name, :price, :variant_unit, :variant_unit_scale, :variant_unit_name, :on_demand +attributes :id, :name, :variant_unit, :variant_unit_scale, :variant_unit_name, :on_demand # Infinity is not a valid JSON object, but Rails encodes it anyway -node( :on_hand ) { |p| p.on_hand.to_f.finite? ? p.on_hand : "On demand" } +node( :on_hand ) { |p| p.on_hand.nil? ? 0 : p.on_hand.to_f.finite? ? p.on_hand : "On demand" } +node( :price ) { |p| p.price.nil? ? '0.0' : p.price } node( :available_on ) { |p| p.available_on.blank? ? "" : p.available_on.strftime("%F %T") } node( :permalink_live ) { |p| p.permalink } diff --git a/app/views/spree/api/variants/bulk_show.v1.rabl b/app/views/spree/api/variants/bulk_show.v1.rabl index ee069c600c..874edf3f8b 100644 --- a/app/views/spree/api/variants/bulk_show.v1.rabl +++ b/app/views/spree/api/variants/bulk_show.v1.rabl @@ -1,6 +1,7 @@ object @variant -attributes :id, :options_text, :price, :unit_value, :unit_description, :on_demand +attributes :id, :options_text, :unit_value, :unit_description, :on_demand # Infinity is not a valid JSON object, but Rails encodes it anyway -node( :on_hand ) { |p| p.on_hand.to_f.finite? ? p.on_hand : "On demand" } +node( :on_hand ) { |v| v.on_hand.nil? ? 0 : v.on_hand.to_f.finite? ? v.on_hand : "On demand" } +node( :price ) { |v| v.price.nil? ? '0.0' : v.price } \ No newline at end of file