{!! $content->title !!}
+{!! $content->title !!}
Mon compte
+Mon compte
Mes coordonnées
+Mes coordonnées
Pour modifier vos informations personnelles,
il vous suffit de renseigner vos nouvelles données dans le formulaire ci-dessous :
-diff --git a/.env.example b/.env.example index 8cc70972..c0ee5e02 100644 --- a/.env.example +++ b/.env.example @@ -43,6 +43,7 @@ MAIL_LIST_INVALIDINCO=equipe.web@ldc.fr,vincent.pierre@ldc.fr,christelle.manceau CRM_ENDPOINT=https://ldcldccrm:K5cJmTsG@dev.ldc-crm.fr # service boutique CRM_TOKEN= +CRM_PASSWORD= AWS_ACCESS_KEY_ID= AWS_SECRET_ACCESS_KEY= diff --git a/app/Enums/ProductBrand.php b/app/Enums/ProductBrand.php index be9119ca..4273642b 100644 --- a/app/Enums/ProductBrand.php +++ b/app/Enums/ProductBrand.php @@ -11,6 +11,7 @@ use Kwaadpepper\Enum\BaseEnumRoutable; * @method static self none() * @method static self loue() * @method static self legaulois() + * @method static self legauloispro() * @method static self marie() * @method static self tregalette() * @method static self esprirestauration() @@ -29,8 +30,9 @@ class ProductBrand extends BaseEnumRoutable 'none' => 'Sans marque', 'loue' => 'Loué', 'legaulois' => 'Le Gaulois', + 'legauloispro' => 'Le Gaulois Professionnel', 'marie' => 'Marie', - 'tregalette' => 'Regalette', + 'tregalette' => 'Trégalette', 'esprirestauration' => 'Espri Restauration', ]; } diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index 46f85e18..5827c1e5 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -2,10 +2,8 @@ namespace App\Exceptions; -use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Kwaadpepper\ExceptionHandler\Exceptions\ExceptionHandler; use Illuminate\Auth\AuthenticationException; -use Illuminate\Support\Facades\Mail; -use Throwable; class Handler extends ExceptionHandler { @@ -61,37 +59,4 @@ class Handler extends ExceptionHandler // Session::forget('url.intented'); . return redirect()->guest(route($login)); } - - /** - * Report or log an exception. - * - * @param \Throwable $e - * @return void - */ - public function report(Throwable $e) - { - if (get_class($e) == RedirectTo::class) { - abort(redirect($e->url)); - } - - if (config('app.debug') === false) { - if ($this->shouldntReport($e)) { - return; - } - Mail::send([ - 'html' => 'emails.exception', - 'text' => 'emails.exception-plain' - ], [ - 'exception' => $e, - 'appName' => config('app.name') - ], function ($m) { - $m->to( - config('mail.contactsList.serviceweb'), - sprintf('%s Exception Handler', config('app.name')) - )->subject('Need help !, an error occured in your application, please check Logs ASAP'); - }); - } - - parent::report($e); - } } diff --git a/app/Http/Controllers/BasketController.php b/app/Http/Controllers/BasketController.php index e52a6504..103a1398 100644 --- a/app/Http/Controllers/BasketController.php +++ b/app/Http/Controllers/BasketController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Lib\Utils; use App\Models\Product; use Illuminate\Http\Request; use Illuminate\Support\Collection; @@ -57,7 +58,12 @@ class BasketController extends Controller $instance = $request->instance ?? "panier"; $rowId = $request->rowId; Cart::instance($instance); - Cart::remove($rowId); + try { + Cart::remove($rowId); + } catch (\Gloudemans\Shoppingcart\Exceptions\InvalidRowIDException $e) { + // Attempted to remove a Row which is not in cart anymore. + Utils::sendEmailErrorManually($e); + } return $this->getCart($instance); } diff --git a/app/Http/Controllers/Bo/RangesController.php b/app/Http/Controllers/Bo/RangesController.php index c9fc1e57..6f867ce3 100644 --- a/app/Http/Controllers/Bo/RangesController.php +++ b/app/Http/Controllers/Bo/RangesController.php @@ -42,13 +42,13 @@ class RangesController extends Controller { $name = $request->name; $slug = Str::slug($name); - $description = $request->description; + $description = $request->description != null ? $request->description : null; $picture = $request->picture; $status = $request->status === null ? 0 : 1; $request->validate([ 'name' => 'required|string|max:255', - 'description' => 'required', + 'description' => 'sometimes|nullable', 'picture' => 'image|mimes:jpeg,png,jpg|max:2048|dimensions:max-width=' . config('theme.range_image_maxwidth') . ',max-height=' . config('theme.range_image_maxheight'), @@ -94,13 +94,13 @@ class RangesController extends Controller { $name = $request->name; $slug = Str::slug($name); - $description = $request->description; + $description = $request->description != null ? $request->description : null; $picture = $request->picture; $status = $request->status === null ? 0 : 1; $request->validate([ 'name' => 'required|string|max:255', - 'description' => 'required', + 'description' => 'sometimes|nullable', 'picture' => 'image|mimes:jpeg,png,jpg|max:2048|dimensions:max-width=' . config('theme.range_image_maxwidth') . ',max-height=' . config('theme.range_image_maxheight'), diff --git a/app/Http/Controllers/CustomerController.php b/app/Http/Controllers/CustomerController.php index 3b425eb7..7443bc5b 100644 --- a/app/Http/Controllers/CustomerController.php +++ b/app/Http/Controllers/CustomerController.php @@ -3,8 +3,10 @@ namespace App\Http\Controllers; use App\Http\Requests\CustomerRegisterRequest; +use App\Http\Requests\CustomerUpdatePassword; use App\Http\Requests\LoginRequest; use App\Http\Requests\UpdateInfosRequest; +use App\Lib\Utils; use App\Mail\PasswordResetMail; use App\Mail\RegisterConfirmMail; use App\Models\Customers; @@ -400,23 +402,44 @@ class CustomerController extends Controller /** * changement de mot de passe depuis le profil * - * @param Request $request + * @param CustomerUpdatePassword $request * @return \Illuminate\Http\RedirectResponse */ - public function changePasswordWhenAuthenticated(Request $request) + public function changePasswordWhenAuthenticated(CustomerUpdatePassword $request) { - $request->validate([ - 'password' => 'required|min:8|confirmed|max:255' - ]); + /** @var \App\Models\Customers */ + $customer = Auth::guard('customer')->user(); - $crm = app('crmApi'); - $customer = $crm->changePwdCustomer(Auth::guard('customer')->user()->crm_id, $request->password); + /** @var \LDC\LDCCRM\CrmApiV2 */ + $crm = app('crmAPI'); - if ($customer->status === "OK") { - return back()->with('success', __("Modifications enregistrés !")); - } else { - return back()->withErrors(__("Une erreur est survenue, merci de réessayer ultérieurement.")); - } + // Test old password. + try { + // Ne devrait pas survenir, $crm->login throws ApiError::authFailed(). + if (!$crm->login($customer->email, $request->password_old)) { + // Mauvais identifiants. + return back()->withErrors('L\'ancien mot de passe ne correspond pas.'); + } + + $crmCustomer = $crm->getCustomer($customer->hashcode); + + $crmCustomer->password = $request->password; + $crmCustomer->save(); + } catch (ApiErrorException $e) { + if ($e->getApiError()->equals(ApiError::authFailed())) { + return back()->withErrors('L\'ancien mot de passe ne correspond pas.'); + } + Utils::sendEmailErrorManually($e); + // Une erreur critique est survenue avec la CRM. + return back()->withErrors('Une erreur est survenue, merci de réessayer ultérieurement.'); + } catch (\TypeError | CrmException $e) { + Utils::sendEmailErrorManually($e); + // Une erreur critique est survenue avec la CRM. + return back()->withErrors('Une erreur est survenue, merci de réessayer ultérieurement.'); + } catch (ValidationException $e) { + return back()->withErrors(sprintf('Nouveau mot de passe : %s', $e->getMessage())); + } //end try + return back()->with('success', __("Modifications enregistrés !")); } /** diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 94fbdcb4..18cf8451 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -33,7 +33,7 @@ class HomeController extends Controller $slider = Slider::where('slug', 'home')->first(); $slides = $slider->showableSlides; - $quickorder_ranges = Range::with('products')->get(); + $quickorder_ranges = Range::where('status', 1)->with('products')->get(); foreach ($quickorder_ranges as $range) { foreach ($range->products as $product) { $product->calculatedPrices = $product->getCalcPrices(); diff --git a/app/Http/Controllers/OrderTunnelController.php b/app/Http/Controllers/OrderTunnelController.php index 2912209e..4e1ca6cc 100644 --- a/app/Http/Controllers/OrderTunnelController.php +++ b/app/Http/Controllers/OrderTunnelController.php @@ -350,13 +350,44 @@ class OrderTunnelController extends Controller 'ok_cgv' => 'accepted', ]); - $time_slot = Carbon::createFromFormat('d/m/Y-H:i', $request->selectedcreneau); $tsday = explode('-', $request->selectedcreneau)[0]; $tstime = explode('-', $request->selectedcreneau)[1]; $magasin_id = $request->selectedmagasin; $reference = $request->order_ref; $order = Order::where('reference', '=', $reference)->firstOrFail(); + // Check total price of this customer commands for a specific delivery day. + $date = CarbonImmutable::create( + explode('/', $tsday)[2], + explode('/', $tsday)[1], + explode('/', $tsday)[0] + ); + $start = $date->startOfWeek(Carbon::MONDAY); + $end = $date->endOfWeek(Carbon::SUNDAY); + $customerOrders = Order::where('customer_id', '=', $order->customer_id) + ->where('status_id', '=', 3) + ->get(); + $totalPrice = 0; + foreach ($customerOrders as $key => $customerOrder) { + $timeslot_day = Carbon::createFromFormat('d/m/Y', $customerOrder->timeslot->day); + if ( + $timeslot_day >= $start && + $timeslot_day <= $end + ) { + $totalPrice += $customerOrder->total; + } + } + if ($totalPrice > 200) { + return redirect()->route('account.order-detail', ['reference' => $order->reference]) + ->with('message', 'Le montant total pour cette date de livraison est dépassé (200€ maximum). + Veuillez modifier cette dernière pour la valider.'); + } + if ($order->total > 200) { + return redirect()->route('account.order-detail', ['reference' => $order->reference]) + ->with('message', 'Le montant total de cette commande est dépassé (200€ maximum). + Veuillez modifier cette dernière pour la valider.'); + } + if ($order->status_id == 1) { // On ne traite l'enregistrement que pour les commandes en attente venant de l'étape de récap. // Save timeslot. diff --git a/app/Http/Controllers/ProductsController.php b/app/Http/Controllers/ProductsController.php index 75dbbe79..6d5fb366 100644 --- a/app/Http/Controllers/ProductsController.php +++ b/app/Http/Controllers/ProductsController.php @@ -7,7 +7,6 @@ use App\Http\Resources\ProductResource; use App\Models\Product; use App\Models\Range; use App\Models\Tag; -use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; class ProductsController extends Controller @@ -81,87 +80,92 @@ class ProductsController extends Controller return view('product', compact('product', 'associated')); } - /** - * tous les produits - * recherche par nom de produit - * - * @param Request $request - * @return \Illuminate\Contracts\View\View - * - */ - public function allProducts(Request $request) - { - $filter = $request->query('filter'); - if (!empty($filter)) { - $products = Product::where('status', 1) - ->where('name', 'like', '%' . $filter . '%') - ->paginate(12); - } else { - $products = Product::where('status', 1)->paginate(12); - } - $search_title = 'Recherche : ' . $filter; - - $ranges = Range::all(); - $tags = Tag::where('status', true)->get(); - - return view('ranges', compact('products', 'ranges', 'tags', 'search_title', 'filter')); - } - - /** - * tous les produits - * filtrage par tag - * - * @param Request $request - * @param string $tag_slug - * @return \Illuminate\Contracts\View\View - * - * @phpcs:disable Generic.CodeAnalysis.UnusedFunctionParameter.FoundInExtendedClassBeforeLastUsed - */ - public function tagFiltered(Request $request, string $tag_slug) - { - // @phpcs:enable - $products = Product::where('status', 1) - ->whereHas('tags', function ($q) use ($tag_slug) { - $q->where('slug', '=', $tag_slug); - }) - ->paginate(12); - - $tag = Tag::where('slug', $tag_slug)->firstOrFail(); - $search_title = $tag->label; - - return view('ranges', compact('products', 'search_title', 'tag')); - } - /** * tous les produits filtrés * * @param \App\Http\Requests\ProductsFilterRequest $request - * @return \Illuminate\Http\JsonResponse + * @return \Illuminate\Http\JsonResponse|\Illuminate\Contracts\View\View */ - public function allProductsFiltered(ProductsFilterRequest $request): JsonResponse + public function allProductsFiltered(ProductsFilterRequest $request) + { + $productfilters = array(); + + if (!empty($request->search)) { + $productfilters['search'] = $request->search; + } + + if (!empty($request->ranges)) { + $productfilters['ranges'] = $request->ranges; + } + + if (!empty($request->promotion)) { + $productfilters['promotions'] = $request->promotion; + } + + if (!empty($request->tags)) { + $productfilters['tags'] = $request->tags; + } + + if (!empty($request->brands)) { + $productfilters['brands'] = $request->brands; + } + + if (!$request->ajax()) { + if (\session()->has("productfilters")) { + $sessionFilter = \session()->get("productfilters"); + $productfilters = \array_merge((array)$sessionFilter, $productfilters); + } + } + + \session()->put("productfilters", (object)$productfilters); + \session()->save(); + $sessionFilter = \session()->get("productfilters"); + + /** @var Illuminate\Database\Eloquent\Builder */ + $productsQuery = $this->buildFilterQuery($sessionFilter); + + /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Product> */ + $products = $productsQuery->paginate(6); + + if ($request->ajax()) { + return \response()->json(ProductResource::collection($products)); + } else { + $ranges = Range::all(); + $tags = Tag::where('status', true)->get(); + return view('ranges', compact('products', 'ranges', 'tags', 'sessionFilter')); + } + } + + /** + * Build filtering Query + * + * @param object $sessionFilter + * @return Illuminate\Database\Eloquent\Builder + */ + public function buildFilterQuery(object $sessionFilter) { /** @var Illuminate\Database\Eloquent\Builder */ $productsQuery = Product::where('status', true); - if (!empty($request->promotion)) { + if (!empty($sessionFilter->search)) { + $productsQuery->where('name', 'LIKE', '%' . $sessionFilter->search . '%'); + } + if (!empty($sessionFilter->promotion)) { $productsQuery->whereHas('promotions'); } - if (!empty($request->ranges)) { - $productsQuery->whereHas('range', function ($q) use ($request) { - $q->whereIn('id', $request->ranges); + if (!empty($sessionFilter->ranges)) { + $productsQuery->whereHas('range', function ($q) use ($sessionFilter) { + $q->whereIn('id', $sessionFilter->ranges); }); } - if (!empty($request->tags)) { - $productsQuery->whereHas('tags', function ($q) use ($request) { - $q->whereIn('id', $request->tags); + if (!empty($sessionFilter->tags)) { + $productsQuery->whereHas('tags', function ($q) use ($sessionFilter) { + $q->whereIn('id', $sessionFilter->tags); }); } - if (!empty($request->brands)) { - $productsQuery->whereIn('brand', $request->brands); + if (!empty($sessionFilter->brands)) { + $productsQuery->whereIn('brand', $sessionFilter->brands); } - /** @var \Illuminate\Database\Eloquent\Collection<\App\Models\Product> */ - $products = $productsQuery->get(); - - return \response()->json(ProductResource::collection($products)); + return $productsQuery; } } diff --git a/app/Http/Requests/CustomerUpdatePassword.php b/app/Http/Requests/CustomerUpdatePassword.php new file mode 100644 index 00000000..22893b89 --- /dev/null +++ b/app/Http/Requests/CustomerUpdatePassword.php @@ -0,0 +1,40 @@ +check(); + } + + /** + * Get the validation rules that apply to the request. + * + * @return array + */ + public function rules() + { + return [ + 'password_old' => 'required', + 'password' => [ + 'required', 'confirmed', 'min:8', 'max:255', + Password::min(8) + ->mixedCase() + ->letters() + ->numbers() + ->symbols() + ->uncompromised() + ], + ]; + } +} diff --git a/app/Http/Resources/ProductResource.php b/app/Http/Resources/ProductResource.php index 4a13eebe..900b44fe 100644 --- a/app/Http/Resources/ProductResource.php +++ b/app/Http/Resources/ProductResource.php @@ -49,6 +49,7 @@ class ProductResource extends JsonResource self::$skeleton ), ['priceTtc' => $this->product->priceTtc], + ['priceKgTtc' => $this->product->priceKgTtc], ['discountedPriceTtc' => $this->product->discountedPriceTtc], ['promotion' => (isset($this->product->promotions[0])) ? $this->product->promotions : null], [ diff --git a/app/Jobs/RefreshSiteMap.php b/app/Jobs/RefreshSiteMap.php index 25b4db34..845dfb71 100644 --- a/app/Jobs/RefreshSiteMap.php +++ b/app/Jobs/RefreshSiteMap.php @@ -3,7 +3,6 @@ namespace App\Jobs; use App\Models\Range; -use App\Models\Tag; use App\Models\Product; use Exception; use Illuminate\Bus\Queueable; @@ -58,9 +57,6 @@ class RefreshSiteMap implements ShouldQueue 'range' => [ 'rangeSlug' => [Range::class, 'slug'] ], - 'products.tagfilter' => [ - 'tagSlug' => [Tag::class, 'slug'] - ], 'product' => [ 'productSlug' => [Product::class, 'slug'] ], diff --git a/app/Lib/Utils.php b/app/Lib/Utils.php index 9aa9cdde..21ec87f2 100644 --- a/app/Lib/Utils.php +++ b/app/Lib/Utils.php @@ -2,6 +2,10 @@ namespace App\Lib; +use Illuminate\Support\Facades\Log; +use Illuminate\Support\Facades\Mail; +use Throwable; + class Utils { /** @@ -22,4 +26,100 @@ class Utils } return $randomString; } + + /** + * Manually send an exception to team instead of going trough the error handler + * (requires package kwaadpepper/exception-handler) + * + * @param Throwable $e + * @return void + */ + public static function sendEmailErrorManually(Throwable $e) + { + Mail::send([ + 'html' => 'exception-handler::emails.exception', + 'text' => 'exception-handler::emails.exception-plain' + ], [ + 'appName' => config('app.name'), + 'code' => $e->getCode(), + 'line' => $e->getLine(), + 'ename' => \get_class($e), + 'emessage' => self::getAnonymizedMessage($e->getMessage()), + 'file' => str_replace(\realpath(\sprintf('%s/../', \app_path())), '', $e->getFile()), + 'stackTrace' => self::getAnonymizedStackTrace($e), + 'uri' => app()->runningInConsole() ? + 'CONSOLE' : ( + (request() and request()->fullUrl()) ? + request()->fullUrl() : 'none') + ], function ($m) { + /** @var \Illuminate\Mail\Message $m */ + $m->to( + config('mail.contactsList.serviceweb'), + sprintf('%s Exception Handler', config('app.name')) + )->subject('Need help !, an error occured in your application, please check Logs ASAP'); + }); + Log::alert(sprintf('Envoie d\'une erreur par mail : %s', json_encode($e))); + } + + /** + * Anonymize at least Sql queries + * + * @param string $message + * @return string + */ + private static function getAnonymizedMessage(string $message): string + { + $message = \preg_replace('/^(.*)( \(SQL:.*\))$/', '$1', $message) ?? $message; + return $message; + } + + /** + * Anonymize stack trace + * + * @param Throwable $e + * @return string + */ + private static function getAnonymizedStackTrace(Throwable $e): string + { + $projectPath = \realpath(\sprintf('%s/../', \app_path())); + $traceStack = $e->getTrace(); + $traceStr = ''; + $maxStackStage = 0; + foreach ($traceStack as $stackStage => $stack) { + $maxStackStage = $stackStage; + $traceStr .= \sprintf( + '#%s %s(%d): ', + $stackStage, + str_replace($projectPath, '', $stack['file']), + $stack['line'] + ); + $traceStr .= "{$stack['class']}->{$stack['function']}("; + $traceArgs = ''; + if (isset($stack['args'])) { + $argsCount = count($stack['args']); + for ($i = 0; $i < $argsCount; $i++) { + $type = \gettype($stack['args'][$i]); + switch ($type) { + case 'object': + $traceArgs .= sprintf('Object(%s)', \get_class($stack['args'][$i])); + break; + case 'array': + $traceArgs .= sprintf('Array(%d)', \count($stack['args'][$i])); + break; + case 'string': + $traceArgs .= sprintf('String(%d)', \strlen($stack['args'][$i])); + break; + default: + $traceArgs .= \gettype($stack['args'][$i]); + } + $traceArgs .= ($i !== ($argsCount - 1) ? ',' : ''); + } + $traceStr .= $traceArgs; + } //end if + $traceStr .= ")\n"; + } //end foreach + $maxStackStage++; + $traceStr .= "#$maxStackStage {main}"; + return $traceStr; + } } diff --git a/app/Models/Product.php b/app/Models/Product.php index 9ba12c10..99dc2b74 100644 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -54,6 +54,13 @@ class Product extends Model implements Buyable */ protected $priceHt; + /** + * Base Price + * + * @var float + */ + protected $priceKgTtc; + /** * Base Price after discount * @@ -101,6 +108,7 @@ class Product extends Model implements Buyable // On data retrived from DB. static::retrieved(function ($model) { $model->priceHt = $model->getPriceHtAttribute(); + $model->priceKgTtc = $model->getPriceKgTtcAttribute(); $model->priceTtc = $model->getPriceTtcAttribute(); $model->discountAmount = $model->getDiscountAmountAttribute(); $model->discountRate = $model->getDiscountRateAttribute(); @@ -127,6 +135,7 @@ class Product extends Model implements Buyable { $prices = array( 'priceHt' => $this->priceHt, + 'priceKgTtc' => $this->priceKgTtc, 'discountAmount' => $this->discountAmount, 'discountRate' => $this->discountRate, 'discountedPriceHt' => $this->discountedPriceHt, @@ -188,6 +197,37 @@ class Product extends Model implements Buyable }//end if } + /** + * getter for price by weight + * + * @return float + */ + public function getPriceKgTtcAttribute() + { + if (isset($this->priceKgTtc)) { + $showPrice = $this->priceKgTtc; + } else { + $priceKgTtc = $this->attributes['price'] * (1 + ($this->tax->rate / 100)); + /** + * On travaille avec des centimes puis on redivise par 100 pour avoir des unités monetaires + * on augmente la précision à 3 digits, l'affichage formate les prix sur 2 décimales + */ + $this->priceKgTtc = round($priceKgTtc * 1000) / 1000; + $showPrice = $this->priceKgTtc; + } + + // Prix transmis en fonction du setting show_prices. + if (config('bosettings.show_prices_authenticated') == "authenticated") { + if (Auth::guard('customer')->check()) { + return $showPrice; + } + } + if (config('bosettings.show_prices_guest') == "guest") { + return $showPrice; + } + return "-.--"; + } + /** * setter for dicounted price * @@ -277,11 +317,9 @@ class Product extends Model implements Buyable } // Prix transmis en fonction du setting show_prices. if (config('bosettings.show_prices_authenticated') == "authenticated") { - { if (Auth::guard('customer')->check()) { return $showPrice; } - } } if (config('bosettings.show_prices_guest') == "guest") { return $showPrice; diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index d593dfba..5653b9d9 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -73,7 +73,7 @@ class AppServiceProvider extends ServiceProvider Blade::directive('fmt_currency', function ($expression) { return ""; diff --git a/composer.json b/composer.json index ad022a5e..5e358ffd 100644 --- a/composer.json +++ b/composer.json @@ -15,6 +15,7 @@ "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0.1", "kwaadpepper/enum": "^2.0.0", + "kwaadpepper/exception-handler": "^0.1.0", "laravel/framework": "^8.12", "laravel/tinker": "^2.5", "ldc/ldccrmv2client": "^3.0", diff --git a/composer.lock b/composer.lock index ab1b4cae..74a65505 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7011b3ec6ca329a4d4d5cb3bdeaac351", + "content-hash": "895507e8a27256f31399e18f2655aece", "packages": [ { "name": "asm89/stack-cors", @@ -1331,6 +1331,67 @@ }, "time": "2022-07-28T14:19:44+00:00" }, + { + "name": "kwaadpepper/exception-handler", + "version": "0.1.0", + "source": { + "type": "git", + "url": "https://github.com/Kwaadpepper/exception-handler.git", + "reference": "36403e6245ea4a2d93d07cafa3409107a0b16f61" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Kwaadpepper/exception-handler/zipball/36403e6245ea4a2d93d07cafa3409107a0b16f61", + "reference": "36403e6245ea4a2d93d07cafa3409107a0b16f61", + "shasum": "" + }, + "require": { + "illuminate/support": "~7|~8|~9", + "laravel/framework": "~7|~8|~9" + }, + "require-dev": { + "orchestra/testbench": "^6.13", + "phpunit/phpunit": "~9.0", + "squizlabs/php_codesniffer": "^3.5" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "Kwaadpepper\\ExceptionHandler\\ExceptionHandlerServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "Kwaadpepper\\ExceptionHandler\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jérémy Munsch", + "email": "github@jeremydev.ovh", + "homepage": "https://jeremydev.ovh" + } + ], + "description": "Send emails when exceptions occurs", + "homepage": "https://github.com/kwaadpepper/exception-handler", + "keywords": [ + "email", + "exception", + "laravel", + "policies" + ], + "support": { + "issues": "https://github.com/Kwaadpepper/exception-handler/issues", + "source": "https://github.com/Kwaadpepper/exception-handler/tree/0.1.0" + }, + "time": "2022-08-22T15:14:23+00:00" + }, { "name": "laravel/framework", "version": "v8.83.23", diff --git a/config/exception-handler.php b/config/exception-handler.php new file mode 100644 index 00000000..7f9bcb99 --- /dev/null +++ b/config/exception-handler.php @@ -0,0 +1,15 @@ + !config('app.debug'), + + /** + * Put a developper secured mailbox in here + * so you can receive email if things go mad + */ + 'contactsList' => explode(',', env('MAIL_LIST_SERVICEWEB')) +]; diff --git a/database/migrations/2022_10_20_111255_alter_ranges_description_table.php b/database/migrations/2022_10_20_111255_alter_ranges_description_table.php new file mode 100644 index 00000000..3f2462df --- /dev/null +++ b/database/migrations/2022_10_20_111255_alter_ranges_description_table.php @@ -0,0 +1,32 @@ +text('description')->default(null)->nullable()->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('ranges', function (Blueprint $table) { + $table->text('description')->default(null)->nullable()->change(); + }); + } +} diff --git a/resources/views/front/sable/auth/register.blade.php b/resources/views/front/sable/auth/register.blade.php index e01e5f7f..35f03d6a 100644 --- a/resources/views/front/sable/auth/register.blade.php +++ b/resources/views/front/sable/auth/register.blade.php @@ -43,12 +43,12 @@ type="text" name="matricule" placeholder="Matricule*" - value="{{ old('matricule') }}" required/> + value="{{ old('matricule') }}"/> + value="{{ old('code') }}"/> @elseif (config('bosettings.register_salaries') && !config('bosettings.register_public')) @@ -177,7 +177,7 @@
Pour modifier vos informations personnelles,
il vous suffit de renseigner vos nouvelles données dans le formulaire ci-dessous :
-