- CouponController OK
This commit is contained in:
parent
ec09989aaa
commit
56d37dbf22
4 changed files with 130 additions and 113 deletions
|
|
@ -6,14 +6,12 @@ use Illuminate\Http\Request;
|
|||
use App\Coupon;
|
||||
use App\Site;
|
||||
use App\Campagne;
|
||||
use App\Mur;
|
||||
use App\Panier;
|
||||
use App\Mouvement;
|
||||
use App\Calendrier;
|
||||
use App\Http\Requests\Coupons\StoreCoupons;
|
||||
use App\Http\Requests\Coupons\UpdateCoupons;
|
||||
use App\Traits\GenerateBR;
|
||||
use App\Traits\CouponTrait;
|
||||
use Validator;
|
||||
|
||||
class CouponController extends Controller
|
||||
{
|
||||
|
|
@ -46,51 +44,31 @@ class CouponController extends Controller
|
|||
*/
|
||||
public function create()
|
||||
{
|
||||
$campagnes = Campagne::where('camp_siteId', session()->get('site')->site_id)->get()
|
||||
->pluck('camp_name', 'camp_id');
|
||||
// TODO : Revoir le passage du site
|
||||
$site = session()->get('site');
|
||||
|
||||
$campagnes = Campagne::where('camp_siteId', $site->id)->get()->pluck('camp_name', 'camp_id');
|
||||
$site = Site::findOrFail($site->id);
|
||||
|
||||
$site = Site::where(['id' => session()->get('site')->id])->first();
|
||||
return view('coupon.create')->with('campagnes', $campagnes)->with('site', $site);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store a newly created resource in storage.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param StoreCoupons $request
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
public function store(Request $request)
|
||||
public function store(StoreCoupons $request)
|
||||
{
|
||||
$data = $request->all();
|
||||
|
||||
$v = Validator::make($data, [
|
||||
'coupon_validity_text' => 'required',
|
||||
'coupon_legal_mentions' => 'required',
|
||||
'coupon_decoration_image' => 'required|image|mimes:jpeg,png',
|
||||
'coupon_logo_image' => 'required|image|mimes:jpeg,png',
|
||||
'coupon_rcs' => 'required',
|
||||
'coupon_site_contact' => 'required',
|
||||
]);
|
||||
|
||||
$v->sometimes('coupon_gs1code', 'required|image|mimes:jpeg', function ($input) {
|
||||
return isset($input->coupon_norme);
|
||||
});
|
||||
|
||||
if ($v->fails()) {
|
||||
return redirect('bo/coupon/' . $coupon->coupon_id . '/edit')
|
||||
->withErrors($v)
|
||||
->withInput();
|
||||
}
|
||||
|
||||
|
||||
$site_id = $request->site_id;
|
||||
|
||||
$datas = $this->saveImg($request);
|
||||
|
||||
|
||||
$coupon = new Coupon();
|
||||
$coupon->coupon_code = $datas['coupon_code'];
|
||||
$coupon->coupon_name = $datas['coupon_name'];
|
||||
$coupon->coupon_value = $datas['coupon_value'];
|
||||
$coupon->fill($datas);
|
||||
|
||||
// TODO : A revoir au moment ou on enlevera les images mobiles
|
||||
if (isset($datas['coupon_thumbnail1'])) {
|
||||
$coupon->coupon_thumbnail1 = $datas['coupon_thumbnail1'];
|
||||
}
|
||||
|
|
@ -106,47 +84,21 @@ class CouponController extends Controller
|
|||
if (isset($datas['coupon_image'])) {
|
||||
$coupon->coupon_image = $datas['coupon_image'];
|
||||
}
|
||||
if (isset($datas['coupon_norme'])) {
|
||||
$coupon->coupon_norme = $datas['coupon_norme'];
|
||||
$coupon->coupon_gs1code = $datas['coupon_gs1code'];
|
||||
}
|
||||
if (isset($datas['coupon_enablelimitquantity'])) {
|
||||
$coupon->coupon_enablelimitquantity = $datas['coupon_enablelimitquantity'];
|
||||
$coupon->coupon_limitquantity = $datas['coupon_limitquantity'];
|
||||
}
|
||||
if (isset($datas['coupon_enablelimitperiod'])) {
|
||||
$coupon->coupon_enablelimitperiod = $datas['coupon_enablelimitperiod'];
|
||||
$coupon->coupon_limitperiod = $datas['coupon_limitperiod'];
|
||||
}
|
||||
if (isset($datas['coupon_published'])) {
|
||||
$coupon->coupon_published = $datas['coupon_published'];
|
||||
} else {
|
||||
|
||||
//TODO : Voir si on peut mettre le set a 0 dans la request
|
||||
if (!isset($datas['coupon_published'])) {
|
||||
$coupon->coupon_published = 0;
|
||||
}
|
||||
if (isset($datas['coupon_legal_mentions_splitted'])) {
|
||||
$coupon->coupon_legal_mentions_splitted = $datas['coupon_legal_mentions_splitted'];
|
||||
} else {
|
||||
if (!isset($datas['coupon_legal_mentions_splitted'])) {
|
||||
$coupon->coupon_legal_mentions_splitted = 0;
|
||||
}
|
||||
$coupon->coupon_validity = $datas['coupon_validity'];
|
||||
$coupon->coupon_mindatediffusion = $datas['coupon_mindatediffusion'];
|
||||
$coupon->coupon_maxdatediffusion = $datas['coupon_maxdatediffusion'];
|
||||
$coupon->coupon_maxdatevalidity = $datas['coupon_maxdatevalidity'];
|
||||
|
||||
$coupon->coupon_validity_text = $datas['coupon_validity_text'];
|
||||
$coupon->coupon_legal_mentions = $datas['coupon_legal_mentions'];
|
||||
if (isset($datas['coupon_decoration_image'])) {
|
||||
$coupon->coupon_decoration_image = $datas['coupon_decoration_image'];
|
||||
}
|
||||
if (isset($datas['coupon_logo_image'])) {
|
||||
$coupon->coupon_logo_image = $datas['coupon_logo_image'];
|
||||
}
|
||||
$coupon->coupon_rcs = $datas['coupon_rcs'];
|
||||
$coupon->coupon_site_contact = $datas['coupon_site_contact'];
|
||||
$coupon->coupon_seuil_alert = $datas['coupon_seuil_alert'];
|
||||
|
||||
$site = Site::find($request->input('site_id'));
|
||||
$br_path = $this->generateBase($request, $coupon);
|
||||
$coupon->coupon_image = $br_path;
|
||||
$coupon->coupon_siteId = $site_id;
|
||||
$coupon->save();
|
||||
|
||||
$site = Site::findOrFail($site_id);
|
||||
$site->coupons()->save($coupon);
|
||||
|
||||
if (isset($datas['initial_quantity'])) {
|
||||
|
|
@ -155,15 +107,6 @@ class CouponController extends Controller
|
|||
$coupon->mouvements()->save($mouvement);
|
||||
}
|
||||
|
||||
if (isset($datas['mouvementNbre'])) {
|
||||
foreach ($datas['mouvementNbre'] as $key => $value) {
|
||||
$mouvement = new Mouvement();
|
||||
$mouvement->mouvement_nombre = $value;
|
||||
$mouvement->mouvement_created_at = $datas['mouvementDate'][$key];
|
||||
$coupon->mouvements()->save($mouvement);
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($datas['startdate'])) {
|
||||
foreach ($datas['startdate'] as $key => $value) {
|
||||
$calendar = new Calendrier();
|
||||
|
|
@ -172,12 +115,7 @@ class CouponController extends Controller
|
|||
$coupon->calendriers()->save($calendar);
|
||||
}
|
||||
}
|
||||
|
||||
$br_path = $this->generateBase($request, $coupon);
|
||||
$coupon->coupon_image = $br_path;
|
||||
$coupon->save();
|
||||
|
||||
return view('coupon.edit', ['coupon' => $coupon]);
|
||||
return redirect()->route('coupon.edit', ['coupon' => $coupon]);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -200,7 +138,7 @@ class CouponController extends Controller
|
|||
*/
|
||||
public function update(UpdateCoupons $request, Coupon $coupon)
|
||||
{
|
||||
//TODO : Use request validated
|
||||
//TODO : Voir si on peut mettre le set a 0 dans la request
|
||||
if (!isset($request->coupon_enablelimitquantity)) {
|
||||
$coupon->coupon_enablelimitquantity = 0;
|
||||
}
|
||||
|
|
|
|||
75
app/Http/Requests/Coupons/StoreCoupons.php
Normal file
75
app/Http/Requests/Coupons/StoreCoupons.php
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Requests\Coupons;
|
||||
|
||||
use App\Enums\UserRoles;
|
||||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Validation\Rule;
|
||||
|
||||
class StoreCoupons extends FormRequest
|
||||
{
|
||||
/**
|
||||
* Determine if the user is authorized to make this request.
|
||||
*
|
||||
* @return bool
|
||||
*/
|
||||
public function authorize()
|
||||
{
|
||||
return Auth::check() && (Auth::user()->roles === UserRoles::superadmin()->value || Auth::user()->roles === UserRoles::admin()->value);
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the validation rules that apply to the request.
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function rules()
|
||||
{
|
||||
return [
|
||||
'coupon_code' => [
|
||||
'required',
|
||||
Rule::unique('coupon', 'coupon_code')
|
||||
],
|
||||
'coupon_name' => 'string|required',
|
||||
'coupon_value' => 'numeric|required',
|
||||
'coupon_validity_text' => 'required',
|
||||
'coupon_legal_mentions' => 'required',
|
||||
'coupon_decoration_image' => 'required|image|mimes:jpeg,png',
|
||||
'coupon_logo_image' => 'required|image|mimes:jpeg,png',
|
||||
'coupon_rcs' => 'required',
|
||||
'coupon_site_contact' => 'required',
|
||||
'coupon_seuil_alert' => 'integer|required',
|
||||
|
||||
'coupon_enablelimitperiod' => 'sometimes|integer|required',
|
||||
'coupon_enablelimitquantity' => 'sometimes|integer|required',
|
||||
'coupon_mindatediffusion' => 'nullable',
|
||||
'coupon_maxdatediffusion' => 'nullable',
|
||||
'coupon_validity' => 'integer|required',
|
||||
'coupon_maxdatevalidity' => 'nullable',
|
||||
|
||||
'coupon_legal_mentions_splitted' => 'sometimes|integer|required',
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Configure the validator instance.
|
||||
*
|
||||
* @param \Illuminate\Validation\Validator $validator
|
||||
* @return void
|
||||
*/
|
||||
public function withValidator($validator)
|
||||
{
|
||||
$validator->sometimes('coupon_gs1code', 'required|image|mimes:jpeg', function ($input) {
|
||||
return isset($input->coupon_norme);
|
||||
});
|
||||
|
||||
$validator->sometimes('coupon_limitquantity', 'integer|required', function ($input) {
|
||||
return !is_null($input->coupon_enablelimitquantity);
|
||||
});
|
||||
|
||||
$validator->sometimes('coupon_limitperiod', 'integer|required', function ($input) {
|
||||
return !is_null($input->coupon_enablelimitperiod);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -6,7 +6,6 @@ use App\Enums\UserRoles;
|
|||
use Illuminate\Foundation\Http\FormRequest;
|
||||
use Illuminate\Support\Facades\Auth;
|
||||
use Illuminate\Validation\Rule;
|
||||
use Illuminate\Validation\Validator;
|
||||
|
||||
class UpdateCoupons extends FormRequest
|
||||
{
|
||||
|
|
@ -32,12 +31,10 @@ class UpdateCoupons extends FormRequest
|
|||
'required',
|
||||
Rule::unique('coupon', 'coupon_code')->ignore($this->coupon->coupon_id, 'coupon_id')
|
||||
],
|
||||
'coupon_name' => 'alphanum|required',
|
||||
'coupon_name' => 'string|required',
|
||||
'coupon_value' => 'numeric|required',
|
||||
'coupon_seuil_alert' => 'integer|required',
|
||||
'coupon_limitperiod' => 'integer|required',
|
||||
'coupon_enablelimitperiod' => 'sometimes|integer|required',
|
||||
'coupon_limitquantity' => 'sometimes|integer|required',
|
||||
'coupon_enablelimitquantity' => 'sometimes|integer|required',
|
||||
'coupon_mindatediffusion' => 'nullable',
|
||||
'coupon_maxdatediffusion' => 'nullable',
|
||||
|
|
@ -50,7 +47,6 @@ class UpdateCoupons extends FormRequest
|
|||
|
||||
'coupon_rcs' => 'required',
|
||||
'coupon_site_contact' => 'email|required',
|
||||
'coupon_published' => 'integer|required',
|
||||
|
||||
'coupon_norme' => 'sometimes|integer|required',
|
||||
'coupon_published' => 'sometimes|integer|required',
|
||||
|
|
@ -68,11 +64,19 @@ class UpdateCoupons extends FormRequest
|
|||
*/
|
||||
public function withValidator($validator)
|
||||
{
|
||||
$validator->sometimes('coupon_gs1code', '', function ($input) {
|
||||
$validator->sometimes('coupon_gs1code', 'required|image|mimes:jpeg', function ($input) {
|
||||
if (isset($input->coupon_gs1code_image_hidden)) {
|
||||
return false;
|
||||
}
|
||||
return isset($input->coupon_norme);
|
||||
});
|
||||
|
||||
$validator->sometimes('coupon_limitquantity', 'integer|required', function ($input) {
|
||||
return !is_null($input->coupon_enablelimitquantity);
|
||||
});
|
||||
|
||||
$validator->sometimes('coupon_limitperiod', 'integer|required', function ($input) {
|
||||
return !is_null($input->coupon_enablelimitperiod);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,43 +20,43 @@
|
|||
<div class="form-split">
|
||||
<div class="form-field">
|
||||
<label>{{ __('Code de traitement') }} *</label>
|
||||
<input type="text" name="coupon_code" required>
|
||||
<input type="text" name="coupon_code" value="{{ old('coupon_code') }}" required>
|
||||
</div>
|
||||
<div class="form-field">
|
||||
<label>{{ __('Nom interne') }} *</label>
|
||||
<input type="text" name="coupon_name" required>
|
||||
<input type="text" name="coupon_name" value="{{ old('coupon_name') }}" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-split">
|
||||
<div class="form-field">
|
||||
<label>{{ __('Valeur faciale') }} *</label>
|
||||
<input type="number" name="coupon_value" step="0.05" required>
|
||||
<input type="number" name="coupon_value" step="0.05" value="{{ old('coupon_value') }}" required>
|
||||
</div>
|
||||
<div class="form-field">
|
||||
<label>{{ __('Quantité initiale') }} *</label>
|
||||
<input type="text" name="initial_quantity" required>
|
||||
<input type="text" name="initial_quantity" value="{{ old('initial_quantity') }}" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-split">
|
||||
<div class="form-field">
|
||||
<label for="coupon_norme">{{ __('Activer la Norme GS1') }}</label>
|
||||
<input type="checkbox" id="coupon_norme" name="coupon_norme" value="1">
|
||||
<input type="checkbox" id="coupon_norme" name="coupon_norme" value="1" {{ (old('coupon_norme') === 1 ? 'checked' : null) }}>
|
||||
<label for="coupon_norme">{{ __('Activer') }}</label>
|
||||
</div>
|
||||
<div class="form-field">
|
||||
<label>{{ __("Seuil d'alerte") }} *</label>
|
||||
<input type="number" name="coupon_seuil_alert" value="100" required>
|
||||
<input type="number" name="coupon_seuil_alert" value="{{ !empty(old('coupon_seuil_alert')) ? old('coupon_seuil_alert') : 100 }}" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-split">
|
||||
<div class="form-field">
|
||||
<label for="coupon_enablelimitquantity">{{ __('Activer La limite de quantité') }}</label>
|
||||
<input type="checkbox" id="coupon_enablelimitquantity" name="coupon_enablelimitquantity" value="1">
|
||||
<input type="checkbox" id="coupon_enablelimitquantity" name="coupon_enablelimitquantity" value="1" {{ (old('coupon_enablelimitquantity') === 1 ? 'checked' : null) }}>
|
||||
<label for="coupon_enablelimitquantity">{{ __('Activer') }}</label>
|
||||
</div>
|
||||
<div class="form-field">
|
||||
<label for="coupon_enablelimitperiod">{{ __('Activer la limite sur une période') }}</label>
|
||||
<input type="checkbox" id="coupon_enablelimitperiod" name="coupon_enablelimitperiod" value="1">
|
||||
<input type="checkbox" id="coupon_enablelimitperiod" name="coupon_enablelimitperiod" value="1" {{ (old('coupon_enablelimitperiod') === 1 ? 'checked' : null) }}>
|
||||
<label for="coupon_enablelimitperiod">{{ __('Activer') }}</label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -64,13 +64,13 @@
|
|||
<div class="form-field enablelimitquantity">
|
||||
<label>{{ __('Limiter la diffusion à') }}</label>
|
||||
<span>
|
||||
<input type="number" name="coupon_limitquantity" class="small"> {{ __('coupons') }}
|
||||
<input type="number" name="coupon_limitquantity" value="{{ old('coupon_limitquantity') }}" class="small"> {{ __('coupons') }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="form-field enablelimitperiod">
|
||||
<label>{{ __('Limiter la diffusion à une offre tous les') }}</label>
|
||||
<span>
|
||||
<input type="number" name="coupon_limitperiod" class="small"> {{ __('jours') }}
|
||||
<input type="number" name="coupon_limitperiod" class="small" value="{{ old('coupon_limitperiod') }}"> {{ __('jours') }}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -78,23 +78,23 @@
|
|||
<div class="form-split">
|
||||
<div class="form-field">
|
||||
<label>{{ __('Date de début de diffusion') }}</label>
|
||||
<input type="date" name="coupon_mindatediffusion">
|
||||
<input type="date" name="coupon_mindatediffusion" value="{{ old('coupon_mindatediffusion') }}">
|
||||
</div>
|
||||
<div class="form-field">
|
||||
<label>{{ __('Date de fin de diffusion') }}</label>
|
||||
<input type="date" name="coupon_maxdatediffusion">
|
||||
<input type="date" name="coupon_maxdatediffusion" value="{{ old('coupon_maxdatediffusion') }}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-split">
|
||||
<div class="form-field">
|
||||
<label>{{ __("Durée de validité à l'impression") }}</label>
|
||||
<span>
|
||||
<input type="number" name="coupon_validity" value="30" class="small" required> {{ __('jours') }}
|
||||
<input type="number" name="coupon_validity" value="{{ !empty(old('coupon_validity')) ? old('coupon_validity') : 30 }}" class="small" required> {{ __('jours') }}
|
||||
</span>
|
||||
</div>
|
||||
<div class="form-field">
|
||||
<label>{{ __('Date de fin de validité') }}</label>
|
||||
<input type="date" name="coupon_maxdatevalidity">
|
||||
<input type="date" name="coupon_maxdatevalidity" value="{{ old('coupon_maxdatevalidity') }}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="calendar">
|
||||
|
|
@ -129,24 +129,24 @@
|
|||
<div class="form-field">
|
||||
<label>{{ __('Centre de traitement') }} *</label>
|
||||
<select name="coupon_treatment_center">
|
||||
<option value="0">HighCo</option>
|
||||
<option value="1">Sogec</option>
|
||||
<option value="0" @if (old('coupon_treatment_center') === 0) selected @endif>HighCo</option>
|
||||
<option value="1" @if (old('coupon_treatment_center') === 1) selected @endif>Sogec</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="form-field">
|
||||
<label for="coupon_legal_mentions_splitted">{{ __('Activer les mentions internationnales') }}</label>
|
||||
<input type="checkbox" id="coupon_legal_mentions_splitted" name="coupon_legal_mentions_splitted" value="1">
|
||||
<input type="checkbox" id="coupon_legal_mentions_splitted" name="coupon_legal_mentions_splitted" value="1" {{ (old('coupon_legal_mentions_splitted') === 1 ? 'checked' : null) }}>
|
||||
<label for="coupon_legal_mentions_splitted">{{ __('Activer') }}</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-split">
|
||||
<div class="form-field-textarea">
|
||||
<label>{{ __('Texte de validité') }} *</label>
|
||||
<textarea name="coupon_validity_text" cols="30" rows="10" required></textarea>
|
||||
<textarea name="coupon_validity_text" cols="30" rows="10" required>{{ old('coupon_validity_text') }}</textarea>
|
||||
</div>
|
||||
<div class="form-field-textarea">
|
||||
<label>{{ __('Mentions légales') }} *</label>
|
||||
<textarea name="coupon_legal_mentions" cols="30" rows="10" required>{{ $mentions }}</textarea>
|
||||
<textarea name="coupon_legal_mentions" cols="30" rows="10" required>{{ !empty(old('coupon_legal_mentions')) ? old('coupon_legal_mentions') : $mentions }}</textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-split">
|
||||
|
|
@ -170,11 +170,11 @@
|
|||
<div class="form-split">
|
||||
<div class="form-field">
|
||||
<label>{{ __('RCS du site') }} *</label>
|
||||
<input type="text" name="coupon_rcs" value="{{ $site->site_rcs }}" required>
|
||||
<input type="text" name="coupon_rcs" value="{{ !empty(old('coupon_rcs')) ? old('coupon_rcs') : $site->site_rcs }}" required>
|
||||
</div>
|
||||
<div class="form-field">
|
||||
<label>{{ __('Contact mail') }} *</label>
|
||||
<input type="text" name="coupon_site_contact" value="{{ $site->site_contact }}" required>
|
||||
<input type="text" name="coupon_site_contact" value="{{ !empty(old('coupon_site_contact')) ? old('coupon_site_contact') : $site->site_contact }}" required>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-split">
|
||||
|
|
@ -187,7 +187,7 @@
|
|||
</div>
|
||||
<div class="form-field">
|
||||
<label for="coupon_published">{{ __('Publié ?') }}</label>
|
||||
<input type="checkbox" id="coupon_published" name="coupon_published" value="1">
|
||||
<input type="checkbox" id="coupon_published" name="coupon_published" value="1" {{ (old('coupon_published') === 1 ? 'checked' : null) }}>
|
||||
<label for="coupon_published">{{ __('Activer') }}</label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue