gitmedia/mivita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Statistiken/Abo: Kundenfeedback 2026-07-24 komplett umgesetzt + Steuern: DATEV-Fixes 08+09/2025 (Sammel-Commit Branch-WIP)

Browse source 
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>
This commit is contained in:
Kevin 2026-07-24 13:51:16 +00:00
parent 657d4bd5b7
commit ac3bd6e8ea
136 changed files with 7610 additions and 2688 deletions
Download patch file Download diff file Expand all files Collapse all files

52
resources/views/user/team/abos.blade.php
View file

@ -38,6 +38,46 @@
</div>
</div>
{{-- Abo-Umsatz in der Payline (Soll/Ist, Live) --}}
@if (isset($paylineAboTurnover))
<div class="row mb-2">
<div class="col-lg-6 col-12 mb-3">
<div class="card h-100">
<div class="card-body">
<div class="text-muted small">
{{ __('abo.payline_abo_turnover') }}
<span class="badge badge-pill badge-info ml-1"
title="{{ __('abo.payline_abo_turnover_hint') }}">Live</span>
</div>
@if (($paylineAboTurnover['paylines'] ?? 0) > 0)
<div class="row mt-2">
<div class="col-6 text-center">
<div class="text-muted small">{{ __('abo.payline_target_label') }}</div>
<div class="display-5 font-weight-bold text-primary">
{{ \App\Services\Util::formatNumber($paylineAboTurnover['target']) }}
</div>
</div>
<div class="col-6 text-center">
<div class="text-muted small">{{ __('abo.payline_actual_label') }}</div>
<div class="display-5 font-weight-bold">
{{ \App\Services\Util::formatNumber($paylineAboTurnover['actual']) }}
</div>
</div>
</div>
<div class="text-muted small mt-2 text-center">
{{ __('abo.payline_hint', ['lines' => $paylineAboTurnover['paylines'], 'members' => $paylineAboTurnover['members']]) }}
<br>
{{ __('abo.payline_abo_counts', ['team_abos' => $paylineAboTurnover['team_abo_count'] ?? 0, 'customer_abos' => $paylineAboTurnover['team_customer_abo_count'] ?? 0]) }}
</div>
@else
<p class="text-muted mb-0 mt-2">{{ __('abo.payline_none') }}</p>
@endif
</div>
</div>
</div>
</div>
@endif
{{-- Linien-/Ebenen-Tabelle --}}
<div class="card mb-4">
<div class="card-header d-flex justify-content-between align-items-center">
@ -53,7 +93,9 @@
<th class="text-center">{{ __('abo.team_customer_abos') }}</th>
<th class="text-center">{{ __('abo.new_this_month') }} ({{ $currentMonthName }})</th>
<th class="text-center">{{ __('abo.team_total') }}</th>
<th class="text-right">{{ __('abo.abo_count_points') }}</th>
<th class="text-right">{{ __('abo.abo_points_per_cycle') }}</th>
<th class="text-right">{{ __('abo.abo_points_billed', ['month' => $currentMonthName]) }}</th>
<th class="text-right" title="{{ __('abo.abo_points_expected_hint', ['day' => 25]) }}">{{ __('abo.abo_points_expected', ['day' => 25]) }}</th>
</tr>
</thead>
<tbody>
@ -77,9 +119,11 @@
<td class="text-center text-success font-weight-bold">+{{ $line['own_abos_new'] + $line['customer_abos_new'] }}</td>
<td class="text-center font-weight-bold text-primary">{{ $line['total_abos'] }}</td>
<td class="text-right font-weight-bold">{{ \App\Services\Util::formatNumber($line['own_abo_points'] + $line['customer_abo_points']) }}</td>
<td class="text-right">{{ \App\Services\Util::formatNumber($line['abo_points_billed'] ?? 0) }}</td>
<td class="text-right text-muted">{{ \App\Services\Util::formatNumber($line['abo_points_expected'] ?? 0) }}</td>
</tr>
<tr class="p-0">
<td colspan="7" class="p-0 border-0">
<td colspan="9" class="p-0 border-0">
<div class="collapse {{ $line['line'] === 1 ? 'show' : '' }}" id="{{ $collapseId }}">
<div class="p-3 bg-lightest">
<table class="table table-sm table-borderless mb-0">
@ -129,7 +173,7 @@
</tr>
@empty
<tr>
<td colspan="7" class="text-muted text-center py-4">{{ __('tables.no_data_available') }}</td>
<td colspan="9" class="text-muted text-center py-4">{{ __('tables.no_data_available') }}</td>
</tr>
@endforelse
</tbody>
@ -143,6 +187,8 @@
<td class="text-center text-success">+{{ $totals['own_abos_new'] + $totals['customer_abos_new'] }}</td>
<td class="text-center text-primary">{{ $totals['total_abos'] }}</td>
<td class="text-right">{{ \App\Services\Util::formatNumber($totals['own_abo_points'] + $totals['customer_abo_points']) }}</td>
<td class="text-right">{{ \App\Services\Util::formatNumber($totals['abo_points_billed'] ?? 0) }}</td>
<td class="text-right text-muted">{{ \App\Services\Util::formatNumber($totals['abo_points_expected'] ?? 0) }}</td>
</tr>
</tfoot>
@endif