forge-joniko/ldc-gen-game-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fully remove 'teaser_end_activity' from settings

Browse source
This commit is contained in:
Jérémy Munsch 2022-03-10 13:56:56 +01:00
parent 0781344016
commit bbb175ad61
No known key found for this signature in database
GPG key ID: 55196BEE445F6049
7 changed files with 11 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Http/Controllers/Bo/SettingsController.php
View file

@ -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);
}

4
app/Http/Controllers/TeaserController.php
View file

@ -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');

2
app/Http/Controllers/re7Controller.php
View file

@ -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'));
}

10
app/Http/Middleware/GameCheckDate.php
View file

@ -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');

1
app/Models/Settings.php
View file

@ -14,5 +14,6 @@ class Settings extends Model
protected $casts = [
'start_date' => 'datetime',
'end_date' => 'datetime',
'activated_teaser' => 'bool'
];
}

1
database/migrations/2020_10_12_123129_create_settings.php
View file

@ -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');

28
resources/views/bo/settings/manage.blade.php
View file

@ -119,11 +119,7 @@
</td>
<td class="align-middle">
<div class="onoffswitch">
@if ($settings->activated_teaser === 1)
<input type="checkbox" name="activated_teaser" class="onoffswitch-checkbox" id="activated_teaser" checked>
@else
<input type="checkbox" name="activated_teaser" class="onoffswitch-checkbox" id="activated_teaser">
@endif
<input type="checkbox" name="activated_teaser" class="onoffswitch-checkbox" id="activated_teaser" value="1" @if($settings->activated_teaser) checked @endif>
<label class="onoffswitch-label" for="activated_teaser">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
@ -131,16 +127,6 @@
</div>
</td>
</tr>
<tr class="form-group" id="teaser_end_activity">
<td>
<label class="col-form-label" for="teaser_end_activity">
Teaser actif jusqu'au <span class="required-asterisk">*</span><br/>
</label>
</td>
<td class="align-middle">
<input class="form-control" type="datetime-local" name="teaser_end_activity" value="{{\Carbon\Carbon::parse($settings->teaser_end_activity)->format('Y-m-d\TH:i')}}" required>
</td>
</tr>
<tr class="form-group">
<td>
<label class="col-form-label" for="activated_close_page">
@ -372,23 +358,11 @@
$("#reductions_campaign").hide();
$("#reductions_web_coupons").hide();
}
if (!$("input[name=activated_teaser]").is(':checked')) {
$("#teaser_end_activity").hide();
}
if (!$("input[name=activated_close_page]").is(':checked')) {
$("#close_page_active_date").hide();
}
});
// Gère l'activation du teaser (champ date à affihcer ou non)
$("input[name=activated_teaser]").change(function() {
if ($(this).is(':checked')) {
$("#teaser_end_activity").show();
} else {
$("#teaser_end_activity").hide();
}
});
// Gère l'activation de la page de fermeture (champ date à afficher ou non)
$("input[name=activated_close_page]").change(function() {
if ($(this).is(':checked')) {