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

20-02-2026

Browse source
This commit is contained in:
Kevin Adametz 2026-02-20 17:55:06 +01:00
parent a8b395e20d
commit a00c42e770
252 changed files with 28785 additions and 8907 deletions
Download patch file Download diff file Expand all files Collapse all files

341
app/Http/Controllers/User/TeamController.php
View file

@ -1,13 +1,12 @@
<?php
namespace App\Http\Controllers\User;
use App\Exports\UserTeamExport;
use App\Http\Controllers\Controller;
use App\Models\UserBusiness;
use App\Models\UserLevel;
use App\Models\UserSalesVolume;
use App\Services\AboHelper;
use App\Services\BusinessPlan\ExportBot;
use App\Services\BusinessPlan\TreeCalcBot;
use App\Services\BusinessPlan\TreeCalcBotOptimized;
@ -17,16 +16,12 @@ use App\Services\LevelReportService;
use App\Services\NextLevelBadgeHelper;
use App\Services\TranslationHelper;
use App\User;
use Auth;
use Carbon\Carbon;
use function Ramsey\Uuid\v1;
use Maatwebsite\Excel\Facades\Excel;
use Request;
/**
* Team Controller für User-Bereich
*
*
* Erweitert um optimierte Versionen:
* - show(): Optimierte Team-Übersicht mit Performance-Monitoring
* - structure(): Nutzt TreeCalcBotOptimized für bessere Performance
@ -36,9 +31,13 @@ use Request;
class TeamController extends Controller
{
private $filter_active = [1 => '', 2 => '', 3 => '']; // Wird in getFilterActive() übersetzt
private $filter_next_level = [0 => '', 1 => '', 2 => '', 3 => '']; // Wird in getFilterNextLevel() übersetzt
private $month;
private $year;
private $forceLiveCalculation;
public function __construct()
@ -46,8 +45,6 @@ class TeamController extends Controller
$this->middleware('active.account');
}
/**
* Zeigt die Team-Übersicht mit optimierter TreeCalcBotOptimized-Datenverarbeitung
* Lädt Team-Daten für DataTable-Anzeige
@ -67,19 +64,19 @@ class TeamController extends Controller
$forceLiveCalculation = Request::get('force_live_calculation', false) || Request::get('live', false);
$forceLiveCalculation = false;
\Log::info("TeamController: Building optimized team overview for user {$user->id} ({$this->month}/{$this->year})" .
($forceLiveCalculation === true ? " with forced live calculation" : "not live calculation"));
\Log::info("TeamController: Building optimized team overview for user {$user->id} ({$this->month}/{$this->year})".
($forceLiveCalculation === true ? ' with forced live calculation' : 'not live calculation'));
// Verwende TreeCalcBotOptimized für bessere Performance
//$TreeCalcBot = new TreeCalcBotOptimized($this->month, $this->year, 'member', $forceLiveCalculation);
//$TreeCalcBot->initStructureUser($user->id);
// $TreeCalcBot = new TreeCalcBotOptimized($this->month, $this->year, 'member', $forceLiveCalculation);
// $TreeCalcBot->initStructureUser($user->id);
$endTime = microtime(true);
$endMemory = memory_get_usage();
$executionTime = round(($endTime - $startTime) * 1000, 2);
$memoryUsed = $this->formatBytes($endMemory - $startMemory);
$calculationType = $forceLiveCalculation ? " (LIVE)" : " (CACHE)";
$calculationType = $forceLiveCalculation ? ' (LIVE)' : ' (CACHE)';
\Log::info("TeamController: Optimized team overview built in {$executionTime}ms, Memory: {$memoryUsed}{$calculationType}");
$data = [
@ -88,21 +85,22 @@ class TeamController extends Controller
'filter_active' => $this->getFilterActive(),
'filter_levels' => $this->getFilterLevels(),
'filter_next_level' => $this->getFilterNextLevel(),
//'TreeCalcBot' => $TreeCalcBot,
// 'TreeCalcBot' => $TreeCalcBot,
'performance' => [
'execution_time' => $executionTime,
'memory_used' => $memoryUsed,
'user_id' => $user->id,
'user_count' => 0, //$TreeCalcBot->getTotalUserCount(),
'user_count' => 0, // $TreeCalcBot->getTotalUserCount(),
'version' => 'Optimized',
'calculation_type' => $forceLiveCalculation ? 'Live' : 'Cache'
'calculation_type' => $forceLiveCalculation ? 'Live' : 'Cache',
],
'optimized' => true,
'forceLiveCalculation' => $forceLiveCalculation,
];
return view('user.team.show', $data);
} catch (\Exception $e) {
\Log::error("TeamController: Error in optimized show for user {$user->id}: " . $e->getMessage());
\Log::error("TeamController: Error in optimized show for user {$user->id}: ".$e->getMessage());
// Fallback mit minimalen Daten
$endTime = microtime(true);
@ -114,12 +112,12 @@ class TeamController extends Controller
'filter_active' => $this->getFilterActive(),
'filter_levels' => $this->getFilterLevels(),
'filter_next_level' => $this->getFilterNextLevel(),
'error' => __('team.error_loading_optimized_overview') . $e->getMessage(),
'error' => __('team.error_loading_optimized_overview').$e->getMessage(),
'performance' => [
'execution_time' => $executionTime,
'memory_used' => 'N/A',
'version' => 'Fallback',
'calculation_type' => 'Error'
'calculation_type' => 'Error',
],
'optimized' => false,
];
@ -175,8 +173,8 @@ class TeamController extends Controller
$executionTime = round(($endTime - $startTime) * 1000, 2);
$memoryUsed = $this->formatBytes($endMemory - $startMemory);
$versionInfo = ($optimizedUsed ? "OPTIMIZED" : "STANDARD") .
($forceLiveCalculation ? " + LIVE" : " + CACHE");
$versionInfo = ($optimizedUsed ? 'OPTIMIZED' : 'STANDARD').
($forceLiveCalculation ? ' + LIVE' : ' + CACHE');
\Log::info("TeamController: Structure built for user {$user->id} in {$executionTime}ms, Memory: {$memoryUsed} ({$versionInfo})");
@ -191,7 +189,7 @@ class TeamController extends Controller
? $TreeCalcBot->getTotalUserCount()
: '-',
'version' => $optimizedUsed ? 'Optimized' : 'Standard',
'calculation_type' => $forceLiveCalculation ? 'Live' : 'Cache'
'calculation_type' => $forceLiveCalculation ? 'Live' : 'Cache',
],
'optimized' => $optimizedUsed,
'forceLiveCalculation' => $forceLiveCalculation,
@ -199,7 +197,7 @@ class TeamController extends Controller
return view('user.team.structure', $data);
} catch (\Exception $e) {
\Log::error("TeamController: Error in structure for user {$user->id}: " . $e->getMessage());
\Log::error("TeamController: Error in structure for user {$user->id}: ".$e->getMessage());
// Fallback zur Standard-Implementierung
$TreeCalcBot = new TreeCalcBot(session('team_user_filter_month'), session('team_user_filter_year'), 'member');
@ -212,13 +210,13 @@ class TeamController extends Controller
'filter_months' => HTMLHelper::getTransMonths(),
'filter_years' => HTMLHelper::getYearRange(2022),
'TreeCalcBot' => $TreeCalcBot,
'error' => 'Fehler aufgetreten, Standard-Version wird verwendet: ' . $e->getMessage(),
'error' => 'Fehler aufgetreten, Standard-Version wird verwendet: '.$e->getMessage(),
'performance' => [
'execution_time' => $executionTime,
'memory_used' => 'N/A',
'user_count' => '-',
'version' => 'Fallback',
'calculation_type' => $forceLiveCalculation ? __('team.live_not_supported_fallback') : __('team.cache')
'calculation_type' => $forceLiveCalculation ? __('team.live_not_supported_fallback') : __('team.cache'),
],
'optimized' => false,
'forceLiveCalculation' => $forceLiveCalculation,
@ -227,6 +225,7 @@ class TeamController extends Controller
return view('user.team.structure', $data);
}
}
public function structureOld()
{
abort(403, 'This page is removed');
@ -237,17 +236,17 @@ class TeamController extends Controller
$this->setFilterVars();
$TreeCalcBot = new TreeCalcBot(session('team_user_filter_month'), session('team_user_filter_year'), 'member');
$TreeCalcBot->initStructureUser($user->id);
//for testing
//$TreeCalcBot->initUser(56);
// for testing
// $TreeCalcBot->initUser(56);
$data = [
'filter_months' => HTMLHelper::getTransMonths(),
'filter_years' => HTMLHelper::getYearRange(2022),
'TreeCalcBot' => $TreeCalcBot,
];
return view('user.team.structure', $data);
}
/**
* Optimierte DataTable für Team-Übersicht mit TreeCalcBotOptimized-Daten
* Nutzt bereits berechnete Business-Daten für bessere Performance
@ -265,8 +264,8 @@ class TeamController extends Controller
// Prüfe ob Live-Berechnung erzwungen werden soll
$forceLiveCalculation = Request::get('force_live_calculation', false) || Request::get('live', false);
$forceLiveCalculation = false;
\Log::info("TeamController: Building optimized datatable for user {$user->id} ({$this->month}/{$this->year})" .
($forceLiveCalculation == true ? " with forced live calculation" : ""));
\Log::info("TeamController: Building optimized datatable for user {$user->id} ({$this->month}/{$this->year})".
($forceLiveCalculation == true ? ' with forced live calculation' : ''));
// Lade TreeCalcBotOptimized-Daten
$TreeCalcBot = new TreeCalcBotOptimized($this->month, $this->year, 'member', $forceLiveCalculation);
@ -277,30 +276,36 @@ class TeamController extends Controller
// KRITISCH: Bereinige die Objekte für DataTables (entferne zirkuläre Referenzen)
$teamUsers = collect($this->cleanBusinessUserItemsForDataTable($teamUsersRaw));
\Log::info("TeamController: TeamUsers cleaned for DataTable: " . $teamUsers->count());
\Log::info('TeamController: TeamUsers cleaned for DataTable: '.$teamUsers->count());
$endTime = microtime(true);
$executionTime = round(($endTime - $startTime) * 1000, 2);
$this->forceLiveCalculation = $forceLiveCalculation;
\Log::info("TeamController: Optimized datatable data prepared in {$executionTime}ms for " . $teamUsers->count() . " users");
\Log::info("TeamController: Optimized datatable data prepared in {$executionTime}ms for ".$teamUsers->count().' users');
return \DataTables::of($teamUsers)
->addColumn('id', function ($teamUser) {
return '<button type="button" class="btn icon-btn btn-xs btn-secondary" data-toggle="modal" data-target="#modals-load-content"
data-id="' . $teamUser->user_id . '"
data-id="'.$teamUser->user_id.'"
data-action="business-user-detail"
data-back=""
data-modal="modal-xl"
data-init_from="member"
data-live="' . $this->forceLiveCalculation . '"
data-live="'.$this->forceLiveCalculation.'"
data-optimized="1"
data-route="' . route('modal_load') . '"><span class="fa fa-calculator"></span></button>';
data-route="'.route('modal_load').'"><span class="fa fa-calculator"></span></button>';
})
->addColumn('m_account', function ($teamUser) {
return $teamUser->m_account;
})
->addColumn('email', function ($teamUser) {
return e($teamUser->email);
$button = '<a href="#" class="text-black" data-toggle="modal" data-target="#modals-load-content" '.
'data-id="'.$teamUser->user_id.'" data-action="business-user-show" data-back="" '.
'data-modal="modal-md" data-init_from="member" data-route="'.route('modal_load').'">'.
'<span class="mr-1 ion ion-ios-contact"></span> '.
'</a>';
return $button.e($teamUser->email);
})
->addColumn('first_name', function ($teamUser) {
return e($teamUser->first_name);
@ -313,6 +318,7 @@ class TeamController extends Controller
})
->addColumn('is_qual_kp', function ($teamUser) {
$user = User::find($teamUser->user_id);
return TreeHelperOptimized::generateQualKPBadgeForUser($user, $this->month, $this->year);
})
->addColumn('sales_volume_KP_points', function ($teamUser) {
@ -331,18 +337,19 @@ class TeamController extends Controller
if ($userBusiness) {
return NextLevelBadgeHelper::generateBadgeFromUserBusiness($userBusiness);
}
return NextLevelBadgeHelper::renderNoDataBadge();
})
->addColumn('active_account', function ($teamUser) {
return get_active_badge($teamUser->active_account);
})
->addColumn('payment_account_date', function ($teamUser) {
return $teamUser->active_date ? formatDate($teamUser->active_date) : "-";
return $teamUser->active_date ? formatDate($teamUser->active_date) : '-';
})
->rawColumns(['id', 'next_level_qualified', 'active_account', 'is_qual_kp', 'sales_volume_KP_points', 'sales_volume_total'])
->rawColumns(['id', 'email', 'next_level_qualified', 'active_account', 'is_qual_kp', 'sales_volume_KP_points', 'sales_volume_total'])
->make(true);
} catch (\Exception $e) {
\Log::error("TeamController: Error in optimized datatable: " . $e->getMessage());
\Log::error('TeamController: Error in optimized datatable: '.$e->getMessage());
// Fallback zur Standard-DataTable
return $this->datatable();
@ -361,12 +368,12 @@ class TeamController extends Controller
return \DataTables::eloquent($query)
->addColumn('id', function (User $teamUser) {
return '<button type="button" class="btn icon-btn btn-xs btn-secondary" data-toggle="modal" data-target="#modals-load-content"
data-id="' . $teamUser->id . '"
data-id="'.$teamUser->id.'"
data-action="team-user-detail"
data-back=""
data-modal="modal-xl"
data-init_from="member"
data-route="' . route('modal_load') . '"><span class="fa fa-eye"></span></button>';
data-route="'.route('modal_load').'"><span class="fa fa-eye"></span></button>';
})
->addColumn('m_account', function (User $teamUser) {
return $teamUser->account ? e($teamUser->account->m_account) : '';
@ -375,7 +382,7 @@ class TeamController extends Controller
return $teamUser->user_level ? e($teamUser->user_level->getLang('name')) : '';
})
->addColumn('is_qual_kp', function (User $teamUser) {
if (!$teamUser->user_level) {
if (! $teamUser->user_level) {
return '-';
}
$qualKP = (int) $teamUser->user_level->qual_kp;
@ -384,7 +391,8 @@ class TeamController extends Controller
$pointsSum = (int) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_points_KP_sum');
$isQual = $pointsSum >= $qualKP;
$badgeClass = $isQual ? 'badge-outline-success' : 'badge-outline-warning-dark';
return '<span class="badge ' . $badgeClass . '"> KU ' . $qualKP . '</span>';
return '<span class="badge '.$badgeClass.'"> KU '.$qualKP.'</span>';
})
->addColumn('sales_volume_KP_points', function (User $teamUser) {
$month = Request::get('team_user_filter_month') ?: session('team_user_filter_month');
@ -392,8 +400,9 @@ class TeamController extends Controller
$total = (int) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_points_KP_sum');
$individual = (int) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_KP_points');
$shop = (int) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_points_shop');
return '<div class="no-line-break">' . $total . '</div>' .
'<span class="small no-line-break">E: ' . $individual . ' | S: ' . $shop . '</span>';
return '<div class="no-line-break">'.$total.'</div>'.
'<span class="small no-line-break">E: '.$individual.' | S: '.$shop.'</span>';
})
->addColumn('sales_volume_total', function (User $teamUser) {
$month = Request::get('team_user_filter_month') ?: session('team_user_filter_month');
@ -401,8 +410,9 @@ class TeamController extends Controller
$total = (float) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_total_sum');
$individual = (float) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_total');
$shop = (float) $teamUser->getUserSalesVolumeBy($month, $year, 'sales_volume_total_shop');
return '<div class="no-line-break">' . formatNumber($total) . ' &euro;</div>' .
'<span class="small no-line-break">E: ' . formatNumber($individual) . ' | S: ' . formatNumber($shop) . ' &euro;</span>';
return '<div class="no-line-break">'.formatNumber($total).' &euro;</div>'.
'<span class="small no-line-break">E: '.formatNumber($individual).' | S: '.formatNumber($shop).' &euro;</span>';
})
->addColumn('email', function (User $teamUser) {
return e($teamUser->email);
@ -414,24 +424,25 @@ class TeamController extends Controller
return $teamUser->account ? e($teamUser->account->last_name) : '';
})
->addColumn('sponsor', function (User $teamUser) {
if (!$teamUser->user_sponsor) {
if (! $teamUser->user_sponsor) {
return '-';
}
$sponsor = $teamUser->user_sponsor;
$html = '';
if ($sponsor->account) {
$html .= e($sponsor->account->first_name . ' ' . $sponsor->account->last_name);
$html .= '<br><span class="small no-line-break">' . e($sponsor->email);
$html .= ' | ' . e($sponsor->account->m_account);
$html .= e($sponsor->account->first_name.' '.$sponsor->account->last_name);
$html .= '<br><span class="small no-line-break">'.e($sponsor->email);
$html .= ' | '.e($sponsor->account->m_account);
$html .= '</span>';
}
return $html;
})
->addColumn('active_account', function (User $teamUser) {
return get_active_badge($teamUser->isActiveAccount());
})
->addColumn('payment_account_date', function (User $teamUser) {
return $teamUser->payment_account ? $teamUser->getPaymentAccountDateFormat(false) : "-";
return $teamUser->payment_account ? $teamUser->getPaymentAccountDateFormat(false) : '-';
})
->addColumn('next_level_qualified', function (User $teamUser) {
// Verwende bereits berechnete UserBusiness-Daten für bessere Performance
@ -450,29 +461,29 @@ class TeamController extends Controller
return NextLevelBadgeHelper::renderNoDataBadge();
})
->filterColumn('m_account', function ($query, $keyword) {
if ($keyword != "") {
if ($keyword != '') {
$query->whereHas('account', function ($q) use ($keyword) {
$q->where('m_account', 'LIKE', '%' . $keyword . '%');
$q->where('m_account', 'LIKE', '%'.$keyword.'%');
});
}
})
->filterColumn('first_name', function ($query, $keyword) {
if ($keyword != "") {
if ($keyword != '') {
$query->whereHas('account', function ($q) use ($keyword) {
$q->where('first_name', 'LIKE', '%' . $keyword . '%');
$q->where('first_name', 'LIKE', '%'.$keyword.'%');
});
}
})
->filterColumn('last_name', function ($query, $keyword) {
if ($keyword != "") {
if ($keyword != '') {
$query->whereHas('account', function ($q) use ($keyword) {
$q->where('last_name', 'LIKE', '%' . $keyword . '%');
$q->where('last_name', 'LIKE', '%'.$keyword.'%');
});
}
})
->filterColumn('email', function ($query, $keyword) {
if ($keyword != "") {
$query->where('email', 'LIKE', '%' . $keyword . '%');
if ($keyword != '') {
$query->where('email', 'LIKE', '%'.$keyword.'%');
}
})
->orderColumn('id', 'users.id $1')
@ -484,10 +495,10 @@ class TeamController extends Controller
->rawColumns(['id', 'is_qual_kp', 'sales_volume_KP_points', 'sales_volume_total', 'sponsor', 'active_account', 'next_level_qualified'])
->make(true);
} catch (\Exception $e) {
\Log::error("TeamController: Error in userDatatable: " . $e->getMessage());
\Log::error('TeamController: Error in userDatatable: '.$e->getMessage());
return response()->json([
'error' => 'Team-Datatable konnte nicht geladen werden: ' . $e->getMessage()
'error' => 'Team-Datatable konnte nicht geladen werden: '.$e->getMessage(),
], 500);
}
}
@ -510,7 +521,7 @@ class TeamController extends Controller
$onlyNotUpdated = Request::boolean('not_updated', false);
// Prüfe ob Live-Berechnung erzwungen werden soll
$forceLiveCalculation = false; //Request::get('force_live_calculation', false) || Request::get('live', false);
$forceLiveCalculation = false; // Request::get('force_live_calculation', false) || Request::get('live', false);
\Log::info("TeamController: Building level reports for user {$user->id} ({$month}/{$year})");
@ -519,7 +530,7 @@ class TeamController extends Controller
$treeCalcBot->initStructureUser($user->id, $forceLiveCalculation);
// Lade Level-Reports für Team
$levelReportService = new LevelReportService();
$levelReportService = new LevelReportService;
$filters = ['only_not_updated' => $onlyNotUpdated];
$promotions = $levelReportService->getTeamLevelPromotions($treeCalcBot, $month, $year, $filters);
$statistics = $levelReportService->getStatistics($promotions);
@ -527,7 +538,7 @@ class TeamController extends Controller
$endTime = microtime(true);
$executionTime = round(($endTime - $startTime) * 1000, 2);
\Log::info("TeamController: Level reports loaded for user {$user->id} in {$executionTime}ms - " . $promotions->count() . " promotions found");
\Log::info("TeamController: Level reports loaded for user {$user->id} in {$executionTime}ms - ".$promotions->count().' promotions found');
$availableYears = range(date('Y'), date('Y') - 5);
$availableMonths = [
@ -542,7 +553,7 @@ class TeamController extends Controller
9 => __('cal.months.September'),
10 => __('cal.months.October'),
11 => __('cal.months.November'),
12 => __('cal.months.December')
12 => __('cal.months.December'),
];
$data = [
@ -551,22 +562,22 @@ class TeamController extends Controller
'filters' => [
'month' => $month,
'year' => $year,
'only_not_updated' => $onlyNotUpdated
'only_not_updated' => $onlyNotUpdated,
],
'availableYears' => $availableYears,
'availableMonths' => $availableMonths,
'performance' => [
'execution_time' => $executionTime,
'user_id' => $user->id
]
'user_id' => $user->id,
],
];
return view('user.team.level-reports', $data);
} catch (\Exception $e) {
\Log::error("TeamController: Error loading level reports: " . $e->getMessage());
\Log::error('TeamController: Error loading level reports: '.$e->getMessage());
return view('user.team.level-reports', [
'error' => 'Fehler beim Laden der Level-Reports: ' . $e->getMessage(),
'error' => 'Fehler beim Laden der Level-Reports: '.$e->getMessage(),
'promotions' => collect([]),
'statistics' => ['total_count' => 0, 'level_stats' => [], 'period_stats' => []],
'filters' => ['month' => date('m'), 'year' => date('Y'), 'only_not_updated' => false],
@ -583,8 +594,8 @@ class TeamController extends Controller
9 => __('cal.months.September'),
10 => __('cal.months.October'),
11 => __('cal.months.November'),
12 => __('cal.months.December')
]
12 => __('cal.months.December'),
],
]);
}
}
@ -608,7 +619,7 @@ class TeamController extends Controller
$treeCalcBot->initStructureUser($user->id, $forceLiveCalculation);
// Lade Level-Reports
$levelReportService = new LevelReportService();
$levelReportService = new LevelReportService;
$filters = ['only_not_updated' => $onlyNotUpdated];
$promotions = $levelReportService->getTeamLevelPromotions($treeCalcBot, $month, $year, $filters);
@ -617,13 +628,14 @@ class TeamController extends Controller
}
// CSV erstellen
$filename = 'team_level_promotions_' . date('Y-m-d_H-i-s') . '.csv';
$filename = 'team_level_promotions_'.date('Y-m-d_H-i-s').'.csv';
$filepath = $levelReportService->exportToCsv($promotions, $filename);
return response()->download($filepath, $filename)->deleteFileAfterSend(true);
} catch (\Exception $e) {
\Log::error("TeamController: Error exporting level reports: " . $e->getMessage());
return redirect()->back()->with('error', 'Fehler beim Export: ' . $e->getMessage());
\Log::error('TeamController: Error exporting level reports: '.$e->getMessage());
return redirect()->back()->with('error', 'Fehler beim Export: '.$e->getMessage());
}
}
@ -654,19 +666,19 @@ class TeamController extends Controller
'currentUser' => $user,
'currentLevel' => $currentLevel,
'performance' => [
'execution_time' => $executionTime
]
'execution_time' => $executionTime,
],
];
return view('user.team.marketingplan', $data);
} catch (\Exception $e) {
\Log::error("TeamController: Error loading marketingplan: " . $e->getMessage());
\Log::error('TeamController: Error loading marketingplan: '.$e->getMessage());
return view('user.team.marketingplan', [
'error' => __('marketingplan.loading_error') . ' ' . $e->getMessage(),
'error' => __('marketingplan.loading_error').' '.$e->getMessage(),
'userLevels' => collect(),
'currentUser' => null,
'currentLevel' => null
'currentLevel' => null,
]);
}
}
@ -678,14 +690,15 @@ class TeamController extends Controller
{
$user = User::find(\Auth::user()->id);
if ($user->isActiveShop() && $user->shop) {
$shop_register_link = $user->shop->getSubdomain(false) . "/reg";
$shop_register_link = $user->shop->getSubdomain(false).'/reg';
} else {
$member_id = 'm' . ($user->id + config('mivita.add_number_id'));
$shop_register_link = config('app.protocol') . config('app.domain') . config('app.tld_care') . '/reg/' . $member_id;
$member_id = 'm'.($user->id + config('mivita.add_number_id'));
$shop_register_link = config('app.protocol').config('app.domain').config('app.tld_care').'/reg/'.$member_id;
}
$data = [
'shop_register_link' => $shop_register_link
'shop_register_link' => $shop_register_link,
];
return view('user.team.members', $data);
}
@ -697,24 +710,8 @@ class TeamController extends Controller
$user = User::find(\Auth::user()->id);
$this->setFilterVars();
// Nutze TreeCalcBotOptimized um das Team zu bekommen
$month = session('team_user_filter_month');
$year = session('team_user_filter_year');
// Lade Team-Struktur
$TreeCalcBot = new TreeCalcBotOptimized($month, $year, 'member', false);
$TreeCalcBot->initStructureUser($user->id, false);
// Hole flache Liste aller Team-Mitglieder
$teamUsersRaw = $this->getTeamUsersFromStructure($TreeCalcBot);
// Sammle User-IDs für Abo-Abfrage
$teamUserIds = [];
foreach ($teamUsersRaw as $teamUser) {
if ($teamUser->user_id && $teamUser->user_id != $user->id) {
$teamUserIds[] = $teamUser->user_id;
}
}
// Hole Team-Mitglieder-IDs effizient via Sponsor-Hierarchie
$teamUserIds = AboHelper::getTeamUserIds($user->id);
// Hole Abos der Team-Mitglieder
$abos = \App\Models\UserAbo::whereIn('user_id', $teamUserIds)
@ -740,24 +737,8 @@ class TeamController extends Controller
$user = User::find(\Auth::user()->id);
$user_abo = \App\Models\UserAbo::findOrFail($id);
// Prüfe ob das Abo zu einem Team-Mitglied gehört
$this->setFilterVars();
$month = session('team_user_filter_month');
$year = session('team_user_filter_year');
$TreeCalcBot = new TreeCalcBotOptimized($month, $year, 'member', false);
$TreeCalcBot->initStructureUser($user->id, false);
$teamUsersRaw = $this->getTeamUsersFromStructure($TreeCalcBot);
$teamUserIds = [];
foreach ($teamUsersRaw as $teamUser) {
if ($teamUser->user_id) {
$teamUserIds[] = $teamUser->user_id;
}
}
// Prüfe Berechtigung
if (!in_array($user_abo->user_id, $teamUserIds)) {
// Prüfe ob das Abo zu einem Team-Mitglied gehört (effizient via Sponsor-Kette)
if (! AboHelper::isUserInTeam($user->id, $user_abo->user_id)) {
abort(403, 'Unauthorized action. This subscription does not belong to your team.');
}
@ -819,6 +800,7 @@ class TeamController extends Controller
'filter_months' => HTMLHelper::getTransMonths(),
'filter_years' => HTMLHelper::getYearRange(2022),
];
return view('user.team.points', $data);
}
@ -826,27 +808,28 @@ class TeamController extends Controller
{
$user = User::find(\Auth::user()->id);
if (!$user->isVIP()) {
if (! $user->isVIP()) {
abort(404);
}
$ExportBot = new ExportBot('member');
$ExportBot->initStructureUser($user, 'list'); //tree or list
$ExportBot->initStructureUser($user, 'list'); // tree or list
$data = [
'ExportBot' => $ExportBot,
];
return view('user.team.export', $data);
}
public function userTeamExport()
{
if (Request::get('action') === "export") {
if (Request::get('action') === 'export') {
$user = User::find(\Auth::user()->id);
$ExportBot = new ExportBot('member');
$ExportBot->initStructureUser($user, 'list'); //tree or list
$ExportBot->initStructureUser($user, 'list'); // tree or list
$columns = [];
$filename = __('team.filename_export') . date('Y-m-d-H-i-s');
$headers = array(
$filename = __('team.filename_export').date('Y-m-d-H-i-s');
$headers = [
__('tables.line'),
__('tables.level'),
__('tables.email'),
@ -864,10 +847,10 @@ class TeamController extends Controller
__('tables.account'),
__('tables.account_to'),
__('tables.sponsor'),
);
];
if (isset($ExportBot->user_list->childs)) {
foreach ($ExportBot->user_list->childs as $child) {
$columns[] = array(
$columns[] = [
__('tables.line') => $child->line,
__('tables.level') => $child->level_name,
__('tables.email') => $child->email,
@ -885,38 +868,39 @@ class TeamController extends Controller
__('tables.account') => ($child->active_account == 1 ? __('yes') : __('no')),
__('tables.account_to') => $child->payment_account_date,
__('tables.sponsor') => $child->sponsor_name,
);
];
}
}
return Excel::download(new UserTeamExport($columns, $headers), $filename . '.xls');
return Excel::download(new UserTeamExport($columns, $headers), $filename.'.xls');
}
}
private function setFilterVars()
{
if (!session('team_user_filter_month')) {
if (! session('team_user_filter_month')) {
session(['team_user_filter_month' => intval(date('m'))]);
}
if (!session('team_user_filter_month_prev')) {
if (! session('team_user_filter_month_prev')) {
session(['team_user_filter_month_prev' => intval(date('m') - 1)]);
}
if (!session('team_user_filter_year')) {
if (! session('team_user_filter_year')) {
session(['team_user_filter_year' => intval(date('Y'))]);
}
if (!session('team_user_points_filter_month')) {
if (! session('team_user_points_filter_month')) {
session(['team_user_points_filter_month' => intval(date('m'))]);
}
if (!session('team_user_points_filter_year')) {
if (! session('team_user_points_filter_year')) {
session(['team_user_points_filter_year' => intval(date('Y'))]);
}
if (!session('team_user_filter_active')) {
if (! session('team_user_filter_active')) {
session(['team_user_filter_active' => 1]);
}
if (!session('team_user_filter_level')) {
if (! session('team_user_filter_level')) {
session(['team_user_filter_level' => 0]);
}
if (!session('team_user_filter_next_level')) {
if (! session('team_user_filter_next_level')) {
session(['team_user_filter_next_level' => 0]);
}
@ -964,38 +948,39 @@ class TeamController extends Controller
return $query;
}
public function datatablePoints()
{
$query = $this->initSearchPoints();
return \DataTables::eloquent($query)
->addColumn('order', function (UserSalesVolume $UserSalesVolume) {
if ($UserSalesVolume->shopping_order) {
if ($UserSalesVolume->status === 1 && $UserSalesVolume->shopping_order->auth_user_id === $UserSalesVolume->user_id) {
return '<a href="' . route('user_order_detail', [$UserSalesVolume->shopping_order->id]) . '" class="btn btn-xs btn-primary">' . $UserSalesVolume->shopping_order->id . '</a>';
return '<a href="'.route('user_order_detail', [$UserSalesVolume->shopping_order->id]).'" class="btn btn-xs btn-primary">'.$UserSalesVolume->shopping_order->id.'</a>';
}
if (($UserSalesVolume->status === 2 || $UserSalesVolume->status === 3) && $UserSalesVolume->shopping_order->member_id === $UserSalesVolume->user_id) {
return '<a href="' . route('user_shop_order_detail', [$UserSalesVolume->shopping_order->id]) . '" class="btn btn-xs btn-secondary">' . $UserSalesVolume->shopping_order->id . '</a>';
if (($UserSalesVolume->status === 2 || $UserSalesVolume->status === 3) && $UserSalesVolume->shopping_order->member_id === $UserSalesVolume->user_id) {
return '<a href="'.route('user_shop_order_detail', [$UserSalesVolume->shopping_order->id]).'" class="btn btn-xs btn-secondary">'.$UserSalesVolume->shopping_order->id.'</a>';
}
}
return '';
})
->addColumn('total_net', function (UserSalesVolume $UserSalesVolume) {
return formatNumber($UserSalesVolume->total_net) . ' &euro;';
return formatNumber($UserSalesVolume->total_net).' &euro;';
})
->addColumn('status_turnover', function (UserSalesVolume $UserSalesVolume) {
return '<span class="badge badge-pill badge-' . $UserSalesVolume->getStatusTurnoverColor() . '">' . $UserSalesVolume->getStatusTurnoverType() . '</span>';
return '<span class="badge badge-pill badge-'.$UserSalesVolume->getStatusTurnoverColor().'">'.$UserSalesVolume->getStatusTurnoverType().'</span>';
})
->addColumn('status', function (UserSalesVolume $UserSalesVolume) {
return '<span class="badge badge-pill badge-' . $UserSalesVolume->getStatusColor() . '">' . $UserSalesVolume->getStatusType() . '</span>';
return '<span class="badge badge-pill badge-'.$UserSalesVolume->getStatusColor().'">'.$UserSalesVolume->getStatusType().'</span>';
})
->addColumn('message', function (UserSalesVolume $UserSalesVolume) {
return '<span class="no-line-break">' . $UserSalesVolume->message . '</span>';
return '<span class="no-line-break">'.$UserSalesVolume->message.'</span>';
})
->addColumn('info', function (UserSalesVolume $UserSalesVolume) {
return '<span class="no-line-break">' . $UserSalesVolume->info . '</span>';
return '<span class="no-line-break">'.$UserSalesVolume->info.'</span>';
})
->orderColumn('id', 'id $1')
@ -1018,7 +1003,8 @@ class TeamController extends Controller
'userSalesVolume' => $userSalesVolume,
];
$html = view('user.team._points_sum', $data)->render();
return response()->json(['response' => true, 'data' => $data, 'html' => $html]);
return response()->json(['response' => true, 'data' => $data, 'html' => $html]);
}
/**
@ -1026,13 +1012,13 @@ class TeamController extends Controller
*/
private function formatBytes(int $bytes, int $precision = 2): string
{
$units = array('B', 'KB', 'MB', 'GB', 'TB');
$units = ['B', 'KB', 'MB', 'GB', 'TB'];
for ($i = 0; $bytes > 1024 && $i < count($units) - 1; $i++) {
$bytes /= 1024;
}
return round($bytes, $precision) . ' ' . $units[$i];
return round($bytes, $precision).' '.$units[$i];
}
/**
@ -1058,7 +1044,7 @@ class TeamController extends Controller
return [
1 => __('team.filter_active'),
2 => __('team.filter_not_active'),
3 => __('team.filter_all')
3 => __('team.filter_all'),
];
}
@ -1071,7 +1057,7 @@ class TeamController extends Controller
0 => __('team.all_status'),
1 => __('team.qualified_green'),
2 => __('team.in_progress_yellow'),
3 => __('team.no_level_red')
3 => __('team.no_level_red'),
];
}
@ -1089,20 +1075,20 @@ class TeamController extends Controller
// Debug: Prüfe TreeCalcBot-Inhalt
$businessUsers = $treeCalcBot->getItems();
\Log::info("TeamController: TreeCalcBot root items count: " . count($businessUsers));
\Log::info('TeamController: TreeCalcBot root items count: '.count($businessUsers));
// Sammle alle Root-User UND deren verschachtelte businessUserItems
foreach ($businessUsers as $businessUser) {
// WICHTIG: user_id korrekt über b_user abrufen (Magic Method Problem mit isset())
$userId = $businessUser->user_id; // Über __get() Method
\Log::debug("TeamController: Processing root businessUser", [
\Log::debug('TeamController: Processing root businessUser', [
'user_id' => $userId,
'businessUserItems_count' => count($businessUser->businessUserItems ?? []),
]);
// WICHTIG: Root-User selbst hinzufügen (korrigierte user_id Prüfung)
//nur User können auch children haben - businessUserItems
if ($userId && !isset($processedIds[$userId])) {
// nur User können auch children haben - businessUserItems
if ($userId && ! isset($processedIds[$userId])) {
$processedIds[$userId] = true;
$businessUser->deep = 0;
$allUsers[] = $businessUser;
@ -1121,7 +1107,7 @@ class TeamController extends Controller
if ($userId) {
// Prüfe ob dieser parentless User bereits gesammelt wurde
if (!isset($processedIds[$userId])) {
if (! isset($processedIds[$userId])) {
$processedIds[$userId] = true;
$businessUser->deep = 0;
$allUsers[] = $businessUser;
@ -1134,17 +1120,17 @@ class TeamController extends Controller
\Log::debug("TeamController: Parentless-User übersprungen: {$userId} (bereits verarbeitet)");
}
} else {
\Log::warning("TeamController: Parentless BusinessUser ohne user_id übersprungen");
\Log::warning('TeamController: Parentless BusinessUser ohne user_id übersprungen');
}
}
}
}
}
\Log::info("TeamController: AllUsers before filtering: " . count($allUsers));
\Log::info('TeamController: AllUsers before filtering: '.count($allUsers));
// Filter anwenden
$filteredUsers = $this->applyTeamFiltersToBusinessUsers($allUsers);
\Log::info("TeamController: AllUsers after filtering: " . count($filteredUsers));
\Log::info('TeamController: AllUsers after filtering: '.count($filteredUsers));
return $filteredUsers;
}
@ -1161,9 +1147,9 @@ class TeamController extends Controller
\Log::info("TeamController: Applying filters - Active: {$activeFilter}, Level: {$levelFilter}, NextLevel: {$nextLevelFilter}");
// Debug: Zeige verfügbare Eigenschaften des ersten BusinessUsers
if (!empty($businessUsers)) {
if (! empty($businessUsers)) {
$firstUser = $businessUsers[0];
\Log::debug("TeamController: First BusinessUser properties", [
\Log::debug('TeamController: First BusinessUser properties', [
'user_id' => $firstUser->user_id ?? 'not set',
'active_account' => $firstUser->active_account ?? 'not set',
'm_level_id' => $firstUser->m_level_id ?? 'not set',
@ -1175,7 +1161,7 @@ class TeamController extends Controller
$filtered = array_filter($businessUsers, function ($businessUser) use ($activeFilter, $levelFilter, $nextLevelFilter) {
// Active Filter anwenden
if ($activeFilter == 1) { // Nur aktive
if (!$businessUser->active_account) {
if (! $businessUser->active_account) {
return false;
}
} elseif ($activeFilter == 2) { // Nur inaktive
@ -1199,12 +1185,12 @@ class TeamController extends Controller
switch ($nextLevelFilter) {
case 1: // Qualifiziert (grün) - hat next_qual_user_level
if (!$hasNextQual) {
if (! $hasNextQual) {
return false;
}
break;
case 2: // In Arbeit (gelb) - hat next_can_user_level aber kein next_qual_user_level
if ($hasNextQual || !$hasNextCan) {
if ($hasNextQual || ! $hasNextCan) {
return false;
}
break;
@ -1233,6 +1219,7 @@ class TeamController extends Controller
$maxDepth = 20;
if ($depth > $maxDepth) {
\Log::warning("TeamController: Maximale Sammlungstiefe ({$maxDepth}) erreicht bei Tiefe {$depth}");
return;
}
@ -1244,6 +1231,7 @@ class TeamController extends Controller
// KRITISCHER SCHUTZ: Prüfe ob User bereits gesammelt wurde
if (isset($processedIds[$userId])) {
\Log::debug("TeamController: Überspringe bereits gesammelten User {$userId} (Duplikat verhindert)");
continue;
}
@ -1255,8 +1243,8 @@ class TeamController extends Controller
\Log::debug("TeamController: Flach gesammelt - User ID: {$userId} at depth {$depth}");
// Rekursiv ALLE verschachtelten businessUserItems sammeln
if (isset($businessUserItem->businessUserItems) && is_array($businessUserItem->businessUserItems) && !empty($businessUserItem->businessUserItems)) {
\Log::debug("TeamController: Sammle " . count($businessUserItem->businessUserItems) . " verschachtelte Items von User {$userId}");
if (isset($businessUserItem->businessUserItems) && is_array($businessUserItem->businessUserItems) && ! empty($businessUserItem->businessUserItems)) {
\Log::debug('TeamController: Sammle '.count($businessUserItem->businessUserItems)." verschachtelte Items von User {$userId}");
$this->collectAllBusinessUserItemsFlat($businessUserItem->businessUserItems, $allUsers, $processedIds, $depth + 1);
}
} else {
@ -1276,11 +1264,12 @@ class TeamController extends Controller
$maxDepth = 20;
if ($deep > $maxDepth) {
\Log::warning("TeamController: Maximale Sammlungstiefe ({$maxDepth}) erreicht");
return;
}
if (isset($businessUser->businessUserItems) && is_array($businessUser->businessUserItems)) {
\Log::debug("TeamController: Collecting from businessUser with " . count($businessUser->businessUserItems) . " sub-items at depth {$deep}");
\Log::debug('TeamController: Collecting from businessUser with '.count($businessUser->businessUserItems)." sub-items at depth {$deep}");
foreach ($businessUser->businessUserItems as $subBusinessUser) {
if ($subBusinessUser) {
@ -1291,6 +1280,7 @@ class TeamController extends Controller
// KRITISCHER BUGFIX: Prüfe ob User bereits gesammelt wurde
if (isset($processedIds[$userId])) {
\Log::debug("TeamController: Überspringe bereits gesammelten User {$userId} (zirkuläre Referenz verhindert)");
continue;
}
@ -1320,13 +1310,13 @@ class TeamController extends Controller
$cleanedUsers = [];
foreach ($businessUserItems as $businessUserItem) {
if (!$businessUserItem) {
if (! $businessUserItem) {
continue;
}
try {
// Extrahiere nur die Properties, die für DataTable benötigt werden
$cleanedUser = new \stdClass();
$cleanedUser = new \stdClass;
// Basis Properties (direkt über Magic Method __get)
$cleanedUser->user_id = $businessUserItem->user_id;
@ -1354,13 +1344,14 @@ class TeamController extends Controller
\Log::debug("TeamController: Cleaned user {$cleanedUser->user_id} for DataTable");
} catch (\Exception $e) {
\Log::error("TeamController: Error cleaning BusinessUserItem for DataTable: " . $e->getMessage());
\Log::error('TeamController: Error cleaning BusinessUserItem for DataTable: '.$e->getMessage());
// Skip diesen User, statt alles abzubrechen
continue;
}
}
\Log::info("TeamController: Cleaned " . count($cleanedUsers) . " users for DataTable (from " . count($businessUserItems) . " raw items)");
\Log::info('TeamController: Cleaned '.count($cleanedUsers).' users for DataTable (from '.count($businessUserItems).' raw items)');
return $cleanedUsers;
}