diff --git a/api/app/views/mno_enterprise/jpi/v1/organizations/_organization.json.jbuilder b/api/app/views/mno_enterprise/jpi/v1/organizations/_organization.json.jbuilder index 183bb277c..87bfe3375 100644 --- a/api/app/views/mno_enterprise/jpi/v1/organizations/_organization.json.jbuilder +++ b/api/app/views/mno_enterprise/jpi/v1/organizations/_organization.json.jbuilder @@ -1,13 +1 @@ -json.extract! organization, :id, :name, :soa_enabled, :payment_restriction, :account_frozen #, :current_support_plan -# json.show_new_db_features !!organization.get_meta_data(:show_new_db_features) -# if organization.support_plan -# json.custom_training_credits organization.support_plan.custom_training_credits -# end - -# json.bootstrap_tasks do -# json.app_launched (@organization.app_instances.count > 0) -# json.credit_card_details @organization.credit_card? -# json.data_uploaded !!@organization.get_meta_data(:data_uploaded) -# json.colleagues_invited (@organization.orga_invites.count > 0) -# json.connec_promo !!@organization.get_meta_data(:connec_promo) -# end +json.extract! organization, :id, :name, :soa_enabled, :payment_restriction, :account_frozen, :billing_currency diff --git a/core/lib/mno_enterprise/testing_support/organizations_shared_helpers.rb b/core/lib/mno_enterprise/testing_support/organizations_shared_helpers.rb index 33579c9c5..fbe6be055 100644 --- a/core/lib/mno_enterprise/testing_support/organizations_shared_helpers.rb +++ b/core/lib/mno_enterprise/testing_support/organizations_shared_helpers.rb @@ -54,7 +54,8 @@ def partial_hash_for_organization(organization, admin = false) 'name' => organization.name, 'soa_enabled' => organization.soa_enabled, 'account_frozen' => organization.account_frozen, - 'payment_restriction' => organization.payment_restriction + 'payment_restriction' => organization.payment_restriction, + 'billing_currency' => organization.billing_currency } if admin