[MNOE-107] Fix admin finance page #75
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| {current_billing_amount: {amount: billing.amount, currency: billing.currency_as_string}} | ||
| end | ||
| render json: data | ||
| tenant = MnoEnterprise::Tenant.get('tenant') |
There was a problem hiding this comment.
To get a singular resource, do we need to specify a fake id? Could it be MnoEnterprise::Tenant.get ?
There was a problem hiding this comment.
It's not a fake id actually. It's the resource name:
>> MnoEnterprise::Tenant.get('tenant')
=> GET /api/mnoe/v1/tenant
I'll check if I can find something cleaner
There was a problem hiding this comment.
@BrunoChauvet @x4d3
How about:
module MnoEnterprise
class Tenant < BaseResource
def self.show
self.get('tenant')
end
end
endSo we can use MnoEnterprise::Tenant.show in the controller? Or I could override get?
There was a problem hiding this comment.
That looks cleaner indeed 👍
|
I would just add a |
|
@BrunoChauvet see last commit |
|
Looks good |
added 2 commits
September 8, 2016 16:45
This should be calculated via mnohub for performance reason (and also to perform the currency conversion)
- Fix invoices table amount - Add extra finance KPIs
ouranos
force-pushed
the
feature/107-fix-admin-finance
branch
from
b8917c7 to
41e42a9
Compare
|
Squashed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Tenant#current_billing_amount to be calculated via mnohub for performance reason (and also to
perform the currency conversion)
Admin Finance page: