diff --git a/app/Enums/Claims/ClaimStatus.php b/app/Enums/Claims/ClaimStatus.php index 53d2c64..afa8e99 100644 --- a/app/Enums/Claims/ClaimStatus.php +++ b/app/Enums/Claims/ClaimStatus.php @@ -12,6 +12,7 @@ enum ClaimStatus: int case sentDigital = 2; case sentMarketing = 3; case treated = 4; + case refused = 5; /** * Optionnal labels definition @@ -21,6 +22,7 @@ enum ClaimStatus: int self::sentDigital->name => 'Transférée au service Digital', self::sentMarketing->name => 'Retournée au Marketing', self::treated->name => 'Traitée', + self::refused->name => 'Refusé de répondre', ]; /** @@ -31,6 +33,7 @@ enum ClaimStatus: int self::sentDigital->name => '#0033c0', self::sentMarketing->name => '#69077c', self::treated->name => '#188618', + self::refused->name => '#dc143c', ]; /** diff --git a/app/Http/Controllers/Bo/ClaimController.php b/app/Http/Controllers/Bo/ClaimController.php index 1fcde8a..68e2caf 100644 --- a/app/Http/Controllers/Bo/ClaimController.php +++ b/app/Http/Controllers/Bo/ClaimController.php @@ -7,9 +7,11 @@ use App\Enums\Claims\ClaimStatus; use App\Enums\Users\RoleEnum; use App\Events\ClaimModelChanged; use App\Http\Controllers\Controller; +use App\Http\Requests\Bo\Claims\ExportClaimRequest; use App\Http\Requests\Bo\Claims\SendClaimAnswerRequest; use App\Http\Requests\Bo\Claims\UpdateClaimRequest; use App\Http\Requests\Bo\PaginateModelsRequest; +use App\Jobs\ExportClaimsAsCsv; use App\Mail\ClaimAnswerMail; use App\Models\Brand; use App\Models\Claim; @@ -54,8 +56,19 @@ class ClaimController extends Controller )->when( $userModel->role->equals(RoleEnum::marketing), fn($q) => $q->whereHas('brand', fn($q) => $q->whereIn('id', $userModel->brands->modelKeys())) + ) + ->when( + $request->filled('subject'), + fn($q) => $q->whereHas('claimSubject', fn($q) => $q->where('id', $request->subject)) + ) + ->when( + $request->filled('status'), + fn($q) => $q->whereIn('status', $request->status), + fn($q) => $q->whereNotIn('status', [ClaimStatus::treated, ClaimStatus::refused]) ); + // dd($query->toRawSql()); + /** @var string $search Search field */ $search = $request->search; if ($search) { @@ -82,7 +95,9 @@ class ClaimController extends Controller /** Custom pagination */ $claimModels = $query->simplePaginate($this->getPagination()); - return view('bo.pages.claims.index', compact('claimModels', 'search', 'searchFields')); + $claimSubjectModels = ClaimSubject::all(); + + return view('bo.pages.claims.index', compact('claimModels', 'search', 'searchFields', 'claimSubjectModels')); } /** @@ -204,4 +219,29 @@ class ClaimController extends Controller ); return \response()->json($models); } + + public function export(ExportClaimRequest $request) + { + $claims = Claim::query()->whereIn('id', $request->validated('claimList'))->get(); + $brandNames = Brand::query() + ->whereIn( + 'id', + \collect($claims) + ->pluck('brand_id') + ->unique() + )->pluck('name') + ->toArray(); + + // dd($brandNames); + \dispatch(new ExportClaimsAsCsv($request->validated('email'), $brandNames, $claims)); + + return \redirect() + ->back() + ->with('success', trans("Le traitement de l'export partiel a été lancé. Si vous n'avez pas recu de mail + cela signifie qu'une erreur est survenue et nous sommes au courant.")); + + } + + + } diff --git a/app/Http/Requests/Bo/Claims/ExportClaimRequest.php b/app/Http/Requests/Bo/Claims/ExportClaimRequest.php new file mode 100644 index 0000000..5cc3a5c --- /dev/null +++ b/app/Http/Requests/Bo/Claims/ExportClaimRequest.php @@ -0,0 +1,59 @@ +check(); + } + + public function prepareForValidation() + { + $this->merge([ + 'claimList' => json_decode($this->input('claimList'), true) + ]); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules(): array + { + return [ + 'email' => 'required|email', + 'claimList' => 'required|array', + 'claimList.*' => 'required|numeric|exists:claims,id', + ]; + } + + /** + * Get custom attributes for validator errors. + * + * @return array|null> + */ + public function attributes(): array + { + return [ + 'brand_id' => trans('models.classes.brands'), + 'subject_id' => trans('models.classes.claimsubjects'), + 'type' => trans('validation.custom.type'), + 'status' => trans('validation.custom.status'), + 'response_type' => trans('validation.custom.response_type'), + ]; + } +} diff --git a/app/Jobs/ExportClaimsAsCsv.php b/app/Jobs/ExportClaimsAsCsv.php new file mode 100644 index 0000000..0ce59dd --- /dev/null +++ b/app/Jobs/ExportClaimsAsCsv.php @@ -0,0 +1,134 @@ +deleteDirectory('export_claims'); + $disk->makeDirectory('export_claims'); + + // Insertion de la ligne d'en-têtes. + $csvlines[] = $this->header; + foreach ($this->claims as $inscription) { + $csvlines[] = $this->fillLine($inscription); + } + + $data = $this->array2csv($csvlines, ";"); + + $uuid = Str::uuid(); + $fileName = date('d-m-Y') . '-' . $uuid . '.csv'; + + $disk->put("export_claims/{$fileName}", $data); + + if (!$disk->exists("export_claims/{$fileName}")) { + throw new \RuntimeException( + "The CSV file 'export_claims/{$fileName}' has not been created." + ); + } + + $brandNamesString = implode(', ', $this->brandNames); + + Mail::to($this->recipient)->send(new ExportClaims($fileName, $brandNamesString)); + } + + /** + * fill one line for csv + * @param \App\Models\Claim $claim + * + * @return array + * @phpcs:disable Generic.Metrics.CyclomaticComplexity.TooHigh, Generic.Metrics.CyclomaticComplexity.MaxExceeded + */ + private function fillLine(Claim $claim) + { + // @phpcs:enable + $oneline = [ + sprintf('%s %s', $claim->first_name, Str::upper($claim->last_name)), + $claim->email, + $claim->address . "," . $claim->postcode . "," . $claim->city, + $claim->created_at->toDateTimeString(), + $claim->claimSubject->label, + $claim->status->label(), + $claim->message, + asset($claim->file), + ]; + return $oneline; + } + + /** + * converts an array to a csv stream + * + * @param array $data + * @param string $delimiter + * @param string $enclosure + * @param string $escape_char + * + * @return string + */ + private function array2csv( + array $data, + string $delimiter = ',', + string $enclosure = '"', + string $escape_char = "\\" + ) { + $f = fopen('php://memory', 'r+'); + + // UTF-8 BOM. + $BOM = "\xEF\xBB\xBF"; + fwrite($f, $BOM); + + foreach ($data as $item) { + fputcsv($f, $item, $delimiter, $enclosure, $escape_char); + } + rewind($f); + return stream_get_contents($f); + } +} diff --git a/app/Mail/ExportClaims.php b/app/Mail/ExportClaims.php new file mode 100644 index 0000000..f8f5cf4 --- /dev/null +++ b/app/Mail/ExportClaims.php @@ -0,0 +1,62 @@ +brandName), + ); + } + + /** + * Get the message content definition. + */ + public function content(): Content + { + return new Content( + markdown: 'mail.export-claims', + text: 'mail.export-claims-plain' + ); + } + + /** + * Get the attachments for the message. + * + * @return array + */ + public function attachments(): array + { + return [ + Attachment::fromStorageDisk('export', "export_claims/{$this->fileName}") + ->as(sprintf( + 'export-reclas-%s.csv', + now()->format('Y-m-d') + )) + ]; + } +} diff --git a/config/filesystems.php b/config/filesystems.php index e8833b8..9f594c1 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -68,6 +68,13 @@ return [ 'throw' => false, ], + 'export' => [ + 'driver' => 'local', + 'root' => storage_path('app/export'), + 'visibility' => 'private', + 'throw' => true, + ], + ], /* diff --git a/resources/ts/bo/bo.ts b/resources/ts/bo/bo.ts index 23b50f3..7325c36 100644 --- a/resources/ts/bo/bo.ts +++ b/resources/ts/bo/bo.ts @@ -14,6 +14,7 @@ import "./../modules/sweetalert"; import "./base/common"; // CUSTOM +import "./pages/claims"; import "./pages/customer.delete"; import "./pages/data.delete"; import "./pages/search-bar"; diff --git a/resources/ts/bo/pages/claims.ts b/resources/ts/bo/pages/claims.ts new file mode 100644 index 0000000..e3736e4 --- /dev/null +++ b/resources/ts/bo/pages/claims.ts @@ -0,0 +1,17 @@ + +document.addEventListener("DOMContentLoaded", function () { + const exportForm = document.getElementById("claimExportForm"); + const exportFormBtn = document.getElementById("claimExportFormBtn"); + const exportFormBtnInside = document.getElementById("claimExportFormBtnInside"); + + if (!exportForm || !exportFormBtn || !exportFormBtnInside || !(exportForm instanceof HTMLFormElement)) { + return; + } + + exportFormBtn.addEventListener("click", function (e) { + e.preventDefault(); + + exportFormBtnInside.click(); + }); +}); + diff --git a/resources/ts/bo/pages/search-bar.ts b/resources/ts/bo/pages/search-bar.ts index 4e9685c..a09f225 100644 --- a/resources/ts/bo/pages/search-bar.ts +++ b/resources/ts/bo/pages/search-bar.ts @@ -2,6 +2,7 @@ enum FilterKey { Brand = "brand", Question = "question", Answer = "answer", + Subject = "subject", } function setupFilterListener(selectId: string, paramKey: FilterKey): void { @@ -25,6 +26,7 @@ const filterMap: Record = { brandSelect: FilterKey.Brand, questionSelect: FilterKey.Question, answerSelect: FilterKey.Answer, + subjectSelect: FilterKey.Subject, }; Object.entries(filterMap).forEach(([selectId, paramKey]) => { diff --git a/resources/ts/bo/utilities/fontawesome.ts b/resources/ts/bo/utilities/fontawesome.ts index 324f67a..c8d371e 100644 --- a/resources/ts/bo/utilities/fontawesome.ts +++ b/resources/ts/bo/utilities/fontawesome.ts @@ -29,6 +29,7 @@ import { faEraser, faEye, faEyeSlash, + faFile, faFolderOpen, faListUl, faPaintRoller, @@ -57,6 +58,7 @@ library.add( faTrash, faEye, faEyeSlash, + faFile, faFolderOpen, faCrop, faQuestionCircle, diff --git a/resources/views/bo/layouts/sidenav.blade.php b/resources/views/bo/layouts/sidenav.blade.php index 59298d5..050610a 100644 --- a/resources/views/bo/layouts/sidenav.blade.php +++ b/resources/views/bo/layouts/sidenav.blade.php @@ -13,6 +13,20 @@ \App\Models\ClaimSubject::class, \App\Models\ClaimMailTemplate::class, ]; + $defaultFilters = [ + 'App\Models\Customer' => [], + 'App\Models\Brand' => [], + 'App\Models\Question' => [], + 'App\Models\Service' => [], + 'App\Models\SingleOptin' => [], + 'App\Models\Claim' => [ + 'sort_col' => 'created_at', + 'sort_way' => 'desc' + ], + 'App\Models\ClaimSubject' => [], + 'App\Models\ClaimMailTemplate' => [], + + ] @endphp @foreach ($modelsClasses as $crudModel) @can('viewAny', $crudModel) @@ -23,7 +37,10 @@ @if (!$loop->last)
diff --git a/resources/views/bo/modules/claim-tools.blade.php b/resources/views/bo/modules/claim-tools.blade.php new file mode 100644 index 0000000..53d2b71 --- /dev/null +++ b/resources/views/bo/modules/claim-tools.blade.php @@ -0,0 +1,61 @@ +@php + $selectedSubject = request()->subject ?? (isset($modelTable) ? Session::get("crud.$modelTable.subject") : null); +@endphp + +
+
+ +
+
+
+ {{-- SUBJECT SELECT --}} + +
+
+
+ +{{-- EXPORT MODAL --}} + diff --git a/resources/views/bo/modules/search-bar.blade.php b/resources/views/bo/modules/search-bar.blade.php index 7baf593..b63772b 100644 --- a/resources/views/bo/modules/search-bar.blade.php +++ b/resources/views/bo/modules/search-bar.blade.php @@ -67,7 +67,7 @@ @php $parameters = ['rstFltrs' => 'true', 'search' => null, 'page' => null]; if ($routes) { - $parameters = array_merge($parameters, ['brand' => null, 'question' => null, 'answer' => null]); + $parameters = array_merge($parameters, ['brand' => null, 'question' => null, 'answer' => null, 'subject' => null]); } @endphp @can('viewAny', $claimModel) diff --git a/resources/views/bo/pages/claims/index-list.blade.php b/resources/views/bo/pages/claims/index-list.blade.php index b1409f6..88809e4 100644 --- a/resources/views/bo/pages/claims/index-list.blade.php +++ b/resources/views/bo/pages/claims/index-list.blade.php @@ -2,11 +2,13 @@ @include('bo.modules.table-col-sorter', [ 'cols' => [ - 'reference' => str(__('validation.custom.reference'))->ucfirst(), - 'email' => str(__('models.classes.customers'))->ucfirst(), - 'brand_id' => str(__('models.classes.brands'))->singular()->ucfirst(), - 'type' => str(__('validation.custom.type'))->ucfirst(), - 'status' => str(__('validation.custom.status'))->ucfirst(), + 'reference' => str(__('validation.custom.reference'))->ucfirst(), + 'created_at' => str(__('validation.attributes.created_at'))->ucfirst(), + 'email' => str(__('models.classes.customers'))->ucfirst(), + 'message' => str(__('validation.attributes.message'))->ucfirst(), + 'brand_id' => str(__('models.classes.brands'))->singular()->ucfirst(), + 'type' => str(__('validation.custom.type'))->ucfirst(), + 'status' => str(__('validation.custom.status'))->ucfirst(), 'updated_at' => str(__('validation.attributes.updated_at'))->ucfirst(), ], ]) @@ -16,12 +18,18 @@ @foreach ($claimModels as $claimModel) {{ $claimModel->reference }} + + + {{ $claimModel->created_at->isoFormat('LLLL') }} + +

{{ sprintf('%s %s', $claimModel->first_name, $claimModel->last_name) }}

{{ e($claimModel->email) }}

+ {{ $claimModel->message }} {{ $claimModel->brand->name }} diff --git a/resources/views/bo/pages/claims/index.blade.php b/resources/views/bo/pages/claims/index.blade.php index 56563b1..82ea16e 100644 --- a/resources/views/bo/pages/claims/index.blade.php +++ b/resources/views/bo/pages/claims/index.blade.php @@ -16,6 +16,7 @@
+ @include('bo.modules.claim-tools') @include('bo.modules.search-bar')
diff --git a/resources/views/mail/export-claims-plain.blade.php b/resources/views/mail/export-claims-plain.blade.php new file mode 100644 index 0000000..604c9ad --- /dev/null +++ b/resources/views/mail/export-claims-plain.blade.php @@ -0,0 +1,5 @@ +Bonjour, + +Vous trouverez ci-joint l'export des réclamations du {{ now()->isoFormat('DD\/MM\/YYYY à HH:mm') }} + +Ceci est un message automatique, ne pas répondre. diff --git a/resources/views/mail/export-claims.blade.php b/resources/views/mail/export-claims.blade.php new file mode 100644 index 0000000..80d4762 --- /dev/null +++ b/resources/views/mail/export-claims.blade.php @@ -0,0 +1,10 @@ +{{-- blade-formatter-disable --}} +@component('mail::layout') + +# {{ __('Bonjour,') }} + +{{ __('Vous trouverez ci-joint l\'export des réclamations du') }} {{ now()->isoFormat('DD\/MM\/YYYY à HH:mm') }} + +{{ __('Ceci est un message automatique, ne pas répondre.') }} + +@endcomponent diff --git a/routes/web-bo.php b/routes/web-bo.php index 4c1d1c0..2c729c6 100644 --- a/routes/web-bo.php +++ b/routes/web-bo.php @@ -93,6 +93,7 @@ Route::middleware(['throttle:web', 'admin-secure'])->prefix('bo')->name('bo.')-> // * CLAIMS. Route::resource('claims', ClaimController::class)->only(['index', 'edit', 'update']); Route::post('claims/{claim}/answer', [ClaimController::class, 'answer'])->name('claims.answer'); + Route::post('claims/export', [ClaimController::class, 'export'])->name('claims.export'); // * CLAIM SUBJECTS. Route::get('/{brand}/claim_subjects/json/paginate', [ClaimController::class, 'jsonClaimPaginateModels'])