diff --git a/app/Http/Controllers/Bo/OrdersController.php b/app/Http/Controllers/Bo/OrdersController.php index 9d17106d..757f90f1 100644 --- a/app/Http/Controllers/Bo/OrdersController.php +++ b/app/Http/Controllers/Bo/OrdersController.php @@ -9,6 +9,7 @@ use Illuminate\Support\Facades\Mail; use App\Mail\OrderStatusMail; use App\Models\Customers; use Carbon\CarbonImmutable; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Http\Request; use Illuminate\Support\Facades\Session; @@ -22,11 +23,55 @@ class OrdersController extends Controller */ public function index(SortOrders $request) { - $orders = $this->filterOrders($request); + $query = $this->sortOrders($request); - $orders = $orders->paginate(10); + /** @var string $search Search field */ + $search = $request->search; + if ($search) { + $this->searchQuery( + $query, + $search, + function (Builder $q) use ($search) { + $q->orWhereHas('timeslot.magasin', function (Builder $q) use ($search) { + $q->where('name', 'LIKE', "%{$search}%"); + }); + }, + 'reference' + ); + } + $searchFields = \implode(', ', [ + trans('Référence, Point de retrait'), + ]); - return view('bo.orders.index', compact('orders')); + // * Dates Filter + if (!empty($request->input('date-order-start'))) { + if (!empty($request->input('date-order-end'))) { + $query->whereBetween('date', [ + $request->input('date-order-start'), + $request->input('date-order-end'), + ]); + } else { + $query->where('date', $request->input('date-order-start')); + } + } + if (!empty($request->input('date-retrait-start'))) { + if (!empty($request->input('date-retrait-end'))) { + $query->whereHas('timeslot', function (Builder $q) use ($request) { + $q->whereBetween('day', [ + $request->input('date-retrait-start'), + $request->input('date-retrait-end'), + ]); + }); + } else { + $query->whereHas('timeslot', function (Builder $q) use ($request) { + $q->where('day', $request->input('date-retrait-start')); + }); + } + } + + $orders = $query->paginate(10); + + return view('bo.orders.index', compact('orders', 'searchFields')); } /** @@ -37,16 +82,34 @@ class OrdersController extends Controller */ public function today(SortOrders $request) { - $orders = $this->filterOrders($request); + $query = $this->sortOrders($request); + + /** @var string $search Search field */ + $search = $request->search; + if ($search) { + $this->searchQuery( + $query, + $search, + function (Builder $q) use ($search) { + $q->orWhereHas('timeslot.magasin', function (Builder $q) use ($search) { + $q->where('name', 'LIKE', "%{$search}%"); + }); + }, + 'reference' + ); + } + $searchFields = \implode(', ', [ + trans('Référence, Point de retrait'), + ]); // Filter today. - $today = CarbonImmutable::now()->startOfDay(); - $orders = $orders->whereHas('timeslot', function ($q) use ($today) { + $today = CarbonImmutable::now()->startOfDay(); + $query = $query->whereHas('timeslot', function ($q) use ($today) { $q->where('day', $today); }); - $orders = $orders->get(); - return view('bo.orders.index', compact('orders', 'today')); + $orders = $query->get(); + return view('bo.orders.index', compact('orders', 'today', 'searchFields')); } /** @@ -55,51 +118,51 @@ class OrdersController extends Controller * @param Request $request * @return \Illuminate\Database\Eloquent\Builder */ - protected function filterOrders(Request $request) + protected function sortOrders(Request $request) { - $orders = Order::query(); + $query = Order::query(); - if ($request->rst) { + if ($request->input('rst')) { Session::remove('orders.sort_col'); Session::remove('orders.sort_way'); } - if ($request->sort_col) { - Session::put('orders.sort_col', $request->sort_col); + if ($request->input('sort_col')) { + Session::put('orders.sort_col', $request->input('sort_col')); Session::save(); } - if ($request->sort_way) { - Session::put('orders.sort_way', $request->sort_way); + if ($request->input('sort_way')) { + Session::put('orders.sort_way', $request->input('sort_way')); Session::save(); } if (Session::has('orders.sort_col') and Session::has('orders.sort_way')) { switch (Session::get('orders.sort_col')) { case 'date': - $orders = $orders->orderBy('date', Session::get('orders.sort_way')); + $query = $query->orderBy('date', Session::get('orders.sort_way')); break; case 'status_id': - $orders = $orders->orderBy('status_id', Session::get('orders.sort_way')); + $query = $query->orderBy('status_id', Session::get('orders.sort_way')); break; case 'magasin_id': - $orders = $orders->select('orders.*'); - $orders = $orders->leftJoin('timeslots', 'timeslots.order_id', '=', 'orders.id'); - $orders = $orders->leftJoin('magasins', 'timeslots.magasin_id', '=', 'magasins.id'); - $orders = $orders->orderBy('magasins.id', Session::get('orders.sort_way')); + $query = $query->select('orders.*'); + $query = $query->leftJoin('timeslots', 'timeslots.order_id', '=', 'orders.id'); + $query = $query->leftJoin('magasins', 'timeslots.magasin_id', '=', 'magasins.id'); + $query = $query->orderBy('magasins.id', Session::get('orders.sort_way')); break; case 'date_retrait': - $orders = $orders->select('orders.*'); - $orders = $orders->leftJoin('timeslots', 'timeslots.order_id', '=', 'orders.id'); - $orders = $orders->orderBy('timeslots.day', Session::get('orders.sort_way')); - $orders = $orders->orderBy('timeslots.time', Session::get('orders.sort_way')); + $query = $query->select('orders.*'); + $query = $query->leftJoin('timeslots', 'timeslots.order_id', '=', 'orders.id'); + $query = $query->orderBy('timeslots.day', Session::get('orders.sort_way')); + $query = $query->orderBy('timeslots.time', Session::get('orders.sort_way')); break; case 'customer_id': - $orders = $orders->orderBy('customer_id', Session::get('orders.sort_way')); + $query = $query->orderBy('customer_id', Session::get('orders.sort_way')); break; - }//end switch - }//end if + } //end switch + } //end if - return $orders; + return $query; } /** diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index ce1176dd..0964a0d0 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -2,14 +2,140 @@ namespace App\Http\Controllers; +use Illuminate\Database\Eloquent\Builder; use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Routing\Controller as BaseController; +use Illuminate\Support\Facades\Schema; +use Illuminate\Support\Str; class Controller extends BaseController { use AuthorizesRequests; use DispatchesJobs; use ValidatesRequests; + + /** + * Build Search query on specified fields + * splitting search into words or using whole sentence + * + * @param \Illuminate\Database\Eloquent\Builder $query The eloquent query builder. + * @param string $search The query string. + * @param callable $searchQuery The query string. + * @param string ...$fields Either a simple array or a string + * in case of a string the two fields + * would be concatenate to make the search. + * @return \Illuminate\Database\Eloquent\Builder + */ + protected function searchQuery( + Builder $query, + string $search, + callable $searchQuery = null, + string ...$fields + ): Builder { + if (count($fields)) { + // Search using words. + $words = explode(' ', $search); + $query->where(function ($query) use ($searchQuery, $words, $search, $fields) { + foreach ($words as $word) { + if (!strlen($word)) { + continue; + } + $this->searchOnFields($query, $word, $fields); + } //end foreach + // Search whole using whole sentence. + $this->searchOnFields($query, $search, $fields); + if ($searchQuery) { + $searchQuery($query); + } + }); + } //end if + return $query; + } + + /** + * Build query search on all fields + * + * @param \Illuminate\Database\Eloquent\Builder $query + * @param string $search + * @param array $fields + * @return \Illuminate\Database\Eloquent\Builder + */ + private function searchOnFields( + Builder $query, + string $search, + array $fields + ): Builder { + $table = $query->getModel()->getTable(); + foreach ($fields as $field) { + $field = str_replace('?', '\?', $field); + if (is_array($field)) { + $query->orWhereRaw( + sprintf("UPPER(CONCAT(%s)) LIKE UPPER(?)", collect($field)->map(function ($q) use ($table) { + return "`$table`.`$q`"; + })->implode(', \' \', ')), + ['%' . htmlspecialchars($search) . '%'] + ); + return $query; + } + // Get models woth enum's label. + if (is_array($this->getSearchValue($query, $search, $field))) { + foreach ($this->getSearchValue($query, $search, $field) as $array) { + $query->orWhereRaw( + "UPPER(`$table`.`$field`) LIKE UPPER(?)", + ['%' . htmlspecialchars($array->value) . '%'] + ); + } + return $query; + } + // Get models with relation's name/label. + if (Str::endsWith($field, '_id')) { + $query->orWhereHas(Str::remove('_id', $field), function ($queryRelation) use ($field, $search) { + if (Schema::hasColumn(Str::remove('_id', $field) . 's', 'name')) { + $queryRelation->where('name', 'like', '%' . $search . '%'); + } elseif (Schema::hasColumn(Str::remove('_id', $field) . 's', 'label')) { + $queryRelation->where('label', 'like', '%' . $search . '%'); + } + }); + return $query; + } + $query->orWhereRaw( + "UPPER(`$table`.`$field`) LIKE UPPER(?)", + ['%' . htmlspecialchars($this->getSearchValue($query, $search, $field)) . '%'] + ); + } //end foreach + return $query; + } + + /** + * Get the search value (on string or Enum). + * + * @param \Illuminate\Database\Eloquent\Builder $query + * @param string $search + * @param string $field + * @return string|array + */ + protected function getSearchValue(Builder $query, string $search, string $field) + { + $cast = $query->getModel()->getCasts()[$field] ?? null; + if ( + count($query->getModel()->getCasts()) and // Check if the model has casts. + // Check if there is cast about specific field. + is_string($cast) and + class_exists($cast) and + // Check if the cast is an enum. + in_array(\Kwaadpepper\Enum\BaseEnum::class, class_parents(\App\Enums\PriceShowingMode::class)) + ) { + /** @var \Kwaadpepper\Enum\BaseEnum $cast */ + // @phpstan-ignore-next-line + $cases = collect($cast::toArray()); + $enum = $cases->filter(function ($item) use ($search) { + return preg_match('/' . Str::lower($search) . '/', Str::lower($item->label)); + }); + return $enum->toArray(); + } else { + return $search; + } + } } diff --git a/app/Http/Requests/SortOrders.php b/app/Http/Requests/SortOrders.php index 7ede9376..2f241864 100644 --- a/app/Http/Requests/SortOrders.php +++ b/app/Http/Requests/SortOrders.php @@ -23,8 +23,35 @@ class SortOrders extends FormRequest */ public function rules() { - return [ + $rules = [ 'sort_way' => 'sometimes|in:asc,desc', ]; + if ($this->routeIs('bo.orders')) { + $rules = array_merge($rules, [ + 'date-order-start' => + 'required_with:date-order-end|nullable|date_format:Y-m-d|before:date-order-end', + 'date-order-end' => 'nullable|date_format:Y-m-d|after:date-order-start', + + 'date-retrait-start' => + 'required_with:date-retrait-end|nullable|date_format:Y-m-d|before:date-retrait-end', + 'date-retrait-end' => 'nullable|date_format:Y-m-d|after:date-retrait-end', + ]); + } + return $rules; + } + + /** + * Get custom attributes for validator errors. + * + * @return array + */ + public function attributes(): array + { + return [ + 'date-order-start' => trans('Date de commande'), + 'date-order-end' => trans('Jusqu\'au'), + 'date-retrait-start' => trans('Date de retrait'), + 'date-retrait-end' => trans('Jusqu\'au'), + ]; } } diff --git a/package-lock.json b/package-lock.json index f3ca1795..405525fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,7 @@ "devDependencies": { "@fancyapps/fancybox": "^3.5.7", "@fortawesome/fontawesome-free": "^6.2.0", + "@ldc-web/cookie-notice": "^3.1.2", "@types/bootstrap": "^5.2.1", "@voerro/vue-tagsinput": "^2.7.1", "axios": "^0.21.1", @@ -1868,6 +1869,12 @@ "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==", "dev": true }, + "node_modules/@ldc-web/cookie-notice": { + "version": "3.1.2", + "resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-3.1.2.tgz", + "integrity": "sha1-UNRi9oPfcnrw4lfGSh4wDUqqcIU=", + "dev": true + }, "node_modules/@leichtgewicht/ip-codec": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", @@ -11132,6 +11139,12 @@ "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==", "dev": true }, + "@ldc-web/cookie-notice": { + "version": "3.1.2", + "resolved": "https://lab.s-web.fr/api/v4/projects/50/packages/npm/@ldc-web/cookie-notice/-/@ldc-web/cookie-notice-3.1.2.tgz", + "integrity": "sha1-UNRi9oPfcnrw4lfGSh4wDUqqcIU=", + "dev": true + }, "@leichtgewicht/ip-codec": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.4.tgz", diff --git a/package.json b/package.json index 7271e3cd..1359afcb 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "devDependencies": { "@fancyapps/fancybox": "^3.5.7", "@fortawesome/fontawesome-free": "^6.2.0", + "@ldc-web/cookie-notice": "^3.1.2", "@types/bootstrap": "^5.2.1", "@voerro/vue-tagsinput": "^2.7.1", "axios": "^0.21.1", diff --git a/resources/js/app.js b/resources/js/app.js index df4a97c8..8ee0337d 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1,6 +1,8 @@ require('./bootstrap'); require('@fancyapps/fancybox'); -import Vue from 'vue' +import Vue from 'vue'; + +import "./orderFilters"; // Vuex // import Vuex from 'vuex'; diff --git a/resources/js/bootstrap.js b/resources/js/bootstrap.js index b7f769c7..ea9fc1cc 100644 --- a/resources/js/bootstrap.js +++ b/resources/js/bootstrap.js @@ -7,12 +7,12 @@ window._ = require('lodash'); */ window.axios = require('axios'); -import Popper from 'popper.js' -import tippy, {createSingleton} from 'tippy.js'; +import Popper from 'popper.js'; +import tippy, { createSingleton } from 'tippy.js'; //window.Popper = require('popper.js').default; window.$ = window.jQuery = require('jquery'); //require('@fortawesome/fontawesome-free/js/all'); -require('bootstrap'); +const bootstrap = require('bootstrap'); window.Popper = Popper; window.tippy = tippy; window.createSingleton = createSingleton; @@ -40,3 +40,15 @@ window.axios.defaults.headers.common = { // cluster: process.env.MIX_PUSHER_APP_CLUSTER, // forceTLS: true // }); + +setTimeout(() => { + const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]'); + const tooltipList = [...document.querySelectorAll('[data-bs-toggle="tooltip"]')].map(tooltipTriggerEl => { + // * VUE 2 removes title attributes + const label = tooltipTriggerEl.getAttribute('arial-label'); + if (label) { + tooltipTriggerEl.setAttribute('title', label); + } + return new bootstrap.Tooltip(tooltipTriggerEl); + }); +}, 2000); diff --git a/resources/js/orderFilters.js b/resources/js/orderFilters.js new file mode 100644 index 00000000..ccd18124 --- /dev/null +++ b/resources/js/orderFilters.js @@ -0,0 +1,30 @@ +document.addEventListener("DOMContentLoaded", function () { + const tagListToSwitchDisplay = ["date-order", "date-retrait"]; + + tagListToSwitchDisplay.forEach(function (tag) { + /** @type {NodeListOf} */ + const elementListToSwitchDisplay = document.querySelectorAll( + `[data-toggle="${tag}-end"]` + ); + /** @type {HTMLElement|null} */ + const toggleSwitchElement = document.getElementById(`${tag}-switch`); + if (!toggleSwitchElement) { + return; + } + // * Force switch on if end is filled with a date + elementListToSwitchDisplay.forEach((el) => { + toggleSwitchElement.checked = el.value?.length ? true : false; + }); + const displaySwitch = () => { + elementListToSwitchDisplay.forEach((el) => { + if (toggleSwitchElement.checked) { + el.classList.remove("d-none"); + } else { + el.classList.add("d-none"); + } + }); + }; + displaySwitch(); + toggleSwitchElement.addEventListener("change", displaySwitch); + }); +}); diff --git a/resources/lang/en/cookie-notice.php b/resources/lang/en/cookie-notice.php new file mode 100644 index 00000000..b97ed87d --- /dev/null +++ b/resources/lang/en/cookie-notice.php @@ -0,0 +1,37 @@ + 'Customize cookies', + 'button_close_cookies' => 'Close cookie window', + 'button_forbid' => 'Prohibit', + 'button_allow' => 'Allow', + 'button_forbid_all' => 'Reject all', + 'button_allow_all' => 'Accept all', + 'button_forbid_all_title' => 'Refuse all cookies and close the cookies panel', + 'button_allow_all_title' => 'Accept all cookies and close the cookies panel', + 'button_customize' => 'Customize', + 'button_back' => 'Back', + 'banner_title' => 'The :site_name website uses cookies!', + 'banner_text' => 'We use cookies to ensure the proper functioning of our site and for analytical purposes. + You can change your mind at any time by clicking on the icon on any page of our site. + By authorizing these third-party services, you agree to the deposit and reading of cookies and the use of tracking technologies necessary for their proper operation.', + 'panel_title' => 'Cookie management panel', + 'panel_content' => 'Cookie management panel content', + 'panel_subtitle' => 'Your privacy is our priority', + 'panel_details' => 'The functionalities of this site are based on services provided by third parties. If you accept, these third parties will deposit cookies that will enable you to view content on the site hosted by these third parties. Through these cookies, these third parties will collect and use your browsing data for their own purposes, in accordance with their privacy policy (link below). This page allows you to give or withdraw your consent, either globally or service by service.', + 'custom' => [ + 'matomo' => [ + 'title' => 'Matomo', + 'description' => 'Audience measurement services are used to generate traffic statistics, which are useful for improving the site.', + 'labelLink' => 'Learn more', + ], + 'recaptcha' => [ + 'title' => 'reCAPTCHA', + 'description' => 'The purpose of the cookies placed on forms via the recaptcha is to prevent them from being submitted by robots.', + 'labelLink' => 'Learn more', + 'warning' => 'You must accept cookies to send the form', + ] + ] +]; diff --git a/resources/lang/fr/cookie-notice.php b/resources/lang/fr/cookie-notice.php new file mode 100644 index 00000000..f8e0b033 --- /dev/null +++ b/resources/lang/fr/cookie-notice.php @@ -0,0 +1,37 @@ + 'Personnaliser les cookies', + 'button_close_cookies' => 'Fermer la fenêtre des cookies', + 'button_forbid' => 'Interdire', + 'button_allow' => 'Autoriser', + 'button_forbid_all' => 'Tout refuser', + 'button_allow_all' => 'Tout accepter', + 'button_forbid_all_title' => 'Refuser tous les cookies et fermer le panneau des cookies', + 'button_allow_all_title' => 'Accepter tous les cookies et fermer le panneau des cookies', + 'button_customize' => 'Personnaliser', + 'button_back' => 'Retour', + 'banner_title' => 'Le site internet :site_name utilise des cookies !', + 'banner_text' => 'Nous utilisons des cookies pour nous assurer du bon fonctionnement de notre site et à des fins analytiques. + Vous pouvez changer d\'avis à tout moment en cliquant sur l\'icône présente sur chaque page de notre site. + En autorisant ces services tiers, vous acceptez le dépôt et la lecture de cookies et l\'utilisation de technologies de suivi nécessaires à leur bon fonctionnement.', + 'panel_title' => 'Panneau de gestion des cookies', + 'panel_content' => 'Contenu du panneau des cookies', + 'panel_subtitle' => 'Le respect de votre vie privée est notre priorité', + 'panel_details' => 'Les fonctionnalités de ce site s’appuient sur des services proposés par des tiers. Si vous acceptez, ces tiers déposeront des cookies qui vous permettront de visualiser sur le site du contenu hébergé par ces tiers. Via ces cookies, ces tiers collecteront et utiliseront vos données de navigation pour des finalités qui leur sont propres, conformément à leur politique de confidentialité (lien ci-dessous). Cette page vous permet de donner ou de retirer votre consentement, soit globalement soit service par service.', + 'custom' => [ + 'matomo' => [ + 'title' => 'Matomo', + 'description' => 'Les services de mesure d\'audience permettent de générer des statistiques de fréquentation utiles à l\'amélioration du site.', + 'labelLink' => 'En apprendre plus', + ], + 'recaptcha' => [ + 'title' => 'reCAPTCHA', + 'description' => 'Les cookies qui sont déposés via le recaptcha sur les formulaires ont pour finalité d\'empêcher que ceux-ci ne soient soumis par des robots.', + 'labelLink' => 'En apprendre plus', + 'warning' => 'Vous devez accepter les cookies pour envoyer le formulaire', + ] + ] +]; diff --git a/resources/sass/_classes.scss b/resources/sass/_classes.scss index 703c7d2c..e175ff62 100644 --- a/resources/sass/_classes.scss +++ b/resources/sass/_classes.scss @@ -10,3 +10,16 @@ .display-flex { display: flex !important; } + +.w-md-auto { + width: 100% !important; + + /** Equivalent to @include media-breakpoint-up(md) */ + @media (min-width: 768px) { + width: auto !important; + } +} + +.flex-50 { + flex-basis: 50% !important; +} diff --git a/resources/sass/_popup.scss b/resources/sass/_popup.scss index b2aa29f5..f07e629f 100644 --- a/resources/sass/_popup.scss +++ b/resources/sass/_popup.scss @@ -32,7 +32,7 @@ //tooltips - .tooltip { + .tooltip:not(.bs-tooltip-auto) { background: #333; color: white; font-weight: bold; diff --git a/resources/views/bo/modules/search-bar-orders.blade.php b/resources/views/bo/modules/search-bar-orders.blade.php new file mode 100644 index 00000000..e2c04474 --- /dev/null +++ b/resources/views/bo/modules/search-bar-orders.blade.php @@ -0,0 +1,39 @@ +@php + $iArgs = []; + if (request()->sort_col) { + $iArgs['sort_col'] = request()->sort_col; + } + + if (request()->search) { + $iArgs['search'] = request()->sort_way; + } +@endphp +
+
+
+ + @if (request()->sort_col) + + @endif + @if (request()->sort_way) + + @endif + @if (request()->rangefilter) + + @endif + @if (request()->group) + + @endif + + + +
+
+
diff --git a/resources/views/bo/orders/index.blade.php b/resources/views/bo/orders/index.blade.php index 2d09e9bd..0c636547 100644 --- a/resources/views/bo/orders/index.blade.php +++ b/resources/views/bo/orders/index.blade.php @@ -1,77 +1,157 @@ @extends('layouts.bo-layout') @section('content') -
-

Commandes @if (isset($today)) à retirer aujourd'hui @endif

+
+

Commandes @if (isset($today)) + à retirer aujourd'hui + @endif +

@if (session('success')) {{ session('success') }} @endif
- - - - - - - - - - - - - @foreach ($orders as $order) - - - - - - - - - - - @endforeach - -
Client  - @include('bo.modules.sorter', ['colname' => 'customer_id', 'list' => 'orders']) - Référence - Date  - @include('bo.modules.sorter', ['colname' => 'date', 'list' => 'orders']) - Total en €Date de retrait  - @include('bo.modules.sorter', ['colname' => 'date_retrait', 'list' => 'orders']) - - Point de retrait  - @include('bo.modules.sorter', ['colname' => 'magasin_id', 'list' => 'orders']) - - Statut  - @include('bo.modules.sorter', ['colname' => 'status_id', 'list' => 'orders']) - Réinitialiser le tri
- {{-- - Infos Client - --}} - Infos Client - {{$order->reference}}{{\Carbon\Carbon::parse($order->date)->format('d/m/Y')}}{{number_format($order->total, 2, ',', ' ')}}€ - @if (!empty($order->timeslot)) - {{$order->timeslot->day}} {{$order->timeslot->time}} - @endif - - @if (!empty($order->timeslot)) - {{-- - {{$order->timeslot->magasin->name}} - --}} - {{$order->timeslot->magasin->name}} - @endif - {{$order->status->label}} - {{-- L'id du status 6 est le status "Retirée", la dernière étape d'une commande --}} - - @if ($order->status_id < 6 && $order->status_id >=3 ) - - @endif - @if ($order->status_id < 6) - - @endif -
- @if($orders instanceof \Illuminate\Pagination\LengthAwarePaginator ) +
+ @include('bo.modules.search-bar-orders') + @if (request()->routeIs('bo.orders')) +
+
+
+ {{ __('Date de commande') }} +
+
+ input('date-order-switch')) ? true : false) checked @endif> + +
+
+ + + + +
+ @include('modules.input-error', ['inputName' => 'date-order-start']) + @include('modules.input-error', ['inputName' => 'date-order-end']) +
+
+
+ {{ __('Date de retrait') }} +
+
+ input('date-retrait-switch')) ? true : false) checked @endif> + +
+
+ + + + +
+ @include('modules.input-error', ['inputName' => 'date-retrait-start']) + @include('modules.input-error', ['inputName' => 'date-retrait-end']) +
+
+ + @push('scripts') + + @endpush + @endif +
+
+
+ {{ __('Obligatoire') }} +
+
+
+ + + + + + + + + + + + + @foreach ($orders as $order) + + + + + + + + + + + @endforeach + +
{{ __('Client') }}  + @include('bo.modules.sorter', ['colname' => 'customer_id', 'list' => 'orders']) + {{ __('Référence') }} + {{ __('Date commande') }}  + @include('bo.modules.sorter', ['colname' => 'date', 'list' => 'orders']) + {{ __('Total en €') }}{{ __('Date de retrait') }}  + @include('bo.modules.sorter', ['colname' => 'date_retrait', 'list' => 'orders']) + + {{ __('Point de retrait') }}  + @include('bo.modules.sorter', ['colname' => 'magasin_id', 'list' => 'orders']) + + {{ __('Statut') }}  + @include('bo.modules.sorter', ['colname' => 'status_id', 'list' => 'orders']) + Réinitialiser + le + tri
+ {{-- + Infos Client + --}} + Infos Client + {{ $order->reference }}{{ \Carbon\Carbon::parse($order->date)->format('d/m/Y') }}{{ number_format($order->total, 2, ',', ' ') }}€ + @if (!empty($order->timeslot)) + {{ optional($order->timeslot->day)->format('d/m/Y') }} + {{ optional($order->timeslot->time)->format('H:i') }} + @endif + + @if (!empty($order->timeslot)) + {{-- + {{$order->timeslot->magasin->name}} + --}} + {{ $order->timeslot->magasin->name }} + @endif + {{ $order->status->label }} + {{-- L'id du status 6 est le status "Retirée", la dernière étape d'une commande --}} + + @if ($order->status_id < 6 && $order->status_id >= 3) + + @endif + @if ($order->status_id < 6) + + @endif +
+
+ @if ($orders instanceof \Illuminate\Pagination\LengthAwarePaginator) {{ $orders->appends($_GET)->links() }} @endif @endsection @@ -86,11 +166,11 @@ var _fetchingCustInfo = false; function loadCustInfo(element) { - if(!_fetchingCustInfo) { - if(typeof customerInfo[element.dataset.custid] === 'undefined') { + if (!_fetchingCustInfo) { + if (typeof customerInfo[element.dataset.custid] === 'undefined') { //fetch only if we don't already have the data _fetchingCustInfo = true; - return fetch('/bo/customer-info/'+element.dataset.custid+'/json') + return fetch('/bo/customer-info/' + element.dataset.custid + '/json') .then(response => { return response.json(); }) @@ -106,12 +186,14 @@ return; } } else { - setTimeout(function () {loadCustInfo(element)}, 250); + setTimeout(function() { + loadCustInfo(element) + }, 250); } } clientLinks = $('.ajax-tippy-cust'); - clientLinks.each(function(index,element){ + clientLinks.each(function(index, element) { return loadCustInfo(element); }); @@ -132,10 +214,10 @@ }, onShow(instance) { if (instance._isFetching || instance._src || instance._error) { - return; + return; } - if(typeof tippyCustContents[instance._custID] === 'undefined') { + if (typeof tippyCustContents[instance._custID] === 'undefined') { //carry on } else { instance.setContent(tippyCustContents[instance._custID]); @@ -143,22 +225,22 @@ } instance._isFetching = true; - fetch('/bo/customer-info/'+instance._custID+'/tippy') - .then(response => { - return response.text(); - }) - .then(data => { - instance.setContent(data); - //save for reusability - tippyCustContents[instance._custID] = data; - }) - .catch((error) => { - // Fallback if the network request failed - instance.setContent(`Request failed. ${error}`); - }) - .finally(() => { - instance._isFetching = false; - }); + fetch('/bo/customer-info/' + instance._custID + '/tippy') + .then(response => { + return response.text(); + }) + .then(data => { + instance.setContent(data); + //save for reusability + tippyCustContents[instance._custID] = data; + }) + .catch((error) => { + // Fallback if the network request failed + instance.setContent(`Request failed. ${error}`); + }) + .finally(() => { + instance._isFetching = false; + }); }, onHidden(instance) { instance.setContent(''); @@ -185,10 +267,10 @@ }, onShow(instance) { if (instance._isFetching || instance._src || instance._error) { - return; + return; } - if(typeof tippyShopContents[instance._shopID] === 'undefined') { + if (typeof tippyShopContents[instance._shopID] === 'undefined') { //carry on } else { instance.setContent(tippyShopContents[instance._shopID]); @@ -196,22 +278,22 @@ } instance._isFetching = true; - fetch('/bo/magasin-info/'+instance._shopID+'/tippy') - .then(response => { - return response.text(); - }) - .then(data => { - instance.setContent(data); - //save for reusability - tippyShopContents[instance._shopID] = data; - }) - .catch((error) => { - // Fallback if the network request failed - instance.setContent(`Request failed. ${error}`); - }) - .finally(() => { - instance._isFetching = false; - }); + fetch('/bo/magasin-info/' + instance._shopID + '/tippy') + .then(response => { + return response.text(); + }) + .then(data => { + instance.setContent(data); + //save for reusability + tippyShopContents[instance._shopID] = data; + }) + .catch((error) => { + // Fallback if the network request failed + instance.setContent(`Request failed. ${error}`); + }) + .finally(() => { + instance._isFetching = false; + }); }, onHidden(instance) { instance.setContent(''); diff --git a/resources/views/front/sable/js/app.js b/resources/views/front/sable/js/app.js index a30fde84..2132e3a8 100644 --- a/resources/views/front/sable/js/app.js +++ b/resources/views/front/sable/js/app.js @@ -1,48 +1,63 @@ -import Axios from 'axios'; -import Vue from 'vue'; -import Vuex from 'vuex'; -import VueContentPlaceholders from 'vue-content-placeholders'; -import '../../../../../node_modules/@fortawesome/fontawesome-free/js/all.min.js'; -import { LdcwebCn } from "./vendor/ldcweb-cookies.js"; -import './utilities/bootstrap'; -import './utilities/swiper'; -import './utilities/simplebar'; -import './fo/common'; +import Axios from "axios"; +import Vue from "vue"; +import Vuex from "vuex"; +import VueContentPlaceholders from "vue-content-placeholders"; +import "../../../../../node_modules/@fortawesome/fontawesome-free/js/all.min.js"; +import CookieNotice from "@ldc-web/cookie-notice"; +import "./utilities/bootstrap"; +import "./utilities/swiper"; +import "./utilities/simplebar"; +import "./fo/common"; -// Ldcweb cookies -window.LdcwebCn = LdcwebCn; +// COOKIES +window.CookieNotice = CookieNotice; -Vue.use(VueContentPlaceholders) -Vue.component('filter-component', require('./components/FilterComponent.vue').default); +Vue.use(VueContentPlaceholders); +Vue.component( + "filter-component", + require("./components/FilterComponent.vue").default +); Vue.use(Vuex); -Vue.component('timeslot-picker', require('./components/TimeSlotPicker.vue').default); -Vue.component('basket-panel', require('./components/BasketPanel.vue').default); -Vue.component('basket-counter', { +Vue.component( + "timeslot-picker", + require("./components/TimeSlotPicker.vue").default +); +Vue.component("basket-panel", require("./components/BasketPanel.vue").default); +Vue.component("basket-counter", { computed: { count() { return this.$store.state.cartTotals.countItems; - } + }, }, - template: '{{ count }}' + template: + '{{ count }}', }); -Vue.component('basket-amount', { +Vue.component("basket-amount", { computed: { amount() { - return this.currencyFormatter(this.$store.state.cartTotals.totalTTC); - } + return this.currencyFormatter( + this.$store.state.cartTotals.totalTTC + ); + }, }, methods: { currencyFormatter(num) { if (isNaN(num)) { - return num; + return num; } - return new Intl.NumberFormat('fr-FR', { style: 'currency', currency: 'EUR' }).format(num); - } + return new Intl.NumberFormat("fr-FR", { + style: "currency", + currency: "EUR", + }).format(num); + }, }, - template: '{{ amount }}' + template: "{{ amount }}", }); -Vue.component('basket-buttons', require('./components/BasketButtons.vue').default); +Vue.component( + "basket-buttons", + require("./components/BasketButtons.vue").default +); const store = new Vuex.Store({ state: { @@ -50,21 +65,19 @@ const store = new Vuex.Store({ cartTotals: {}, }, mutations: { - Reload (state,payload) { + Reload(state, payload) { state.reload = payload.reload; }, - updatePanier (state, payload) { + updatePanier(state, payload) { state.panier = payload.panier; }, - updateCartTotals (state, payload) { + updateCartTotals(state, payload) { state.cartTotals = payload.cartTotals; }, - } + }, }); -const metaCSRFToken = document.querySelector( - "meta[name='csrf-token']" -) +const metaCSRFToken = document.querySelector("meta[name='csrf-token']"); if (!metaCSRFToken) { throw new Error("Missing meta CSRF token"); @@ -79,14 +92,14 @@ Axios.defaults.headers.common = { window.axios = Axios; const app = new Vue({ - el: '#app', + el: "#app", store, data: { - num: 1 //for the numeric stepper on product pages + num: 1, //for the numeric stepper on product pages }, methods: { - addtocart(product,qtty) { - this.$refs.basketpanel.addtocart(product,qtty); + addtocart(product, qtty) { + this.$refs.basketpanel.addtocart(product, qtty); }, }, }); diff --git a/resources/views/front/sable/js/vendor/ldcweb-cookies.js b/resources/views/front/sable/js/vendor/ldcweb-cookies.js deleted file mode 100644 index 1548dc0b..00000000 --- a/resources/views/front/sable/js/vendor/ldcweb-cookies.js +++ /dev/null @@ -1,372 +0,0 @@ -/** - * LDC Service Web - * Version 1.3 - */ - -export class LdcwebCn { - constructor(config) { - this.config = config; - this.cookieContainer = document.getElementById("ldcweb-cn"); - this.bannerContainer = document.querySelector(".ldcweb-cn-banner"); - this.bannerBtn = document.querySelector(".ldcweb-banner-btnDetails-p"); - this.ldcwebBtn = document.querySelector(".ldcweb-btn"); - this.ldcwebBannerParaP = document.querySelector(".ldcweb-banner-para-p"); - this.ldcwebBannerContent = document.querySelector(".ldcweb-banner-content"); - this.ldcwebBannerDetails = document.querySelector(".ldcweb-banner-details"); - this.ldcwebBannerBtnDetails = document.querySelector(".ldcweb-banner-btnDetails"); - this.modalContainer = document.getElementById("ldcweb-cn-modal"); - this.acceptAllBtnBanner = document.getElementById("ldcweb-cn-accept-banner"); - this.denyAllBtnBanner = document.getElementById("ldcweb-cn-deny-banner"); - this.personalizeBtn = document.getElementsByClassName("ldcweb-cn-personalize"); - this.personalizeBtnBanner = document.querySelector(".ldcweb-cn-personalize") - this.changeBtn = document.getElementsByClassName("ldcweb-cn-change"); - this.cookiesList = document.getElementById("ldcweb-cn-list"); - this.cookieLink = document.querySelector(".ldcweb-cn-cookie-link"); - this.modalDetails = document.querySelector('.modal-details'); - this.template = document.getElementById("template").cloneNode(true); - this.modalBtnBoolean = 0; - this.bannerBtnTextBoolean = 0; - document.getElementById("template").remove(); - - let cookies = this.getLDCWebCookie("ldcwebcn-init"); - if (cookies === undefined) { - let newCookie = []; - - for (const [key] of Object.entries(this.config)) { - newCookie.push(key + "=wait"); - } - - this.bannerContainer.classList.add("ldcweb-cn-banner-open"); - - this.saveLDCWebCookie(newCookie); - } else { - let test = cookies.split(","); - test.forEach((elm) => { - let test = elm.split("="); - if (test[1] === "wait") { - this.bannerContainer.classList.add("ldcweb-cn-banner-open"); - } - }); - } - let accept = function (e) { - e.preventDefault(); - for (const [key, value] of Object.entries(this.config)) { - this.addCookie(key, value); - } - for (let acceptLabel of this.cookieContainer.querySelectorAll( - ".accept > label" - )) { - acceptLabel.classList.add("active"); - } - for (let denyLabel of this.cookieContainer.querySelectorAll( - ".deny > label" - )) { - denyLabel.classList.remove("active"); - } - this.updateAllCookiesButtonsActiveStatus(); - this.bannerContainer.classList.remove("ldcweb-cn-banner-open"); - }.bind(this); - this.acceptAllBtnBanner.addEventListener("click", accept); - - let deny = function (e) { - e.preventDefault(); - for (const [key, value] of Object.entries(this.config)) { - this.removeCookie(key, value); - } - for (let acceptLabel of this.cookieContainer.querySelectorAll( - ".accept > label" - )) { - acceptLabel.classList.remove("active"); - } - for (let denyLabel of this.cookieContainer.querySelectorAll( - ".deny > label" - )) { - denyLabel.classList.add("active"); - } - this.updateAllCookiesButtonsActiveStatus(); - this.bannerContainer.classList.remove("ldcweb-cn-banner-open"); - }.bind(this); - this.denyAllBtnBanner.addEventListener("click", deny); - - let openLdcwebCookies = function(e) { - e.preventDefault(); - this.bannerContainer.classList.add("ldcweb-cn-banner-open"); - this.ldcwebBannerContent.classList.add("visibility"); - this.ldcwebBannerDetails.classList.add("visibility"); - this.ldcwebBannerBtnDetails.classList.add("visibility"); - this.modalContainer.classList.remove("visibility"); - this.personalizeBtnBanner.innerHTML = this.personalizeBtnBanner.getAttribute("data-open-modal"); - this.modalBtnBoolean = 1; - this.modalDetails.scrollTop = 0; - this.openModal() - }.bind(this) - this.cookieLink.addEventListener("click", openLdcwebCookies); - - let hideModal = function(e) { - e.preventDefault(); - this.ldcwebBannerContent.classList.toggle("visibility"); - this.ldcwebBannerDetails.classList.toggle("visibility"); - this.ldcwebBannerBtnDetails.classList.toggle("visibility"); - this.modalContainer.classList.toggle("visibility"); - this.setCookieList(); - }.bind(this) - this.personalizeBtnBanner.addEventListener("click", hideModal); - - let changeBtnPersonalize = function(e){ - e.preventDefault(); - this.modalDetails.scrollTop = 0; - if(this.modalBtnBoolean === 0){ - this.personalizeBtnBanner.innerHTML = this.personalizeBtnBanner.getAttribute("data-open-modal"); - this.modalBtnBoolean = 1; - } - else { - this.personalizeBtnBanner.innerHTML = this.personalizeBtnBanner.getAttribute("data-close-modal"); - this.modalBtnBoolean = 0; - } - }.bind(this); - this.personalizeBtnBanner.addEventListener("click", changeBtnPersonalize); - - this.setListenerOnChange(); - - let cookie = this.getLDCWebCookie("ldcwebcn-init"); - let test = cookie.split(","); - test.forEach((elm) => { - let test = elm.split("="); - if (test[1] === "true") { - this.config[test[0]].script(); - } - }); - - this.updateAllCookiesButtonsActiveStatus(); - - let changePara = function(e) { - e.preventDefault(); - this.ldcwebBannerDetails.classList.toggle("ldcweb-banner-details-open"); - this.bannerBtn.classList.toggle("ldcweb-banner-btnDetails-p-open"); - if(this.bannerBtnTextBoolean === 0){ - e.target.innerHTML = e.target.getAttribute("data-open"); - this.ldcwebBannerParaP.innerHTML = this.ldcwebBannerParaP.getAttribute("data-open"); - this.ldcwebBannerDetails.style.height = this.ldcwebBannerDetails.children[0].clientHeight + "px" - this.bannerBtnTextBoolean = 1; - } - else{ - e.target.innerHTML = e.target.getAttribute("data-close"); - this.ldcwebBannerParaP.innerHTML = this.ldcwebBannerParaP.getAttribute("data-close"); - this.ldcwebBannerDetails.style.height = "0px" - this.bannerBtnTextBoolean = 0; - } - }.bind(this); - this.bannerBtn.addEventListener("click", changePara); - - let resetVue = function(e){ - e.preventDefault(); - this.bannerContainer.classList.toggle("ldcweb-cn-banner-open") - if(this.bannerContainer.classList.contains("ldcweb-cn-banner-open")){ - this.ldcwebBannerContent.classList.remove("visibility"), - this.ldcwebBannerDetails.classList.remove("visibility"), - this.ldcwebBannerBtnDetails.classList.remove("visibility"), - this.modalContainer.classList.add("visibility"); - this.personalizeBtnBanner.innerHTML = this.personalizeBtnBanner.getAttribute("data-close-modal"); - this.modalBtnBoolean = 0; - } - }.bind(this); - this.ldcwebBtn.addEventListener("click", resetVue); - } - - setCookieList() { - this.cookiesList.innerHTML = ""; - let cookiesSite = this.getLDCWebCookie("ldcwebcn-init"); - let acceptInputEvent = function (acceptLabel, denyLabel, key, value) { - return function () { - acceptLabel.classList.add("active"); - denyLabel.classList.remove("active"); - this.updateAllCookiesButtonsActiveStatus(); - this.addCookie(key, value); - }.bind(this, [acceptLabel, denyLabel, key, value]); - }; - let denyInputEvent = function (acceptLabel, denyLabel, key, value) { - return function () { - acceptLabel.classList.remove("active"); - denyLabel.classList.add("active"); - this.updateAllCookiesButtonsActiveStatus(); - this.removeCookie(key, value); - }.bind(this, [acceptLabel, denyLabel, key, value]); - }; - - for (const [key, value] of Object.entries(this.config)) { - let cookie = document.createElement("li"); - cookie.append(this.template.children.item(0).cloneNode(true)); - let name = cookie.querySelector("span.ldcweb-cn-name"); - let description = cookie.querySelector("span.ldcweb-cn-description"); - let link = cookie.querySelector("a.ldcweb-cn-link"); - let acceptInput = cookie.querySelector(".accept > input"); - let denyInput = cookie.querySelector(".deny > input"); - let acceptLabel = cookie.querySelector(".accept > label"); - let denyLabel = cookie.querySelector(".deny > label"); - - name.textContent = value.name; - description.textContent = value.description; - link.textContent = value.labelLink; - link.setAttribute("href", value.link); - acceptInput.id = key + "1"; - acceptInput.name = key; - acceptInput.dataset.name = key; - acceptLabel.htmlFor = key + "1"; - denyInput.id = key + "2"; - denyInput.name = key; - denyInput.dataset.name = key; - denyLabel.htmlFor = key + "2"; - - acceptInput.addEventListener( - "click", - acceptInputEvent.apply(this, [acceptLabel, denyLabel, key, value]) - ); - denyInput.addEventListener( - "click", - denyInputEvent.apply(this, [acceptLabel, denyLabel, key, value]) - ); - - this.cookiesList.append(cookie); - - let cookiesArray = cookiesSite.split(","); - for (const cookieEl of cookiesArray) { - let name = cookieEl.slice(0, cookieEl.indexOf("=")); - let status = cookieEl.slice(cookieEl.indexOf("=") + 1); - if (name === key) { - acceptLabel.classList.remove("active"); - denyLabel.classList.remove("active"); - switch (status) { - case "true": - acceptLabel.classList.add("active"); - break; - case "false": - denyLabel.classList.add("active"); - break; - } - } - } - } - this.setListenerOnChange(); - } - - updateAllCookiesButtonsActiveStatus() { - let acceptsButtons = this.cookieContainer.querySelectorAll("div.accept > label"); - let deniesButtons = this.cookieContainer.querySelectorAll("div.deny > label"); - let activeAcceptsButtons = this.cookieContainer.querySelectorAll("div.accept > label.active"); - let activeDeniesButtons = this.cookieContainer.querySelectorAll("div.deny > label.active"); - - if (acceptsButtons.length && acceptsButtons.length === activeAcceptsButtons.length) { - } - if (deniesButtons.length && deniesButtons.length === activeDeniesButtons.length) { - } - } - - addCookie(key, value) { - if (value.script) { - value.script(); - } - this.changeStatus(key, "true"); - } - - removeCookie(key, value) { - for (let cookieName of value.cookies) { - this.deleteBrowserCookie(cookieName, "/", "." + location.host); - } - if (document.getElementById(key)) { - document.getElementById(key).remove(); - } - this.changeStatus(key, "false"); - } - - setListenerOnChange() { - this.changeBtn = document.getElementsByClassName("ldcweb-cn-change"); - let itemClick = function (item) { - return function () { - this.changeStatus( - item.getAttribute("data-name"), - item.getAttribute("data-status") - ); - }.bind(this); - }; - for (let item of this.changeBtn) { - this.addEvent(item, "click", itemClick.bind(this, [item])); - } - } - - changeStatus(name, status) { - let newCookie = []; - - let cookie = this.getLDCWebCookie("ldcwebcn-init"); - let test = cookie.split(","); - test.forEach((elm) => { - let test = elm.split("="); - if (test[0] === name) { - newCookie.push(name + "=" + status); - if (status === "false") { - this.config[test[0]].cookies.forEach((elm) => { - let cookies = this.getLDCWebCookie(elm); - if (cookies !== undefined) { - document.cookie = - elm + - "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; domain=" + - document.domain + - "; path=/"; - document.cookie = - elm + - "=; expires=Thu, 01 Jan 1970 00:00:00 UTC; domain=." + - document.domain + - "; path=/"; - } - }); - } - } else { - newCookie.push(elm); - } - }); - - this.saveLDCWebCookie(newCookie); - } - - deleteBrowserCookie(name, path, domain) { - if (this.getLDCWebCookie(name)) { - document.cookie = - name + - "=" + - (path ? ";path=" + path : "") + - (domain ? ";domain=" + domain : "") + - ";expires=Thu, 01 Jan 1970 00:00:01 GMT"; - } - } - - getLDCWebCookie(name) { - let matches = document.cookie.match( - new RegExp( - "(?:^|; )" + - name.replace(/([\.$?*|{}\(\)\[\]\\\/\+^])/g, "\\$1") + - "=([^;]*)" - ) - ); - return matches ? decodeURIComponent(matches[1]) : undefined; - } - - addEvent(element, evnt, funct) { - if (element.attachEvent) return element.attachEvent("on" + evnt, funct); - else return element.addEventListener(evnt, funct, false); - } - - saveLDCWebCookie(content) { - let date = new Date(); - let newDate = new Date(date.setMonth(date.getMonth() + 13)); - document.cookie = - "ldcwebcn-init=" + - content + - "; expires=" + - newDate.toUTCString() + - "; path=/;"; - } - - openModal() { - this.setCookieList(); - this.updateAllCookiesButtonsActiveStatus(); - } -} diff --git a/resources/views/front/sable/layouts/footer.blade.php b/resources/views/front/sable/layouts/footer.blade.php index eb53b592..c0098696 100644 --- a/resources/views/front/sable/layouts/footer.blade.php +++ b/resources/views/front/sable/layouts/footer.blade.php @@ -1,11 +1,11 @@ -