diff --git a/api/app/views/mno_enterprise/jpi/v1/marketplace/_app.json.jbuilder b/api/app/views/mno_enterprise/jpi/v1/marketplace/_app.json.jbuilder index 9f5ab0967..7f59d3979 100644 --- a/api/app/views/mno_enterprise/jpi/v1/marketplace/_app.json.jbuilder +++ b/api/app/views/mno_enterprise/jpi/v1/marketplace/_app.json.jbuilder @@ -1,5 +1,5 @@ json.extract! app, :id, :nid, :name, :stack, :key_benefits, :categories, :tags, :tiny_description, - :testimonials, :pictures, :pricing_plans, :rank, :support_url, :key_workflows, :key_features + :testimonials, :pictures, :pricing_plans, :rank, :support_url, :key_workflows, :key_features, :pricing_text json.description markdown(app.sanitized_description) json.known_limitations markdown(app.known_limitations) diff --git a/api/spec/controllers/mno_enterprise/jpi/v1/marketplace_controller_spec.rb b/api/spec/controllers/mno_enterprise/jpi/v1/marketplace_controller_spec.rb index d249e3154..466a7d4b4 100644 --- a/api/spec/controllers/mno_enterprise/jpi/v1/marketplace_controller_spec.rb +++ b/api/spec/controllers/mno_enterprise/jpi/v1/marketplace_controller_spec.rb @@ -44,7 +44,8 @@ def partial_hash_for_app(app) 'subcategories' => app.subcategories, 'average_rating' => app.average_rating, 'add_on' => app.add_on?, - 'running_instances_count' => app.running_instances_count + 'running_instances_count' => app.running_instances_count, + 'pricing_text' => app.pricing_text } end diff --git a/core/app/models/mno_enterprise/app.rb b/core/app/models/mno_enterprise/app.rb index 05eed1e05..01426ddc2 100644 --- a/core/app/models/mno_enterprise/app.rb +++ b/core/app/models/mno_enterprise/app.rb @@ -33,7 +33,7 @@ class App < BaseResource attributes :id, :uid, :nid, :name, :description, :tiny_description, :created_at, :updated_at, :logo, :website, :slug, :categories, :key_benefits, :key_features, :testimonials, :worldwide_usage, :tiny_description, :popup_description, :stack, :terms_url, :pictures, :tags, :api_key, :metadata_url, :metadata, :details, :rank, - :multi_instantiable, :subcategories, :reviews, :average_rating, :running_instances_count + :multi_instantiable, :subcategories, :reviews, :average_rating, :running_instances_count, :pricing_text #================================