Add monthly/hourly/weekly in rates for 'per time' types #11733
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
lpichler
force-pushed
the
return_back_per_time_to_more_intervals
branch
from
d822c9d
to
edae13b
Compare
lpichler
force-pushed
the
return_back_per_time_to_more_intervals
branch
from
edae13b
to
54175ac
Compare
lpichler
force-pushed
the
return_back_per_time_to_more_intervals
branch
from
54175ac
to
871b087
Compare
mzazrivec
reviewed
Oct 7, 2016
| @@ -4,6 +4,8 @@ class ChargebackController < ApplicationController | |||
| after_action :cleanup_action | |||
| after_action :set_session_data | |||
|
|
|||
| PER_TIME_TYPES = {"hourly" => _("Hourly"), "weekly" => _("Weekly"), "monthly" => "Monthly"}.freeze | |||
There was a problem hiding this comment.
"Monthly" needs to be inside a _()
lpichler
force-pushed
the
return_back_per_time_to_more_intervals
branch
from
871b087
to
03f455d
Compare
lpichler
force-pushed
the
return_back_per_time_to_more_intervals
branch
from
03f455d
to
95f356f
Compare
|
Checked commit lpichler@95f356f with ruby 2.2.5, rubocop 0.37.2, and haml-lint 0.16.1 |
lpichler
changed the title
|
depends on #11648 |
|
@miq-bot remove_label wip |
|
this can be merged because this is already merged |
lpichler
changed the title
|
@mzazrivec @gtanzillo |
|
Also - what is this PR? Bug fix, enhancement, tech debt, refactor? Please label accordingly |
chessbyte
pushed a commit
that referenced
this pull request
Oct 21, 2016
…intervals Add monthly/hourly/weekly in rates for 'per time' types (cherry picked from commit 4c854e4)
|
Euwe Backport details: $ git log -1
commit 03acdfe5cca6bad8a32aa511502dcd4e8fa72b63
Author: Milan Zázrivec <mzazrivec@redhat.com>
Date: Thu Oct 20 11:07:43 2016 +0200
Merge pull request #11733 from lpichler/return_back_per_time_to_more_intervals
Add monthly/hourly/weekly in rates for 'per time' types
(cherry picked from commit 4c854e48cc37aac9ef4f8628ebd3c8c163cc26ac) |
|
Backported to Darga via #13559 |
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.
basically revert of https://github.com/ManageIQ/manageiq/pull/9298/files
as we are doing new calculations for chargeback we can also support
chargeback rates in monthly/hourly/weekly time frame (Per Time in UI)
@miq-bot add_label ui, chargeback
@miq-bot assign @gtanzillo
cc @mzazrivec