FE admin claims #3144
Merged
FE admin claims #3144
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
asmega
commented
Sep 3, 2024
| @@ -396,7 +396,7 @@ def important_notes | |||
| end | |||
|
|
|||
| def award_amount_with_topups | |||
| topups.sum(:award_amount) + award_amount | |||
| topups.sum(:award_amount) + (award_amount || 0) | |||
There was a problem hiding this comment.
feeling ambivalent about this one
asmega
commented
Sep 3, 2024
| @@ -55,7 +55,7 @@ def self.create_with_claims!(claims, topups, attrs = {}) | |||
| # associates the payment to the Topup, so we know it's payrolled | |||
| group_topups = grouped_items.select { |i| i.is_a?(Topup) } | |||
|
|
|||
| award_amount = grouped_items.sum(&:award_amount) | |||
| award_amount = grouped_items.map(&:award_amount).compact.sum(0) | |||
There was a problem hiding this comment.
looks ugly but fixes deprecation
rjlynch
approved these changes
Sep 3, 2024
| @@ -827,6 +827,12 @@ en: | |||
| feedback_email: "[email protected]" | |||
| support_email_address: "[email protected]" | |||
| claim_subject: "Further education payment" | |||
| policy_acronym: FE | |||
There was a problem hiding this comment.
so TRIPFE? otherwise TRIP also includes EY?
There was a problem hiding this comment.
Ah yeah good point, I guess TRIPFE makes sense, maybe something to run by policy, but given it's just in the admin area it's not a blocker
There was a problem hiding this comment.
i'll leave for now and sort it later
config/locales/en.yml
Outdated
| @@ -827,6 +827,12 @@ en: | |||
| feedback_email: "[email protected]" | |||
| support_email_address: "[email protected]" | |||
| claim_subject: "Further education payment" | |||
| policy_acronym: FE | |||
| policy_short_name: Further education payments | |||
There was a problem hiding this comment.
In figma I think this is now "Targeted Retention Incentive Payment For FE Teachers"
There was a problem hiding this comment.
it's called policy_short_name 😂
asmega
force-pushed
the
fe-admin-claims
branch
from
40248b3 to
c13eb34
Compare
asmega
force-pushed
the
fe-admin-claims
branch
from
c13eb34 to
e430dba
Compare
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.
Context