Skip to content

Commit

Permalink
Merge pull request #569 from fgourichon/MNOE-780
Browse files Browse the repository at this point in the history
[MNOE-780] - Add billing_currency in org view
  • Loading branch information
ouranos authored Nov 8, 2017
2 parents 1963b14 + 44a02f4 commit 9c39b7a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 14 deletions.
Original file line number Diff line number Diff line change
@@ -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 [email protected]_meta_data(:data_uploaded)
# json.colleagues_invited (@organization.orga_invites.count > 0)
# json.connec_promo [email protected]_meta_data(:connec_promo)
# end
json.extract! organization, :id, :name, :soa_enabled, :payment_restriction, :account_frozen, :billing_currency
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9c39b7a

Please sign in to comment.