Kevin
ac3bd6e8ea
Feedback-Umsetzung (dev/2026-07-22/feedback-analyse-2026-07-24.md, alle 10 Punkte):
- VIP-Statistik: eigener Berater ('ich', Linie 0) in Neue-Kundenabos- und beiden Top-10-Listen; Top-10-Umsatz sortiert nach abgerechneten Ist-Punkten + Abo-Anzahl-Spalte; Fußnote nicht-payline-wirksame Punkte (SalesVolumePoints::nonPaylinePoints)
- Führungskräfte-Liste: beide Sichten 'direkt' (an nächster FK abgeschnitten, additiv) und 'gesamt' (komplette Downline), Gesamt-Spalte nach Kundenzählweise
- Team-Abos: je Ebene 'abgerechnet (Monat)' und 'bis zum 25. erwartet'; Payline-Karte mit Teamabo-/Kundenabo-Zählern
- Incentive-Live-Ranking: Qualifizierte zuerst nummeriert (fixt auch isWinner rank<=max_winners)
- Porto: Netto-/Brutto-Kennzeichnung (Berater netto, Endkunden inkl. MwSt., portal_view-Flag; auch CRM-/Shop-Warenkorb + Checkout), Yard::shipping_tax-Fix
- Struktur-Ansicht: Abo-Badges 'A' (eigenes Abo) und '(n)' (Kundenabos) je Teampartner, gebatcht
- Abo-Löschung: Softdelete setzt active=0 (UserAbo deleting-Hook) + Bereinigungs-Migration für gelöschte-aber-aktive Abos
- Doku: technische Analyse + Kundinnen-Feedback-Dokument unter dev/2026-07-22/
- Tests: IncentiveRankingTest, TeamStructureAboBadgesTest, YardShippingTaxTest (neu); BackofficeStatisticsListsTest, TeamAboOverviewTest, PaylineForecastServiceTest, AboAdminDeleteTest, AboOneTimeViewTest erweitert
Außerdem enthalten (Branch-WIP vor dem Feedback): DATEV-Abgleich-Fixes 08+09/2025, USt-ID-Live-Validierung sowie restliche unkommittete Stände (u. a. Abo-Pause-Sprachkeys).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
112 lines
4 KiB
PHP
112 lines
4 KiB
PHP
<?php
|
|
|
|
use App\Models\UserAbo;
|
|
use App\Services\BusinessPlan\TreeHtmlRenderer;
|
|
use App\User;
|
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
|
use Tests\TestCase;
|
|
|
|
uses(TestCase::class, RefreshDatabase::class);
|
|
|
|
function tsabMakeUser(): User
|
|
{
|
|
return User::forceCreate([
|
|
'email' => 'tsab-'.uniqid('', true).'@example.com',
|
|
'password' => bcrypt('secret'),
|
|
'lang' => 'de',
|
|
]);
|
|
}
|
|
|
|
/**
|
|
* @param array<string, mixed> $overrides
|
|
*/
|
|
function tsabMakeAbo(array $overrides = []): UserAbo
|
|
{
|
|
return UserAbo::create(array_merge([
|
|
'user_id' => 0,
|
|
'member_id' => null,
|
|
'shopping_user_id' => 0,
|
|
'email' => 'tsab-abo-'.uniqid('', true).'@example.com',
|
|
'is_for' => 'me',
|
|
'payone_userid' => 0,
|
|
'clearingtype' => 'cc',
|
|
'active' => true,
|
|
'status' => 2,
|
|
'abo_interval' => 5,
|
|
'next_date' => now()->addDays(3),
|
|
], $overrides));
|
|
}
|
|
|
|
it('renders own-abo and customer-abo badges for a team partner', function () {
|
|
$partner = tsabMakeUser();
|
|
|
|
tsabMakeAbo(['user_id' => $partner->id, 'is_for' => 'me']);
|
|
tsabMakeAbo(['user_id' => $partner->id, 'is_for' => 'ot', 'member_id' => $partner->id]);
|
|
tsabMakeAbo(['user_id' => $partner->id, 'is_for' => 'ot', 'member_id' => $partner->id]);
|
|
|
|
$renderer = new TreeHtmlRenderer('member');
|
|
$renderer->loadAboBadges([$partner->id]);
|
|
$html = $renderer->renderAboBadges($partner->id);
|
|
|
|
expect($html)->toContain('badge badge-success')
|
|
->toContain('>A</span>')
|
|
->toContain(e(__('team.badge_own_abo')))
|
|
->toContain('badge badge-danger')
|
|
->toContain('>(2)</span>')
|
|
->toContain(e(trans_choice('team.badge_customer_abos', 2)));
|
|
});
|
|
|
|
it('renders no badges for a team partner without active abos', function () {
|
|
$partner = tsabMakeUser();
|
|
|
|
$renderer = new TreeHtmlRenderer('member');
|
|
$renderer->loadAboBadges([$partner->id]);
|
|
|
|
expect($renderer->renderAboBadges($partner->id))->toBe('');
|
|
});
|
|
|
|
it('does not count soft-deleted, inactive or terminated abos', function () {
|
|
$partner = tsabMakeUser();
|
|
|
|
tsabMakeAbo(['user_id' => $partner->id, 'is_for' => 'me'])->delete();
|
|
tsabMakeAbo(['user_id' => $partner->id, 'is_for' => 'ot', 'member_id' => $partner->id])->delete();
|
|
tsabMakeAbo(['user_id' => $partner->id, 'is_for' => 'ot', 'member_id' => $partner->id, 'active' => false]);
|
|
tsabMakeAbo(['user_id' => $partner->id, 'is_for' => 'ot', 'member_id' => $partner->id, 'status' => 4]);
|
|
tsabMakeAbo(['user_id' => $partner->id, 'is_for' => 'ot', 'member_id' => $partner->id, 'status' => 5]);
|
|
tsabMakeAbo(['user_id' => $partner->id, 'is_for' => 'ot', 'member_id' => $partner->id, 'status' => 6]);
|
|
|
|
$renderer = new TreeHtmlRenderer('member');
|
|
$renderer->loadAboBadges([$partner->id]);
|
|
|
|
expect($renderer->renderAboBadges($partner->id))->toBe('');
|
|
});
|
|
|
|
it('shows only the customer badge when the partner has customer abos but no own abo', function () {
|
|
$partner = tsabMakeUser();
|
|
|
|
tsabMakeAbo(['user_id' => $partner->id, 'is_for' => 'ot', 'member_id' => $partner->id]);
|
|
|
|
$renderer = new TreeHtmlRenderer('member');
|
|
$renderer->loadAboBadges([$partner->id]);
|
|
$html = $renderer->renderAboBadges($partner->id);
|
|
|
|
expect($html)->not->toContain('badge badge-success')
|
|
->toContain('badge badge-danger')
|
|
->toContain('>(1)</span>')
|
|
->toContain(e(trans_choice('team.badge_customer_abos', 1)));
|
|
});
|
|
|
|
it('does not attribute abos of other users to the team partner', function () {
|
|
$partner = tsabMakeUser();
|
|
$other = tsabMakeUser();
|
|
|
|
tsabMakeAbo(['user_id' => $other->id, 'is_for' => 'me']);
|
|
tsabMakeAbo(['user_id' => $other->id, 'is_for' => 'ot', 'member_id' => $other->id]);
|
|
|
|
$renderer = new TreeHtmlRenderer('member');
|
|
$renderer->loadAboBadges([$partner->id, $other->id]);
|
|
|
|
expect($renderer->renderAboBadges($partner->id))->toBe('')
|
|
->and($renderer->renderAboBadges($other->id))->toContain('>A</span>')
|
|
->and($renderer->renderAboBadges($other->id))->toContain('>(1)</span>');
|
|
});
|