diff --git a/app/Http/Controllers/Bo/SettingsController.php b/app/Http/Controllers/Bo/SettingsController.php index c193f18..6078a73 100644 --- a/app/Http/Controllers/Bo/SettingsController.php +++ b/app/Http/Controllers/Bo/SettingsController.php @@ -24,7 +24,6 @@ class SettingsController extends Controller $nbUniqueCodeUse = $request->nb_unique_code_use; $useEanCodes = $request->use_ean_codes === null ? 0 : 1; $activatedTeaser = $request->activated_teaser === null ? 0 : 1; - $teaserEndActivity = $request->teaser_end_activity; $activatedClosePage = $request->activated_close_page === null ? 0 : 1; $closePageActiveDate = $request->close_page_active_date; $redirectClose = $request->redirect_close; @@ -53,10 +52,7 @@ class SettingsController extends Controller $settings->nb_unique_code_use = $nbUniqueCodeUse; $settings->use_ean_codes = $useEanCodes; $settings->activated_teaser = $activatedTeaser; - if ($activatedTeaser === 1) { - $settings->teaser_end_activity = Carbon::parse($teaserEndActivity); - } - $settings->activated_close_page = $activatedClosePage; + $settings->activated_close_page = $activatedClosePage; if ($activatedClosePage === 1) { $settings->close_page_active_date = Carbon::parse($closePageActiveDate); } diff --git a/app/Http/Controllers/TeaserController.php b/app/Http/Controllers/TeaserController.php index c096177..0650a32 100644 --- a/app/Http/Controllers/TeaserController.php +++ b/app/Http/Controllers/TeaserController.php @@ -9,8 +9,8 @@ class TeaserController extends Controller public function index() { $settings = app(Settings::class) - ->select('start_date', 'end_date', 'activated_teaser', 'teaser_end_activity')->first(); - if ($settings->activated_teaser === 1 && $settings->teaser_end_activity > now()) { + ->select('start_date', 'end_date', 'activated_teaser')->first(); + if ($settings->activated_teaser) { return view('front.basic.teaser', compact('settings')); } return redirect()->route('home'); diff --git a/app/Http/Controllers/re7Controller.php b/app/Http/Controllers/re7Controller.php index 483295a..d3f6d13 100644 --- a/app/Http/Controllers/re7Controller.php +++ b/app/Http/Controllers/re7Controller.php @@ -15,7 +15,7 @@ class re7Controller extends Controller public function teaser() { $settings = app(Settings::class) - ->select('start_date', 'end_date', 'activated_teaser', 'teaser_end_activity')->first(); + ->select('start_date', 'end_date', 'activated_teaser')->first(); return view('front.basic.teaser', compact('settings')); } diff --git a/app/Http/Middleware/GameCheckDate.php b/app/Http/Middleware/GameCheckDate.php index 0d19fca..8de597a 100644 --- a/app/Http/Middleware/GameCheckDate.php +++ b/app/Http/Middleware/GameCheckDate.php @@ -10,8 +10,8 @@ class GameCheckDate /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param mixed $request + * @param \Closure $next * @return mixed */ public function handle($request, Closure $next) @@ -19,15 +19,15 @@ class GameCheckDate /** @var \App\Models\Settings $settings */ $settings = app(Settings::class); - // Check si le teaser est actif + // * Check si le teaser est actif. if ($settings->start_date > now()) { - if ($settings->activated_teaser === 1 && $settings->teaser_end_activity > now()) { + if ($settings->activated_teaser) { return redirect()->route('teaser'); } return redirect($settings->redirect_close); } - // Check si le jeu est terminé + // * Check si le jeu est terminé. if ($settings->end_date < now()) { if ($settings->activated_close_page === 1 && $settings->close_page_active_date > now()) { return redirect()->route('end'); diff --git a/app/Models/Settings.php b/app/Models/Settings.php index b8da128..5b512ba 100644 --- a/app/Models/Settings.php +++ b/app/Models/Settings.php @@ -14,5 +14,6 @@ class Settings extends Model protected $casts = [ 'start_date' => 'datetime', 'end_date' => 'datetime', + 'activated_teaser' => 'bool' ]; } diff --git a/database/migrations/2020_10_12_123129_create_settings.php b/database/migrations/2020_10_12_123129_create_settings.php index e3d2b5f..84b2678 100644 --- a/database/migrations/2020_10_12_123129_create_settings.php +++ b/database/migrations/2020_10_12_123129_create_settings.php @@ -25,7 +25,6 @@ class CreateSettings extends Migration ->default(config('codes.codeLength')); $table->boolean('use_ean_codes'); $table->boolean('activated_teaser'); - $table->dateTime('teaser_end_activity')->nullable(); $table->boolean('activated_close_page'); $table->dateTime('close_page_active_date')->nullable(); $table->string('redirect_close'); diff --git a/resources/views/bo/settings/manage.blade.php b/resources/views/bo/settings/manage.blade.php index da1e4f6..9935cb5 100644 --- a/resources/views/bo/settings/manage.blade.php +++ b/resources/views/bo/settings/manage.blade.php @@ -119,11 +119,7 @@
- @if ($settings->activated_teaser === 1) - - @else - - @endif + activated_teaser) checked @endif>
- - - - - - - -