Join GitHub today
GitHub is home to over 28 million developers working together to host and review code, manage projects, and build software together.
Sign upAdd supporter status to the supporter page #2896
Conversation
nekodex
added some commits
Apr 3, 2018
nekodex
added
the
resolves issue
label
Apr 3, 2018
This comment has been minimized.
This comment has been minimized.
| @@ -54,8 +54,54 @@ | ||
| </div> | ||
| <div class="osu-page osu-page--small osu-page--stg-block"> | ||
| @if (!empty($supporterStatus)) | ||
| <!-- supporter status --> | ||
| <div class="stg-status{{ $supporterStatus['current'] ? ' stg-status--active' : '' }} stg-block__top"> |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
| <!-- why support --> | ||
| <div class="stg-block"> | ||
| <div class="stg-block{{ empty($supporterStatus) ? ' stg-block__top' : ''}}"> |
This comment has been minimized.
This comment has been minimized.
| </div> | ||
| <div class="stg-status__text"> | ||
| {!! trans('community.support.supporter_status.contribution', [ | ||
| 'dollars' => "<strong>\${$supporterStatus['dollars']}</strong>", |
This comment has been minimized.
This comment has been minimized.
nanaya
Apr 4, 2018
Collaborator
number formatted somewhere else and then prefixed with dollar here? Sounds smart
| @if ($supporterStatus['giftedTags'] > 0) | ||
| <div class="stg-status__text"> | ||
| {!! trans('community.support.supporter_status.gifted', [ | ||
| 'giftedDollars' => "<strong>\${$supporterStatus['giftedDollars']}</strong>", |
This comment has been minimized.
This comment has been minimized.
| background: @link-gray-light; | ||
| opacity: 0.5; | ||
| overflow: hidden; | ||
| -webkit-mask-image: -webkit-radial-gradient(white, black); // this fixes child content overflowing beyond a parent's rounded corners in safari |
This comment has been minimized.
This comment has been minimized.
| // gifted | ||
| $gifted = $tagPurchases->where('target_user_id', '<>', $user->user_id); | ||
| $giftedDollars = $gifted->sum('amount'); | ||
| $canceledGifts = $gifted->sum('cancel') * 2; // 1 for purchase transaction and 1 for cancel transaction |
This comment has been minimized.
This comment has been minimized.
| $current = $expiration !== null ? $expiration->isFuture() : false; | ||
| // purchased | ||
| $tagPurchases = $user->supporterTagPurchases()->get(); |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
notbakaneko
Apr 4, 2018
Contributor
Would depend if you want to use the methods defined by Collection to filter through the existing collection as opposed to running more queries when called through Builder
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
nanaya
Apr 11, 2018
Collaborator
but $user->supporterTagPurchases()->get() and $user->supporterTagPurchases are same thing...?
This comment has been minimized.
This comment has been minimized.
nekodex
added some commits
Apr 11, 2018
nanaya
merged commit ab09672
into
ppy:master
Apr 11, 2018
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.
nekodex commentedApr 3, 2018
•
edited
The supporter page might end up being merged with the store/purchase page later, but for the time being the status can go here.
fixes #2782, fixes #2027