torsten/tippspiel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://bitbucket.org/Terminon/tippspiel

Browse source
This commit is contained in:
tschneider 2020-12-31 15:23:25 +01:00
commit 76d3e9aed1
18 changed files with 177517 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

1
pfosten/app/Http/Controllers/Leagues/LeaguesController.php
View file

@ -73,6 +73,7 @@ class LeaguesController extends Controller
}
public function createLeagues($start_round_id, $round_count) {
Log::info("CREATE_LEAGUES");
$a=new TimeLogger("LeaguesController::createLeagues()");
Log::info($a->getStartMessage());

15
pfosten/app/Http/Controllers/RoundmailController.php
View file

@ -83,8 +83,10 @@ class RoundmailController extends Controller
array_push($activeMailList,$user->email);
} else {
Log::info("Season is NOT paid.");
array_push($inactive_users, $user);
array_push($inactiveMailList,$user->email);
if (!$user->deleted) {
array_push($inactive_users, $user);
array_push($inactiveMailList, $user->email);
}
}
//Log::info("user-id=".$user->id.", ".$user->name);
@ -229,9 +231,12 @@ class RoundmailController extends Controller
Log::info("Usercount: ".sizeof($users));
$emailsOfUsersWithIncompleteTipps=array();
foreach($users as $user) {
if (User::hasMissingTipp($user->id) || User::hasMissingJoker($user->id)) {
if ($user->gets_reminders) {
array_push($emailsOfUsersWithIncompleteTipps, $user->email);
// 2.Versuch nur aktiven Spielern reminder mails zu schicken
if (User::is_season_paid($user->id)=="Ja") {
if (User::hasMissingTipp($user->id) || User::hasMissingJoker($user->id)) {
if ($user->gets_reminders) {
array_push($emailsOfUsersWithIncompleteTipps, $user->email);
}
}
}
}

1
pfosten/app/Http/Controllers/TippsController.php
View file

@ -30,7 +30,6 @@ class TippsController extends Controller
foreach($rounds as $round) {
$games=Game::all()->where('round_id','=',$round->id);
foreach($games as $game) {
// Tipp erzeugen wenn noch nicht vorhanden
$tipp = DB::table('tipps')->where([
['game_id','=',$game->id],

3
pfosten/app/Http/Controllers/UsersController.php
View file

@ -798,4 +798,7 @@ class UsersController extends Controller
return view ('users.gshirt_ranking', compact('rankingDisplay','usernames', 'roundnames'));
}
public function no_payment() {
return view ('users.no_payment');
}
}