diff --git a/app/Http/Controllers/Bo/CampaignController.php b/app/Http/Controllers/Bo/CampaignController.php index 36f5838..3b21100 100644 --- a/app/Http/Controllers/Bo/CampaignController.php +++ b/app/Http/Controllers/Bo/CampaignController.php @@ -5,8 +5,10 @@ namespace App\Http\Controllers\Bo; use App\Http\Controllers\Controller; use App\Http\Requests\Bo\Campaigns\StoreCampaignRequest; use App\Http\Requests\Bo\Campaigns\UpdateCampaignRequest; +use App\Http\Requests\Bo\Campaigns\UpdateCouponCampaignRequest; use App\Models\Brand; use App\Models\Campaign; +use App\Models\Coupon; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; use Illuminate\Support\Str; @@ -25,9 +27,9 @@ class CampaignController extends Controller public function index(Request $request) { /** @var \Illuminate\Database\Eloquent\Builder $campaign */ - $campaign = Campaign::query(); + $campaign = Campaign::query()->with('brand'); - if ($request->search) { + if ($request->input('search')) { $this->searchQuery( $campaign, $request->search, @@ -51,9 +53,10 @@ class CampaignController extends Controller */ public function create() { - $brandModels = Brand::orderBy('name', 'ASC')->get(); + $brandModels = Brand::query()->orderBy('name', 'ASC')->get(); + $couponModels = Coupon::query()->orderBy('name', 'ASC')->get(); - return view('bo.pages.campaigns.create', compact('brandModels')); + return view('bo.pages.campaigns.create', compact('brandModels', 'couponModels')); } @@ -67,9 +70,10 @@ class CampaignController extends Controller { return DB::transaction(function () use ($request) { $campaign = new Campaign(); - $campaign->fill($request->validated()); + $campaign->fill($request->safe()->except(['coupons'])); if ($campaign->saveOrFail()) { + $campaign->coupons()->attach(collect($request->validated('coupons'))->pluck('id')); return redirect() ->route('bo.campaigns.edit', $campaign) ->with('success', trans( @@ -94,11 +98,13 @@ class CampaignController extends Controller */ public function edit(Campaign $campaign) { - $brandModels = Brand::orderBy('name', 'ASC')->get(); + $brandModels = Brand::orderBy('name', 'ASC')->get(); + $couponModels = Coupon::orderBy('name', 'ASC')->where('brand_id', $campaign->brand_id)->get(); return view('bo.pages.campaigns.edit', [ 'campaignModel' => $campaign, - 'brandModels' => $brandModels + 'brandModels' => $brandModels, + 'couponModels' => $couponModels ]); } @@ -113,6 +119,8 @@ class CampaignController extends Controller { return DB::transaction(function () use ($request, $campaign) { $campaign->fill($request->validated()); + $campaign->fill($request->safe()->except('coupons')); + $campaign->coupons()->sync(\collect($request->validated('coupons'))->pluck('id')); if ($campaign->saveOrFail()) { return redirect() ->route('bo.campaigns.edit', $campaign) @@ -138,19 +146,92 @@ class CampaignController extends Controller */ public function destroy(Campaign $campaign) { + if ($campaign->coupons->isNotEmpty()) { + return redirect()->back() + ->with('error', __('crud.messages.cannot_be_deleted_relation', [ + 'model' => Str::ucfirst(__('models.classes.campaigns')), + 'relations' => Str::plural(__('models.classes.coupons')) + ])); + } if ($campaign->deleteOrFail()) { + return redirect()->route('bo.campaigns.index') + ->with('success', __('crud.messages.has_been_deleted', [ + 'model' => Str::ucfirst(__('models.classes.campaigns')) + ])); + } + return redirect()->back() + ->with('error', __('crud.messages.cannot_be_deleted', [ + 'model' => Str::ucfirst(__('models.classes.campagins')) + ])); + } + + // * --- COUPON PART --- + + /** + * Display a listing of the linked coupons. + * + * @param \App\Models\Campaign $campaign + * + * @return \Illuminate\Http\Response + */ + public function indexLinkedCoupons(Campaign $campaign) + { + $campaign->load('brand.coupons'); + + return view( + 'bo.pages.campaigns.index-linked-coupons', + compact('campaign') + ); + } + + /** + * Detach the linked coupon. + * + * @param \App\Models\Campaign $campaign + * @param \App\Models\Coupon $coupon + * + * @return \Illuminate\Http\Response + */ + public function detachLinkedCoupon(Campaign $campaign, Coupon $coupon) + { + if ($campaign->coupons()->detach($coupon)) { + return redirect()->route('bo.campaigns.linked-coupons', $campaign) + ->with('success', trans('crud.messages.has_been_detached', [ + 'model' => Str::ucfirst(trans('models.classes.coupons')) + ])); + } + return redirect()->back() + ->with('error', trans('crud.messages.cannot_be_deleted', [ + 'model' => Str::ucfirst(trans('models.classes.coupons')) + ])); + } + + /** + * Update the specified resource in storage. + * + * @param \App\Http\Requests\Bo\Campaigns\UpdateCouponCampaignRequest $request + * @param \App\Models\Campaign $campaign + * @return \Illuminate\Http\Response + */ + public function updateCoupon(UpdateCouponCampaignRequest $request, Campaign $campaign) + { + return DB::transaction(function () use ($request, $campaign) { + $campaign->fill($request->safe()->except('coupons')); + $campaign->coupons()->sync(\collect($request->validated('coupons'))->pluck('id')); + if ($campaign->save()) { + return redirect() + ->route('bo.campaigns.linked-coupons', $campaign) + ->with('success', trans( + 'crud.messages.has_been_updated', + ['model' => Str::singular(trans('models.classes.campaigns'))] + )); + } //end if return redirect() - ->route('bo.campaigns.index') - ->with('success', trans( - 'crud.messages.has_been_deleted', + ->back() + ->with('error', trans( + 'crud.messages.cannot_be_updated', ['model' => Str::singular(trans('models.classes.campaigns'))] )); - } - return redirect() - ->back() - ->with('error', trans( - ':crud.messages.cannot_be_deleted', - ['model' => Str::singular(trans('models.classes.campaigns'))] - )); + }); } } diff --git a/app/Http/Controllers/Bo/CouponController.php b/app/Http/Controllers/Bo/CouponController.php index cb7dd4c..5152037 100644 --- a/app/Http/Controllers/Bo/CouponController.php +++ b/app/Http/Controllers/Bo/CouponController.php @@ -25,7 +25,7 @@ class CouponController extends Controller public function index(Request $request) { /** @var \Illuminate\Database\Eloquent\Builder $coupon */ - $coupon = Coupon::query(); + $coupon = Coupon::query()->with('brand'); if ($request->search) { $this->searchQuery( diff --git a/app/Http/Requests/Bo/Campaigns/StoreCampaignRequest.php b/app/Http/Requests/Bo/Campaigns/StoreCampaignRequest.php index f17f2d2..674bd36 100644 --- a/app/Http/Requests/Bo/Campaigns/StoreCampaignRequest.php +++ b/app/Http/Requests/Bo/Campaigns/StoreCampaignRequest.php @@ -41,7 +41,9 @@ class StoreCampaignRequest extends FormRequest 'name' => 'required|string|min:3|max:255', 'type' => [new Enum(CampaignTypes::class)], 'status' => 'required|boolean', - 'brand_id' => 'required|exists:brands,id' + 'brand_id' => 'required|exists:brands,id', + 'coupons' => 'required|array', + 'coupons.*.id' => 'required|exists:coupons,id' ]; return $rules; } diff --git a/app/Http/Requests/Bo/Campaigns/UpdateCouponCampaignRequest.php b/app/Http/Requests/Bo/Campaigns/UpdateCouponCampaignRequest.php new file mode 100644 index 0000000..15c927c --- /dev/null +++ b/app/Http/Requests/Bo/Campaigns/UpdateCouponCampaignRequest.php @@ -0,0 +1,31 @@ +check(); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + $rules = [ + 'coupons' => 'required', + ]; + return $rules; + } +} diff --git a/app/Models/Brand.php b/app/Models/Brand.php index 36c1081..fa6eafd 100644 --- a/app/Models/Brand.php +++ b/app/Models/Brand.php @@ -35,6 +35,7 @@ class Brand extends Model 'crm_password' => 'encrypted', ]; + // * RELATIONSHIPS /** * Get campaign that owned by the Brand @@ -46,6 +47,16 @@ class Brand extends Model return $this->hasMany(Campaign::class); } + /** + * Get all of the coupons for the Brand + * + * @return \Illuminate\Database\Eloquent\Relations\HasMany + */ + public function coupons(): HasMany + { + return $this->hasMany(Coupon::class); + } + // * EVENTS /** diff --git a/app/Models/Campaign.php b/app/Models/Campaign.php index cde2329..3b0047e 100644 --- a/app/Models/Campaign.php +++ b/app/Models/Campaign.php @@ -21,7 +21,7 @@ class Campaign extends Model 'name', 'type', 'status', - 'brand_id' + 'brand_id', ]; /** @@ -31,7 +31,7 @@ class Campaign extends Model */ protected $casts = [ 'type' => CampaignTypes::class, - 'status' => 'bool' + 'status' => 'bool', ]; // * RELATIONS diff --git a/app/Models/Coupon.php b/app/Models/Coupon.php index ae87b35..2da98b2 100644 --- a/app/Models/Coupon.php +++ b/app/Models/Coupon.php @@ -6,6 +6,7 @@ use App\Lib\Helpers\FileStorageHelper; use Carbon\Carbon; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; use Illuminate\Database\Eloquent\Relations\BelongsToMany; /** @@ -133,6 +134,16 @@ class Coupon extends Model return $this->belongsToMany(Campaign::class); } + /** + * Get the brand that owns the Coupon + * + * @return \Illuminate\Database\Eloquent\Relations\BelongsTo + */ + public function brand(): BelongsTo + { + return $this->belongsTo(Brand::class); + } + // * METHODS /** diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 73e4665..479499a 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -3,6 +3,7 @@ namespace App\Providers; use DateTime; +use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Facades\Storage; use Illuminate\Pagination\Paginator; use Illuminate\Support\Carbon; @@ -29,6 +30,9 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { + + Model::shouldBeStrict(!$this->app->environment('production')); + // * HTTPS FIX URL::forceScheme('https'); diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 6ab665f..e97bd0a 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -46,9 +46,6 @@ class RouteServiceProvider extends ServiceProvider ->group(base_path('routes/web-fo.php')); }); - Route::model('campaign', Campaign::class); - Route::model('coupon', Coupon::class); - Route::bind('publishedCampaign', function (string $value) { return Campaign::where( [ diff --git a/resources/lang/en/crud.php b/resources/lang/en/crud.php index f63bca6..6eec156 100644 --- a/resources/lang/en/crud.php +++ b/resources/lang/en/crud.php @@ -19,6 +19,7 @@ return [ 'view_model' => 'View :model', 'update_model' => 'Update :model', 'delete_model' => 'Delete :model', + 'detach_model' => 'Detach :model', 'no_results' => 'No results for :models', 'publish' => 'Publish', 'unpublish' => 'Unpublish', @@ -40,6 +41,7 @@ return [ 'has_been_deleted' => ':model has been deleted', 'cannot_be_deleted' => ':model cannot be deleted', 'cannot_be_deleted_relation' => ':model cannot be deleted because some :relations are attached to it', + 'has_been_detached' => ':model has been detached' ], 'minicrud' => [ diff --git a/resources/lang/fr/crud.php b/resources/lang/fr/crud.php index bfd7b49..f5f24ba 100644 --- a/resources/lang/fr/crud.php +++ b/resources/lang/fr/crud.php @@ -20,6 +20,7 @@ return [ 'update_model' => 'Éditer :model', 'duplicate_model' => 'Dupliquer :model', 'delete_model' => 'Supprimer :model', + 'detach_model' => 'Détacher :model', 'save_model' => 'Sauvegarder :model', 'edit_model' => 'Mettre à jour :model', 'no_results' => 'Aucun résultat pour :model', @@ -46,7 +47,8 @@ return [ 'order_changed' => 'L\'ordre a été changé !', 'order_not_changed' => 'L\'ordre n\'a pas été changé !', 'publish_status_saved' => 'Changement de l\'état de publication réussi !', - 'right' => 'Vous n\'avez pas les droits pour accéder à cette partie !' + 'right' => 'Vous n\'avez pas les droits pour accéder à cette partie !', + 'has_been_detached' => ':model a été détaché' ], 'minicrud' => [ diff --git a/resources/ts/utilities/fontawesome.ts b/resources/ts/utilities/fontawesome.ts index 14b563d..7c26932 100644 --- a/resources/ts/utilities/fontawesome.ts +++ b/resources/ts/utilities/fontawesome.ts @@ -21,10 +21,12 @@ import { faEraser, faEye, faFolderOpen, + faLinkSlash, faPencil, faPlus, faQuestionCircle, faRedoAlt, + faReceipt, faSearch, faSearchMinus, faSearchPlus, @@ -67,6 +69,8 @@ library.add(faArrowAltCircleDown); library.add(faArrowAltCircleUp); library.add(faCircleXmark); library.add(faCircleCheck); +library.add(faReceipt); +library.add(faLinkSlash); // Front diff --git a/resources/views/bo/pages/campaigns/edit.blade.php b/resources/views/bo/pages/campaigns/edit.blade.php index 14f20dd..f30fd65 100644 --- a/resources/views/bo/pages/campaigns/edit.blade.php +++ b/resources/views/bo/pages/campaigns/edit.blade.php @@ -25,7 +25,7 @@
-
+ @csrf @method('PUT') @include('bo.pages.campaigns.form-inputs', ['model' => $campaignModel]) diff --git a/resources/views/bo/pages/campaigns/form-inputs.blade.php b/resources/views/bo/pages/campaigns/form-inputs.blade.php index 175060e..73c1fdf 100644 --- a/resources/views/bo/pages/campaigns/form-inputs.blade.php +++ b/resources/views/bo/pages/campaigns/form-inputs.blade.php @@ -42,25 +42,8 @@
- {{-- STATUS --}} -
-
- {{ __('validation.attributes.status') }} -
-
- @include('bo.partials.inputs.tinyint-boolean', [ - 'id' => 'campaignStatus', - 'name' => 'status', - 'label' => __('crud.minicrud.visibility_label'), - 'helper' => __('crud.minicrud.visibility_helper'), - 'model' => $campaignModel ?? null, - ]) -
-
-
-
{{-- BRAND_ID --}} -
+
{{ __('validation.attributes.brand_id') }}
@@ -81,3 +64,42 @@
+ {{-- COUPON_ID --}} +
+
+ {{ __('models.classes.coupons') }} +
+
+ @include('bo.partials.inputs.pivot-belongsToMany', [ + 'id' => 'campaignCoupons', + 'label' => __(':model associée', ['model' => Str::singular(trans('models.classes.coupons'))]), + 'name' => 'coupons', + 'placeholder' => 'Coupons', + 'model' => $campaignModel ?? null, + 'itemsList' => $couponModels, + 'helper' => __('Choisir un :model dans la liste.', [ + 'model' => Str::singular(trans('models.classes.coupons')), + ]), + ]) +
+
+
+
+ {{-- STATUS --}} +
+
+ {{ __('validation.attributes.status') }} +
+
+ @include('bo.partials.inputs.tinyint-boolean', [ + 'id' => 'campaignStatus', + 'name' => 'status', + 'label' => __('crud.minicrud.visibility_label'), + 'helper' => __('crud.minicrud.visibility_helper'), + 'model' => $campaignModel ?? null, + ]) +
+
+
+
+
diff --git a/resources/views/bo/pages/campaigns/index-linked-coupons.blade.php b/resources/views/bo/pages/campaigns/index-linked-coupons.blade.php new file mode 100644 index 0000000..84c0367 --- /dev/null +++ b/resources/views/bo/pages/campaigns/index-linked-coupons.blade.php @@ -0,0 +1,65 @@ +@extends('bo.layout') + +@section('title', __('crud.helpers.list_all', ['model' => __('models.classes.coupons')])) +@section('description', __('crud.helpers.list_all', ['model' => __('models.classes.coupons')])) +@section('breadcrumb', request()->route()->getName()) + +@section('content') +
+
+
+
+
+
+
+ + + +

{{ __('models.classes.coupons') }} {{ Str::ucfirst(__('crud.helpers.list')) }}  

+
+
+ + @csrf + @method('PUT') +
+ {{ __('models.classes.coupons') }} +
+
+ @include('bo.partials.inputs.pivot-belongsToMany', [ + 'id' => 'campaignCoupons', + 'label' => __(':model associée', ['model' => Str::singular(trans('models.classes.coupons'))]), + 'name' => 'coupons', + 'placeholder' => 'Coupons', + 'model' => $campaign ?? null, + 'itemsList' => $campaign->brand->coupons, + 'helper' => __('Choisir un :model dans la liste.', [ + 'model' => Str::singular(trans('models.classes.coupons')), + ]), + ]) +
+
+ +
+
+
+ +
+
+
+
+
+
+ @include('bo.pages.campaigns.index-list-linked-coupons') +
+
+
+
+
+
+
+@endsection diff --git a/resources/views/bo/pages/campaigns/index-list-linked-coupons.blade.php b/resources/views/bo/pages/campaigns/index-list-linked-coupons.blade.php new file mode 100644 index 0000000..42e757c --- /dev/null +++ b/resources/views/bo/pages/campaigns/index-list-linked-coupons.blade.php @@ -0,0 +1,49 @@ +
+ + + @php + $cols = [ + 'name' => __('validation.attributes.name'), + 'amount' => __('validation.attributes.amount'), + 'brand_id' => __('validation.attributes.brand_id'), + 'updated_at' => __('validation.attributes.updated_at'), + ]; + @endphp + @include('bo.modules.table-col-sorter', ['cols' => $cols, 'mobileHide' => ['status']]) + + + @if ($campaign->coupons->count()) + @foreach ($campaign->coupons as $linkedCouponModel) + + + + + + + + @endforeach + @else + + + + @endif + +
{{ $linkedCouponModel->name }}{{ $linkedCouponModel->amount }}{{ $campaign->brand->name }} + {{ $linkedCouponModel->updated_at->formatLocalized('%d/%m/%Y à %H:%M') }} + +
+ @csrf + @method('PUT') +
+ +
+
+
+ {{ __('crud.helpers.no_results', ['model' => __('models.classes.coupons')]) }} +
+
diff --git a/resources/views/bo/pages/campaigns/index-list.blade.php b/resources/views/bo/pages/campaigns/index-list.blade.php index 81379a4..13f7415 100644 --- a/resources/views/bo/pages/campaigns/index-list.blade.php +++ b/resources/views/bo/pages/campaigns/index-list.blade.php @@ -28,13 +28,18 @@ class="badge bg-warning text-dark text-wrap">{{ $campaignModel->updated_at->formatLocalized('%d/%m/%Y à %H:%M') }} -
+ + + @method('DELETE') @csrf
diff --git a/resources/views/bo/pages/coupons/index-list.blade.php b/resources/views/bo/pages/coupons/index-list.blade.php index e6a00dd..7187fea 100644 --- a/resources/views/bo/pages/coupons/index-list.blade.php +++ b/resources/views/bo/pages/coupons/index-list.blade.php @@ -31,7 +31,7 @@ @foreach ($couponModels as $couponModel) {{ $couponModel->name }} - {{ $couponModel->brand_id }} + {{ $couponModel->brand->name }} @include('bo.modules.change-status', [ 'routeName' => 'coupons', 'model' => $couponModel, diff --git a/routes/web-bo.php b/routes/web-bo.php index 96f5a57..c71acf1 100644 --- a/routes/web-bo.php +++ b/routes/web-bo.php @@ -39,6 +39,14 @@ Route::prefix('bo')->name('bo.')->group( Route::resource('campaigns', CampaignController::class)->except('show'); Route::post('/campaigns/{campaign}/change-published', [CampaignController::class, 'changePublished']) ->name('campaigns.change-published'); + Route::get('/campaigns/{campaign}/linked-coupons', [CampaignController::class, 'indexLinkedCoupons']) + ->name('campaigns.linked-coupons'); + Route::put( + '/campaigns/{campaign}/detach-linked-coupon/{coupon}', + [CampaignController::class, 'detachLinkedCoupon'] + )->name('campaigns.detach-linked-coupon'); + Route::put('/campaigns/{campaign}/update-coupon', [CampaignController::class, 'updateCoupon']) + ->name('campaigns.update-coupon'); }); } );