diff --git a/pfosten/app/Http/Controllers/SeasonsController.php b/pfosten/app/Http/Controllers/SeasonsController.php index 7b2280c7..7bac3157 100644 --- a/pfosten/app/Http/Controllers/SeasonsController.php +++ b/pfosten/app/Http/Controllers/SeasonsController.php @@ -22,7 +22,8 @@ class SeasonsController extends Controller $seasons = DB::table('seasons')->get(); $currentSeason=Season::getCurrent(); - $active_user_count = sizeof( User::getActives() ); + $users = User::getActives(); + $active_user_count = sizeof( $users ); $currentSeasonId=-1; if ($currentSeason) { @@ -30,7 +31,7 @@ class SeasonsController extends Controller $payouts = Quota::getPayouts(); } - return view('seasons.index', compact('seasons','currentSeason','active_user_count','quotas','payouts')); + return view('seasons.index', compact('seasons','currentSeason','active_user_count','quotas','payouts', 'users')); } public function create() { diff --git a/pfosten/app/ManualPayout.php b/pfosten/app/ManualPayout.php new file mode 100644 index 00000000..011aa6a1 --- /dev/null +++ b/pfosten/app/ManualPayout.php @@ -0,0 +1,10 @@ +integer('season_id')->default(0); $table->string('name',100); $table->integer('order')->default(0); - $table->integer('prc')->default(0); + $table->float('prc')->default(0); $table->timestamps(); }); diff --git a/pfosten/database/migrations/2017_09_08_095740_create_matches_table.php b/pfosten/database/migrations/2017_09_08_095740_create_matches_table.php index 441e2e77..062c1f9a 100644 --- a/pfosten/database/migrations/2017_09_08_095740_create_matches_table.php +++ b/pfosten/database/migrations/2017_09_08_095740_create_matches_table.php @@ -30,6 +30,6 @@ class CreateMatchesTable extends Migration */ public function down() { - Schema::dropIfExists('league_matches'); + Schema::dropIfExists('leagues_matches'); } } diff --git a/pfosten/resources/views/seasons/index.blade.php b/pfosten/resources/views/seasons/index.blade.php index 4c53673f..725fd7ff 100644 --- a/pfosten/resources/views/seasons/index.blade.php +++ b/pfosten/resources/views/seasons/index.blade.php @@ -142,11 +142,27 @@ Liga bearbeiten @endif -
@@ -195,4 +211,36 @@ + + + + + + @endsection \ No newline at end of file diff --git a/pfosten/vendor/composer/autoload_classmap.php b/pfosten/vendor/composer/autoload_classmap.php index d339806e..480ef1e4 100755 --- a/pfosten/vendor/composer/autoload_classmap.php +++ b/pfosten/vendor/composer/autoload_classmap.php @@ -37,6 +37,7 @@ return array( 'App\\Leagues\\LeagueMember' => $baseDir . '/app/Leagues/LeagueMember.php', 'App\\Leagues\\Match' => $baseDir . '/app/Leagues/Match.php', 'App\\Mail\\RoundmailMailer' => $baseDir . '/app/Mail/RoundmailMailer.php', + 'App\\ManualPayout' => $baseDir . '/app/ManualPayout.php', 'App\\Payment' => $baseDir . '/app/Payment.php', 'App\\Providers\\AppServiceProvider' => $baseDir . '/app/Providers/AppServiceProvider.php', 'App\\Providers\\AuthServiceProvider' => $baseDir . '/app/Providers/AuthServiceProvider.php', @@ -63,6 +64,7 @@ return array( 'Collective\\Html\\HtmlServiceProvider' => $vendorDir . '/laravelcollective/html/src/HtmlServiceProvider.php', 'CreateGamesTable' => $baseDir . '/database/migrations/2017_06_19_112641_create_games_table.php', 'CreateLeaguesTable' => $baseDir . '/database/migrations/2017_09_08_095721_create_leagues_table.php', + 'CreateManualPayoutsTable' => $baseDir . '/database/migrations/2018_01_15_140815_create_manual_payouts_table.php', 'CreateMatchesTable' => $baseDir . '/database/migrations/2017_09_08_095740_create_matches_table.php', 'CreatePasswordResetsTable' => $baseDir . '/database/migrations/2014_10_12_100000_create_password_resets_table.php', 'CreatePaymentsTable' => $baseDir . '/database/migrations/2017_06_19_112638_create_payments_table.php', diff --git a/pfosten/vendor/composer/autoload_static.php b/pfosten/vendor/composer/autoload_static.php index d8ef1be3..103342cf 100755 --- a/pfosten/vendor/composer/autoload_static.php +++ b/pfosten/vendor/composer/autoload_static.php @@ -309,6 +309,7 @@ class ComposerStaticInita19fb0695e1b61b4feeb3cc3fbdd2feb 'App\\Leagues\\LeagueMember' => __DIR__ . '/../..' . '/app/Leagues/LeagueMember.php', 'App\\Leagues\\Match' => __DIR__ . '/../..' . '/app/Leagues/Match.php', 'App\\Mail\\RoundmailMailer' => __DIR__ . '/../..' . '/app/Mail/RoundmailMailer.php', + 'App\\ManualPayout' => __DIR__ . '/../..' . '/app/ManualPayout.php', 'App\\Payment' => __DIR__ . '/../..' . '/app/Payment.php', 'App\\Providers\\AppServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AppServiceProvider.php', 'App\\Providers\\AuthServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AuthServiceProvider.php', @@ -335,6 +336,7 @@ class ComposerStaticInita19fb0695e1b61b4feeb3cc3fbdd2feb 'Collective\\Html\\HtmlServiceProvider' => __DIR__ . '/..' . '/laravelcollective/html/src/HtmlServiceProvider.php', 'CreateGamesTable' => __DIR__ . '/../..' . '/database/migrations/2017_06_19_112641_create_games_table.php', 'CreateLeaguesTable' => __DIR__ . '/../..' . '/database/migrations/2017_09_08_095721_create_leagues_table.php', + 'CreateManualPayoutsTable' => __DIR__ . '/../..' . '/database/migrations/2018_01_15_140815_create_manual_payouts_table.php', 'CreateMatchesTable' => __DIR__ . '/../..' . '/database/migrations/2017_09_08_095740_create_matches_table.php', 'CreatePasswordResetsTable' => __DIR__ . '/../..' . '/database/migrations/2014_10_12_100000_create_password_resets_table.php', 'CreatePaymentsTable' => __DIR__ . '/../..' . '/database/migrations/2017_06_19_112638_create_payments_table.php',