diff --git a/resources/views/user/incentive/_how_it_works.blade.php b/resources/views/user/incentive/_how_it_works.blade.php new file mode 100644 index 00000000..7da3f644 --- /dev/null +++ b/resources/views/user/incentive/_how_it_works.blade.php @@ -0,0 +1,24 @@ +{{-- "So funktioniert die Challenge": ersetzt auf der Ranglisten-Seite den Punkte-Abschnitt bei Geldpraemie. Erwartet $incentive. --}} +
+
+ + {{ __('incentive.section_how_it_works') }} +
+
+
+ + {{ __('incentive.payout_tile_title') }} +
+
+ {{ \App\Services\Incentive\IncentivePayoutService::formatAmount((float) $incentive->amount_per_partner) }} + {{ __('incentive.payout_per_partner_label') }} +
+ +
+
diff --git a/resources/views/user/incentive/show.blade.php b/resources/views/user/incentive/show.blade.php index 1e98a5e0..fd4cd5e5 100644 --- a/resources/views/user/incentive/show.blade.php +++ b/resources/views/user/incentive/show.blade.php @@ -804,56 +804,60 @@ @endif - {{-- Punkte-System --}} -
-
- - {{ __('incentive.section_points') }} -
-
-
-
-
- - {{ __('incentive.points_partners_title') }} -
-
- {{ number_format($incentive->points_partner_onetime, 0, ',', '.') }} - {{ __('incentive.points_short') }} -
-
    -
  • {{ __('incentive.points_onetime_label') }}
  • -
  • {{ __('incentive.points_starter_package_label') }}
  • - @if ($incentive->includesSalesPoints()) -
  • {{ __('incentive.points_partner_boost') }}
  • - @endif - @include('user.incentive._payout_bullets', ['incentive' => $incentive]) -
-
-
- @if ($incentive->usesAbos()) -
-
-
- - {{ __('incentive.points_abos_title') }} -
-
- {{ number_format($incentive->points_abo_onetime, 0, ',', '.') }} - {{ __('incentive.points_short') }} -
-
    -
  • {{ __('incentive.points_onetime_label') }}
  • -
  • {{ __('incentive.points_abo_direct') }}
  • - @if ($incentive->includesSalesPoints()) -
  • {{ __('incentive.points_abo_boost') }}
  • - @endif -
-
+ @if ($incentive->hasCashPayout() && $incentive->ranksByPartnerCount()) + @include('user.incentive._how_it_works', ['incentive' => $incentive]) + @else + {{-- Punkte-System --}} +
+
+ + {{ __('incentive.section_points') }} +
+
+
+
+
+ + {{ __('incentive.points_partners_title') }} +
+
+ {{ number_format($incentive->points_partner_onetime, 0, ',', '.') }} + {{ __('incentive.points_short') }}
- @endif +
    +
  • {{ __('incentive.points_onetime_label') }}
  • +
  • {{ __('incentive.points_starter_package_label') }}
  • + @if ($incentive->includesSalesPoints()) +
  • {{ __('incentive.points_partner_boost') }}
  • + @endif + @include('user.incentive._payout_bullets', ['incentive' => $incentive]) +
+
+
+ @if ($incentive->usesAbos()) +
+
+
+ + {{ __('incentive.points_abos_title') }} +
+
+ {{ number_format($incentive->points_abo_onetime, 0, ',', '.') }} + {{ __('incentive.points_short') }} +
+
    +
  • {{ __('incentive.points_onetime_label') }}
  • +
  • {{ __('incentive.points_abo_direct') }}
  • + @if ($incentive->includesSalesPoints()) +
  • {{ __('incentive.points_abo_boost') }}
  • + @endif +
+
+
+ @endif +
-
+ @endif
@@ -1089,56 +1093,60 @@
- {{-- Punkte-System --}} -
-
- - {{ __('incentive.section_points') }} -
-
-
-
-
- - {{ __('incentive.points_partners_title') }} -
-
- {{ number_format($incentive->points_partner_onetime, 0, ',', '.') }} - {{ __('incentive.points_short') }} -
-
    -
  • {{ __('incentive.points_onetime_label') }}
  • -
  • {{ __('incentive.points_starter_package_label') }}
  • - @if ($incentive->includesSalesPoints()) -
  • {{ __('incentive.points_partner_boost') }}
  • - @endif - @include('user.incentive._payout_bullets', ['incentive' => $incentive]) -
-
-
- @if ($incentive->usesAbos()) -
-
+ @if ($incentive->hasCashPayout() && $incentive->ranksByPartnerCount()) + @include('user.incentive._how_it_works', ['incentive' => $incentive]) + @else + {{-- Punkte-System --}} +
+
+ + {{ __('incentive.section_points') }} +
+
+
+
- - {{ __('incentive.points_abos_title') }} + + {{ __('incentive.points_partners_title') }}
- {{ number_format($incentive->points_abo_onetime, 0, ',', '.') }} + {{ number_format($incentive->points_partner_onetime, 0, ',', '.') }} {{ __('incentive.points_short') }}
  • {{ __('incentive.points_onetime_label') }}
  • -
  • {{ __('incentive.points_abo_direct') }}
  • +
  • {{ __('incentive.points_starter_package_label') }}
  • @if ($incentive->includesSalesPoints()) -
  • {{ __('incentive.points_abo_boost') }}
  • +
  • {{ __('incentive.points_partner_boost') }}
  • @endif + @include('user.incentive._payout_bullets', ['incentive' => $incentive])
- @endif + @if ($incentive->usesAbos()) +
+
+
+ + {{ __('incentive.points_abos_title') }} +
+
+ {{ number_format($incentive->points_abo_onetime, 0, ',', '.') }} + {{ __('incentive.points_short') }} +
+
    +
  • {{ __('incentive.points_onetime_label') }}
  • +
  • {{ __('incentive.points_abo_direct') }}
  • + @if ($incentive->includesSalesPoints()) +
  • {{ __('incentive.points_abo_boost') }}
  • + @endif +
+
+
+ @endif +
-
+ @endif @endif {{-- ============================================================ diff --git a/tests/Feature/Incentive/IncentiveVipOnlyTest.php b/tests/Feature/Incentive/IncentiveVipOnlyTest.php index 10248b94..20bad455 100644 --- a/tests/Feature/Incentive/IncentiveVipOnlyTest.php +++ b/tests/Feature/Incentive/IncentiveVipOnlyTest.php @@ -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')); }); });