Incentive (E1): Rangliste zeigt bei Geldpraemie "So funktioniert die Challenge" statt Incentive-Punkte
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
This commit is contained in:
parent
f340d0de3d
commit
483cad3391
3 changed files with 124 additions and 87 deletions
24
resources/views/user/incentive/_how_it_works.blade.php
Normal file
24
resources/views/user/incentive/_how_it_works.blade.php
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{{-- "So funktioniert die Challenge": ersetzt auf der Ranglisten-Seite den Punkte-Abschnitt bei Geldpraemie. Erwartet $incentive. --}}
|
||||
<div class="inc-points-section mb-4" id="incentive-how-it-works">
|
||||
<h6 class="font-weight-bold mb-3">
|
||||
<i class="ion ion-md-cash mr-1" style="color: #d7d700;"></i>
|
||||
{{ __('incentive.section_how_it_works') }}
|
||||
</h6>
|
||||
<div class="inc-point-card inc-point-card-partner">
|
||||
<h6 class="font-weight-bold mb-1" style="font-size: .9rem;">
|
||||
<i class="ion ion-md-person-add mr-1"></i>
|
||||
{{ __('incentive.payout_tile_title') }}
|
||||
</h6>
|
||||
<div class="inc-point-val mb-2">
|
||||
{{ \App\Services\Incentive\IncentivePayoutService::formatAmount((float) $incentive->amount_per_partner) }}
|
||||
<span class="small font-weight-normal">{{ __('incentive.payout_per_partner_label') }}</span>
|
||||
</div>
|
||||
<ul class="pl-3 mb-0">
|
||||
<li>{{ __('incentive.points_starter_package_label') }}</li>
|
||||
@if ($incentive->rankBonuses() !== [])
|
||||
<li>{{ __('incentive.payout_top_bonus_text', ['n' => count($incentive->rankBonuses()), 'list' => collect($incentive->rankBonuses())->map(fn ($amount, $rank) => __('incentive.payout_rank_label', ['n' => $rank]).' '.\App\Services\Incentive\IncentivePayoutService::formatAmount($amount))->implode(', ')]) }}</li>
|
||||
@endif
|
||||
<li>{{ __('incentive.payout_ranking_hint') }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -804,56 +804,60 @@
|
|||
</div>
|
||||
@endif
|
||||
|
||||
{{-- Punkte-System --}}
|
||||
<div class="inc-points-section mb-4">
|
||||
<h6 class="font-weight-bold mb-3">
|
||||
<i class="ion ion-md-star mr-1" style="color: #d7d700;"></i>
|
||||
{{ __('incentive.section_points') }}
|
||||
</h6>
|
||||
<div class="row">
|
||||
<div class="{{ $incentive->usesAbos() ? 'col-md-6 mb-3 mb-md-0' : 'col-md-12' }}">
|
||||
<div class="inc-point-card inc-point-card-partner">
|
||||
<h6 class="font-weight-bold mb-1" style="font-size: .9rem;">
|
||||
<i class="ion ion-md-person-add mr-1"></i>
|
||||
{{ __('incentive.points_partners_title') }}
|
||||
</h6>
|
||||
<div class="inc-point-val mb-2">
|
||||
{{ number_format($incentive->points_partner_onetime, 0, ',', '.') }}
|
||||
<span class="small font-weight-normal">{{ __('incentive.points_short') }}</span>
|
||||
</div>
|
||||
<ul class="pl-3 mb-0">
|
||||
<li>{{ __('incentive.points_onetime_label') }}</li>
|
||||
<li>{{ __('incentive.points_starter_package_label') }}</li>
|
||||
@if ($incentive->includesSalesPoints())
|
||||
<li>{{ __('incentive.points_partner_boost') }}</li>
|
||||
@endif
|
||||
@include('user.incentive._payout_bullets', ['incentive' => $incentive])
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@if ($incentive->usesAbos())
|
||||
<div class="col-md-6">
|
||||
<div class="inc-point-card inc-point-card-abo">
|
||||
<h6 class="font-weight-bold mb-1" style="font-size: .9rem;">
|
||||
<i class="ion ion-md-ribbon mr-1"></i>
|
||||
{{ __('incentive.points_abos_title') }}
|
||||
</h6>
|
||||
<div class="inc-point-val mb-2">
|
||||
{{ number_format($incentive->points_abo_onetime, 0, ',', '.') }}
|
||||
<span class="small font-weight-normal">{{ __('incentive.points_short') }}</span>
|
||||
</div>
|
||||
<ul class="pl-3 mb-0">
|
||||
<li>{{ __('incentive.points_onetime_label') }}</li>
|
||||
<li>{{ __('incentive.points_abo_direct') }}</li>
|
||||
@if ($incentive->includesSalesPoints())
|
||||
<li>{{ __('incentive.points_abo_boost') }}</li>
|
||||
@endif
|
||||
</ul>
|
||||
</div>
|
||||
@if ($incentive->hasCashPayout() && $incentive->ranksByPartnerCount())
|
||||
@include('user.incentive._how_it_works', ['incentive' => $incentive])
|
||||
@else
|
||||
{{-- Punkte-System --}}
|
||||
<div class="inc-points-section mb-4">
|
||||
<h6 class="font-weight-bold mb-3">
|
||||
<i class="ion ion-md-star mr-1" style="color: #d7d700;"></i>
|
||||
{{ __('incentive.section_points') }}
|
||||
</h6>
|
||||
<div class="row">
|
||||
<div class="{{ $incentive->usesAbos() ? 'col-md-6 mb-3 mb-md-0' : 'col-md-12' }}">
|
||||
<div class="inc-point-card inc-point-card-partner">
|
||||
<h6 class="font-weight-bold mb-1" style="font-size: .9rem;">
|
||||
<i class="ion ion-md-person-add mr-1"></i>
|
||||
{{ __('incentive.points_partners_title') }}
|
||||
</h6>
|
||||
<div class="inc-point-val mb-2">
|
||||
{{ number_format($incentive->points_partner_onetime, 0, ',', '.') }}
|
||||
<span class="small font-weight-normal">{{ __('incentive.points_short') }}</span>
|
||||
</div>
|
||||
@endif
|
||||
<ul class="pl-3 mb-0">
|
||||
<li>{{ __('incentive.points_onetime_label') }}</li>
|
||||
<li>{{ __('incentive.points_starter_package_label') }}</li>
|
||||
@if ($incentive->includesSalesPoints())
|
||||
<li>{{ __('incentive.points_partner_boost') }}</li>
|
||||
@endif
|
||||
@include('user.incentive._payout_bullets', ['incentive' => $incentive])
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@if ($incentive->usesAbos())
|
||||
<div class="col-md-6">
|
||||
<div class="inc-point-card inc-point-card-abo">
|
||||
<h6 class="font-weight-bold mb-1" style="font-size: .9rem;">
|
||||
<i class="ion ion-md-ribbon mr-1"></i>
|
||||
{{ __('incentive.points_abos_title') }}
|
||||
</h6>
|
||||
<div class="inc-point-val mb-2">
|
||||
{{ number_format($incentive->points_abo_onetime, 0, ',', '.') }}
|
||||
<span class="small font-weight-normal">{{ __('incentive.points_short') }}</span>
|
||||
</div>
|
||||
<ul class="pl-3 mb-0">
|
||||
<li>{{ __('incentive.points_onetime_label') }}</li>
|
||||
<li>{{ __('incentive.points_abo_direct') }}</li>
|
||||
@if ($incentive->includesSalesPoints())
|
||||
<li>{{ __('incentive.points_abo_boost') }}</li>
|
||||
@endif
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
</div>
|
||||
|
||||
|
|
@ -1089,56 +1093,60 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
{{-- Punkte-System --}}
|
||||
<div class="inc-points-section mb-4">
|
||||
<h6 class="font-weight-bold mb-3">
|
||||
<i class="ion ion-md-star mr-1" style="color: #d7d700;"></i>
|
||||
{{ __('incentive.section_points') }}
|
||||
</h6>
|
||||
<div class="row">
|
||||
<div class="{{ $incentive->usesAbos() ? 'col-md-6 mb-3 mb-md-0' : 'col-md-12' }}">
|
||||
<div class="inc-point-card inc-point-card-partner">
|
||||
<h6 class="font-weight-bold mb-1" style="font-size: .9rem;">
|
||||
<i class="ion ion-md-person-add mr-1"></i>
|
||||
{{ __('incentive.points_partners_title') }}
|
||||
</h6>
|
||||
<div class="inc-point-val mb-2">
|
||||
{{ number_format($incentive->points_partner_onetime, 0, ',', '.') }}
|
||||
<span class="small font-weight-normal">{{ __('incentive.points_short') }}</span>
|
||||
</div>
|
||||
<ul class="pl-3 mb-0">
|
||||
<li>{{ __('incentive.points_onetime_label') }}</li>
|
||||
<li>{{ __('incentive.points_starter_package_label') }}</li>
|
||||
@if ($incentive->includesSalesPoints())
|
||||
<li>{{ __('incentive.points_partner_boost') }}</li>
|
||||
@endif
|
||||
@include('user.incentive._payout_bullets', ['incentive' => $incentive])
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@if ($incentive->usesAbos())
|
||||
<div class="col-md-6">
|
||||
<div class="inc-point-card inc-point-card-abo">
|
||||
@if ($incentive->hasCashPayout() && $incentive->ranksByPartnerCount())
|
||||
@include('user.incentive._how_it_works', ['incentive' => $incentive])
|
||||
@else
|
||||
{{-- Punkte-System --}}
|
||||
<div class="inc-points-section mb-4">
|
||||
<h6 class="font-weight-bold mb-3">
|
||||
<i class="ion ion-md-star mr-1" style="color: #d7d700;"></i>
|
||||
{{ __('incentive.section_points') }}
|
||||
</h6>
|
||||
<div class="row">
|
||||
<div class="{{ $incentive->usesAbos() ? 'col-md-6 mb-3 mb-md-0' : 'col-md-12' }}">
|
||||
<div class="inc-point-card inc-point-card-partner">
|
||||
<h6 class="font-weight-bold mb-1" style="font-size: .9rem;">
|
||||
<i class="ion ion-md-ribbon mr-1"></i>
|
||||
{{ __('incentive.points_abos_title') }}
|
||||
<i class="ion ion-md-person-add mr-1"></i>
|
||||
{{ __('incentive.points_partners_title') }}
|
||||
</h6>
|
||||
<div class="inc-point-val mb-2">
|
||||
{{ number_format($incentive->points_abo_onetime, 0, ',', '.') }}
|
||||
{{ number_format($incentive->points_partner_onetime, 0, ',', '.') }}
|
||||
<span class="small font-weight-normal">{{ __('incentive.points_short') }}</span>
|
||||
</div>
|
||||
<ul class="pl-3 mb-0">
|
||||
<li>{{ __('incentive.points_onetime_label') }}</li>
|
||||
<li>{{ __('incentive.points_abo_direct') }}</li>
|
||||
<li>{{ __('incentive.points_starter_package_label') }}</li>
|
||||
@if ($incentive->includesSalesPoints())
|
||||
<li>{{ __('incentive.points_abo_boost') }}</li>
|
||||
<li>{{ __('incentive.points_partner_boost') }}</li>
|
||||
@endif
|
||||
@include('user.incentive._payout_bullets', ['incentive' => $incentive])
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@if ($incentive->usesAbos())
|
||||
<div class="col-md-6">
|
||||
<div class="inc-point-card inc-point-card-abo">
|
||||
<h6 class="font-weight-bold mb-1" style="font-size: .9rem;">
|
||||
<i class="ion ion-md-ribbon mr-1"></i>
|
||||
{{ __('incentive.points_abos_title') }}
|
||||
</h6>
|
||||
<div class="inc-point-val mb-2">
|
||||
{{ number_format($incentive->points_abo_onetime, 0, ',', '.') }}
|
||||
<span class="small font-weight-normal">{{ __('incentive.points_short') }}</span>
|
||||
</div>
|
||||
<ul class="pl-3 mb-0">
|
||||
<li>{{ __('incentive.points_onetime_label') }}</li>
|
||||
<li>{{ __('incentive.points_abo_direct') }}</li>
|
||||
@if ($incentive->includesSalesPoints())
|
||||
<li>{{ __('incentive.points_abo_boost') }}</li>
|
||||
@endif
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
{{-- ============================================================
|
||||
|
|
|
|||
|
|
@ -151,7 +151,10 @@ describe('Ranglisten-Seite: Teilnahme-Block oben', function () {
|
|||
->assertSee(__('incentive.join_highlight_rank', ['amount' => '500,00 €', 'n' => 1]))
|
||||
->assertSee(__('incentive.join_terms_toggle'))
|
||||
->assertSee('Bedingungen Text', false)
|
||||
->assertSee('id="incentive-payout-tile"', false);
|
||||
->assertSee('id="incentive-payout-tile"', false)
|
||||
->assertSee('id="incentive-how-it-works"', false)
|
||||
->assertDontSee(__('incentive.section_points'))
|
||||
->assertDontSee(__('incentive.points_short'));
|
||||
});
|
||||
|
||||
it('nennt den Block "Teilnahme bestaetigen", wenn Punkte schon laufen', function () {
|
||||
|
|
@ -182,7 +185,9 @@ describe('Ranglisten-Seite: Teilnahme-Block oben', function () {
|
|||
$this->get(route('user_incentive_show', [$incentive->slug]))
|
||||
->assertOk()
|
||||
->assertDontSee('id="incentive-join"', false)
|
||||
->assertSee(__('incentive.my_details'));
|
||||
->assertSee(__('incentive.my_details'))
|
||||
->assertSee('id="incentive-how-it-works"', false)
|
||||
->assertDontSee(__('incentive.section_points'));
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue