diff --git a/pfosten/app/ManualPayout.php b/pfosten/app/ManualPayout.php index 3938ad79..938924d9 100644 --- a/pfosten/app/ManualPayout.php +++ b/pfosten/app/ManualPayout.php @@ -13,7 +13,7 @@ class ManualPayout extends Model ]; public static function getManualQuotaNames() { - $manualQuotas=array('Liga Platz 1','Liga Platz 2','Liga Platz 3','Liga Platz 2_1','Liga Platz 3_1','Pokal'); + $manualQuotas=array('liga_platz1','liga_platz2','liga_platz3','liga_platz2_1','liga_platz3_1','pokal'); return $manualQuotas; } diff --git a/pfosten/app/Quota.php b/pfosten/app/Quota.php index 3d47b88f..437a6368 100644 --- a/pfosten/app/Quota.php +++ b/pfosten/app/Quota.php @@ -31,7 +31,7 @@ class Quota extends Model $euro_gruenes_trikot = intval($euro_pott * (($quotas["Gruenes Trikot"] / 100))); $euro_gruenes_trikot = Quota::get6Divisor($euro_gruenes_trikot); - $euro_pokal= intval ($euro_pott * (($quotas["Pokal"] / 100))); + $euro_pokal= intval ($euro_pott * (($quotas["pokal"] / 100))); $euro_pokal= Quota::get6Divisor($euro_pokal); @@ -191,14 +191,10 @@ class Quota extends Model $quota = new Quota; $quota->season_id = $season_id; - $quota->name = "Pokal"; + $quota->name = "pokal"; $quota->prc = 15; $quota->save(); - /// ####################################### - - // Sub-Quotas für den Spielmodus 'Tagessieg' - $quota = new Quota; $quota->season_id = $season_id; $quota->name = "Platz 1"; @@ -273,35 +269,35 @@ class Quota extends Model $quota = new Quota; $quota->season_id = $season_id; - $quota->name = "Liga Platz 1"; + $quota->name = "liga_platz1"; $quota->order = 10; $quota->prc = 50; $quota->save(); $quota = new Quota; $quota->season_id = $season_id; - $quota->name = "Liga Platz 2"; + $quota->name = "liga_platz2"; $quota->order = 10; $quota->prc = 20; $quota->save(); $quota = new Quota; $quota->season_id = $season_id; - $quota->name = "Liga Platz 3"; + $quota->name = "liga_platz3"; $quota->order = 10; $quota->prc = 17; $quota->save(); $quota = new Quota; $quota->season_id = $season_id; - $quota->name = "Liga Platz 2_1"; + $quota->name = "liga_platz2_1"; $quota->order = 10; $quota->prc = 8; $quota->save(); $quota = new Quota; $quota->season_id = $season_id; - $quota->name = "Liga Platz 3_1"; + $quota->name = "liga_platz3_1"; $quota->order = 10; $quota->prc = 5; $quota->save(); @@ -405,7 +401,6 @@ class Quota extends Model foreach ($winners as $quota => $userId) { Log::info($quota." => ".$userId); - if (!array_key_exists($userId, $winners)) { Log::info("Key not found: ".$quota); continue; diff --git a/pfosten/d0274241_2017-08-22.sql b/pfosten/d0274241_2017-08-22.sql index e46cb8ef..4acbc9d4 100644 --- a/pfosten/d0274241_2017-08-22.sql +++ b/pfosten/d0274241_2017-08-22.sql @@ -240,7 +240,7 @@ INSERT INTO `quotas` (`id`, `season_id`, `name`, `order`, `prc`, `created_at`, ` (3, 1, 'Platzierung', 1, 50, '2017-08-18 14:23:49', '2017-08-18 14:23:49'), (4, 1, 'Gruenes Trikot', 1, 0, '2017-08-18 14:23:49', '2017-08-18 14:23:49'), (5, 1, 'Liga-Wertung', 1, 0, '2017-08-18 14:23:49', '2017-08-18 14:23:49'), -(6, 1, 'Pokal', 1, 0, '2017-08-18 14:23:49', '2017-08-18 14:23:49'), +(6, 1, 'oPokal', 1, 0, '2017-08-18 14:23:49', '2017-08-18 14:23:49'), (7, 1, 'Platz 1', 1, 21, '2017-08-18 14:23:49', '2017-08-18 14:23:49'), (8, 1, 'Platz 2', 2, 17, '2017-08-18 14:23:49', '2017-08-18 14:23:49'), (9, 1, 'Platz 3', 3, 13, '2017-08-18 14:23:49', '2017-08-18 14:23:49'), diff --git a/pfosten/resources/views/seasons/index.blade.php b/pfosten/resources/views/seasons/index.blade.php index 43ef582c..093670da 100644 --- a/pfosten/resources/views/seasons/index.blade.php +++ b/pfosten/resources/views/seasons/index.blade.php @@ -158,7 +158,7 @@

- + @@ -176,7 +176,7 @@

 

- + @@ -191,7 +191,7 @@

 

- + @@ -207,7 +207,7 @@ - + @@ -225,7 +225,7 @@

 

- + @@ -246,8 +246,6 @@ - -
@@ -272,9 +270,7 @@