Merge branch 'develop' into trunk

This commit is contained in:
Vincent BRIDIER 2022-09-19 09:13:34 +02:00
commit fcc2e101d9
No known key found for this signature in database
GPG key ID: 8571BFA20420D512
11 changed files with 242 additions and 28 deletions

View file

@ -14,19 +14,30 @@ use Kwaadpepper\Enum\BaseEnumRoutable;
*/
final class ContactFormType extends BaseEnumRoutable
{
/**
* Enum values
*
* @return array
*/
protected static function values(): array
{
return [
'none' => 0,
'abuse' => 1,
// * special case passerelle
'complain' => 3,
// special case passerelle
'recipe' => 5,
'games' => 9,
// * special case page nl
'onepage' => 10,
// special case page nl
];
}
/**
* Enum labels
*
* @return array
*/
protected static function labels(): array
{
return [
@ -39,6 +50,10 @@ final class ContactFormType extends BaseEnumRoutable
];
}
/**
* Output the value as a string
* @return string
*/
public function __toString(): string
{
return (string)$this->label;

View file

@ -10,17 +10,33 @@ use Illuminate\Support\Facades\File;
class SubRangeController extends Controller
{
/**
* Viewany subrange
*
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function index()
{
$subranges = SubRange::paginate();
return view('bo.subranges.index', compact('subranges'));
}
/**
* Create subrange
*
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function create()
{
return view('bo.subranges.create');
}
/**
* Store subrange
*
* @param \App\Http\Requests\StoreSubRange $request
* @return \Illuminate\Http\RedirectResponse
*/
public function store(StoreSubRange $request)
{
$subrange = new SubRange($request->validated());
@ -29,11 +45,24 @@ class SubRangeController extends Controller
return redirect()->route('bo.subranges.index');
}
/**
* Edit subrange
*
* @param \App\Models\SubRange $subrange
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function edit(SubRange $subrange)
{
return view('bo.subranges.edit', ['subrange' => $subrange]);
}
/**
* Update subrange
*
* @param \App\Http\Requests\UpdateSubRange $request
* @param \App\Models\SubRange $subrange
* @return \Illuminate\Http\RedirectResponse
*/
public function update(UpdateSubRange $request, SubRange $subrange)
{
$subrange->fill($request->validated());
@ -43,6 +72,12 @@ class SubRangeController extends Controller
->with('success', 'Enregistré !');
}
/**
* Destroy subrange
*
* @param \App\Models\SubRange $subrange
* @return \Illuminate\Http\RedirectResponse
*/
public function destroy(SubRange $subrange)
{
if (File::exists($subrange->picture)) {
@ -57,6 +92,12 @@ class SubRangeController extends Controller
->with('warning', 'Le contenu a bien été supprimé');
}
/**
* Remove subrange picture
*
* @param \App\Models\SubRange $subrange
* @return \Illuminate\Http\RedirectResponse
*/
public function removeImage(SubRange $subrange)
{
if (File::exists($subrange->picture)) {

View file

@ -15,6 +15,13 @@ use Illuminate\Support\Facades\Log;
class ContactController extends Controller
{
/**
* Show contact Form
*
* @param \Illuminate\Http\Request $request
* @param \App\Enums\ContactFormType|null $type
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function contact(Request $request, ContactFormType $type = null)
{
$user = null;
@ -24,6 +31,12 @@ class ContactController extends Controller
return view('front.contact.contact', compact('type', 'user', 'status', 'username'));
}
/**
* Submit contact Form
*
* @param \App\Http\Requests\ContactFormRequest $request
* @return \Illuminate\Http\RedirectResponse
*/
public function contactSubmit(ContactFormRequest $request)
{
try {
@ -41,11 +54,23 @@ class ContactController extends Controller
return back()->withInput()->with('status', false);
}
/**
* Show complain form
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function complain(Request $request)
{
return $this->contact($request, ContactFormType::complain());
}
/**
* Submit complain form
*
* @param \App\Http\Requests\ContactFormRequest $request
* @return \Illuminate\Http\RedirectResponse
*/
public function complainSubmit(ContactFormRequest $request)
{
try {
@ -59,11 +84,22 @@ class ContactController extends Controller
return back()->withInput()->with('status', false);
}
/**
* Report customer from Club magnet exchange
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function reportCustomer(Request $request)
{
return $this->contact($request, ContactFormType::abuse());
}
/**
* Propose meal recipe
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory
*/
public function proposeRecipe(Request $request)
{
return $this->contact($request, ContactFormType::recipe());

View file

@ -38,12 +38,14 @@ class ContactFormRequest extends FormRequest
'required',
new EnumIsValidRule(ContactFormType::class)
],
'lastname' => 'required|min:2',
'firstname' => 'required|min:2',
// * max arcadia 50 chars
'lastname' => 'required|min:2|max:50',
// * max arcadia 50 chars
'firstname' => 'required|min:2|max:50',
'address' => 'required|min:4',
'email' => 'required|email:rfc,dns,spoof',
'postal' => 'required|min:3|max:10',
// max arcadia 10 chars
// * max arcadia 10 chars
'town' => 'required|min:3|max:90',
'phone' => 'required|min:8|max:14',
'onepagesubject' => 'sometimes|min:10|max:250',

View file

@ -23,6 +23,7 @@ class SendNLMail implements ShouldQueue
/**
* Create a new job instance.
*
* @param \App\Models\MailContactData $data
* @return void
*/
public function __construct(MailContactData $data)

View file

@ -24,6 +24,7 @@ class SendPasserelleMail implements ShouldQueue
/**
* Create a new job instance.
*
* @param \App\Models\MailContactData $data
* @return void
*/
public function __construct(MailContactData $data)

View file

@ -21,6 +21,7 @@ class ContactComplainMail extends ContactMail
/**
* Create a new message instance.
*
* @param \App\Models\MailContactData $data
* @return void
*/
public function __construct(MailContactData $data)

View file

@ -7,10 +7,25 @@ use Illuminate\Database\Eloquent\Model;
class Contact extends Model
{
/**
* The primary key for the model.
*
* @var string
*/
protected $primaryKey = 'date';
/**
* Indicates if the model should be timestamped.
*
* @var boolean
*/
public $timestamps = false;
/**
* Perform any actions required after the model boots.
*
* @return void
*/
protected static function booted()
{
static::creating(function ($contact) {
@ -18,8 +33,8 @@ class Contact extends Model
return $contact;
});
static::updating(function ($contact) {
// * increment general counter
$contact->all++;
// increment general counter
return $contact;
});
}
@ -33,34 +48,67 @@ class Contact extends Model
public static function incrementStat(ContactFormType $type)
{
$contact = static::where('date', '=', date('Y-m-d'))->firstOrNew();
// Can't do $contact->counter[$type->value]++ => ErrorException
// * Can't do $contact->counter[$type->value]++ => ErrorException
$d = $contact->values;
$d[$type->value]++;
$contact->values = $d;
$contact->save();
}
/**
* Get values attribute
*
* @param mixed $value
* @return array
*/
public function getValuesAttribute($value): array
{
return $this->unserialize($value ?? serialize($this->counterSkeleton()));
}
/**
* Set values attribute
*
* @param array $value
* @return string
*/
public function setValuesAttribute(array $value): string
{
$this->attributes['values'] = $this->serialize($value);
return $this->attributes['values'];
}
/**
* Serialize value
*
* @param array $value
* @return string
*/
private function serialize(array $value)
{
return serialize($this->merge($this->counterSkeleton(), $value));
}
/**
* Unserialize value
*
* @param string $value
* @return array
*/
private function unserialize(string $value)
{
return $this->merge($this->counterSkeleton(), unserialize($value));
}
/**
* Merge thow array
*
* TODO: Replace this with collection or array merge.
*
* @param array $a
* @param array $b
* @return array
*/
private function merge(array $a, array $b): array
{
foreach ($a as $i => $v) {
@ -71,9 +119,13 @@ class Contact extends Model
return $a;
}
/**
* Get Counter skeleton
* @return array
*/
private function counterSkeleton(): array
{
return collect(ContactFormType::toArray())->mapWithKeys(function ($enum) {
return collect(ContactFormType::toArray())->mapWithKeys(function (ContactFormType $enum) {
if ($enum->equals(ContactFormType::none())) {
return [];
}

View file

@ -5,6 +5,7 @@ namespace App\Models;
use App\Enums\ContactFormCivility;
use App\Enums\ContactFormType;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;
use Kwaadpepper\Enum\Traits\CastsEnums;
/**
@ -14,6 +15,11 @@ class MailContactData extends Model
{
use CastsEnums;
/**
* The attributes that should be cast to Enums.
*
* @var array
*/
protected $enumCasts = [
'type' => ContactFormType::class,
'civility' => ContactFormCivility::class
@ -56,6 +62,11 @@ class MailContactData extends Model
'consumptionDateYear'
];
/**
* The model's attributes.
*
* @var array
*/
protected $attributes = [
'productName' => '',
'productCode' => '',
@ -95,40 +106,39 @@ class MailContactData extends Model
/**
* Export the model data to a Formatted Passerelle Data array
*
* @return array
*/
/**
* Removed
* * Removed
* 'EMETTEUR_OBJETDEMANDE' => "objet de la reclamation string",
* 'EMETTEUR_OPT_IN' => '',
* 'REPONSE_ETAT' => 0,
* 'TYPE_REPONSE' => 'mail',
*
* @return array
*/
public function exportToPasserelleDataArray(): array
{
// CF PAsserrelle fields .csv
// * CF PAsserrelle fields .csv
return [
// Marque le Gaulois (Obligatoire)
// * Marque le Gaulois (Obligatoire)
'EMETTEUR_MARQUE' => 1,
// Obligatoire
// * Obligatoire
'EMETTEUR_DATE' => date("Y-m-d"),
// Obligatoire
// * Obligatoire
'EMETTEUR_HEURE' => date("h:i:s"),
'EMETTEUR_CIVILITE' => $this->civility->value,
// Obligatoire
'EMETTEUR_NOM' => $this->lastname,
// Obligatoire
// * Obligatoire Limité a 50
'EMETTEUR_NOM' => Str::limit($this->lastname, 50, ''),
// * Obligatoire
'EMETTEUR_PRENOM' => $this->firstname,
'EMETTEUR_ADRESSE1' => $this->address,
'EMETTEUR_ADRESSE2' => '',
'EMETTEUR_CP' => $this->postal,
// Obligatoire
// * Obligatoire
'EMETTEUR_VILLE' => $this->town,
'EMETTEUR_EMAIL' => $this->email,
'EMETTEUR_TELEPHONE' => $this->phone,
'EMETTEUR_PAYS' => 'France',
'EMETTEUR_NOM_PRODUIT' => $this->productName,
// Obligatoire
// * Obligatoire
'EMETTEUR_EAN13' => $this->productCode,
'EMETTEUR_DATE_LIMITE_CONSO' => sprintf(
'%s/%s/%s',
@ -149,15 +159,15 @@ class MailContactData extends Model
),
'LIEU_ACHAT' => $this->buyPlace,
// FUCK passerelle et leur DTD qui n'existe pas cf: resources/documents
// * FUCK passerelle et leur DTD qui n'existe pas cf: resources/documents
// * Recla conso ?
'EMETTEUR_OBJETDEMANDE' => 3,
// Recla conso ?
// * doit être vide ?
'EMETTEUR_OPT_IN' => '',
// doit être vide ?
// * c'est quoi ça ?
'REPONSE_ETAT' => 0,
// c'est quoi ça ?
// * ok
'TYPE_REPONSE' => 'mail'
// ok
];
}
}

View file

@ -0,0 +1,55 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
class AllowSubrangeDeletion extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('range_sub_range', function (Blueprint $table) {
$table->dropForeign('range_sub_range_range_id_foreign');
$table->foreign('range_id')
->references('id')->on('ranges')
->cascadeOnDelete();
$table->dropForeign('range_sub_range_sub_range_id_foreign');
$table->foreign('sub_range_id')
->references('id')->on('sub_ranges')
->cascadeOnDelete();
});
Schema::table('products', function (Blueprint $table) {
$table->dropForeign('products_sub_range_id_foreign');
$table->foreign('sub_range_id')
->references('id')->on('sub_ranges')
->nullOnDelete();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('range_sub_range', function (Blueprint $table) {
$table->dropForeign('range_sub_range_range_id_foreign');
$table->foreign('range_id')
->references('id')->on('ranges');
$table->dropForeign('range_sub_range_sub_range_id_foreign');
$table->foreign('sub_range_id')
->references('id')->on('sub_ranges');
});
Schema::table('products', function (Blueprint $table) {
$table->dropForeign('products_sub_range_id_foreign');
$table->foreign('sub_range_id')
->references('id')->on('sub_ranges');
});
}
}

View file

@ -35,9 +35,9 @@
Notre démarche inédite Le Gaulois&nbsp;<img alt="Sortant à l’Extérieur Dans Les Prés - Le Gaulois" src="{{ asset('assets/images/danslespres/logoDLP.png') }}">&nbsp;, c’est la garantie de produits de qualité, accessibles en prix et, surtout, engagés dans l’<b>amélioration du bien-être animal</b>, la <b>préservation de la santé des volailles</b> et le <b>respect de l’environnement</b>.
</p>
<p class="danslespres-dark-green inline-with-image">
Le Gaulois s’engage avec cette nouvelle démarche à ce que les volailles sortent <b>VRAIMENT</b> à l’extérieur, tous les jours, dans les prés de l’ouest de France.
Le Gaulois s’engage avec cette nouvelle démarche à ce que les volailles <b>sortent à l’extérieur</b>, tous les jours, dans les prés de l’ouest de France.
<br>
Pour cela, nos <b>30 éleveurs partenaires</b> suivent un cahier des charges européen stricte pour s’assurer du bien-être de leurs animaux.
Pour cela, nos <b>30 éleveurs partenaires</b> suivent un cahier des charges européen strict pour s’assurer du bien-être de leurs animaux.
<br><br>
<b>Rendez-vous</b> dans nos différentes rubriques ci-dessus pour découvrir nos actions concrètes !
</p>